]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-2.9-3.3.5-201205071839.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.3.5-201205071839.patch
CommitLineData
c7c3c4d0
PK		 1diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2index 0c083c5..bf13011 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@@ -69,6 +74,7 @@ Image
38 Module.markers
39 Module.symvers
40 PENDING
41+PERF*
42 SCCS
43 System.map*
44 TAGS
45@@ -92,19 +98,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@@ -115,9 +126,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@@ -125,12 +138,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@@ -145,7 +161,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@@ -153,7 +169,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@@ -165,14 +181,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@@ -208,6 +225,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@@ -218,6 +236,7 @@ setup
142 setup.bin
143 setup.elf
144 sImage
145+slabinfo
146 sm_tbl*
147 split-include
148 syscalltab.h
149@@ -228,6 +247,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@@ -245,7 +265,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@@ -253,9 +275,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 d99fd9c..8689fef 100644
181--- a/Documentation/kernel-parameters.txt
182+++ b/Documentation/kernel-parameters.txt
183@@ -1977,6 +1977,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 64615e9..64d72ce 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,55 @@ 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+ifndef CONFIG_UML
232+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
233+endif
234+endif
235+ifdef CONFIG_PAX_MEMORY_STACKLEAK
236+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
237+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
238+endif
239+ifdef CONFIG_KALLOCSTAT_PLUGIN
240+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
241+endif
242+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
243+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
244+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
245+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
246+endif
247+ifdef CONFIG_CHECKER_PLUGIN
248+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
249+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
250+endif
251+endif
252+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
253+ifdef CONFIG_PAX_SIZE_OVERFLOW
254+SIZE_OVERFLOW_PLUGIN := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
255+endif
256+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
257+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS) $(SIZE_OVERFLOW_PLUGIN)
258+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
259+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN SIZE_OVERFLOW_PLUGIN
260+ifeq ($(KBUILD_EXTMOD),)
261+gcc-plugins:
262+ $(Q)$(MAKE) $(build)=tools/gcc
263+else
264+gcc-plugins: ;
265+endif
266+else
267+gcc-plugins:
268+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
269+ $(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.))
270+else
271+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
272+endif
273+ $(Q)echo "PAX_MEMORY_STACKLEAK and other features will be less secure"
274+endif
275+endif
276+
277 include $(srctree)/arch/$(SRCARCH)/Makefile
278
279 ifneq ($(CONFIG_FRAME_WARN),0)
280@@ -708,7 +758,7 @@ export mod_strip_cmd
281
282
283 ifeq ($(KBUILD_EXTMOD),)
284-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
285+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
286
287 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
288 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
289@@ -932,6 +982,8 @@ vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE
290
291 # The actual objects are generated when descending,
292 # make sure no implicit rule kicks in
293+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
294+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
295 $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
296
297 # Handle descending into subdirectories listed in $(vmlinux-dirs)
298@@ -941,7 +993,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
299 # Error messages still appears in the original language
300
301 PHONY += $(vmlinux-dirs)
302-$(vmlinux-dirs): prepare scripts
303+$(vmlinux-dirs): gcc-plugins prepare scripts
304 $(Q)$(MAKE) $(build)=$@
305
306 # Store (new) KERNELRELASE string in include/config/kernel.release
307@@ -985,6 +1037,7 @@ prepare0: archprepare FORCE
308 $(Q)$(MAKE) $(build)=.
309
310 # All the preparing..
311+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
312 prepare: prepare0
313
314 # Generate some files
315@@ -1089,6 +1142,8 @@ all: modules
316 # using awk while concatenating to the final file.
317
318 PHONY += modules
319+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
320+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
321 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
322 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
323 @$(kecho) ' Building modules, stage 2.';
324@@ -1104,7 +1159,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
325
326 # Target to prepare building external modules
327 PHONY += modules_prepare
328-modules_prepare: prepare scripts
329+modules_prepare: gcc-plugins prepare scripts
330
331 # Target to install modules
332 PHONY += modules_install
333@@ -1201,6 +1256,7 @@ distclean: mrproper
334 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
335 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
336 -o -name '.*.rej' \
337+ -o -name '.*.rej' -o -name '*.so' \
338 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
339 -type f -print | xargs rm -f
340
341@@ -1361,6 +1417,8 @@ PHONY += $(module-dirs) modules
342 $(module-dirs): crmodverdir $(objtree)/Module.symvers
343 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
344
345+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
346+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
347 modules: $(module-dirs)
348 @$(kecho) ' Building modules, stage 2.';
349 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
350@@ -1487,17 +1545,21 @@ else
351 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
352 endif
353
354-%.s: %.c prepare scripts FORCE
355+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
356+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
357+%.s: %.c gcc-plugins prepare scripts FORCE
358 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
359 %.i: %.c prepare scripts FORCE
360 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
361-%.o: %.c prepare scripts FORCE
362+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
363+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
364+%.o: %.c gcc-plugins prepare scripts FORCE
365 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
366 %.lst: %.c prepare scripts FORCE
367 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
368-%.s: %.S prepare scripts FORCE
369+%.s: %.S gcc-plugins prepare scripts FORCE
370 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
371-%.o: %.S prepare scripts FORCE
372+%.o: %.S gcc-plugins prepare scripts FORCE
373 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
374 %.symtypes: %.c prepare scripts FORCE
375 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
376@@ -1507,11 +1569,15 @@ endif
377 $(cmd_crmodverdir)
378 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
379 $(build)=$(build-dir)
380-%/: prepare scripts FORCE
381+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
382+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
383+%/: gcc-plugins prepare scripts FORCE
384 $(cmd_crmodverdir)
385 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
386 $(build)=$(build-dir)
387-%.ko: prepare scripts FORCE
388+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
389+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
390+%.ko: gcc-plugins prepare scripts FORCE
391 $(cmd_crmodverdir)
392 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
393 $(build)=$(build-dir) $(@:.ko=.o)
394diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
395index 640f909..48b6597 100644
396--- a/arch/alpha/include/asm/atomic.h
397+++ b/arch/alpha/include/asm/atomic.h
398@@ -250,6 +250,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
399 #define atomic_dec(v) atomic_sub(1,(v))
400 #define atomic64_dec(v) atomic64_sub(1,(v))
401
402+#define atomic64_read_unchecked(v) atomic64_read(v)
403+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
404+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
405+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
406+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
407+#define atomic64_inc_unchecked(v) atomic64_inc(v)
408+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
409+#define atomic64_dec_unchecked(v) atomic64_dec(v)
410+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
411+
412 #define smp_mb__before_atomic_dec() smp_mb()
413 #define smp_mb__after_atomic_dec() smp_mb()
414 #define smp_mb__before_atomic_inc() smp_mb()
415diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
416index ad368a9..fbe0f25 100644
417--- a/arch/alpha/include/asm/cache.h
418+++ b/arch/alpha/include/asm/cache.h
419@@ -4,19 +4,19 @@
420 #ifndef __ARCH_ALPHA_CACHE_H
421 #define __ARCH_ALPHA_CACHE_H
422
423+#include <linux/const.h>
424
425 /* Bytes per L1 (data) cache line. */
426 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
427-# define L1_CACHE_BYTES 64
428 # define L1_CACHE_SHIFT 6
429 #else
430 /* Both EV4 and EV5 are write-through, read-allocate,
431 direct-mapped, physical.
432 */
433-# define L1_CACHE_BYTES 32
434 # define L1_CACHE_SHIFT 5
435 #endif
436
437+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
438 #define SMP_CACHE_BYTES L1_CACHE_BYTES
439
440 #endif
441diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
442index da5449e..7418343 100644
443--- a/arch/alpha/include/asm/elf.h
444+++ b/arch/alpha/include/asm/elf.h
445@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
446
447 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
448
449+#ifdef CONFIG_PAX_ASLR
450+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
451+
452+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
453+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
454+#endif
455+
456 /* $0 is set by ld.so to a pointer to a function which might be
457 registered using atexit. This provides a mean for the dynamic
458 linker to call DT_FINI functions for shared libraries that have
459diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
460index bc2a0da..8ad11ee 100644
461--- a/arch/alpha/include/asm/pgalloc.h
462+++ b/arch/alpha/include/asm/pgalloc.h
463@@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
464 pgd_set(pgd, pmd);
465 }
466
467+static inline void
468+pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
469+{
470+ pgd_populate(mm, pgd, pmd);
471+}
472+
473 extern pgd_t *pgd_alloc(struct mm_struct *mm);
474
475 static inline void
476diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
477index de98a73..bd4f1f8 100644
478--- a/arch/alpha/include/asm/pgtable.h
479+++ b/arch/alpha/include/asm/pgtable.h
480@@ -101,6 +101,17 @@ struct vm_area_struct;
481 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
482 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
483 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
484+
485+#ifdef CONFIG_PAX_PAGEEXEC
486+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
487+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
488+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
489+#else
490+# define PAGE_SHARED_NOEXEC PAGE_SHARED
491+# define PAGE_COPY_NOEXEC PAGE_COPY
492+# define PAGE_READONLY_NOEXEC PAGE_READONLY
493+#endif
494+
495 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
496
497 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
498diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
499index 2fd00b7..cfd5069 100644
500--- a/arch/alpha/kernel/module.c
501+++ b/arch/alpha/kernel/module.c
502@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
503
504 /* The small sections were sorted to the end of the segment.
505 The following should definitely cover them. */
506- gp = (u64)me->module_core + me->core_size - 0x8000;
507+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
508 got = sechdrs[me->arch.gotsecindex].sh_addr;
509
510 for (i = 0; i < n; i++) {
511diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
512index 01e8715..be0e80f 100644
513--- a/arch/alpha/kernel/osf_sys.c
514+++ b/arch/alpha/kernel/osf_sys.c
515@@ -1147,7 +1147,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
516 /* At this point: (!vma || addr < vma->vm_end). */
517 if (limit - len < addr)
518 return -ENOMEM;
519- if (!vma || addr + len <= vma->vm_start)
520+ if (check_heap_stack_gap(vma, addr, len))
521 return addr;
522 addr = vma->vm_end;
523 vma = vma->vm_next;
524@@ -1183,6 +1183,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
525 merely specific addresses, but regions of memory -- perhaps
526 this feature should be incorporated into all ports? */
527
528+#ifdef CONFIG_PAX_RANDMMAP
529+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
530+#endif
531+
532 if (addr) {
533 addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
534 if (addr != (unsigned long) -ENOMEM)
535@@ -1190,8 +1194,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
536 }
537
538 /* Next, try allocating at TASK_UNMAPPED_BASE. */
539- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
540- len, limit);
541+ addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base), len, limit);
542+
543 if (addr != (unsigned long) -ENOMEM)
544 return addr;
545
546diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
547index fadd5f8..904e73a 100644
548--- a/arch/alpha/mm/fault.c
549+++ b/arch/alpha/mm/fault.c
550@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
551 __reload_thread(pcb);
552 }
553
554+#ifdef CONFIG_PAX_PAGEEXEC
555+/*
556+ * PaX: decide what to do with offenders (regs->pc = fault address)
557+ *
558+ * returns 1 when task should be killed
559+ * 2 when patched PLT trampoline was detected
560+ * 3 when unpatched PLT trampoline was detected
561+ */
562+static int pax_handle_fetch_fault(struct pt_regs *regs)
563+{
564+
565+#ifdef CONFIG_PAX_EMUPLT
566+ int err;
567+
568+ do { /* PaX: patched PLT emulation #1 */
569+ unsigned int ldah, ldq, jmp;
570+
571+ err = get_user(ldah, (unsigned int *)regs->pc);
572+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
573+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
574+
575+ if (err)
576+ break;
577+
578+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
579+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
580+ jmp == 0x6BFB0000U)
581+ {
582+ unsigned long r27, addr;
583+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
584+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
585+
586+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
587+ err = get_user(r27, (unsigned long *)addr);
588+ if (err)
589+ break;
590+
591+ regs->r27 = r27;
592+ regs->pc = r27;
593+ return 2;
594+ }
595+ } while (0);
596+
597+ do { /* PaX: patched PLT emulation #2 */
598+ unsigned int ldah, lda, br;
599+
600+ err = get_user(ldah, (unsigned int *)regs->pc);
601+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
602+ err |= get_user(br, (unsigned int *)(regs->pc+8));
603+
604+ if (err)
605+ break;
606+
607+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
608+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
609+ (br & 0xFFE00000U) == 0xC3E00000U)
610+ {
611+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
612+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
613+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
614+
615+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
616+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
617+ return 2;
618+ }
619+ } while (0);
620+
621+ do { /* PaX: unpatched PLT emulation */
622+ unsigned int br;
623+
624+ err = get_user(br, (unsigned int *)regs->pc);
625+
626+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
627+ unsigned int br2, ldq, nop, jmp;
628+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
629+
630+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
631+ err = get_user(br2, (unsigned int *)addr);
632+ err |= get_user(ldq, (unsigned int *)(addr+4));
633+ err |= get_user(nop, (unsigned int *)(addr+8));
634+ err |= get_user(jmp, (unsigned int *)(addr+12));
635+ err |= get_user(resolver, (unsigned long *)(addr+16));
636+
637+ if (err)
638+ break;
639+
640+ if (br2 == 0xC3600000U &&
641+ ldq == 0xA77B000CU &&
642+ nop == 0x47FF041FU &&
643+ jmp == 0x6B7B0000U)
644+ {
645+ regs->r28 = regs->pc+4;
646+ regs->r27 = addr+16;
647+ regs->pc = resolver;
648+ return 3;
649+ }
650+ }
651+ } while (0);
652+#endif
653+
654+ return 1;
655+}
656+
657+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
658+{
659+ unsigned long i;
660+
661+ printk(KERN_ERR "PAX: bytes at PC: ");
662+ for (i = 0; i < 5; i++) {
663+ unsigned int c;
664+ if (get_user(c, (unsigned int *)pc+i))
665+ printk(KERN_CONT "???????? ");
666+ else
667+ printk(KERN_CONT "%08x ", c);
668+ }
669+ printk("\n");
670+}
671+#endif
672
673 /*
674 * This routine handles page faults. It determines the address,
675@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
676 good_area:
677 si_code = SEGV_ACCERR;
678 if (cause < 0) {
679- if (!(vma->vm_flags & VM_EXEC))
680+ if (!(vma->vm_flags & VM_EXEC)) {
681+
682+#ifdef CONFIG_PAX_PAGEEXEC
683+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
684+ goto bad_area;
685+
686+ up_read(&mm->mmap_sem);
687+ switch (pax_handle_fetch_fault(regs)) {
688+
689+#ifdef CONFIG_PAX_EMUPLT
690+ case 2:
691+ case 3:
692+ return;
693+#endif
694+
695+ }
696+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
697+ do_group_exit(SIGKILL);
698+#else
699 goto bad_area;
700+#endif
701+
702+ }
703 } else if (!cause) {
704 /* Allow reads even for write-only mappings */
705 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
706diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
707index 86976d0..8e07f84 100644
708--- a/arch/arm/include/asm/atomic.h
709+++ b/arch/arm/include/asm/atomic.h
710@@ -15,6 +15,10 @@
711 #include <linux/types.h>
712 #include <asm/system.h>
713
714+#ifdef CONFIG_GENERIC_ATOMIC64
715+#include <asm-generic/atomic64.h>
716+#endif
717+
718 #define ATOMIC_INIT(i) { (i) }
719
720 #ifdef __KERNEL__
721@@ -25,7 +29,15 @@
722 * atomic_set() is the clrex or dummy strex done on every exception return.
723 */
724 #define atomic_read(v) (*(volatile int *)&(v)->counter)
725+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
726+{
727+ return v->counter;
728+}
729 #define atomic_set(v,i) (((v)->counter) = (i))
730+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
731+{
732+ v->counter = i;
733+}
734
735 #if __LINUX_ARM_ARCH__ >= 6
736
737@@ -40,6 +52,35 @@ static inline void atomic_add(int i, atomic_t *v)
738 int result;
739
740 __asm__ __volatile__("@ atomic_add\n"
741+"1: ldrex %1, [%3]\n"
742+" adds %0, %1, %4\n"
743+
744+#ifdef CONFIG_PAX_REFCOUNT
745+" bvc 3f\n"
746+"2: bkpt 0xf103\n"
747+"3:\n"
748+#endif
749+
750+" strex %1, %0, [%3]\n"
751+" teq %1, #0\n"
752+" bne 1b"
753+
754+#ifdef CONFIG_PAX_REFCOUNT
755+"\n4:\n"
756+ _ASM_EXTABLE(2b, 4b)
757+#endif
758+
759+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
760+ : "r" (&v->counter), "Ir" (i)
761+ : "cc");
762+}
763+
764+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
765+{
766+ unsigned long tmp;
767+ int result;
768+
769+ __asm__ __volatile__("@ atomic_add_unchecked\n"
770 "1: ldrex %0, [%3]\n"
771 " add %0, %0, %4\n"
772 " strex %1, %0, [%3]\n"
773@@ -58,6 +99,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
774 smp_mb();
775
776 __asm__ __volatile__("@ atomic_add_return\n"
777+"1: ldrex %1, [%3]\n"
778+" adds %0, %1, %4\n"
779+
780+#ifdef CONFIG_PAX_REFCOUNT
781+" bvc 3f\n"
782+" mov %0, %1\n"
783+"2: bkpt 0xf103\n"
784+"3:\n"
785+#endif
786+
787+" strex %1, %0, [%3]\n"
788+" teq %1, #0\n"
789+" bne 1b"
790+
791+#ifdef CONFIG_PAX_REFCOUNT
792+"\n4:\n"
793+ _ASM_EXTABLE(2b, 4b)
794+#endif
795+
796+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
797+ : "r" (&v->counter), "Ir" (i)
798+ : "cc");
799+
800+ smp_mb();
801+
802+ return result;
803+}
804+
805+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
806+{
807+ unsigned long tmp;
808+ int result;
809+
810+ smp_mb();
811+
812+ __asm__ __volatile__("@ atomic_add_return_unchecked\n"
813 "1: ldrex %0, [%3]\n"
814 " add %0, %0, %4\n"
815 " strex %1, %0, [%3]\n"
816@@ -78,6 +155,35 @@ static inline void atomic_sub(int i, atomic_t *v)
817 int result;
818
819 __asm__ __volatile__("@ atomic_sub\n"
820+"1: ldrex %1, [%3]\n"
821+" subs %0, %1, %4\n"
822+
823+#ifdef CONFIG_PAX_REFCOUNT
824+" bvc 3f\n"
825+"2: bkpt 0xf103\n"
826+"3:\n"
827+#endif
828+
829+" strex %1, %0, [%3]\n"
830+" teq %1, #0\n"
831+" bne 1b"
832+
833+#ifdef CONFIG_PAX_REFCOUNT
834+"\n4:\n"
835+ _ASM_EXTABLE(2b, 4b)
836+#endif
837+
838+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
839+ : "r" (&v->counter), "Ir" (i)
840+ : "cc");
841+}
842+
843+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
844+{
845+ unsigned long tmp;
846+ int result;
847+
848+ __asm__ __volatile__("@ atomic_sub_unchecked\n"
849 "1: ldrex %0, [%3]\n"
850 " sub %0, %0, %4\n"
851 " strex %1, %0, [%3]\n"
852@@ -96,11 +202,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
853 smp_mb();
854
855 __asm__ __volatile__("@ atomic_sub_return\n"
856-"1: ldrex %0, [%3]\n"
857-" sub %0, %0, %4\n"
858+"1: ldrex %1, [%3]\n"
859+" sub %0, %1, %4\n"
860+
861+#ifdef CONFIG_PAX_REFCOUNT
862+" bvc 3f\n"
863+" mov %0, %1\n"
864+"2: bkpt 0xf103\n"
865+"3:\n"
866+#endif
867+
868 " strex %1, %0, [%3]\n"
869 " teq %1, #0\n"
870 " bne 1b"
871+
872+#ifdef CONFIG_PAX_REFCOUNT
873+"\n4:\n"
874+ _ASM_EXTABLE(2b, 4b)
875+#endif
876+
877 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
878 : "r" (&v->counter), "Ir" (i)
879 : "cc");
880@@ -132,6 +252,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
881 return oldval;
882 }
883
884+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
885+{
886+ unsigned long oldval, res;
887+
888+ smp_mb();
889+
890+ do {
891+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
892+ "ldrex %1, [%3]\n"
893+ "mov %0, #0\n"
894+ "teq %1, %4\n"
895+ "strexeq %0, %5, [%3]\n"
896+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
897+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
898+ : "cc");
899+ } while (res);
900+
901+ smp_mb();
902+
903+ return oldval;
904+}
905+
906 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
907 {
908 unsigned long tmp, tmp2;
909@@ -165,7 +307,9 @@ static inline int atomic_add_return(int i, atomic_t *v)
910
911 return val;
912 }
913+#define atomic_add_return_unchecked(i, v) atomic_add_return(i, v)
914 #define atomic_add(i, v) (void) atomic_add_return(i, v)
915+#define atomic_add_unchecked(i, v) (void) atomic_add_return_unchecked(i, v)
916
917 static inline int atomic_sub_return(int i, atomic_t *v)
918 {
919@@ -179,7 +323,9 @@ static inline int atomic_sub_return(int i, atomic_t *v)
920
921 return val;
922 }
923+#define atomic_sub_return_unchecked(i, v) atomic_sub_return(i, v)
924 #define atomic_sub(i, v) (void) atomic_sub_return(i, v)
925+#define atomic_sub_unchecked(i, v) (void) atomic_sub_return_unchecked(i, v)
926
927 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
928 {
929@@ -194,6 +340,7 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
930
931 return ret;
932 }
933+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg(v, o, n)
934
935 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
936 {
937@@ -207,6 +354,10 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
938 #endif /* __LINUX_ARM_ARCH__ */
939
940 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
941+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
942+{
943+ return xchg(&v->counter, new);
944+}
945
946 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
947 {
948@@ -219,11 +370,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
949 }
950
951 #define atomic_inc(v) atomic_add(1, v)
952+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
953+{
954+ atomic_add_unchecked(1, v);
955+}
956 #define atomic_dec(v) atomic_sub(1, v)
957+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
958+{
959+ atomic_sub_unchecked(1, v);
960+}
961
962 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
963+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
964+{
965+ return atomic_add_return_unchecked(1, v) == 0;
966+}
967 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
968 #define atomic_inc_return(v) (atomic_add_return(1, v))
969+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
970+{
971+ return atomic_add_return_unchecked(1, v);
972+}
973 #define atomic_dec_return(v) (atomic_sub_return(1, v))
974 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
975
976@@ -239,6 +406,14 @@ typedef struct {
977 u64 __aligned(8) counter;
978 } atomic64_t;
979
980+#ifdef CONFIG_PAX_REFCOUNT
981+typedef struct {
982+ u64 __aligned(8) counter;
983+} atomic64_unchecked_t;
984+#else
985+typedef atomic64_t atomic64_unchecked_t;
986+#endif
987+
988 #define ATOMIC64_INIT(i) { (i) }
989
990 static inline u64 atomic64_read(atomic64_t *v)
991@@ -254,6 +429,19 @@ static inline u64 atomic64_read(atomic64_t *v)
992 return result;
993 }
994
995+static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *v)
996+{
997+ u64 result;
998+
999+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1000+" ldrexd %0, %H0, [%1]"
1001+ : "=&r" (result)
1002+ : "r" (&v->counter), "Qo" (v->counter)
1003+ );
1004+
1005+ return result;
1006+}
1007+
1008 static inline void atomic64_set(atomic64_t *v, u64 i)
1009 {
1010 u64 tmp;
1011@@ -268,6 +456,20 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
1012 : "cc");
1013 }
1014
1015+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
1016+{
1017+ u64 tmp;
1018+
1019+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1020+"1: ldrexd %0, %H0, [%2]\n"
1021+" strexd %0, %3, %H3, [%2]\n"
1022+" teq %0, #0\n"
1023+" bne 1b"
1024+ : "=&r" (tmp), "=Qo" (v->counter)
1025+ : "r" (&v->counter), "r" (i)
1026+ : "cc");
1027+}
1028+
1029 static inline void atomic64_add(u64 i, atomic64_t *v)
1030 {
1031 u64 result;
1032@@ -276,6 +478,36 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1033 __asm__ __volatile__("@ atomic64_add\n"
1034 "1: ldrexd %0, %H0, [%3]\n"
1035 " adds %0, %0, %4\n"
1036+" adcs %H0, %H0, %H4\n"
1037+
1038+#ifdef CONFIG_PAX_REFCOUNT
1039+" bvc 3f\n"
1040+"2: bkpt 0xf103\n"
1041+"3:\n"
1042+#endif
1043+
1044+" strexd %1, %0, %H0, [%3]\n"
1045+" teq %1, #0\n"
1046+" bne 1b"
1047+
1048+#ifdef CONFIG_PAX_REFCOUNT
1049+"\n4:\n"
1050+ _ASM_EXTABLE(2b, 4b)
1051+#endif
1052+
1053+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1054+ : "r" (&v->counter), "r" (i)
1055+ : "cc");
1056+}
1057+
1058+static inline void atomic64_add_unchecked(u64 i, atomic64_unchecked_t *v)
1059+{
1060+ u64 result;
1061+ unsigned long tmp;
1062+
1063+ __asm__ __volatile__("@ atomic64_add_unchecked\n"
1064+"1: ldrexd %0, %H0, [%3]\n"
1065+" adds %0, %0, %4\n"
1066 " adc %H0, %H0, %H4\n"
1067 " strexd %1, %0, %H0, [%3]\n"
1068 " teq %1, #0\n"
1069@@ -287,12 +519,49 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1070
1071 static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
1072 {
1073- u64 result;
1074- unsigned long tmp;
1075+ u64 result, tmp;
1076
1077 smp_mb();
1078
1079 __asm__ __volatile__("@ atomic64_add_return\n"
1080+"1: ldrexd %1, %H1, [%3]\n"
1081+" adds %0, %1, %4\n"
1082+" adcs %H0, %H1, %H4\n"
1083+
1084+#ifdef CONFIG_PAX_REFCOUNT
1085+" bvc 3f\n"
1086+" mov %0, %1\n"
1087+" mov %H0, %H1\n"
1088+"2: bkpt 0xf103\n"
1089+"3:\n"
1090+#endif
1091+
1092+" strexd %1, %0, %H0, [%3]\n"
1093+" teq %1, #0\n"
1094+" bne 1b"
1095+
1096+#ifdef CONFIG_PAX_REFCOUNT
1097+"\n4:\n"
1098+ _ASM_EXTABLE(2b, 4b)
1099+#endif
1100+
1101+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1102+ : "r" (&v->counter), "r" (i)
1103+ : "cc");
1104+
1105+ smp_mb();
1106+
1107+ return result;
1108+}
1109+
1110+static inline u64 atomic64_add_return_unchecked(u64 i, atomic64_unchecked_t *v)
1111+{
1112+ u64 result;
1113+ unsigned long tmp;
1114+
1115+ smp_mb();
1116+
1117+ __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
1118 "1: ldrexd %0, %H0, [%3]\n"
1119 " adds %0, %0, %4\n"
1120 " adc %H0, %H0, %H4\n"
1121@@ -316,6 +585,36 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1122 __asm__ __volatile__("@ atomic64_sub\n"
1123 "1: ldrexd %0, %H0, [%3]\n"
1124 " subs %0, %0, %4\n"
1125+" sbcs %H0, %H0, %H4\n"
1126+
1127+#ifdef CONFIG_PAX_REFCOUNT
1128+" bvc 3f\n"
1129+"2: bkpt 0xf103\n"
1130+"3:\n"
1131+#endif
1132+
1133+" strexd %1, %0, %H0, [%3]\n"
1134+" teq %1, #0\n"
1135+" bne 1b"
1136+
1137+#ifdef CONFIG_PAX_REFCOUNT
1138+"\n4:\n"
1139+ _ASM_EXTABLE(2b, 4b)
1140+#endif
1141+
1142+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1143+ : "r" (&v->counter), "r" (i)
1144+ : "cc");
1145+}
1146+
1147+static inline void atomic64_sub_unchecked(u64 i, atomic64_unchecked_t *v)
1148+{
1149+ u64 result;
1150+ unsigned long tmp;
1151+
1152+ __asm__ __volatile__("@ atomic64_sub_unchecked\n"
1153+"1: ldrexd %0, %H0, [%3]\n"
1154+" subs %0, %0, %4\n"
1155 " sbc %H0, %H0, %H4\n"
1156 " strexd %1, %0, %H0, [%3]\n"
1157 " teq %1, #0\n"
1158@@ -327,18 +626,32 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1159
1160 static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
1161 {
1162- u64 result;
1163- unsigned long tmp;
1164+ u64 result, tmp;
1165
1166 smp_mb();
1167
1168 __asm__ __volatile__("@ atomic64_sub_return\n"
1169-"1: ldrexd %0, %H0, [%3]\n"
1170-" subs %0, %0, %4\n"
1171-" sbc %H0, %H0, %H4\n"
1172+"1: ldrexd %1, %H1, [%3]\n"
1173+" subs %0, %1, %4\n"
1174+" sbc %H0, %H1, %H4\n"
1175+
1176+#ifdef CONFIG_PAX_REFCOUNT
1177+" bvc 3f\n"
1178+" mov %0, %1\n"
1179+" mov %H0, %H1\n"
1180+"2: bkpt 0xf103\n"
1181+"3:\n"
1182+#endif
1183+
1184 " strexd %1, %0, %H0, [%3]\n"
1185 " teq %1, #0\n"
1186 " bne 1b"
1187+
1188+#ifdef CONFIG_PAX_REFCOUNT
1189+"\n4:\n"
1190+ _ASM_EXTABLE(2b, 4b)
1191+#endif
1192+
1193 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1194 : "r" (&v->counter), "r" (i)
1195 : "cc");
1196@@ -372,6 +685,30 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
1197 return oldval;
1198 }
1199
1200+static inline u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old, u64 new)
1201+{
1202+ u64 oldval;
1203+ unsigned long res;
1204+
1205+ smp_mb();
1206+
1207+ do {
1208+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1209+ "ldrexd %1, %H1, [%3]\n"
1210+ "mov %0, #0\n"
1211+ "teq %1, %4\n"
1212+ "teqeq %H1, %H4\n"
1213+ "strexdeq %0, %5, %H5, [%3]"
1214+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1215+ : "r" (&ptr->counter), "r" (old), "r" (new)
1216+ : "cc");
1217+ } while (res);
1218+
1219+ smp_mb();
1220+
1221+ return oldval;
1222+}
1223+
1224 static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1225 {
1226 u64 result;
1227@@ -395,21 +732,34 @@ static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1228
1229 static inline u64 atomic64_dec_if_positive(atomic64_t *v)
1230 {
1231- u64 result;
1232- unsigned long tmp;
1233+ u64 result, tmp;
1234
1235 smp_mb();
1236
1237 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1238-"1: ldrexd %0, %H0, [%3]\n"
1239-" subs %0, %0, #1\n"
1240-" sbc %H0, %H0, #0\n"
1241+"1: ldrexd %1, %H1, [%3]\n"
1242+" subs %0, %1, #1\n"
1243+" sbc %H0, %H1, #0\n"
1244+
1245+#ifdef CONFIG_PAX_REFCOUNT
1246+" bvc 3f\n"
1247+" mov %0, %1\n"
1248+" mov %H0, %H1\n"
1249+"2: bkpt 0xf103\n"
1250+"3:\n"
1251+#endif
1252+
1253 " teq %H0, #0\n"
1254-" bmi 2f\n"
1255+" bmi 4f\n"
1256 " strexd %1, %0, %H0, [%3]\n"
1257 " teq %1, #0\n"
1258 " bne 1b\n"
1259-"2:"
1260+"4:\n"
1261+
1262+#ifdef CONFIG_PAX_REFCOUNT
1263+ _ASM_EXTABLE(2b, 4b)
1264+#endif
1265+
1266 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1267 : "r" (&v->counter)
1268 : "cc");
1269@@ -432,13 +782,25 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1270 " teq %0, %5\n"
1271 " teqeq %H0, %H5\n"
1272 " moveq %1, #0\n"
1273-" beq 2f\n"
1274+" beq 4f\n"
1275 " adds %0, %0, %6\n"
1276 " adc %H0, %H0, %H6\n"
1277+
1278+#ifdef CONFIG_PAX_REFCOUNT
1279+" bvc 3f\n"
1280+"2: bkpt 0xf103\n"
1281+"3:\n"
1282+#endif
1283+
1284 " strexd %2, %0, %H0, [%4]\n"
1285 " teq %2, #0\n"
1286 " bne 1b\n"
1287-"2:"
1288+"4:\n"
1289+
1290+#ifdef CONFIG_PAX_REFCOUNT
1291+ _ASM_EXTABLE(2b, 4b)
1292+#endif
1293+
1294 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1295 : "r" (&v->counter), "r" (u), "r" (a)
1296 : "cc");
1297@@ -451,10 +813,13 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1298
1299 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1300 #define atomic64_inc(v) atomic64_add(1LL, (v))
1301+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1302 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1303+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1304 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1305 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1306 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1307+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1308 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1309 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1310 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1311diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1312index 75fe66b..2255c86 100644
1313--- a/arch/arm/include/asm/cache.h
1314+++ b/arch/arm/include/asm/cache.h
1315@@ -4,8 +4,10 @@
1316 #ifndef __ASMARM_CACHE_H
1317 #define __ASMARM_CACHE_H
1318
1319+#include <linux/const.h>
1320+
1321 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1322-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1323+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1324
1325 /*
1326 * Memory returned by kmalloc() may be used for DMA, so we must make
1327diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1328index d5d8d5c..ad92c96 100644
1329--- a/arch/arm/include/asm/cacheflush.h
1330+++ b/arch/arm/include/asm/cacheflush.h
1331@@ -108,7 +108,7 @@ struct cpu_cache_fns {
1332 void (*dma_unmap_area)(const void *, size_t, int);
1333
1334 void (*dma_flush_range)(const void *, const void *);
1335-};
1336+} __no_const;
1337
1338 /*
1339 * Select the calling method
1340diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1341index 0e9ce8d..6ef1e03 100644
1342--- a/arch/arm/include/asm/elf.h
1343+++ b/arch/arm/include/asm/elf.h
1344@@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1345 the loader. We need to make sure that it is out of the way of the program
1346 that it will "exec", and that there is sufficient room for the brk. */
1347
1348-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1349+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1350+
1351+#ifdef CONFIG_PAX_ASLR
1352+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1353+
1354+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1355+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1356+#endif
1357
1358 /* When the program starts, a1 contains a pointer to a function to be
1359 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1360@@ -126,10 +133,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1361 extern void elf_set_personality(const struct elf32_hdr *);
1362 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1363
1364-struct mm_struct;
1365-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1366-#define arch_randomize_brk arch_randomize_brk
1367-
1368 extern int vectors_user_mapping(void);
1369 #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
1370 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
1371diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1372index e51b1e8..32a3113 100644
1373--- a/arch/arm/include/asm/kmap_types.h
1374+++ b/arch/arm/include/asm/kmap_types.h
1375@@ -21,6 +21,7 @@ enum km_type {
1376 KM_L1_CACHE,
1377 KM_L2_CACHE,
1378 KM_KDB,
1379+ KM_CLEARPAGE,
1380 KM_TYPE_NR
1381 };
1382
1383diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1384index 53426c6..c7baff3 100644
1385--- a/arch/arm/include/asm/outercache.h
1386+++ b/arch/arm/include/asm/outercache.h
1387@@ -35,7 +35,7 @@ struct outer_cache_fns {
1388 #endif
1389 void (*set_debug)(unsigned long);
1390 void (*resume)(void);
1391-};
1392+} __no_const;
1393
1394 #ifdef CONFIG_OUTER_CACHE
1395
1396diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1397index 97b440c..b7ff179 100644
1398--- a/arch/arm/include/asm/page.h
1399+++ b/arch/arm/include/asm/page.h
1400@@ -123,7 +123,7 @@ struct cpu_user_fns {
1401 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1402 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1403 unsigned long vaddr, struct vm_area_struct *vma);
1404-};
1405+} __no_const;
1406
1407 #ifdef MULTI_USER
1408 extern struct cpu_user_fns cpu_user;
1409diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1410index 943504f..bf8d667 100644
1411--- a/arch/arm/include/asm/pgalloc.h
1412+++ b/arch/arm/include/asm/pgalloc.h
1413@@ -43,6 +43,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1414 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1415 }
1416
1417+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1418+{
1419+ pud_populate(mm, pud, pmd);
1420+}
1421+
1422 #else /* !CONFIG_ARM_LPAE */
1423
1424 /*
1425@@ -51,6 +56,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1426 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1427 #define pmd_free(mm, pmd) do { } while (0)
1428 #define pud_populate(mm,pmd,pte) BUG()
1429+#define pud_populate_kernel(mm,pmd,pte) BUG()
1430
1431 #endif /* CONFIG_ARM_LPAE */
1432
1433diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
1434index e4c96cc..1145653 100644
1435--- a/arch/arm/include/asm/system.h
1436+++ b/arch/arm/include/asm/system.h
1437@@ -98,6 +98,8 @@ void hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int,
1438
1439 #define xchg(ptr,x) \
1440 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1441+#define xchg_unchecked(ptr,x) \
1442+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1443
1444 extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
1445
1446@@ -534,6 +536,13 @@ static inline unsigned long long __cmpxchg64_mb(volatile void *ptr,
1447
1448 #endif /* __LINUX_ARM_ARCH__ >= 6 */
1449
1450+#define _ASM_EXTABLE(from, to) \
1451+" .pushsection __ex_table,\"a\"\n"\
1452+" .align 3\n" \
1453+" .long " #from ", " #to"\n" \
1454+" .popsection"
1455+
1456+
1457 #endif /* __ASSEMBLY__ */
1458
1459 #define arch_align_stack(x) (x)
1460diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
1461index 2958976..12ccac4 100644
1462--- a/arch/arm/include/asm/uaccess.h
1463+++ b/arch/arm/include/asm/uaccess.h
1464@@ -22,6 +22,8 @@
1465 #define VERIFY_READ 0
1466 #define VERIFY_WRITE 1
1467
1468+extern void check_object_size(const void *ptr, unsigned long n, bool to);
1469+
1470 /*
1471 * The exception table consists of pairs of addresses: the first is the
1472 * address of an instruction that is allowed to fault, and the second is
1473@@ -387,8 +389,23 @@ do { \
1474
1475
1476 #ifdef CONFIG_MMU
1477-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
1478-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
1479+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
1480+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
1481+
1482+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
1483+{
1484+ if (!__builtin_constant_p(n))
1485+ check_object_size(to, n, false);
1486+ return ___copy_from_user(to, from, n);
1487+}
1488+
1489+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
1490+{
1491+ if (!__builtin_constant_p(n))
1492+ check_object_size(from, n, true);
1493+ return ___copy_to_user(to, from, n);
1494+}
1495+
1496 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
1497 extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
1498 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
1499@@ -403,6 +420,9 @@ extern unsigned long __must_check __strnlen_user(const char __user *s, long n);
1500
1501 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
1502 {
1503+ if ((long)n < 0)
1504+ return n;
1505+
1506 if (access_ok(VERIFY_READ, from, n))
1507 n = __copy_from_user(to, from, n);
1508 else /* security hole - plug it */
1509@@ -412,6 +432,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
1510
1511 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
1512 {
1513+ if ((long)n < 0)
1514+ return n;
1515+
1516 if (access_ok(VERIFY_WRITE, to, n))
1517 n = __copy_to_user(to, from, n);
1518 return n;
1519diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
1520index 5b0bce6..becd81c 100644
1521--- a/arch/arm/kernel/armksyms.c
1522+++ b/arch/arm/kernel/armksyms.c
1523@@ -95,8 +95,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
1524 #ifdef CONFIG_MMU
1525 EXPORT_SYMBOL(copy_page);
1526
1527-EXPORT_SYMBOL(__copy_from_user);
1528-EXPORT_SYMBOL(__copy_to_user);
1529+EXPORT_SYMBOL(___copy_from_user);
1530+EXPORT_SYMBOL(___copy_to_user);
1531 EXPORT_SYMBOL(__clear_user);
1532
1533 EXPORT_SYMBOL(__get_user_1);
1534diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
1535index 971d65c..cc936fb 100644
1536--- a/arch/arm/kernel/process.c
1537+++ b/arch/arm/kernel/process.c
1538@@ -28,7 +28,6 @@
1539 #include <linux/tick.h>
1540 #include <linux/utsname.h>
1541 #include <linux/uaccess.h>
1542-#include <linux/random.h>
1543 #include <linux/hw_breakpoint.h>
1544 #include <linux/cpuidle.h>
1545
1546@@ -273,9 +272,10 @@ void machine_power_off(void)
1547 machine_shutdown();
1548 if (pm_power_off)
1549 pm_power_off();
1550+ BUG();
1551 }
1552
1553-void machine_restart(char *cmd)
1554+__noreturn void machine_restart(char *cmd)
1555 {
1556 machine_shutdown();
1557
1558@@ -517,12 +517,6 @@ unsigned long get_wchan(struct task_struct *p)
1559 return 0;
1560 }
1561
1562-unsigned long arch_randomize_brk(struct mm_struct *mm)
1563-{
1564- unsigned long range_end = mm->brk + 0x02000000;
1565- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
1566-}
1567-
1568 #ifdef CONFIG_MMU
1569 /*
1570 * The vectors page is always readable from user space for the
1571diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
1572index a255c39..4a19b25 100644
1573--- a/arch/arm/kernel/setup.c
1574+++ b/arch/arm/kernel/setup.c
1575@@ -109,13 +109,13 @@ struct processor processor __read_mostly;
1576 struct cpu_tlb_fns cpu_tlb __read_mostly;
1577 #endif
1578 #ifdef MULTI_USER
1579-struct cpu_user_fns cpu_user __read_mostly;
1580+struct cpu_user_fns cpu_user __read_only;
1581 #endif
1582 #ifdef MULTI_CACHE
1583-struct cpu_cache_fns cpu_cache __read_mostly;
1584+struct cpu_cache_fns cpu_cache __read_only;
1585 #endif
1586 #ifdef CONFIG_OUTER_CACHE
1587-struct outer_cache_fns outer_cache __read_mostly;
1588+struct outer_cache_fns outer_cache __read_only;
1589 EXPORT_SYMBOL(outer_cache);
1590 #endif
1591
1592diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
1593index f84dfe6..13e94f7 100644
1594--- a/arch/arm/kernel/traps.c
1595+++ b/arch/arm/kernel/traps.c
1596@@ -259,6 +259,8 @@ static int __die(const char *str, int err, struct thread_info *thread, struct pt
1597
1598 static DEFINE_RAW_SPINLOCK(die_lock);
1599
1600+extern void gr_handle_kernel_exploit(void);
1601+
1602 /*
1603 * This function is protected against re-entrancy.
1604 */
1605@@ -291,6 +293,9 @@ void die(const char *str, struct pt_regs *regs, int err)
1606 panic("Fatal exception in interrupt");
1607 if (panic_on_oops)
1608 panic("Fatal exception");
1609+
1610+ gr_handle_kernel_exploit();
1611+
1612 if (ret != NOTIFY_STOP)
1613 do_exit(SIGSEGV);
1614 }
1615diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
1616index 66a477a..bee61d3 100644
1617--- a/arch/arm/lib/copy_from_user.S
1618+++ b/arch/arm/lib/copy_from_user.S
1619@@ -16,7 +16,7 @@
1620 /*
1621 * Prototype:
1622 *
1623- * size_t __copy_from_user(void *to, const void *from, size_t n)
1624+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
1625 *
1626 * Purpose:
1627 *
1628@@ -84,11 +84,11 @@
1629
1630 .text
1631
1632-ENTRY(__copy_from_user)
1633+ENTRY(___copy_from_user)
1634
1635 #include "copy_template.S"
1636
1637-ENDPROC(__copy_from_user)
1638+ENDPROC(___copy_from_user)
1639
1640 .pushsection .fixup,"ax"
1641 .align 0
1642diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
1643index 6ee2f67..d1cce76 100644
1644--- a/arch/arm/lib/copy_page.S
1645+++ b/arch/arm/lib/copy_page.S
1646@@ -10,6 +10,7 @@
1647 * ASM optimised string functions
1648 */
1649 #include <linux/linkage.h>
1650+#include <linux/const.h>
1651 #include <asm/assembler.h>
1652 #include <asm/asm-offsets.h>
1653 #include <asm/cache.h>
1654diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
1655index d066df6..df28194 100644
1656--- a/arch/arm/lib/copy_to_user.S
1657+++ b/arch/arm/lib/copy_to_user.S
1658@@ -16,7 +16,7 @@
1659 /*
1660 * Prototype:
1661 *
1662- * size_t __copy_to_user(void *to, const void *from, size_t n)
1663+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
1664 *
1665 * Purpose:
1666 *
1667@@ -88,11 +88,11 @@
1668 .text
1669
1670 ENTRY(__copy_to_user_std)
1671-WEAK(__copy_to_user)
1672+WEAK(___copy_to_user)
1673
1674 #include "copy_template.S"
1675
1676-ENDPROC(__copy_to_user)
1677+ENDPROC(___copy_to_user)
1678 ENDPROC(__copy_to_user_std)
1679
1680 .pushsection .fixup,"ax"
1681diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
1682index 5c908b1..e712687 100644
1683--- a/arch/arm/lib/uaccess.S
1684+++ b/arch/arm/lib/uaccess.S
1685@@ -20,7 +20,7 @@
1686
1687 #define PAGE_SHIFT 12
1688
1689-/* Prototype: int __copy_to_user(void *to, const char *from, size_t n)
1690+/* Prototype: int ___copy_to_user(void *to, const char *from, size_t n)
1691 * Purpose : copy a block to user memory from kernel memory
1692 * Params : to - user memory
1693 * : from - kernel memory
1694@@ -40,7 +40,7 @@ USER( TUSER( strgtb) r3, [r0], #1) @ May fault
1695 sub r2, r2, ip
1696 b .Lc2u_dest_aligned
1697
1698-ENTRY(__copy_to_user)
1699+ENTRY(___copy_to_user)
1700 stmfd sp!, {r2, r4 - r7, lr}
1701 cmp r2, #4
1702 blt .Lc2u_not_enough
1703@@ -278,14 +278,14 @@ USER( TUSER( strgeb) r3, [r0], #1) @ May fault
1704 ldrgtb r3, [r1], #0
1705 USER( TUSER( strgtb) r3, [r0], #1) @ May fault
1706 b .Lc2u_finished
1707-ENDPROC(__copy_to_user)
1708+ENDPROC(___copy_to_user)
1709
1710 .pushsection .fixup,"ax"
1711 .align 0
1712 9001: ldmfd sp!, {r0, r4 - r7, pc}
1713 .popsection
1714
1715-/* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);
1716+/* Prototype: unsigned long ___copy_from_user(void *to,const void *from,unsigned long n);
1717 * Purpose : copy a block from user memory to kernel memory
1718 * Params : to - kernel memory
1719 * : from - user memory
1720@@ -304,7 +304,7 @@ USER( TUSER( ldrgtb) r3, [r1], #1) @ May fault
1721 sub r2, r2, ip
1722 b .Lcfu_dest_aligned
1723
1724-ENTRY(__copy_from_user)
1725+ENTRY(___copy_from_user)
1726 stmfd sp!, {r0, r2, r4 - r7, lr}
1727 cmp r2, #4
1728 blt .Lcfu_not_enough
1729@@ -544,7 +544,7 @@ USER( TUSER( ldrgeb) r3, [r1], #1) @ May fault
1730 USER( TUSER( ldrgtb) r3, [r1], #1) @ May fault
1731 strgtb r3, [r0], #1
1732 b .Lcfu_finished
1733-ENDPROC(__copy_from_user)
1734+ENDPROC(___copy_from_user)
1735
1736 .pushsection .fixup,"ax"
1737 .align 0
1738diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
1739index 025f742..8432b08 100644
1740--- a/arch/arm/lib/uaccess_with_memcpy.c
1741+++ b/arch/arm/lib/uaccess_with_memcpy.c
1742@@ -104,7 +104,7 @@ out:
1743 }
1744
1745 unsigned long
1746-__copy_to_user(void __user *to, const void *from, unsigned long n)
1747+___copy_to_user(void __user *to, const void *from, unsigned long n)
1748 {
1749 /*
1750 * This test is stubbed out of the main function above to keep
1751diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
1752index 6722627..8f97548c 100644
1753--- a/arch/arm/mach-omap2/board-n8x0.c
1754+++ b/arch/arm/mach-omap2/board-n8x0.c
1755@@ -597,7 +597,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
1756 }
1757 #endif
1758
1759-static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
1760+static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
1761 .late_init = n8x0_menelaus_late_init,
1762 };
1763
1764diff --git a/arch/arm/mach-ux500/mbox-db5500.c b/arch/arm/mach-ux500/mbox-db5500.c
1765index 2b2d51c..0127490 100644
1766--- a/arch/arm/mach-ux500/mbox-db5500.c
1767+++ b/arch/arm/mach-ux500/mbox-db5500.c
1768@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct device *dev,
1769 return sprintf(buf, "0x%X\n", mbox_value);
1770 }
1771
1772-static DEVICE_ATTR(fifo, S_IWUGO | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
1773+static DEVICE_ATTR(fifo, S_IWUSR | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
1774
1775 static int mbox_show(struct seq_file *s, void *data)
1776 {
1777diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
1778index bb7eac3..3bade16 100644
1779--- a/arch/arm/mm/fault.c
1780+++ b/arch/arm/mm/fault.c
1781@@ -172,6 +172,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
1782 }
1783 #endif
1784
1785+#ifdef CONFIG_PAX_PAGEEXEC
1786+ if (fsr & FSR_LNX_PF) {
1787+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
1788+ do_group_exit(SIGKILL);
1789+ }
1790+#endif
1791+
1792 tsk->thread.address = addr;
1793 tsk->thread.error_code = fsr;
1794 tsk->thread.trap_no = 14;
1795@@ -393,6 +400,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
1796 }
1797 #endif /* CONFIG_MMU */
1798
1799+#ifdef CONFIG_PAX_PAGEEXEC
1800+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1801+{
1802+ long i;
1803+
1804+ printk(KERN_ERR "PAX: bytes at PC: ");
1805+ for (i = 0; i < 20; i++) {
1806+ unsigned char c;
1807+ if (get_user(c, (__force unsigned char __user *)pc+i))
1808+ printk(KERN_CONT "?? ");
1809+ else
1810+ printk(KERN_CONT "%02x ", c);
1811+ }
1812+ printk("\n");
1813+
1814+ printk(KERN_ERR "PAX: bytes at SP-4: ");
1815+ for (i = -1; i < 20; i++) {
1816+ unsigned long c;
1817+ if (get_user(c, (__force unsigned long __user *)sp+i))
1818+ printk(KERN_CONT "???????? ");
1819+ else
1820+ printk(KERN_CONT "%08lx ", c);
1821+ }
1822+ printk("\n");
1823+}
1824+#endif
1825+
1826 /*
1827 * First Level Translation Fault Handler
1828 *
1829@@ -573,6 +607,20 @@ do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
1830 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
1831 struct siginfo info;
1832
1833+#ifdef CONFIG_PAX_REFCOUNT
1834+ if (fsr_fs(ifsr) == 2) {
1835+ unsigned int bkpt;
1836+
1837+ if (!probe_kernel_address((unsigned int *)addr, bkpt) && bkpt == 0xe12f1073) {
1838+ current->thread.error_code = ifsr;
1839+ current->thread.trap_no = 0;
1840+ pax_report_refcount_overflow(regs);
1841+ fixup_exception(regs);
1842+ return;
1843+ }
1844+ }
1845+#endif
1846+
1847 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
1848 return;
1849
1850diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
1851index ce8cb19..3ec539d 100644
1852--- a/arch/arm/mm/mmap.c
1853+++ b/arch/arm/mm/mmap.c
1854@@ -93,6 +93,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1855 if (len > TASK_SIZE)
1856 return -ENOMEM;
1857
1858+#ifdef CONFIG_PAX_RANDMMAP
1859+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
1860+#endif
1861+
1862 if (addr) {
1863 if (do_align)
1864 addr = COLOUR_ALIGN(addr, pgoff);
1865@@ -100,15 +104,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1866 addr = PAGE_ALIGN(addr);
1867
1868 vma = find_vma(mm, addr);
1869- if (TASK_SIZE - len >= addr &&
1870- (!vma || addr + len <= vma->vm_start))
1871+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
1872 return addr;
1873 }
1874 if (len > mm->cached_hole_size) {
1875- start_addr = addr = mm->free_area_cache;
1876+ start_addr = addr = mm->free_area_cache;
1877 } else {
1878- start_addr = addr = mm->mmap_base;
1879- mm->cached_hole_size = 0;
1880+ start_addr = addr = mm->mmap_base;
1881+ mm->cached_hole_size = 0;
1882 }
1883
1884 full_search:
1885@@ -124,14 +127,14 @@ full_search:
1886 * Start a new search - just in case we missed
1887 * some holes.
1888 */
1889- if (start_addr != TASK_UNMAPPED_BASE) {
1890- start_addr = addr = TASK_UNMAPPED_BASE;
1891+ if (start_addr != mm->mmap_base) {
1892+ start_addr = addr = mm->mmap_base;
1893 mm->cached_hole_size = 0;
1894 goto full_search;
1895 }
1896 return -ENOMEM;
1897 }
1898- if (!vma || addr + len <= vma->vm_start) {
1899+ if (check_heap_stack_gap(vma, addr, len)) {
1900 /*
1901 * Remember the place where we stopped the search:
1902 */
1903@@ -266,10 +269,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
1904
1905 if (mmap_is_legacy()) {
1906 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
1907+
1908+#ifdef CONFIG_PAX_RANDMMAP
1909+ if (mm->pax_flags & MF_PAX_RANDMMAP)
1910+ mm->mmap_base += mm->delta_mmap;
1911+#endif
1912+
1913 mm->get_unmapped_area = arch_get_unmapped_area;
1914 mm->unmap_area = arch_unmap_area;
1915 } else {
1916 mm->mmap_base = mmap_base(random_factor);
1917+
1918+#ifdef CONFIG_PAX_RANDMMAP
1919+ if (mm->pax_flags & MF_PAX_RANDMMAP)
1920+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
1921+#endif
1922+
1923 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
1924 mm->unmap_area = arch_unmap_area_topdown;
1925 }
1926diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
1927index 71a6827..e7fbc23 100644
1928--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
1929+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
1930@@ -43,7 +43,7 @@ struct samsung_dma_ops {
1931 int (*started)(unsigned ch);
1932 int (*flush)(unsigned ch);
1933 int (*stop)(unsigned ch);
1934-};
1935+} __no_const;
1936
1937 extern void *samsung_dmadev_get_ops(void);
1938 extern void *s3c_dma_get_ops(void);
1939diff --git a/arch/arm/plat-samsung/include/plat/ehci.h b/arch/arm/plat-samsung/include/plat/ehci.h
1940index 5f28cae..3d23723 100644
1941--- a/arch/arm/plat-samsung/include/plat/ehci.h
1942+++ b/arch/arm/plat-samsung/include/plat/ehci.h
1943@@ -14,7 +14,7 @@
1944 struct s5p_ehci_platdata {
1945 int (*phy_init)(struct platform_device *pdev, int type);
1946 int (*phy_exit)(struct platform_device *pdev, int type);
1947-};
1948+} __no_const;
1949
1950 extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
1951
1952diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
1953index c3a58a1..78fbf54 100644
1954--- a/arch/avr32/include/asm/cache.h
1955+++ b/arch/avr32/include/asm/cache.h
1956@@ -1,8 +1,10 @@
1957 #ifndef __ASM_AVR32_CACHE_H
1958 #define __ASM_AVR32_CACHE_H
1959
1960+#include <linux/const.h>
1961+
1962 #define L1_CACHE_SHIFT 5
1963-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1964+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1965
1966 /*
1967 * Memory returned by kmalloc() may be used for DMA, so we must make
1968diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
1969index 3b3159b..425ea94 100644
1970--- a/arch/avr32/include/asm/elf.h
1971+++ b/arch/avr32/include/asm/elf.h
1972@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
1973 the loader. We need to make sure that it is out of the way of the program
1974 that it will "exec", and that there is sufficient room for the brk. */
1975
1976-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1977+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1978
1979+#ifdef CONFIG_PAX_ASLR
1980+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
1981+
1982+#define PAX_DELTA_MMAP_LEN 15
1983+#define PAX_DELTA_STACK_LEN 15
1984+#endif
1985
1986 /* This yields a mask that user programs can use to figure out what
1987 instruction set this CPU supports. This could be done in user space,
1988diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
1989index b7f5c68..556135c 100644
1990--- a/arch/avr32/include/asm/kmap_types.h
1991+++ b/arch/avr32/include/asm/kmap_types.h
1992@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
1993 D(11) KM_IRQ1,
1994 D(12) KM_SOFTIRQ0,
1995 D(13) KM_SOFTIRQ1,
1996-D(14) KM_TYPE_NR
1997+D(14) KM_CLEARPAGE,
1998+D(15) KM_TYPE_NR
1999 };
2000
2001 #undef D
2002diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
2003index f7040a1..db9f300 100644
2004--- a/arch/avr32/mm/fault.c
2005+++ b/arch/avr32/mm/fault.c
2006@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
2007
2008 int exception_trace = 1;
2009
2010+#ifdef CONFIG_PAX_PAGEEXEC
2011+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2012+{
2013+ unsigned long i;
2014+
2015+ printk(KERN_ERR "PAX: bytes at PC: ");
2016+ for (i = 0; i < 20; i++) {
2017+ unsigned char c;
2018+ if (get_user(c, (unsigned char *)pc+i))
2019+ printk(KERN_CONT "???????? ");
2020+ else
2021+ printk(KERN_CONT "%02x ", c);
2022+ }
2023+ printk("\n");
2024+}
2025+#endif
2026+
2027 /*
2028 * This routine handles page faults. It determines the address and the
2029 * problem, and then passes it off to one of the appropriate routines.
2030@@ -156,6 +173,16 @@ bad_area:
2031 up_read(&mm->mmap_sem);
2032
2033 if (user_mode(regs)) {
2034+
2035+#ifdef CONFIG_PAX_PAGEEXEC
2036+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
2037+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
2038+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
2039+ do_group_exit(SIGKILL);
2040+ }
2041+ }
2042+#endif
2043+
2044 if (exception_trace && printk_ratelimit())
2045 printk("%s%s[%d]: segfault at %08lx pc %08lx "
2046 "sp %08lx ecr %lu\n",
2047diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
2048index 568885a..f8008df 100644
2049--- a/arch/blackfin/include/asm/cache.h
2050+++ b/arch/blackfin/include/asm/cache.h
2051@@ -7,6 +7,7 @@
2052 #ifndef __ARCH_BLACKFIN_CACHE_H
2053 #define __ARCH_BLACKFIN_CACHE_H
2054
2055+#include <linux/const.h>
2056 #include <linux/linkage.h> /* for asmlinkage */
2057
2058 /*
2059@@ -14,7 +15,7 @@
2060 * Blackfin loads 32 bytes for cache
2061 */
2062 #define L1_CACHE_SHIFT 5
2063-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2064+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2065 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2066
2067 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
2068diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
2069index aea2718..3639a60 100644
2070--- a/arch/cris/include/arch-v10/arch/cache.h
2071+++ b/arch/cris/include/arch-v10/arch/cache.h
2072@@ -1,8 +1,9 @@
2073 #ifndef _ASM_ARCH_CACHE_H
2074 #define _ASM_ARCH_CACHE_H
2075
2076+#include <linux/const.h>
2077 /* Etrax 100LX have 32-byte cache-lines. */
2078-#define L1_CACHE_BYTES 32
2079 #define L1_CACHE_SHIFT 5
2080+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2081
2082 #endif /* _ASM_ARCH_CACHE_H */
2083diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
2084index 1de779f..336fad3 100644
2085--- a/arch/cris/include/arch-v32/arch/cache.h
2086+++ b/arch/cris/include/arch-v32/arch/cache.h
2087@@ -1,11 +1,12 @@
2088 #ifndef _ASM_CRIS_ARCH_CACHE_H
2089 #define _ASM_CRIS_ARCH_CACHE_H
2090
2091+#include <linux/const.h>
2092 #include <arch/hwregs/dma.h>
2093
2094 /* A cache-line is 32 bytes. */
2095-#define L1_CACHE_BYTES 32
2096 #define L1_CACHE_SHIFT 5
2097+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2098
2099 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
2100
2101diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
2102index 0d8a7d6..d0c9ff5 100644
2103--- a/arch/frv/include/asm/atomic.h
2104+++ b/arch/frv/include/asm/atomic.h
2105@@ -241,6 +241,16 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v);
2106 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
2107 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
2108
2109+#define atomic64_read_unchecked(v) atomic64_read(v)
2110+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2111+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2112+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2113+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2114+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2115+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2116+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2117+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2118+
2119 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
2120 {
2121 int c, old;
2122diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
2123index 2797163..c2a401d 100644
2124--- a/arch/frv/include/asm/cache.h
2125+++ b/arch/frv/include/asm/cache.h
2126@@ -12,10 +12,11 @@
2127 #ifndef __ASM_CACHE_H
2128 #define __ASM_CACHE_H
2129
2130+#include <linux/const.h>
2131
2132 /* bytes per L1 cache line */
2133 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
2134-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2135+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2136
2137 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2138 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2139diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
2140index f8e16b2..c73ff79 100644
2141--- a/arch/frv/include/asm/kmap_types.h
2142+++ b/arch/frv/include/asm/kmap_types.h
2143@@ -23,6 +23,7 @@ enum km_type {
2144 KM_IRQ1,
2145 KM_SOFTIRQ0,
2146 KM_SOFTIRQ1,
2147+ KM_CLEARPAGE,
2148 KM_TYPE_NR
2149 };
2150
2151diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
2152index 385fd30..6c3d97e 100644
2153--- a/arch/frv/mm/elf-fdpic.c
2154+++ b/arch/frv/mm/elf-fdpic.c
2155@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2156 if (addr) {
2157 addr = PAGE_ALIGN(addr);
2158 vma = find_vma(current->mm, addr);
2159- if (TASK_SIZE - len >= addr &&
2160- (!vma || addr + len <= vma->vm_start))
2161+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
2162 goto success;
2163 }
2164
2165@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2166 for (; vma; vma = vma->vm_next) {
2167 if (addr > limit)
2168 break;
2169- if (addr + len <= vma->vm_start)
2170+ if (check_heap_stack_gap(vma, addr, len))
2171 goto success;
2172 addr = vma->vm_end;
2173 }
2174@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2175 for (; vma; vma = vma->vm_next) {
2176 if (addr > limit)
2177 break;
2178- if (addr + len <= vma->vm_start)
2179+ if (check_heap_stack_gap(vma, addr, len))
2180 goto success;
2181 addr = vma->vm_end;
2182 }
2183diff --git a/arch/h8300/include/asm/cache.h b/arch/h8300/include/asm/cache.h
2184index c635028..6d9445a 100644
2185--- a/arch/h8300/include/asm/cache.h
2186+++ b/arch/h8300/include/asm/cache.h
2187@@ -1,8 +1,10 @@
2188 #ifndef __ARCH_H8300_CACHE_H
2189 #define __ARCH_H8300_CACHE_H
2190
2191+#include <linux/const.h>
2192+
2193 /* bytes per L1 cache line */
2194-#define L1_CACHE_BYTES 4
2195+#define L1_CACHE_BYTES _AC(4,UL)
2196
2197 /* m68k-elf-gcc 2.95.2 doesn't like these */
2198
2199diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
2200index 0f01de2..d37d309 100644
2201--- a/arch/hexagon/include/asm/cache.h
2202+++ b/arch/hexagon/include/asm/cache.h
2203@@ -21,9 +21,11 @@
2204 #ifndef __ASM_CACHE_H
2205 #define __ASM_CACHE_H
2206
2207+#include <linux/const.h>
2208+
2209 /* Bytes per L1 cache line */
2210-#define L1_CACHE_SHIFT (5)
2211-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2212+#define L1_CACHE_SHIFT 5
2213+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2214
2215 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
2216 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
2217diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
2218index 3fad89e..3047da5 100644
2219--- a/arch/ia64/include/asm/atomic.h
2220+++ b/arch/ia64/include/asm/atomic.h
2221@@ -209,6 +209,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
2222 #define atomic64_inc(v) atomic64_add(1, (v))
2223 #define atomic64_dec(v) atomic64_sub(1, (v))
2224
2225+#define atomic64_read_unchecked(v) atomic64_read(v)
2226+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2227+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2228+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2229+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2230+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2231+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2232+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2233+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2234+
2235 /* Atomic operations are already serializing */
2236 #define smp_mb__before_atomic_dec() barrier()
2237 #define smp_mb__after_atomic_dec() barrier()
2238diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
2239index 988254a..e1ee885 100644
2240--- a/arch/ia64/include/asm/cache.h
2241+++ b/arch/ia64/include/asm/cache.h
2242@@ -1,6 +1,7 @@
2243 #ifndef _ASM_IA64_CACHE_H
2244 #define _ASM_IA64_CACHE_H
2245
2246+#include <linux/const.h>
2247
2248 /*
2249 * Copyright (C) 1998-2000 Hewlett-Packard Co
2250@@ -9,7 +10,7 @@
2251
2252 /* Bytes per L1 (data) cache line. */
2253 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
2254-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2255+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2256
2257 #ifdef CONFIG_SMP
2258 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2259diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
2260index b5298eb..67c6e62 100644
2261--- a/arch/ia64/include/asm/elf.h
2262+++ b/arch/ia64/include/asm/elf.h
2263@@ -42,6 +42,13 @@
2264 */
2265 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
2266
2267+#ifdef CONFIG_PAX_ASLR
2268+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
2269+
2270+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2271+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2272+#endif
2273+
2274 #define PT_IA_64_UNWIND 0x70000001
2275
2276 /* IA-64 relocations: */
2277diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
2278index 96a8d92..617a1cf 100644
2279--- a/arch/ia64/include/asm/pgalloc.h
2280+++ b/arch/ia64/include/asm/pgalloc.h
2281@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
2282 pgd_val(*pgd_entry) = __pa(pud);
2283 }
2284
2285+static inline void
2286+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
2287+{
2288+ pgd_populate(mm, pgd_entry, pud);
2289+}
2290+
2291 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
2292 {
2293 return quicklist_alloc(0, GFP_KERNEL, NULL);
2294@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
2295 pud_val(*pud_entry) = __pa(pmd);
2296 }
2297
2298+static inline void
2299+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
2300+{
2301+ pud_populate(mm, pud_entry, pmd);
2302+}
2303+
2304 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
2305 {
2306 return quicklist_alloc(0, GFP_KERNEL, NULL);
2307diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
2308index 1a97af3..7529d31 100644
2309--- a/arch/ia64/include/asm/pgtable.h
2310+++ b/arch/ia64/include/asm/pgtable.h
2311@@ -12,7 +12,7 @@
2312 * David Mosberger-Tang <davidm@hpl.hp.com>
2313 */
2314
2315-
2316+#include <linux/const.h>
2317 #include <asm/mman.h>
2318 #include <asm/page.h>
2319 #include <asm/processor.h>
2320@@ -143,6 +143,17 @@
2321 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2322 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2323 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
2324+
2325+#ifdef CONFIG_PAX_PAGEEXEC
2326+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
2327+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2328+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2329+#else
2330+# define PAGE_SHARED_NOEXEC PAGE_SHARED
2331+# define PAGE_READONLY_NOEXEC PAGE_READONLY
2332+# define PAGE_COPY_NOEXEC PAGE_COPY
2333+#endif
2334+
2335 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
2336 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
2337 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
2338diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
2339index b77768d..e0795eb 100644
2340--- a/arch/ia64/include/asm/spinlock.h
2341+++ b/arch/ia64/include/asm/spinlock.h
2342@@ -72,7 +72,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
2343 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
2344
2345 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
2346- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
2347+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
2348 }
2349
2350 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
2351diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
2352index 449c8c0..432a3d2 100644
2353--- a/arch/ia64/include/asm/uaccess.h
2354+++ b/arch/ia64/include/asm/uaccess.h
2355@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2356 const void *__cu_from = (from); \
2357 long __cu_len = (n); \
2358 \
2359- if (__access_ok(__cu_to, __cu_len, get_fs())) \
2360+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \
2361 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
2362 __cu_len; \
2363 })
2364@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2365 long __cu_len = (n); \
2366 \
2367 __chk_user_ptr(__cu_from); \
2368- if (__access_ok(__cu_from, __cu_len, get_fs())) \
2369+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \
2370 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
2371 __cu_len; \
2372 })
2373diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
2374index 24603be..948052d 100644
2375--- a/arch/ia64/kernel/module.c
2376+++ b/arch/ia64/kernel/module.c
2377@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
2378 void
2379 module_free (struct module *mod, void *module_region)
2380 {
2381- if (mod && mod->arch.init_unw_table &&
2382- module_region == mod->module_init) {
2383+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
2384 unw_remove_unwind_table(mod->arch.init_unw_table);
2385 mod->arch.init_unw_table = NULL;
2386 }
2387@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
2388 }
2389
2390 static inline int
2391+in_init_rx (const struct module *mod, uint64_t addr)
2392+{
2393+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
2394+}
2395+
2396+static inline int
2397+in_init_rw (const struct module *mod, uint64_t addr)
2398+{
2399+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
2400+}
2401+
2402+static inline int
2403 in_init (const struct module *mod, uint64_t addr)
2404 {
2405- return addr - (uint64_t) mod->module_init < mod->init_size;
2406+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
2407+}
2408+
2409+static inline int
2410+in_core_rx (const struct module *mod, uint64_t addr)
2411+{
2412+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
2413+}
2414+
2415+static inline int
2416+in_core_rw (const struct module *mod, uint64_t addr)
2417+{
2418+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
2419 }
2420
2421 static inline int
2422 in_core (const struct module *mod, uint64_t addr)
2423 {
2424- return addr - (uint64_t) mod->module_core < mod->core_size;
2425+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
2426 }
2427
2428 static inline int
2429@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
2430 break;
2431
2432 case RV_BDREL:
2433- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
2434+ if (in_init_rx(mod, val))
2435+ val -= (uint64_t) mod->module_init_rx;
2436+ else if (in_init_rw(mod, val))
2437+ val -= (uint64_t) mod->module_init_rw;
2438+ else if (in_core_rx(mod, val))
2439+ val -= (uint64_t) mod->module_core_rx;
2440+ else if (in_core_rw(mod, val))
2441+ val -= (uint64_t) mod->module_core_rw;
2442 break;
2443
2444 case RV_LTV:
2445@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
2446 * addresses have been selected...
2447 */
2448 uint64_t gp;
2449- if (mod->core_size > MAX_LTOFF)
2450+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
2451 /*
2452 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
2453 * at the end of the module.
2454 */
2455- gp = mod->core_size - MAX_LTOFF / 2;
2456+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
2457 else
2458- gp = mod->core_size / 2;
2459- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
2460+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
2461+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
2462 mod->arch.gp = gp;
2463 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
2464 }
2465diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
2466index 609d500..7dde2a8 100644
2467--- a/arch/ia64/kernel/sys_ia64.c
2468+++ b/arch/ia64/kernel/sys_ia64.c
2469@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2470 if (REGION_NUMBER(addr) == RGN_HPAGE)
2471 addr = 0;
2472 #endif
2473+
2474+#ifdef CONFIG_PAX_RANDMMAP
2475+ if (mm->pax_flags & MF_PAX_RANDMMAP)
2476+ addr = mm->free_area_cache;
2477+ else
2478+#endif
2479+
2480 if (!addr)
2481 addr = mm->free_area_cache;
2482
2483@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2484 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
2485 /* At this point: (!vma || addr < vma->vm_end). */
2486 if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
2487- if (start_addr != TASK_UNMAPPED_BASE) {
2488+ if (start_addr != mm->mmap_base) {
2489 /* Start a new search --- just in case we missed some holes. */
2490- addr = TASK_UNMAPPED_BASE;
2491+ addr = mm->mmap_base;
2492 goto full_search;
2493 }
2494 return -ENOMEM;
2495 }
2496- if (!vma || addr + len <= vma->vm_start) {
2497+ if (check_heap_stack_gap(vma, addr, len)) {
2498 /* Remember the address where we stopped this search: */
2499 mm->free_area_cache = addr + len;
2500 return addr;
2501diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
2502index 53c0ba0..2accdde 100644
2503--- a/arch/ia64/kernel/vmlinux.lds.S
2504+++ b/arch/ia64/kernel/vmlinux.lds.S
2505@@ -199,7 +199,7 @@ SECTIONS {
2506 /* Per-cpu data: */
2507 . = ALIGN(PERCPU_PAGE_SIZE);
2508 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
2509- __phys_per_cpu_start = __per_cpu_load;
2510+ __phys_per_cpu_start = per_cpu_load;
2511 /*
2512 * ensure percpu data fits
2513 * into percpu page size
2514diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
2515index 20b3593..1ce77f0 100644
2516--- a/arch/ia64/mm/fault.c
2517+++ b/arch/ia64/mm/fault.c
2518@@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned long address)
2519 return pte_present(pte);
2520 }
2521
2522+#ifdef CONFIG_PAX_PAGEEXEC
2523+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2524+{
2525+ unsigned long i;
2526+
2527+ printk(KERN_ERR "PAX: bytes at PC: ");
2528+ for (i = 0; i < 8; i++) {
2529+ unsigned int c;
2530+ if (get_user(c, (unsigned int *)pc+i))
2531+ printk(KERN_CONT "???????? ");
2532+ else
2533+ printk(KERN_CONT "%08x ", c);
2534+ }
2535+ printk("\n");
2536+}
2537+#endif
2538+
2539 void __kprobes
2540 ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
2541 {
2542@@ -146,9 +163,23 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
2543 mask = ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
2544 | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
2545
2546- if ((vma->vm_flags & mask) != mask)
2547+ if ((vma->vm_flags & mask) != mask) {
2548+
2549+#ifdef CONFIG_PAX_PAGEEXEC
2550+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
2551+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
2552+ goto bad_area;
2553+
2554+ up_read(&mm->mmap_sem);
2555+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
2556+ do_group_exit(SIGKILL);
2557+ }
2558+#endif
2559+
2560 goto bad_area;
2561
2562+ }
2563+
2564 /*
2565 * If for any reason at all we couldn't handle the fault, make
2566 * sure we exit gracefully rather than endlessly redo the
2567diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
2568index 5ca674b..e0e1b70 100644
2569--- a/arch/ia64/mm/hugetlbpage.c
2570+++ b/arch/ia64/mm/hugetlbpage.c
2571@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
2572 /* At this point: (!vmm || addr < vmm->vm_end). */
2573 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
2574 return -ENOMEM;
2575- if (!vmm || (addr + len) <= vmm->vm_start)
2576+ if (check_heap_stack_gap(vmm, addr, len))
2577 return addr;
2578 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
2579 }
2580diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
2581index 13df239d..cb52116 100644
2582--- a/arch/ia64/mm/init.c
2583+++ b/arch/ia64/mm/init.c
2584@@ -121,6 +121,19 @@ ia64_init_addr_space (void)
2585 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
2586 vma->vm_end = vma->vm_start + PAGE_SIZE;
2587 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
2588+
2589+#ifdef CONFIG_PAX_PAGEEXEC
2590+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
2591+ vma->vm_flags &= ~VM_EXEC;
2592+
2593+#ifdef CONFIG_PAX_MPROTECT
2594+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
2595+ vma->vm_flags &= ~VM_MAYEXEC;
2596+#endif
2597+
2598+ }
2599+#endif
2600+
2601 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
2602 down_write(&current->mm->mmap_sem);
2603 if (insert_vm_struct(current->mm, vma)) {
2604diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
2605index 40b3ee9..8c2c112 100644
2606--- a/arch/m32r/include/asm/cache.h
2607+++ b/arch/m32r/include/asm/cache.h
2608@@ -1,8 +1,10 @@
2609 #ifndef _ASM_M32R_CACHE_H
2610 #define _ASM_M32R_CACHE_H
2611
2612+#include <linux/const.h>
2613+
2614 /* L1 cache line size */
2615 #define L1_CACHE_SHIFT 4
2616-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2617+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2618
2619 #endif /* _ASM_M32R_CACHE_H */
2620diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
2621index 82abd15..d95ae5d 100644
2622--- a/arch/m32r/lib/usercopy.c
2623+++ b/arch/m32r/lib/usercopy.c
2624@@ -14,6 +14,9 @@
2625 unsigned long
2626 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2627 {
2628+ if ((long)n < 0)
2629+ return n;
2630+
2631 prefetch(from);
2632 if (access_ok(VERIFY_WRITE, to, n))
2633 __copy_user(to,from,n);
2634@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2635 unsigned long
2636 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
2637 {
2638+ if ((long)n < 0)
2639+ return n;
2640+
2641 prefetchw(to);
2642 if (access_ok(VERIFY_READ, from, n))
2643 __copy_user_zeroing(to,from,n);
2644diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
2645index 0395c51..5f26031 100644
2646--- a/arch/m68k/include/asm/cache.h
2647+++ b/arch/m68k/include/asm/cache.h
2648@@ -4,9 +4,11 @@
2649 #ifndef __ARCH_M68K_CACHE_H
2650 #define __ARCH_M68K_CACHE_H
2651
2652+#include <linux/const.h>
2653+
2654 /* bytes per L1 cache line */
2655 #define L1_CACHE_SHIFT 4
2656-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
2657+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2658
2659 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
2660
2661diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
2662index 4efe96a..60e8699 100644
2663--- a/arch/microblaze/include/asm/cache.h
2664+++ b/arch/microblaze/include/asm/cache.h
2665@@ -13,11 +13,12 @@
2666 #ifndef _ASM_MICROBLAZE_CACHE_H
2667 #define _ASM_MICROBLAZE_CACHE_H
2668
2669+#include <linux/const.h>
2670 #include <asm/registers.h>
2671
2672 #define L1_CACHE_SHIFT 5
2673 /* word-granular cache in microblaze */
2674-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2675+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2676
2677 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2678
2679diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
2680index 1d93f81..67794d0 100644
2681--- a/arch/mips/include/asm/atomic.h
2682+++ b/arch/mips/include/asm/atomic.h
2683@@ -21,6 +21,10 @@
2684 #include <asm/war.h>
2685 #include <asm/system.h>
2686
2687+#ifdef CONFIG_GENERIC_ATOMIC64
2688+#include <asm-generic/atomic64.h>
2689+#endif
2690+
2691 #define ATOMIC_INIT(i) { (i) }
2692
2693 /*
2694@@ -765,6 +769,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
2695 */
2696 #define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)
2697
2698+#define atomic64_read_unchecked(v) atomic64_read(v)
2699+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2700+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2701+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2702+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2703+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2704+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2705+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2706+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2707+
2708 #endif /* CONFIG_64BIT */
2709
2710 /*
2711diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
2712index b4db69f..8f3b093 100644
2713--- a/arch/mips/include/asm/cache.h
2714+++ b/arch/mips/include/asm/cache.h
2715@@ -9,10 +9,11 @@
2716 #ifndef _ASM_CACHE_H
2717 #define _ASM_CACHE_H
2718
2719+#include <linux/const.h>
2720 #include <kmalloc.h>
2721
2722 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
2723-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2724+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2725
2726 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2727 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2728diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
2729index 455c0ac..ad65fbe 100644
2730--- a/arch/mips/include/asm/elf.h
2731+++ b/arch/mips/include/asm/elf.h
2732@@ -372,13 +372,16 @@ extern const char *__elf_platform;
2733 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
2734 #endif
2735
2736+#ifdef CONFIG_PAX_ASLR
2737+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2738+
2739+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2740+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2741+#endif
2742+
2743 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
2744 struct linux_binprm;
2745 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
2746 int uses_interp);
2747
2748-struct mm_struct;
2749-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
2750-#define arch_randomize_brk arch_randomize_brk
2751-
2752 #endif /* _ASM_ELF_H */
2753diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
2754index da9bd7d..91aa7ab 100644
2755--- a/arch/mips/include/asm/page.h
2756+++ b/arch/mips/include/asm/page.h
2757@@ -98,7 +98,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
2758 #ifdef CONFIG_CPU_MIPS32
2759 typedef struct { unsigned long pte_low, pte_high; } pte_t;
2760 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
2761- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
2762+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
2763 #else
2764 typedef struct { unsigned long long pte; } pte_t;
2765 #define pte_val(x) ((x).pte)
2766diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
2767index 881d18b..cea38bc 100644
2768--- a/arch/mips/include/asm/pgalloc.h
2769+++ b/arch/mips/include/asm/pgalloc.h
2770@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
2771 {
2772 set_pud(pud, __pud((unsigned long)pmd));
2773 }
2774+
2775+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
2776+{
2777+ pud_populate(mm, pud, pmd);
2778+}
2779 #endif
2780
2781 /*
2782diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h
2783index 6018c80..7c37203 100644
2784--- a/arch/mips/include/asm/system.h
2785+++ b/arch/mips/include/asm/system.h
2786@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
2787 */
2788 #define __ARCH_WANT_UNLOCKED_CTXSW
2789
2790-extern unsigned long arch_align_stack(unsigned long sp);
2791+#define arch_align_stack(x) ((x) & ~0xfUL)
2792
2793 #endif /* _ASM_SYSTEM_H */
2794diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
2795index 9fdd8bc..4bd7f1a 100644
2796--- a/arch/mips/kernel/binfmt_elfn32.c
2797+++ b/arch/mips/kernel/binfmt_elfn32.c
2798@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2799 #undef ELF_ET_DYN_BASE
2800 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2801
2802+#ifdef CONFIG_PAX_ASLR
2803+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2804+
2805+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2806+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2807+#endif
2808+
2809 #include <asm/processor.h>
2810 #include <linux/module.h>
2811 #include <linux/elfcore.h>
2812diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
2813index ff44823..97f8906 100644
2814--- a/arch/mips/kernel/binfmt_elfo32.c
2815+++ b/arch/mips/kernel/binfmt_elfo32.c
2816@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2817 #undef ELF_ET_DYN_BASE
2818 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2819
2820+#ifdef CONFIG_PAX_ASLR
2821+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2822+
2823+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2824+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2825+#endif
2826+
2827 #include <asm/processor.h>
2828
2829 /*
2830diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
2831index 7955409..ceaea7c 100644
2832--- a/arch/mips/kernel/process.c
2833+++ b/arch/mips/kernel/process.c
2834@@ -483,15 +483,3 @@ unsigned long get_wchan(struct task_struct *task)
2835 out:
2836 return pc;
2837 }
2838-
2839-/*
2840- * Don't forget that the stack pointer must be aligned on a 8 bytes
2841- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
2842- */
2843-unsigned long arch_align_stack(unsigned long sp)
2844-{
2845- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
2846- sp -= get_random_int() & ~PAGE_MASK;
2847-
2848- return sp & ALMASK;
2849-}
2850diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
2851index 69ebd58..e4bff83 100644
2852--- a/arch/mips/mm/fault.c
2853+++ b/arch/mips/mm/fault.c
2854@@ -28,6 +28,23 @@
2855 #include <asm/highmem.h> /* For VMALLOC_END */
2856 #include <linux/kdebug.h>
2857
2858+#ifdef CONFIG_PAX_PAGEEXEC
2859+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2860+{
2861+ unsigned long i;
2862+
2863+ printk(KERN_ERR "PAX: bytes at PC: ");
2864+ for (i = 0; i < 5; i++) {
2865+ unsigned int c;
2866+ if (get_user(c, (unsigned int *)pc+i))
2867+ printk(KERN_CONT "???????? ");
2868+ else
2869+ printk(KERN_CONT "%08x ", c);
2870+ }
2871+ printk("\n");
2872+}
2873+#endif
2874+
2875 /*
2876 * This routine handles page faults. It determines the address,
2877 * and the problem, and then passes it off to one of the appropriate
2878diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
2879index 302d779..7d35bf8 100644
2880--- a/arch/mips/mm/mmap.c
2881+++ b/arch/mips/mm/mmap.c
2882@@ -95,6 +95,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2883 do_color_align = 1;
2884
2885 /* requesting a specific address */
2886+
2887+#ifdef CONFIG_PAX_RANDMMAP
2888+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
2889+#endif
2890+
2891 if (addr) {
2892 if (do_color_align)
2893 addr = COLOUR_ALIGN(addr, pgoff);
2894@@ -102,8 +107,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2895 addr = PAGE_ALIGN(addr);
2896
2897 vma = find_vma(mm, addr);
2898- if (TASK_SIZE - len >= addr &&
2899- (!vma || addr + len <= vma->vm_start))
2900+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len))
2901 return addr;
2902 }
2903
2904@@ -118,7 +122,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2905 /* At this point: (!vma || addr < vma->vm_end). */
2906 if (TASK_SIZE - len < addr)
2907 return -ENOMEM;
2908- if (!vma || addr + len <= vma->vm_start)
2909+ if (check_heap_stack_gap(vmm, addr, len))
2910 return addr;
2911 addr = vma->vm_end;
2912 if (do_color_align)
2913@@ -145,7 +149,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2914 /* make sure it can fit in the remaining address space */
2915 if (likely(addr > len)) {
2916 vma = find_vma(mm, addr - len);
2917- if (!vma || addr <= vma->vm_start) {
2918+ if (check_heap_stack_gap(vmm, addr - len, len))
2919 /* cache the address as a hint for next time */
2920 return mm->free_area_cache = addr - len;
2921 }
2922@@ -165,7 +169,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2923 * return with success:
2924 */
2925 vma = find_vma(mm, addr);
2926- if (likely(!vma || addr + len <= vma->vm_start)) {
2927+ if (check_heap_stack_gap(vmm, addr, len)) {
2928 /* cache the address as a hint for next time */
2929 return mm->free_area_cache = addr;
2930 }
2931@@ -242,30 +246,3 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
2932 mm->unmap_area = arch_unmap_area_topdown;
2933 }
2934 }
2935-
2936-static inline unsigned long brk_rnd(void)
2937-{
2938- unsigned long rnd = get_random_int();
2939-
2940- rnd = rnd << PAGE_SHIFT;
2941- /* 8MB for 32bit, 256MB for 64bit */
2942- if (TASK_IS_32BIT_ADDR)
2943- rnd = rnd & 0x7ffffful;
2944- else
2945- rnd = rnd & 0xffffffful;
2946-
2947- return rnd;
2948-}
2949-
2950-unsigned long arch_randomize_brk(struct mm_struct *mm)
2951-{
2952- unsigned long base = mm->brk;
2953- unsigned long ret;
2954-
2955- ret = PAGE_ALIGN(base + brk_rnd());
2956-
2957- if (ret < mm->brk)
2958- return mm->brk;
2959-
2960- return ret;
2961-}
2962diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
2963index 967d144..db12197 100644
2964--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
2965+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
2966@@ -11,12 +11,14 @@
2967 #ifndef _ASM_PROC_CACHE_H
2968 #define _ASM_PROC_CACHE_H
2969
2970+#include <linux/const.h>
2971+
2972 /* L1 cache */
2973
2974 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
2975 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
2976-#define L1_CACHE_BYTES 16 /* bytes per entry */
2977 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
2978+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
2979 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
2980
2981 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
2982diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2983index bcb5df2..84fabd2 100644
2984--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2985+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2986@@ -16,13 +16,15 @@
2987 #ifndef _ASM_PROC_CACHE_H
2988 #define _ASM_PROC_CACHE_H
2989
2990+#include <linux/const.h>
2991+
2992 /*
2993 * L1 cache
2994 */
2995 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
2996 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
2997-#define L1_CACHE_BYTES 32 /* bytes per entry */
2998 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
2999+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
3000 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
3001
3002 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
3003diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
3004index 4ce7a01..449202a 100644
3005--- a/arch/openrisc/include/asm/cache.h
3006+++ b/arch/openrisc/include/asm/cache.h
3007@@ -19,11 +19,13 @@
3008 #ifndef __ASM_OPENRISC_CACHE_H
3009 #define __ASM_OPENRISC_CACHE_H
3010
3011+#include <linux/const.h>
3012+
3013 /* FIXME: How can we replace these with values from the CPU...
3014 * they shouldn't be hard-coded!
3015 */
3016
3017-#define L1_CACHE_BYTES 16
3018 #define L1_CACHE_SHIFT 4
3019+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
3020
3021 #endif /* __ASM_OPENRISC_CACHE_H */
3022diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
3023index 4054b31..a10c105 100644
3024--- a/arch/parisc/include/asm/atomic.h
3025+++ b/arch/parisc/include/asm/atomic.h
3026@@ -335,6 +335,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
3027
3028 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3029
3030+#define atomic64_read_unchecked(v) atomic64_read(v)
3031+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
3032+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
3033+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
3034+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
3035+#define atomic64_inc_unchecked(v) atomic64_inc(v)
3036+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
3037+#define atomic64_dec_unchecked(v) atomic64_dec(v)
3038+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
3039+
3040 #endif /* !CONFIG_64BIT */
3041
3042
3043diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
3044index 47f11c7..3420df2 100644
3045--- a/arch/parisc/include/asm/cache.h
3046+++ b/arch/parisc/include/asm/cache.h
3047@@ -5,6 +5,7 @@
3048 #ifndef __ARCH_PARISC_CACHE_H
3049 #define __ARCH_PARISC_CACHE_H
3050
3051+#include <linux/const.h>
3052
3053 /*
3054 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
3055@@ -15,13 +16,13 @@
3056 * just ruin performance.
3057 */
3058 #ifdef CONFIG_PA20
3059-#define L1_CACHE_BYTES 64
3060 #define L1_CACHE_SHIFT 6
3061 #else
3062-#define L1_CACHE_BYTES 32
3063 #define L1_CACHE_SHIFT 5
3064 #endif
3065
3066+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
3067+
3068 #ifndef __ASSEMBLY__
3069
3070 #define SMP_CACHE_BYTES L1_CACHE_BYTES
3071diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
3072index 19f6cb1..6c78cf2 100644
3073--- a/arch/parisc/include/asm/elf.h
3074+++ b/arch/parisc/include/asm/elf.h
3075@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
3076
3077 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
3078
3079+#ifdef CONFIG_PAX_ASLR
3080+#define PAX_ELF_ET_DYN_BASE 0x10000UL
3081+
3082+#define PAX_DELTA_MMAP_LEN 16
3083+#define PAX_DELTA_STACK_LEN 16
3084+#endif
3085+
3086 /* This yields a mask that user programs can use to figure out what
3087 instruction set this CPU supports. This could be done in user space,
3088 but it's not easy, and we've already done it here. */
3089diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
3090index fc987a1..6e068ef 100644
3091--- a/arch/parisc/include/asm/pgalloc.h
3092+++ b/arch/parisc/include/asm/pgalloc.h
3093@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
3094 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
3095 }
3096
3097+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
3098+{
3099+ pgd_populate(mm, pgd, pmd);
3100+}
3101+
3102 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
3103 {
3104 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
3105@@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
3106 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
3107 #define pmd_free(mm, x) do { } while (0)
3108 #define pgd_populate(mm, pmd, pte) BUG()
3109+#define pgd_populate_kernel(mm, pmd, pte) BUG()
3110
3111 #endif
3112
3113diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
3114index 22dadeb..f6c2be4 100644
3115--- a/arch/parisc/include/asm/pgtable.h
3116+++ b/arch/parisc/include/asm/pgtable.h
3117@@ -210,6 +210,17 @@ struct vm_area_struct;
3118 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
3119 #define PAGE_COPY PAGE_EXECREAD
3120 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
3121+
3122+#ifdef CONFIG_PAX_PAGEEXEC
3123+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
3124+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
3125+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
3126+#else
3127+# define PAGE_SHARED_NOEXEC PAGE_SHARED
3128+# define PAGE_COPY_NOEXEC PAGE_COPY
3129+# define PAGE_READONLY_NOEXEC PAGE_READONLY
3130+#endif
3131+
3132 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
3133 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
3134 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
3135diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
3136index 5e34ccf..672bc9c 100644
3137--- a/arch/parisc/kernel/module.c
3138+++ b/arch/parisc/kernel/module.c
3139@@ -98,16 +98,38 @@
3140
3141 /* three functions to determine where in the module core
3142 * or init pieces the location is */
3143+static inline int in_init_rx(struct module *me, void *loc)
3144+{
3145+ return (loc >= me->module_init_rx &&
3146+ loc < (me->module_init_rx + me->init_size_rx));
3147+}
3148+
3149+static inline int in_init_rw(struct module *me, void *loc)
3150+{
3151+ return (loc >= me->module_init_rw &&
3152+ loc < (me->module_init_rw + me->init_size_rw));
3153+}
3154+
3155 static inline int in_init(struct module *me, void *loc)
3156 {
3157- return (loc >= me->module_init &&
3158- loc <= (me->module_init + me->init_size));
3159+ return in_init_rx(me, loc) || in_init_rw(me, loc);
3160+}
3161+
3162+static inline int in_core_rx(struct module *me, void *loc)
3163+{
3164+ return (loc >= me->module_core_rx &&
3165+ loc < (me->module_core_rx + me->core_size_rx));
3166+}
3167+
3168+static inline int in_core_rw(struct module *me, void *loc)
3169+{
3170+ return (loc >= me->module_core_rw &&
3171+ loc < (me->module_core_rw + me->core_size_rw));
3172 }
3173
3174 static inline int in_core(struct module *me, void *loc)
3175 {
3176- return (loc >= me->module_core &&
3177- loc <= (me->module_core + me->core_size));
3178+ return in_core_rx(me, loc) || in_core_rw(me, loc);
3179 }
3180
3181 static inline int in_local(struct module *me, void *loc)
3182@@ -373,13 +395,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
3183 }
3184
3185 /* align things a bit */
3186- me->core_size = ALIGN(me->core_size, 16);
3187- me->arch.got_offset = me->core_size;
3188- me->core_size += gots * sizeof(struct got_entry);
3189+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
3190+ me->arch.got_offset = me->core_size_rw;
3191+ me->core_size_rw += gots * sizeof(struct got_entry);
3192
3193- me->core_size = ALIGN(me->core_size, 16);
3194- me->arch.fdesc_offset = me->core_size;
3195- me->core_size += fdescs * sizeof(Elf_Fdesc);
3196+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
3197+ me->arch.fdesc_offset = me->core_size_rw;
3198+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
3199
3200 me->arch.got_max = gots;
3201 me->arch.fdesc_max = fdescs;
3202@@ -397,7 +419,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3203
3204 BUG_ON(value == 0);
3205
3206- got = me->module_core + me->arch.got_offset;
3207+ got = me->module_core_rw + me->arch.got_offset;
3208 for (i = 0; got[i].addr; i++)
3209 if (got[i].addr == value)
3210 goto out;
3211@@ -415,7 +437,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3212 #ifdef CONFIG_64BIT
3213 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3214 {
3215- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
3216+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
3217
3218 if (!value) {
3219 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
3220@@ -433,7 +455,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3221
3222 /* Create new one */
3223 fdesc->addr = value;
3224- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3225+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3226 return (Elf_Addr)fdesc;
3227 }
3228 #endif /* CONFIG_64BIT */
3229@@ -845,7 +867,7 @@ register_unwind_table(struct module *me,
3230
3231 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
3232 end = table + sechdrs[me->arch.unwind_section].sh_size;
3233- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3234+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3235
3236 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
3237 me->arch.unwind_section, table, end, gp);
3238diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
3239index c9b9322..02d8940 100644
3240--- a/arch/parisc/kernel/sys_parisc.c
3241+++ b/arch/parisc/kernel/sys_parisc.c
3242@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
3243 /* At this point: (!vma || addr < vma->vm_end). */
3244 if (TASK_SIZE - len < addr)
3245 return -ENOMEM;
3246- if (!vma || addr + len <= vma->vm_start)
3247+ if (check_heap_stack_gap(vma, addr, len))
3248 return addr;
3249 addr = vma->vm_end;
3250 }
3251@@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
3252 /* At this point: (!vma || addr < vma->vm_end). */
3253 if (TASK_SIZE - len < addr)
3254 return -ENOMEM;
3255- if (!vma || addr + len <= vma->vm_start)
3256+ if (check_heap_stack_gap(vma, addr, len))
3257 return addr;
3258 addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
3259 if (addr < vma->vm_end) /* handle wraparound */
3260@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
3261 if (flags & MAP_FIXED)
3262 return addr;
3263 if (!addr)
3264- addr = TASK_UNMAPPED_BASE;
3265+ addr = current->mm->mmap_base;
3266
3267 if (filp) {
3268 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
3269diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
3270index f19e660..414fe24 100644
3271--- a/arch/parisc/kernel/traps.c
3272+++ b/arch/parisc/kernel/traps.c
3273@@ -733,9 +733,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
3274
3275 down_read(&current->mm->mmap_sem);
3276 vma = find_vma(current->mm,regs->iaoq[0]);
3277- if (vma && (regs->iaoq[0] >= vma->vm_start)
3278- && (vma->vm_flags & VM_EXEC)) {
3279-
3280+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
3281 fault_address = regs->iaoq[0];
3282 fault_space = regs->iasq[0];
3283
3284diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
3285index 18162ce..94de376 100644
3286--- a/arch/parisc/mm/fault.c
3287+++ b/arch/parisc/mm/fault.c
3288@@ -15,6 +15,7 @@
3289 #include <linux/sched.h>
3290 #include <linux/interrupt.h>
3291 #include <linux/module.h>
3292+#include <linux/unistd.h>
3293
3294 #include <asm/uaccess.h>
3295 #include <asm/traps.h>
3296@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
3297 static unsigned long
3298 parisc_acctyp(unsigned long code, unsigned int inst)
3299 {
3300- if (code == 6 || code == 16)
3301+ if (code == 6 || code == 7 || code == 16)
3302 return VM_EXEC;
3303
3304 switch (inst & 0xf0000000) {
3305@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
3306 }
3307 #endif
3308
3309+#ifdef CONFIG_PAX_PAGEEXEC
3310+/*
3311+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
3312+ *
3313+ * returns 1 when task should be killed
3314+ * 2 when rt_sigreturn trampoline was detected
3315+ * 3 when unpatched PLT trampoline was detected
3316+ */
3317+static int pax_handle_fetch_fault(struct pt_regs *regs)
3318+{
3319+
3320+#ifdef CONFIG_PAX_EMUPLT
3321+ int err;
3322+
3323+ do { /* PaX: unpatched PLT emulation */
3324+ unsigned int bl, depwi;
3325+
3326+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
3327+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
3328+
3329+ if (err)
3330+ break;
3331+
3332+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
3333+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
3334+
3335+ err = get_user(ldw, (unsigned int *)addr);
3336+ err |= get_user(bv, (unsigned int *)(addr+4));
3337+ err |= get_user(ldw2, (unsigned int *)(addr+8));
3338+
3339+ if (err)
3340+ break;
3341+
3342+ if (ldw == 0x0E801096U &&
3343+ bv == 0xEAC0C000U &&
3344+ ldw2 == 0x0E881095U)
3345+ {
3346+ unsigned int resolver, map;
3347+
3348+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
3349+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
3350+ if (err)
3351+ break;
3352+
3353+ regs->gr[20] = instruction_pointer(regs)+8;
3354+ regs->gr[21] = map;
3355+ regs->gr[22] = resolver;
3356+ regs->iaoq[0] = resolver | 3UL;
3357+ regs->iaoq[1] = regs->iaoq[0] + 4;
3358+ return 3;
3359+ }
3360+ }
3361+ } while (0);
3362+#endif
3363+
3364+#ifdef CONFIG_PAX_EMUTRAMP
3365+
3366+#ifndef CONFIG_PAX_EMUSIGRT
3367+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
3368+ return 1;
3369+#endif
3370+
3371+ do { /* PaX: rt_sigreturn emulation */
3372+ unsigned int ldi1, ldi2, bel, nop;
3373+
3374+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
3375+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
3376+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
3377+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
3378+
3379+ if (err)
3380+ break;
3381+
3382+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
3383+ ldi2 == 0x3414015AU &&
3384+ bel == 0xE4008200U &&
3385+ nop == 0x08000240U)
3386+ {
3387+ regs->gr[25] = (ldi1 & 2) >> 1;
3388+ regs->gr[20] = __NR_rt_sigreturn;
3389+ regs->gr[31] = regs->iaoq[1] + 16;
3390+ regs->sr[0] = regs->iasq[1];
3391+ regs->iaoq[0] = 0x100UL;
3392+ regs->iaoq[1] = regs->iaoq[0] + 4;
3393+ regs->iasq[0] = regs->sr[2];
3394+ regs->iasq[1] = regs->sr[2];
3395+ return 2;
3396+ }
3397+ } while (0);
3398+#endif
3399+
3400+ return 1;
3401+}
3402+
3403+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3404+{
3405+ unsigned long i;
3406+
3407+ printk(KERN_ERR "PAX: bytes at PC: ");
3408+ for (i = 0; i < 5; i++) {
3409+ unsigned int c;
3410+ if (get_user(c, (unsigned int *)pc+i))
3411+ printk(KERN_CONT "???????? ");
3412+ else
3413+ printk(KERN_CONT "%08x ", c);
3414+ }
3415+ printk("\n");
3416+}
3417+#endif
3418+
3419 int fixup_exception(struct pt_regs *regs)
3420 {
3421 const struct exception_table_entry *fix;
3422@@ -192,8 +303,33 @@ good_area:
3423
3424 acc_type = parisc_acctyp(code,regs->iir);
3425
3426- if ((vma->vm_flags & acc_type) != acc_type)
3427+ if ((vma->vm_flags & acc_type) != acc_type) {
3428+
3429+#ifdef CONFIG_PAX_PAGEEXEC
3430+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
3431+ (address & ~3UL) == instruction_pointer(regs))
3432+ {
3433+ up_read(&mm->mmap_sem);
3434+ switch (pax_handle_fetch_fault(regs)) {
3435+
3436+#ifdef CONFIG_PAX_EMUPLT
3437+ case 3:
3438+ return;
3439+#endif
3440+
3441+#ifdef CONFIG_PAX_EMUTRAMP
3442+ case 2:
3443+ return;
3444+#endif
3445+
3446+ }
3447+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
3448+ do_group_exit(SIGKILL);
3449+ }
3450+#endif
3451+
3452 goto bad_area;
3453+ }
3454
3455 /*
3456 * If for any reason at all we couldn't handle the fault, make
3457diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
3458index 02e41b5..ec6e26c 100644
3459--- a/arch/powerpc/include/asm/atomic.h
3460+++ b/arch/powerpc/include/asm/atomic.h
3461@@ -469,6 +469,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
3462
3463 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3464
3465+#define atomic64_read_unchecked(v) atomic64_read(v)
3466+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
3467+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
3468+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
3469+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
3470+#define atomic64_inc_unchecked(v) atomic64_inc(v)
3471+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
3472+#define atomic64_dec_unchecked(v) atomic64_dec(v)
3473+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
3474+
3475 #endif /* __powerpc64__ */
3476
3477 #endif /* __KERNEL__ */
3478diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
3479index 4b50941..5605819 100644
3480--- a/arch/powerpc/include/asm/cache.h
3481+++ b/arch/powerpc/include/asm/cache.h
3482@@ -3,6 +3,7 @@
3483
3484 #ifdef __KERNEL__
3485
3486+#include <linux/const.h>
3487
3488 /* bytes per L1 cache line */
3489 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
3490@@ -22,7 +23,7 @@
3491 #define L1_CACHE_SHIFT 7
3492 #endif
3493
3494-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
3495+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
3496
3497 #define SMP_CACHE_BYTES L1_CACHE_BYTES
3498
3499diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
3500index 3bf9cca..e7457d0 100644
3501--- a/arch/powerpc/include/asm/elf.h
3502+++ b/arch/powerpc/include/asm/elf.h
3503@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
3504 the loader. We need to make sure that it is out of the way of the program
3505 that it will "exec", and that there is sufficient room for the brk. */
3506
3507-extern unsigned long randomize_et_dyn(unsigned long base);
3508-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
3509+#define ELF_ET_DYN_BASE (0x20000000)
3510+
3511+#ifdef CONFIG_PAX_ASLR
3512+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
3513+
3514+#ifdef __powerpc64__
3515+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
3516+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
3517+#else
3518+#define PAX_DELTA_MMAP_LEN 15
3519+#define PAX_DELTA_STACK_LEN 15
3520+#endif
3521+#endif
3522
3523 /*
3524 * Our registers are always unsigned longs, whether we're a 32 bit
3525@@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
3526 (0x7ff >> (PAGE_SHIFT - 12)) : \
3527 (0x3ffff >> (PAGE_SHIFT - 12)))
3528
3529-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
3530-#define arch_randomize_brk arch_randomize_brk
3531-
3532 #endif /* __KERNEL__ */
3533
3534 /*
3535diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
3536index bca8fdc..61e9580 100644
3537--- a/arch/powerpc/include/asm/kmap_types.h
3538+++ b/arch/powerpc/include/asm/kmap_types.h
3539@@ -27,6 +27,7 @@ enum km_type {
3540 KM_PPC_SYNC_PAGE,
3541 KM_PPC_SYNC_ICACHE,
3542 KM_KDB,
3543+ KM_CLEARPAGE,
3544 KM_TYPE_NR
3545 };
3546
3547diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
3548index d4a7f64..451de1c 100644
3549--- a/arch/powerpc/include/asm/mman.h
3550+++ b/arch/powerpc/include/asm/mman.h
3551@@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
3552 }
3553 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
3554
3555-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
3556+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
3557 {
3558 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
3559 }
3560diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
3561index f072e97..b436dee 100644
3562--- a/arch/powerpc/include/asm/page.h
3563+++ b/arch/powerpc/include/asm/page.h
3564@@ -220,8 +220,9 @@ extern long long virt_phys_offset;
3565 * and needs to be executable. This means the whole heap ends
3566 * up being executable.
3567 */
3568-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3569- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3570+#define VM_DATA_DEFAULT_FLAGS32 \
3571+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3572+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3573
3574 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3575 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3576@@ -249,6 +250,9 @@ extern long long virt_phys_offset;
3577 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
3578 #endif
3579
3580+#define ktla_ktva(addr) (addr)
3581+#define ktva_ktla(addr) (addr)
3582+
3583 /*
3584 * Use the top bit of the higher-level page table entries to indicate whether
3585 * the entries we point to contain hugepages. This works because we know that
3586diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
3587index fed85e6..da5c71b 100644
3588--- a/arch/powerpc/include/asm/page_64.h
3589+++ b/arch/powerpc/include/asm/page_64.h
3590@@ -146,15 +146,18 @@ do { \
3591 * stack by default, so in the absence of a PT_GNU_STACK program header
3592 * we turn execute permission off.
3593 */
3594-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3595- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3596+#define VM_STACK_DEFAULT_FLAGS32 \
3597+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3598+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3599
3600 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3601 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3602
3603+#ifndef CONFIG_PAX_PAGEEXEC
3604 #define VM_STACK_DEFAULT_FLAGS \
3605 (is_32bit_task() ? \
3606 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
3607+#endif
3608
3609 #include <asm-generic/getorder.h>
3610
3611diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
3612index 292725c..f87ae14 100644
3613--- a/arch/powerpc/include/asm/pgalloc-64.h
3614+++ b/arch/powerpc/include/asm/pgalloc-64.h
3615@@ -50,6 +50,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
3616 #ifndef CONFIG_PPC_64K_PAGES
3617
3618 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
3619+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
3620
3621 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
3622 {
3623@@ -67,6 +68,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
3624 pud_set(pud, (unsigned long)pmd);
3625 }
3626
3627+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
3628+{
3629+ pud_populate(mm, pud, pmd);
3630+}
3631+
3632 #define pmd_populate(mm, pmd, pte_page) \
3633 pmd_populate_kernel(mm, pmd, page_address(pte_page))
3634 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
3635@@ -76,6 +82,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
3636 #else /* CONFIG_PPC_64K_PAGES */
3637
3638 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
3639+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
3640
3641 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
3642 pte_t *pte)
3643diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
3644index 2e0e411..7899c68 100644
3645--- a/arch/powerpc/include/asm/pgtable.h
3646+++ b/arch/powerpc/include/asm/pgtable.h
3647@@ -2,6 +2,7 @@
3648 #define _ASM_POWERPC_PGTABLE_H
3649 #ifdef __KERNEL__
3650
3651+#include <linux/const.h>
3652 #ifndef __ASSEMBLY__
3653 #include <asm/processor.h> /* For TASK_SIZE */
3654 #include <asm/mmu.h>
3655diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
3656index 4aad413..85d86bf 100644
3657--- a/arch/powerpc/include/asm/pte-hash32.h
3658+++ b/arch/powerpc/include/asm/pte-hash32.h
3659@@ -21,6 +21,7 @@
3660 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
3661 #define _PAGE_USER 0x004 /* usermode access allowed */
3662 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
3663+#define _PAGE_EXEC _PAGE_GUARDED
3664 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
3665 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
3666 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
3667diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
3668index 7fdc2c0..e47a9b02d3 100644
3669--- a/arch/powerpc/include/asm/reg.h
3670+++ b/arch/powerpc/include/asm/reg.h
3671@@ -212,6 +212,7 @@
3672 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
3673 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
3674 #define DSISR_NOHPTE 0x40000000 /* no translation found */
3675+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
3676 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
3677 #define DSISR_ISSTORE 0x02000000 /* access was a store */
3678 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
3679diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
3680index c377457..3c69fbc 100644
3681--- a/arch/powerpc/include/asm/system.h
3682+++ b/arch/powerpc/include/asm/system.h
3683@@ -539,7 +539,7 @@ __cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new,
3684 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
3685 #endif
3686
3687-extern unsigned long arch_align_stack(unsigned long sp);
3688+#define arch_align_stack(x) ((x) & ~0xfUL)
3689
3690 /* Used in very early kernel initialization. */
3691 extern unsigned long reloc_offset(void);
3692diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
3693index bd0fb84..a42a14b 100644
3694--- a/arch/powerpc/include/asm/uaccess.h
3695+++ b/arch/powerpc/include/asm/uaccess.h
3696@@ -13,6 +13,8 @@
3697 #define VERIFY_READ 0
3698 #define VERIFY_WRITE 1
3699
3700+extern void check_object_size(const void *ptr, unsigned long n, bool to);
3701+
3702 /*
3703 * The fs value determines whether argument validity checking should be
3704 * performed or not. If get_fs() == USER_DS, checking is performed, with
3705@@ -327,52 +329,6 @@ do { \
3706 extern unsigned long __copy_tofrom_user(void __user *to,
3707 const void __user *from, unsigned long size);
3708
3709-#ifndef __powerpc64__
3710-
3711-static inline unsigned long copy_from_user(void *to,
3712- const void __user *from, unsigned long n)
3713-{
3714- unsigned long over;
3715-
3716- if (access_ok(VERIFY_READ, from, n))
3717- return __copy_tofrom_user((__force void __user *)to, from, n);
3718- if ((unsigned long)from < TASK_SIZE) {
3719- over = (unsigned long)from + n - TASK_SIZE;
3720- return __copy_tofrom_user((__force void __user *)to, from,
3721- n - over) + over;
3722- }
3723- return n;
3724-}
3725-
3726-static inline unsigned long copy_to_user(void __user *to,
3727- const void *from, unsigned long n)
3728-{
3729- unsigned long over;
3730-
3731- if (access_ok(VERIFY_WRITE, to, n))
3732- return __copy_tofrom_user(to, (__force void __user *)from, n);
3733- if ((unsigned long)to < TASK_SIZE) {
3734- over = (unsigned long)to + n - TASK_SIZE;
3735- return __copy_tofrom_user(to, (__force void __user *)from,
3736- n - over) + over;
3737- }
3738- return n;
3739-}
3740-
3741-#else /* __powerpc64__ */
3742-
3743-#define __copy_in_user(to, from, size) \
3744- __copy_tofrom_user((to), (from), (size))
3745-
3746-extern unsigned long copy_from_user(void *to, const void __user *from,
3747- unsigned long n);
3748-extern unsigned long copy_to_user(void __user *to, const void *from,
3749- unsigned long n);
3750-extern unsigned long copy_in_user(void __user *to, const void __user *from,
3751- unsigned long n);
3752-
3753-#endif /* __powerpc64__ */
3754-
3755 static inline unsigned long __copy_from_user_inatomic(void *to,
3756 const void __user *from, unsigned long n)
3757 {
3758@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
3759 if (ret == 0)
3760 return 0;
3761 }
3762+
3763+ if (!__builtin_constant_p(n))
3764+ check_object_size(to, n, false);
3765+
3766 return __copy_tofrom_user((__force void __user *)to, from, n);
3767 }
3768
3769@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
3770 if (ret == 0)
3771 return 0;
3772 }
3773+
3774+ if (!__builtin_constant_p(n))
3775+ check_object_size(from, n, true);
3776+
3777 return __copy_tofrom_user(to, (__force const void __user *)from, n);
3778 }
3779
3780@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_user(void __user *to,
3781 return __copy_to_user_inatomic(to, from, size);
3782 }
3783
3784+#ifndef __powerpc64__
3785+
3786+static inline unsigned long __must_check copy_from_user(void *to,
3787+ const void __user *from, unsigned long n)
3788+{
3789+ unsigned long over;
3790+
3791+ if ((long)n < 0)
3792+ return n;
3793+
3794+ if (access_ok(VERIFY_READ, from, n)) {
3795+ if (!__builtin_constant_p(n))
3796+ check_object_size(to, n, false);
3797+ return __copy_tofrom_user((__force void __user *)to, from, n);
3798+ }
3799+ if ((unsigned long)from < TASK_SIZE) {
3800+ over = (unsigned long)from + n - TASK_SIZE;
3801+ if (!__builtin_constant_p(n - over))
3802+ check_object_size(to, n - over, false);
3803+ return __copy_tofrom_user((__force void __user *)to, from,
3804+ n - over) + over;
3805+ }
3806+ return n;
3807+}
3808+
3809+static inline unsigned long __must_check copy_to_user(void __user *to,
3810+ const void *from, unsigned long n)
3811+{
3812+ unsigned long over;
3813+
3814+ if ((long)n < 0)
3815+ return n;
3816+
3817+ if (access_ok(VERIFY_WRITE, to, n)) {
3818+ if (!__builtin_constant_p(n))
3819+ check_object_size(from, n, true);
3820+ return __copy_tofrom_user(to, (__force void __user *)from, n);
3821+ }
3822+ if ((unsigned long)to < TASK_SIZE) {
3823+ over = (unsigned long)to + n - TASK_SIZE;
3824+ if (!__builtin_constant_p(n))
3825+ check_object_size(from, n - over, true);
3826+ return __copy_tofrom_user(to, (__force void __user *)from,
3827+ n - over) + over;
3828+ }
3829+ return n;
3830+}
3831+
3832+#else /* __powerpc64__ */
3833+
3834+#define __copy_in_user(to, from, size) \
3835+ __copy_tofrom_user((to), (from), (size))
3836+
3837+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
3838+{
3839+ if ((long)n < 0 || n > INT_MAX)
3840+ return n;
3841+
3842+ if (!__builtin_constant_p(n))
3843+ check_object_size(to, n, false);
3844+
3845+ if (likely(access_ok(VERIFY_READ, from, n)))
3846+ n = __copy_from_user(to, from, n);
3847+ else
3848+ memset(to, 0, n);
3849+ return n;
3850+}
3851+
3852+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
3853+{
3854+ if ((long)n < 0 || n > INT_MAX)
3855+ return n;
3856+
3857+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
3858+ if (!__builtin_constant_p(n))
3859+ check_object_size(from, n, true);
3860+ n = __copy_to_user(to, from, n);
3861+ }
3862+ return n;
3863+}
3864+
3865+extern unsigned long copy_in_user(void __user *to, const void __user *from,
3866+ unsigned long n);
3867+
3868+#endif /* __powerpc64__ */
3869+
3870 extern unsigned long __clear_user(void __user *addr, unsigned long size);
3871
3872 static inline unsigned long clear_user(void __user *addr, unsigned long size)
3873diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
3874index 429983c..7af363b 100644
3875--- a/arch/powerpc/kernel/exceptions-64e.S
3876+++ b/arch/powerpc/kernel/exceptions-64e.S
3877@@ -587,6 +587,7 @@ storage_fault_common:
3878 std r14,_DAR(r1)
3879 std r15,_DSISR(r1)
3880 addi r3,r1,STACK_FRAME_OVERHEAD
3881+ bl .save_nvgprs
3882 mr r4,r14
3883 mr r5,r15
3884 ld r14,PACA_EXGEN+EX_R14(r13)
3885@@ -596,8 +597,7 @@ storage_fault_common:
3886 cmpdi r3,0
3887 bne- 1f
3888 b .ret_from_except_lite
3889-1: bl .save_nvgprs
3890- mr r5,r3
3891+1: mr r5,r3
3892 addi r3,r1,STACK_FRAME_OVERHEAD
3893 ld r4,_DAR(r1)
3894 bl .bad_page_fault
3895diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
3896index 15c5a4f..22a4000 100644
3897--- a/arch/powerpc/kernel/exceptions-64s.S
3898+++ b/arch/powerpc/kernel/exceptions-64s.S
3899@@ -1004,10 +1004,10 @@ handle_page_fault:
3900 11: ld r4,_DAR(r1)
3901 ld r5,_DSISR(r1)
3902 addi r3,r1,STACK_FRAME_OVERHEAD
3903+ bl .save_nvgprs
3904 bl .do_page_fault
3905 cmpdi r3,0
3906 beq+ 13f
3907- bl .save_nvgprs
3908 mr r5,r3
3909 addi r3,r1,STACK_FRAME_OVERHEAD
3910 lwz r4,_DAR(r1)
3911diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
3912index 01e2877..a1ba360 100644
3913--- a/arch/powerpc/kernel/irq.c
3914+++ b/arch/powerpc/kernel/irq.c
3915@@ -560,9 +560,6 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
3916 host->ops = ops;
3917 host->of_node = of_node_get(of_node);
3918
3919- if (host->ops->match == NULL)
3920- host->ops->match = default_irq_host_match;
3921-
3922 raw_spin_lock_irqsave(&irq_big_lock, flags);
3923
3924 /* If it's a legacy controller, check for duplicates and
3925@@ -635,7 +632,12 @@ struct irq_host *irq_find_host(struct device_node *node)
3926 */
3927 raw_spin_lock_irqsave(&irq_big_lock, flags);
3928 list_for_each_entry(h, &irq_hosts, link)
3929- if (h->ops->match(h, node)) {
3930+ if (h->ops->match) {
3931+ if (h->ops->match(h, node)) {
3932+ found = h;
3933+ break;
3934+ }
3935+ } else if (default_irq_host_match(h, node)) {
3936 found = h;
3937 break;
3938 }
3939diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
3940index 0b6d796..d760ddb 100644
3941--- a/arch/powerpc/kernel/module_32.c
3942+++ b/arch/powerpc/kernel/module_32.c
3943@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
3944 me->arch.core_plt_section = i;
3945 }
3946 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
3947- printk("Module doesn't contain .plt or .init.plt sections.\n");
3948+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
3949 return -ENOEXEC;
3950 }
3951
3952@@ -192,11 +192,16 @@ static uint32_t do_plt_call(void *location,
3953
3954 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
3955 /* Init, or core PLT? */
3956- if (location >= mod->module_core
3957- && location < mod->module_core + mod->core_size)
3958+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
3959+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
3960 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
3961- else
3962+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
3963+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
3964 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
3965+ else {
3966+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
3967+ return ~0UL;
3968+ }
3969
3970 /* Find this entry, or if that fails, the next avail. entry */
3971 while (entry->jump[0]) {
3972diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
3973index d817ab0..b23b18e 100644
3974--- a/arch/powerpc/kernel/process.c
3975+++ b/arch/powerpc/kernel/process.c
3976@@ -676,8 +676,8 @@ void show_regs(struct pt_regs * regs)
3977 * Lookup NIP late so we have the best change of getting the
3978 * above info out without failing
3979 */
3980- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
3981- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
3982+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
3983+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
3984 #endif
3985 show_stack(current, (unsigned long *) regs->gpr[1]);
3986 if (!user_mode(regs))
3987@@ -1181,10 +1181,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
3988 newsp = stack[0];
3989 ip = stack[STACK_FRAME_LR_SAVE];
3990 if (!firstframe || ip != lr) {
3991- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
3992+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
3993 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
3994 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
3995- printk(" (%pS)",
3996+ printk(" (%pA)",
3997 (void *)current->ret_stack[curr_frame].ret);
3998 curr_frame--;
3999 }
4000@@ -1204,7 +1204,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
4001 struct pt_regs *regs = (struct pt_regs *)
4002 (sp + STACK_FRAME_OVERHEAD);
4003 lr = regs->link;
4004- printk("--- Exception: %lx at %pS\n LR = %pS\n",
4005+ printk("--- Exception: %lx at %pA\n LR = %pA\n",
4006 regs->trap, (void *)regs->nip, (void *)lr);
4007 firstframe = 1;
4008 }
4009@@ -1279,58 +1279,3 @@ void thread_info_cache_init(void)
4010 }
4011
4012 #endif /* THREAD_SHIFT < PAGE_SHIFT */
4013-
4014-unsigned long arch_align_stack(unsigned long sp)
4015-{
4016- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
4017- sp -= get_random_int() & ~PAGE_MASK;
4018- return sp & ~0xf;
4019-}
4020-
4021-static inline unsigned long brk_rnd(void)
4022-{
4023- unsigned long rnd = 0;
4024-
4025- /* 8MB for 32bit, 1GB for 64bit */
4026- if (is_32bit_task())
4027- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
4028- else
4029- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
4030-
4031- return rnd << PAGE_SHIFT;
4032-}
4033-
4034-unsigned long arch_randomize_brk(struct mm_struct *mm)
4035-{
4036- unsigned long base = mm->brk;
4037- unsigned long ret;
4038-
4039-#ifdef CONFIG_PPC_STD_MMU_64
4040- /*
4041- * If we are using 1TB segments and we are allowed to randomise
4042- * the heap, we can put it above 1TB so it is backed by a 1TB
4043- * segment. Otherwise the heap will be in the bottom 1TB
4044- * which always uses 256MB segments and this may result in a
4045- * performance penalty.
4046- */
4047- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
4048- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
4049-#endif
4050-
4051- ret = PAGE_ALIGN(base + brk_rnd());
4052-
4053- if (ret < mm->brk)
4054- return mm->brk;
4055-
4056- return ret;
4057-}
4058-
4059-unsigned long randomize_et_dyn(unsigned long base)
4060-{
4061- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
4062-
4063- if (ret < base)
4064- return base;
4065-
4066- return ret;
4067-}
4068diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
4069index 836a5a1..27289a3 100644
4070--- a/arch/powerpc/kernel/signal_32.c
4071+++ b/arch/powerpc/kernel/signal_32.c
4072@@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
4073 /* Save user registers on the stack */
4074 frame = &rt_sf->uc.uc_mcontext;
4075 addr = frame;
4076- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
4077+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
4078 if (save_user_regs(regs, frame, 0, 1))
4079 goto badframe;
4080 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
4081diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
4082index a50b5ec..547078a 100644
4083--- a/arch/powerpc/kernel/signal_64.c
4084+++ b/arch/powerpc/kernel/signal_64.c
4085@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
4086 current->thread.fpscr.val = 0;
4087
4088 /* Set up to return from userspace. */
4089- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
4090+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
4091 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
4092 } else {
4093 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
4094diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
4095index c091527..5592625 100644
4096--- a/arch/powerpc/kernel/traps.c
4097+++ b/arch/powerpc/kernel/traps.c
4098@@ -131,6 +131,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
4099 return flags;
4100 }
4101
4102+extern void gr_handle_kernel_exploit(void);
4103+
4104 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
4105 int signr)
4106 {
4107@@ -178,6 +180,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
4108 panic("Fatal exception in interrupt");
4109 if (panic_on_oops)
4110 panic("Fatal exception");
4111+
4112+ gr_handle_kernel_exploit();
4113+
4114 do_exit(signr);
4115 }
4116
4117diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
4118index 7d14bb6..1305601 100644
4119--- a/arch/powerpc/kernel/vdso.c
4120+++ b/arch/powerpc/kernel/vdso.c
4121@@ -35,6 +35,7 @@
4122 #include <asm/firmware.h>
4123 #include <asm/vdso.h>
4124 #include <asm/vdso_datapage.h>
4125+#include <asm/mman.h>
4126
4127 #include "setup.h"
4128
4129@@ -219,7 +220,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
4130 vdso_base = VDSO32_MBASE;
4131 #endif
4132
4133- current->mm->context.vdso_base = 0;
4134+ current->mm->context.vdso_base = ~0UL;
4135
4136 /* vDSO has a problem and was disabled, just don't "enable" it for the
4137 * process
4138@@ -239,7 +240,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
4139 vdso_base = get_unmapped_area(NULL, vdso_base,
4140 (vdso_pages << PAGE_SHIFT) +
4141 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
4142- 0, 0);
4143+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
4144 if (IS_ERR_VALUE(vdso_base)) {
4145 rc = vdso_base;
4146 goto fail_mmapsem;
4147diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
4148index 5eea6f3..5d10396 100644
4149--- a/arch/powerpc/lib/usercopy_64.c
4150+++ b/arch/powerpc/lib/usercopy_64.c
4151@@ -9,22 +9,6 @@
4152 #include <linux/module.h>
4153 #include <asm/uaccess.h>
4154
4155-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
4156-{
4157- if (likely(access_ok(VERIFY_READ, from, n)))
4158- n = __copy_from_user(to, from, n);
4159- else
4160- memset(to, 0, n);
4161- return n;
4162-}
4163-
4164-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
4165-{
4166- if (likely(access_ok(VERIFY_WRITE, to, n)))
4167- n = __copy_to_user(to, from, n);
4168- return n;
4169-}
4170-
4171 unsigned long copy_in_user(void __user *to, const void __user *from,
4172 unsigned long n)
4173 {
4174@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
4175 return n;
4176 }
4177
4178-EXPORT_SYMBOL(copy_from_user);
4179-EXPORT_SYMBOL(copy_to_user);
4180 EXPORT_SYMBOL(copy_in_user);
4181
4182diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
4183index 2f0d1b0..36fb5cc 100644
4184--- a/arch/powerpc/mm/fault.c
4185+++ b/arch/powerpc/mm/fault.c
4186@@ -32,6 +32,10 @@
4187 #include <linux/perf_event.h>
4188 #include <linux/magic.h>
4189 #include <linux/ratelimit.h>
4190+#include <linux/slab.h>
4191+#include <linux/pagemap.h>
4192+#include <linux/compiler.h>
4193+#include <linux/unistd.h>
4194
4195 #include <asm/firmware.h>
4196 #include <asm/page.h>
4197@@ -43,6 +47,7 @@
4198 #include <asm/tlbflush.h>
4199 #include <asm/siginfo.h>
4200 #include <mm/mmu_decl.h>
4201+#include <asm/ptrace.h>
4202
4203 #include "icswx.h"
4204
4205@@ -68,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
4206 }
4207 #endif
4208
4209+#ifdef CONFIG_PAX_PAGEEXEC
4210+/*
4211+ * PaX: decide what to do with offenders (regs->nip = fault address)
4212+ *
4213+ * returns 1 when task should be killed
4214+ */
4215+static int pax_handle_fetch_fault(struct pt_regs *regs)
4216+{
4217+ return 1;
4218+}
4219+
4220+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4221+{
4222+ unsigned long i;
4223+
4224+ printk(KERN_ERR "PAX: bytes at PC: ");
4225+ for (i = 0; i < 5; i++) {
4226+ unsigned int c;
4227+ if (get_user(c, (unsigned int __user *)pc+i))
4228+ printk(KERN_CONT "???????? ");
4229+ else
4230+ printk(KERN_CONT "%08x ", c);
4231+ }
4232+ printk("\n");
4233+}
4234+#endif
4235+
4236 /*
4237 * Check whether the instruction at regs->nip is a store using
4238 * an update addressing form which will update r1.
4239@@ -138,7 +170,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
4240 * indicate errors in DSISR but can validly be set in SRR1.
4241 */
4242 if (trap == 0x400)
4243- error_code &= 0x48200000;
4244+ error_code &= 0x58200000;
4245 else
4246 is_write = error_code & DSISR_ISSTORE;
4247 #else
4248@@ -276,7 +308,7 @@ good_area:
4249 * "undefined". Of those that can be set, this is the only
4250 * one which seems bad.
4251 */
4252- if (error_code & 0x10000000)
4253+ if (error_code & DSISR_GUARDED)
4254 /* Guarded storage error. */
4255 goto bad_area;
4256 #endif /* CONFIG_8xx */
4257@@ -291,7 +323,7 @@ good_area:
4258 * processors use the same I/D cache coherency mechanism
4259 * as embedded.
4260 */
4261- if (error_code & DSISR_PROTFAULT)
4262+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
4263 goto bad_area;
4264 #endif /* CONFIG_PPC_STD_MMU */
4265
4266@@ -360,6 +392,23 @@ bad_area:
4267 bad_area_nosemaphore:
4268 /* User mode accesses cause a SIGSEGV */
4269 if (user_mode(regs)) {
4270+
4271+#ifdef CONFIG_PAX_PAGEEXEC
4272+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4273+#ifdef CONFIG_PPC_STD_MMU
4274+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
4275+#else
4276+ if (is_exec && regs->nip == address) {
4277+#endif
4278+ switch (pax_handle_fetch_fault(regs)) {
4279+ }
4280+
4281+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
4282+ do_group_exit(SIGKILL);
4283+ }
4284+ }
4285+#endif
4286+
4287 _exception(SIGSEGV, regs, code, address);
4288 return 0;
4289 }
4290diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
4291index 67a42ed..1c7210c 100644
4292--- a/arch/powerpc/mm/mmap_64.c
4293+++ b/arch/powerpc/mm/mmap_64.c
4294@@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4295 */
4296 if (mmap_is_legacy()) {
4297 mm->mmap_base = TASK_UNMAPPED_BASE;
4298+
4299+#ifdef CONFIG_PAX_RANDMMAP
4300+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4301+ mm->mmap_base += mm->delta_mmap;
4302+#endif
4303+
4304 mm->get_unmapped_area = arch_get_unmapped_area;
4305 mm->unmap_area = arch_unmap_area;
4306 } else {
4307 mm->mmap_base = mmap_base();
4308+
4309+#ifdef CONFIG_PAX_RANDMMAP
4310+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4311+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4312+#endif
4313+
4314 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4315 mm->unmap_area = arch_unmap_area_topdown;
4316 }
4317diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
4318index 73709f7..6b90313 100644
4319--- a/arch/powerpc/mm/slice.c
4320+++ b/arch/powerpc/mm/slice.c
4321@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
4322 if ((mm->task_size - len) < addr)
4323 return 0;
4324 vma = find_vma(mm, addr);
4325- return (!vma || (addr + len) <= vma->vm_start);
4326+ return check_heap_stack_gap(vma, addr, len);
4327 }
4328
4329 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
4330@@ -256,7 +256,7 @@ full_search:
4331 addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
4332 continue;
4333 }
4334- if (!vma || addr + len <= vma->vm_start) {
4335+ if (check_heap_stack_gap(vma, addr, len)) {
4336 /*
4337 * Remember the place where we stopped the search:
4338 */
4339@@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4340 }
4341 }
4342
4343- addr = mm->mmap_base;
4344- while (addr > len) {
4345+ if (mm->mmap_base < len)
4346+ addr = -ENOMEM;
4347+ else
4348+ addr = mm->mmap_base - len;
4349+
4350+ while (!IS_ERR_VALUE(addr)) {
4351 /* Go down by chunk size */
4352- addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
4353+ addr = _ALIGN_DOWN(addr, 1ul << pshift);
4354
4355 /* Check for hit with different page size */
4356 mask = slice_range_to_mask(addr, len);
4357@@ -336,7 +340,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4358 * return with success:
4359 */
4360 vma = find_vma(mm, addr);
4361- if (!vma || (addr + len) <= vma->vm_start) {
4362+ if (check_heap_stack_gap(vma, addr, len)) {
4363 /* remember the address as a hint for next time */
4364 if (use_cache)
4365 mm->free_area_cache = addr;
4366@@ -348,7 +352,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4367 mm->cached_hole_size = vma->vm_start - addr;
4368
4369 /* try just below the current vma->vm_start */
4370- addr = vma->vm_start;
4371+ addr = skip_heap_stack_gap(vma, len);
4372 }
4373
4374 /*
4375@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
4376 if (fixed && addr > (mm->task_size - len))
4377 return -EINVAL;
4378
4379+#ifdef CONFIG_PAX_RANDMMAP
4380+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
4381+ addr = 0;
4382+#endif
4383+
4384 /* If hint, make sure it matches our alignment restrictions */
4385 if (!fixed && addr) {
4386 addr = _ALIGN_UP(addr, 1ul << pshift);
4387diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
4388index 8517d2a..d2738d4 100644
4389--- a/arch/s390/include/asm/atomic.h
4390+++ b/arch/s390/include/asm/atomic.h
4391@@ -326,6 +326,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
4392 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
4393 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
4394
4395+#define atomic64_read_unchecked(v) atomic64_read(v)
4396+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4397+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4398+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4399+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4400+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4401+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4402+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4403+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4404+
4405 #define smp_mb__before_atomic_dec() smp_mb()
4406 #define smp_mb__after_atomic_dec() smp_mb()
4407 #define smp_mb__before_atomic_inc() smp_mb()
4408diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
4409index 2a30d5a..5e5586f 100644
4410--- a/arch/s390/include/asm/cache.h
4411+++ b/arch/s390/include/asm/cache.h
4412@@ -11,8 +11,10 @@
4413 #ifndef __ARCH_S390_CACHE_H
4414 #define __ARCH_S390_CACHE_H
4415
4416-#define L1_CACHE_BYTES 256
4417+#include <linux/const.h>
4418+
4419 #define L1_CACHE_SHIFT 8
4420+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4421 #define NET_SKB_PAD 32
4422
4423 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4424diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
4425index 547f1a6..0b22b53 100644
4426--- a/arch/s390/include/asm/elf.h
4427+++ b/arch/s390/include/asm/elf.h
4428@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
4429 the loader. We need to make sure that it is out of the way of the program
4430 that it will "exec", and that there is sufficient room for the brk. */
4431
4432-extern unsigned long randomize_et_dyn(unsigned long base);
4433-#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
4434+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
4435+
4436+#ifdef CONFIG_PAX_ASLR
4437+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
4438+
4439+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4440+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4441+#endif
4442
4443 /* This yields a mask that user programs can use to figure out what
4444 instruction set this CPU supports. */
4445@@ -211,7 +217,4 @@ struct linux_binprm;
4446 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
4447 int arch_setup_additional_pages(struct linux_binprm *, int);
4448
4449-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
4450-#define arch_randomize_brk arch_randomize_brk
4451-
4452 #endif
4453diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h
4454index d73cc6b..1a296ad 100644
4455--- a/arch/s390/include/asm/system.h
4456+++ b/arch/s390/include/asm/system.h
4457@@ -260,7 +260,7 @@ extern void (*_machine_restart)(char *command);
4458 extern void (*_machine_halt)(void);
4459 extern void (*_machine_power_off)(void);
4460
4461-extern unsigned long arch_align_stack(unsigned long sp);
4462+#define arch_align_stack(x) ((x) & ~0xfUL)
4463
4464 static inline int tprot(unsigned long addr)
4465 {
4466diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
4467index 2b23885..e136e31 100644
4468--- a/arch/s390/include/asm/uaccess.h
4469+++ b/arch/s390/include/asm/uaccess.h
4470@@ -235,6 +235,10 @@ static inline unsigned long __must_check
4471 copy_to_user(void __user *to, const void *from, unsigned long n)
4472 {
4473 might_fault();
4474+
4475+ if ((long)n < 0)
4476+ return n;
4477+
4478 if (access_ok(VERIFY_WRITE, to, n))
4479 n = __copy_to_user(to, from, n);
4480 return n;
4481@@ -260,6 +264,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
4482 static inline unsigned long __must_check
4483 __copy_from_user(void *to, const void __user *from, unsigned long n)
4484 {
4485+ if ((long)n < 0)
4486+ return n;
4487+
4488 if (__builtin_constant_p(n) && (n <= 256))
4489 return uaccess.copy_from_user_small(n, from, to);
4490 else
4491@@ -294,6 +301,10 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
4492 unsigned int sz = __compiletime_object_size(to);
4493
4494 might_fault();
4495+
4496+ if ((long)n < 0)
4497+ return n;
4498+
4499 if (unlikely(sz != -1 && sz < n)) {
4500 copy_from_user_overflow();
4501 return n;
4502diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
4503index dfcb343..eda788a 100644
4504--- a/arch/s390/kernel/module.c
4505+++ b/arch/s390/kernel/module.c
4506@@ -161,11 +161,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
4507
4508 /* Increase core size by size of got & plt and set start
4509 offsets for got and plt. */
4510- me->core_size = ALIGN(me->core_size, 4);
4511- me->arch.got_offset = me->core_size;
4512- me->core_size += me->arch.got_size;
4513- me->arch.plt_offset = me->core_size;
4514- me->core_size += me->arch.plt_size;
4515+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
4516+ me->arch.got_offset = me->core_size_rw;
4517+ me->core_size_rw += me->arch.got_size;
4518+ me->arch.plt_offset = me->core_size_rx;
4519+ me->core_size_rx += me->arch.plt_size;
4520 return 0;
4521 }
4522
4523@@ -242,7 +242,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4524 if (info->got_initialized == 0) {
4525 Elf_Addr *gotent;
4526
4527- gotent = me->module_core + me->arch.got_offset +
4528+ gotent = me->module_core_rw + me->arch.got_offset +
4529 info->got_offset;
4530 *gotent = val;
4531 info->got_initialized = 1;
4532@@ -266,7 +266,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4533 else if (r_type == R_390_GOTENT ||
4534 r_type == R_390_GOTPLTENT)
4535 *(unsigned int *) loc =
4536- (val + (Elf_Addr) me->module_core - loc) >> 1;
4537+ (val + (Elf_Addr) me->module_core_rw - loc) >> 1;
4538 else if (r_type == R_390_GOT64 ||
4539 r_type == R_390_GOTPLT64)
4540 *(unsigned long *) loc = val;
4541@@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4542 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
4543 if (info->plt_initialized == 0) {
4544 unsigned int *ip;
4545- ip = me->module_core + me->arch.plt_offset +
4546+ ip = me->module_core_rx + me->arch.plt_offset +
4547 info->plt_offset;
4548 #ifndef CONFIG_64BIT
4549 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
4550@@ -305,7 +305,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4551 val - loc + 0xffffUL < 0x1ffffeUL) ||
4552 (r_type == R_390_PLT32DBL &&
4553 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
4554- val = (Elf_Addr) me->module_core +
4555+ val = (Elf_Addr) me->module_core_rx +
4556 me->arch.plt_offset +
4557 info->plt_offset;
4558 val += rela->r_addend - loc;
4559@@ -327,7 +327,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4560 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
4561 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
4562 val = val + rela->r_addend -
4563- ((Elf_Addr) me->module_core + me->arch.got_offset);
4564+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
4565 if (r_type == R_390_GOTOFF16)
4566 *(unsigned short *) loc = val;
4567 else if (r_type == R_390_GOTOFF32)
4568@@ -337,7 +337,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4569 break;
4570 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
4571 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
4572- val = (Elf_Addr) me->module_core + me->arch.got_offset +
4573+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
4574 rela->r_addend - loc;
4575 if (r_type == R_390_GOTPC)
4576 *(unsigned int *) loc = val;
4577diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
4578index e795933..b32563c 100644
4579--- a/arch/s390/kernel/process.c
4580+++ b/arch/s390/kernel/process.c
4581@@ -323,39 +323,3 @@ unsigned long get_wchan(struct task_struct *p)
4582 }
4583 return 0;
4584 }
4585-
4586-unsigned long arch_align_stack(unsigned long sp)
4587-{
4588- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
4589- sp -= get_random_int() & ~PAGE_MASK;
4590- return sp & ~0xf;
4591-}
4592-
4593-static inline unsigned long brk_rnd(void)
4594-{
4595- /* 8MB for 32bit, 1GB for 64bit */
4596- if (is_32bit_task())
4597- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
4598- else
4599- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
4600-}
4601-
4602-unsigned long arch_randomize_brk(struct mm_struct *mm)
4603-{
4604- unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd());
4605-
4606- if (ret < mm->brk)
4607- return mm->brk;
4608- return ret;
4609-}
4610-
4611-unsigned long randomize_et_dyn(unsigned long base)
4612-{
4613- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
4614-
4615- if (!(current->flags & PF_RANDOMIZE))
4616- return base;
4617- if (ret < base)
4618- return base;
4619- return ret;
4620-}
4621diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
4622index a0155c0..34cc491 100644
4623--- a/arch/s390/mm/mmap.c
4624+++ b/arch/s390/mm/mmap.c
4625@@ -92,10 +92,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4626 */
4627 if (mmap_is_legacy()) {
4628 mm->mmap_base = TASK_UNMAPPED_BASE;
4629+
4630+#ifdef CONFIG_PAX_RANDMMAP
4631+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4632+ mm->mmap_base += mm->delta_mmap;
4633+#endif
4634+
4635 mm->get_unmapped_area = arch_get_unmapped_area;
4636 mm->unmap_area = arch_unmap_area;
4637 } else {
4638 mm->mmap_base = mmap_base();
4639+
4640+#ifdef CONFIG_PAX_RANDMMAP
4641+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4642+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4643+#endif
4644+
4645 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4646 mm->unmap_area = arch_unmap_area_topdown;
4647 }
4648@@ -167,10 +179,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4649 */
4650 if (mmap_is_legacy()) {
4651 mm->mmap_base = TASK_UNMAPPED_BASE;
4652+
4653+#ifdef CONFIG_PAX_RANDMMAP
4654+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4655+ mm->mmap_base += mm->delta_mmap;
4656+#endif
4657+
4658 mm->get_unmapped_area = s390_get_unmapped_area;
4659 mm->unmap_area = arch_unmap_area;
4660 } else {
4661 mm->mmap_base = mmap_base();
4662+
4663+#ifdef CONFIG_PAX_RANDMMAP
4664+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4665+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4666+#endif
4667+
4668 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
4669 mm->unmap_area = arch_unmap_area_topdown;
4670 }
4671diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
4672index ae3d59f..f65f075 100644
4673--- a/arch/score/include/asm/cache.h
4674+++ b/arch/score/include/asm/cache.h
4675@@ -1,7 +1,9 @@
4676 #ifndef _ASM_SCORE_CACHE_H
4677 #define _ASM_SCORE_CACHE_H
4678
4679+#include <linux/const.h>
4680+
4681 #define L1_CACHE_SHIFT 4
4682-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4683+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4684
4685 #endif /* _ASM_SCORE_CACHE_H */
4686diff --git a/arch/score/include/asm/system.h b/arch/score/include/asm/system.h
4687index 589d5c7..669e274 100644
4688--- a/arch/score/include/asm/system.h
4689+++ b/arch/score/include/asm/system.h
4690@@ -17,7 +17,7 @@ do { \
4691 #define finish_arch_switch(prev) do {} while (0)
4692
4693 typedef void (*vi_handler_t)(void);
4694-extern unsigned long arch_align_stack(unsigned long sp);
4695+#define arch_align_stack(x) (x)
4696
4697 #define mb() barrier()
4698 #define rmb() barrier()
4699diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
4700index 25d0803..d6c8e36 100644
4701--- a/arch/score/kernel/process.c
4702+++ b/arch/score/kernel/process.c
4703@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_struct *task)
4704
4705 return task_pt_regs(task)->cp0_epc;
4706 }
4707-
4708-unsigned long arch_align_stack(unsigned long sp)
4709-{
4710- return sp;
4711-}
4712diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
4713index ef9e555..331bd29 100644
4714--- a/arch/sh/include/asm/cache.h
4715+++ b/arch/sh/include/asm/cache.h
4716@@ -9,10 +9,11 @@
4717 #define __ASM_SH_CACHE_H
4718 #ifdef __KERNEL__
4719
4720+#include <linux/const.h>
4721 #include <linux/init.h>
4722 #include <cpu/cache.h>
4723
4724-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4725+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4726
4727 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4728
4729diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
4730index afeb710..d1d1289 100644
4731--- a/arch/sh/mm/mmap.c
4732+++ b/arch/sh/mm/mmap.c
4733@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
4734 addr = PAGE_ALIGN(addr);
4735
4736 vma = find_vma(mm, addr);
4737- if (TASK_SIZE - len >= addr &&
4738- (!vma || addr + len <= vma->vm_start))
4739+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4740 return addr;
4741 }
4742
4743@@ -106,7 +105,7 @@ full_search:
4744 }
4745 return -ENOMEM;
4746 }
4747- if (likely(!vma || addr + len <= vma->vm_start)) {
4748+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4749 /*
4750 * Remember the place where we stopped the search:
4751 */
4752@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4753 addr = PAGE_ALIGN(addr);
4754
4755 vma = find_vma(mm, addr);
4756- if (TASK_SIZE - len >= addr &&
4757- (!vma || addr + len <= vma->vm_start))
4758+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4759 return addr;
4760 }
4761
4762@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4763 /* make sure it can fit in the remaining address space */
4764 if (likely(addr > len)) {
4765 vma = find_vma(mm, addr-len);
4766- if (!vma || addr <= vma->vm_start) {
4767+ if (check_heap_stack_gap(vma, addr - len, len)) {
4768 /* remember the address as a hint for next time */
4769 return (mm->free_area_cache = addr-len);
4770 }
4771@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4772 if (unlikely(mm->mmap_base < len))
4773 goto bottomup;
4774
4775- addr = mm->mmap_base-len;
4776- if (do_colour_align)
4777- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4778+ addr = mm->mmap_base - len;
4779
4780 do {
4781+ if (do_colour_align)
4782+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4783 /*
4784 * Lookup failure means no vma is above this address,
4785 * else if new region fits below vma->vm_start,
4786 * return with success:
4787 */
4788 vma = find_vma(mm, addr);
4789- if (likely(!vma || addr+len <= vma->vm_start)) {
4790+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4791 /* remember the address as a hint for next time */
4792 return (mm->free_area_cache = addr);
4793 }
4794@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4795 mm->cached_hole_size = vma->vm_start - addr;
4796
4797 /* try just below the current vma->vm_start */
4798- addr = vma->vm_start-len;
4799- if (do_colour_align)
4800- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4801- } while (likely(len < vma->vm_start));
4802+ addr = skip_heap_stack_gap(vma, len);
4803+ } while (!IS_ERR_VALUE(addr));
4804
4805 bottomup:
4806 /*
4807diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
4808index eddcfb3..b117d90 100644
4809--- a/arch/sparc/Makefile
4810+++ b/arch/sparc/Makefile
4811@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/
4812 # Export what is needed by arch/sparc/boot/Makefile
4813 export VMLINUX_INIT VMLINUX_MAIN
4814 VMLINUX_INIT := $(head-y) $(init-y)
4815-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
4816+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
4817 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
4818 VMLINUX_MAIN += $(drivers-y) $(net-y)
4819
4820diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
4821index 9f421df..b81fc12 100644
4822--- a/arch/sparc/include/asm/atomic_64.h
4823+++ b/arch/sparc/include/asm/atomic_64.h
4824@@ -14,18 +14,40 @@
4825 #define ATOMIC64_INIT(i) { (i) }
4826
4827 #define atomic_read(v) (*(volatile int *)&(v)->counter)
4828+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
4829+{
4830+ return v->counter;
4831+}
4832 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
4833+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
4834+{
4835+ return v->counter;
4836+}
4837
4838 #define atomic_set(v, i) (((v)->counter) = i)
4839+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
4840+{
4841+ v->counter = i;
4842+}
4843 #define atomic64_set(v, i) (((v)->counter) = i)
4844+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
4845+{
4846+ v->counter = i;
4847+}
4848
4849 extern void atomic_add(int, atomic_t *);
4850+extern void atomic_add_unchecked(int, atomic_unchecked_t *);
4851 extern void atomic64_add(long, atomic64_t *);
4852+extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
4853 extern void atomic_sub(int, atomic_t *);
4854+extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
4855 extern void atomic64_sub(long, atomic64_t *);
4856+extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
4857
4858 extern int atomic_add_ret(int, atomic_t *);
4859+extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
4860 extern long atomic64_add_ret(long, atomic64_t *);
4861+extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
4862 extern int atomic_sub_ret(int, atomic_t *);
4863 extern long atomic64_sub_ret(long, atomic64_t *);
4864
4865@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4866 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
4867
4868 #define atomic_inc_return(v) atomic_add_ret(1, v)
4869+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
4870+{
4871+ return atomic_add_ret_unchecked(1, v);
4872+}
4873 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
4874+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
4875+{
4876+ return atomic64_add_ret_unchecked(1, v);
4877+}
4878
4879 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
4880 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
4881
4882 #define atomic_add_return(i, v) atomic_add_ret(i, v)
4883+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
4884+{
4885+ return atomic_add_ret_unchecked(i, v);
4886+}
4887 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
4888+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
4889+{
4890+ return atomic64_add_ret_unchecked(i, v);
4891+}
4892
4893 /*
4894 * atomic_inc_and_test - increment and test
4895@@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4896 * other cases.
4897 */
4898 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
4899+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
4900+{
4901+ return atomic_inc_return_unchecked(v) == 0;
4902+}
4903 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
4904
4905 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
4906@@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4907 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
4908
4909 #define atomic_inc(v) atomic_add(1, v)
4910+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
4911+{
4912+ atomic_add_unchecked(1, v);
4913+}
4914 #define atomic64_inc(v) atomic64_add(1, v)
4915+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
4916+{
4917+ atomic64_add_unchecked(1, v);
4918+}
4919
4920 #define atomic_dec(v) atomic_sub(1, v)
4921+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
4922+{
4923+ atomic_sub_unchecked(1, v);
4924+}
4925 #define atomic64_dec(v) atomic64_sub(1, v)
4926+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
4927+{
4928+ atomic64_sub_unchecked(1, v);
4929+}
4930
4931 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
4932 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
4933
4934 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
4935+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
4936+{
4937+ return cmpxchg(&v->counter, old, new);
4938+}
4939 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
4940+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
4941+{
4942+ return xchg(&v->counter, new);
4943+}
4944
4945 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
4946 {
4947- int c, old;
4948+ int c, old, new;
4949 c = atomic_read(v);
4950 for (;;) {
4951- if (unlikely(c == (u)))
4952+ if (unlikely(c == u))
4953 break;
4954- old = atomic_cmpxchg((v), c, c + (a));
4955+
4956+ asm volatile("addcc %2, %0, %0\n"
4957+
4958+#ifdef CONFIG_PAX_REFCOUNT
4959+ "tvs %%icc, 6\n"
4960+#endif
4961+
4962+ : "=r" (new)
4963+ : "0" (c), "ir" (a)
4964+ : "cc");
4965+
4966+ old = atomic_cmpxchg(v, c, new);
4967 if (likely(old == c))
4968 break;
4969 c = old;
4970@@ -89,20 +166,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
4971 #define atomic64_cmpxchg(v, o, n) \
4972 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
4973 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
4974+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
4975+{
4976+ return xchg(&v->counter, new);
4977+}
4978
4979 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
4980 {
4981- long c, old;
4982+ long c, old, new;
4983 c = atomic64_read(v);
4984 for (;;) {
4985- if (unlikely(c == (u)))
4986+ if (unlikely(c == u))
4987 break;
4988- old = atomic64_cmpxchg((v), c, c + (a));
4989+
4990+ asm volatile("addcc %2, %0, %0\n"
4991+
4992+#ifdef CONFIG_PAX_REFCOUNT
4993+ "tvs %%xcc, 6\n"
4994+#endif
4995+
4996+ : "=r" (new)
4997+ : "0" (c), "ir" (a)
4998+ : "cc");
4999+
5000+ old = atomic64_cmpxchg(v, c, new);
5001 if (likely(old == c))
5002 break;
5003 c = old;
5004 }
5005- return c != (u);
5006+ return c != u;
5007 }
5008
5009 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
5010diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
5011index 69358b5..9d0d492 100644
5012--- a/arch/sparc/include/asm/cache.h
5013+++ b/arch/sparc/include/asm/cache.h
5014@@ -7,10 +7,12 @@
5015 #ifndef _SPARC_CACHE_H
5016 #define _SPARC_CACHE_H
5017
5018+#include <linux/const.h>
5019+
5020 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
5021
5022 #define L1_CACHE_SHIFT 5
5023-#define L1_CACHE_BYTES 32
5024+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5025
5026 #ifdef CONFIG_SPARC32
5027 #define SMP_CACHE_BYTES_SHIFT 5
5028diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
5029index 4269ca6..e3da77f 100644
5030--- a/arch/sparc/include/asm/elf_32.h
5031+++ b/arch/sparc/include/asm/elf_32.h
5032@@ -114,6 +114,13 @@ typedef struct {
5033
5034 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
5035
5036+#ifdef CONFIG_PAX_ASLR
5037+#define PAX_ELF_ET_DYN_BASE 0x10000UL
5038+
5039+#define PAX_DELTA_MMAP_LEN 16
5040+#define PAX_DELTA_STACK_LEN 16
5041+#endif
5042+
5043 /* This yields a mask that user programs can use to figure out what
5044 instruction set this cpu supports. This can NOT be done in userspace
5045 on Sparc. */
5046diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
5047index 7df8b7f..4946269 100644
5048--- a/arch/sparc/include/asm/elf_64.h
5049+++ b/arch/sparc/include/asm/elf_64.h
5050@@ -180,6 +180,13 @@ typedef struct {
5051 #define ELF_ET_DYN_BASE 0x0000010000000000UL
5052 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
5053
5054+#ifdef CONFIG_PAX_ASLR
5055+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
5056+
5057+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
5058+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
5059+#endif
5060+
5061 extern unsigned long sparc64_elf_hwcap;
5062 #define ELF_HWCAP sparc64_elf_hwcap
5063
5064diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
5065index ca2b344..c6084f89 100644
5066--- a/arch/sparc/include/asm/pgalloc_32.h
5067+++ b/arch/sparc/include/asm/pgalloc_32.h
5068@@ -37,6 +37,7 @@ BTFIXUPDEF_CALL(void, free_pgd_fast, pgd_t *)
5069 BTFIXUPDEF_CALL(void, pgd_set, pgd_t *, pmd_t *)
5070 #define pgd_set(pgdp,pmdp) BTFIXUP_CALL(pgd_set)(pgdp,pmdp)
5071 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
5072+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
5073
5074 BTFIXUPDEF_CALL(pmd_t *, pmd_alloc_one, struct mm_struct *, unsigned long)
5075 #define pmd_alloc_one(mm, address) BTFIXUP_CALL(pmd_alloc_one)(mm, address)
5076diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
5077index 40b2d7a..22a665b 100644
5078--- a/arch/sparc/include/asm/pgalloc_64.h
5079+++ b/arch/sparc/include/asm/pgalloc_64.h
5080@@ -26,6 +26,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
5081 }
5082
5083 #define pud_populate(MM, PUD, PMD) pud_set(PUD, PMD)
5084+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
5085
5086 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5087 {
5088diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
5089index a790cc6..091ed94 100644
5090--- a/arch/sparc/include/asm/pgtable_32.h
5091+++ b/arch/sparc/include/asm/pgtable_32.h
5092@@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
5093 BTFIXUPDEF_INT(page_none)
5094 BTFIXUPDEF_INT(page_copy)
5095 BTFIXUPDEF_INT(page_readonly)
5096+
5097+#ifdef CONFIG_PAX_PAGEEXEC
5098+BTFIXUPDEF_INT(page_shared_noexec)
5099+BTFIXUPDEF_INT(page_copy_noexec)
5100+BTFIXUPDEF_INT(page_readonly_noexec)
5101+#endif
5102+
5103 BTFIXUPDEF_INT(page_kernel)
5104
5105 #define PMD_SHIFT SUN4C_PMD_SHIFT
5106@@ -66,6 +73,16 @@ extern pgprot_t PAGE_SHARED;
5107 #define PAGE_COPY __pgprot(BTFIXUP_INT(page_copy))
5108 #define PAGE_READONLY __pgprot(BTFIXUP_INT(page_readonly))
5109
5110+#ifdef CONFIG_PAX_PAGEEXEC
5111+extern pgprot_t PAGE_SHARED_NOEXEC;
5112+# define PAGE_COPY_NOEXEC __pgprot(BTFIXUP_INT(page_copy_noexec))
5113+# define PAGE_READONLY_NOEXEC __pgprot(BTFIXUP_INT(page_readonly_noexec))
5114+#else
5115+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5116+# define PAGE_COPY_NOEXEC PAGE_COPY
5117+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5118+#endif
5119+
5120 extern unsigned long page_kernel;
5121
5122 #ifdef MODULE
5123diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
5124index f6ae2b2..b03ffc7 100644
5125--- a/arch/sparc/include/asm/pgtsrmmu.h
5126+++ b/arch/sparc/include/asm/pgtsrmmu.h
5127@@ -115,6 +115,13 @@
5128 SRMMU_EXEC | SRMMU_REF)
5129 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
5130 SRMMU_EXEC | SRMMU_REF)
5131+
5132+#ifdef CONFIG_PAX_PAGEEXEC
5133+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
5134+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
5135+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
5136+#endif
5137+
5138 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
5139 SRMMU_DIRTY | SRMMU_REF)
5140
5141diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
5142index 9689176..63c18ea 100644
5143--- a/arch/sparc/include/asm/spinlock_64.h
5144+++ b/arch/sparc/include/asm/spinlock_64.h
5145@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
5146
5147 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
5148
5149-static void inline arch_read_lock(arch_rwlock_t *lock)
5150+static inline void arch_read_lock(arch_rwlock_t *lock)
5151 {
5152 unsigned long tmp1, tmp2;
5153
5154 __asm__ __volatile__ (
5155 "1: ldsw [%2], %0\n"
5156 " brlz,pn %0, 2f\n"
5157-"4: add %0, 1, %1\n"
5158+"4: addcc %0, 1, %1\n"
5159+
5160+#ifdef CONFIG_PAX_REFCOUNT
5161+" tvs %%icc, 6\n"
5162+#endif
5163+
5164 " cas [%2], %0, %1\n"
5165 " cmp %0, %1\n"
5166 " bne,pn %%icc, 1b\n"
5167@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
5168 " .previous"
5169 : "=&r" (tmp1), "=&r" (tmp2)
5170 : "r" (lock)
5171- : "memory");
5172+ : "memory", "cc");
5173 }
5174
5175-static int inline arch_read_trylock(arch_rwlock_t *lock)
5176+static inline int arch_read_trylock(arch_rwlock_t *lock)
5177 {
5178 int tmp1, tmp2;
5179
5180@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5181 "1: ldsw [%2], %0\n"
5182 " brlz,a,pn %0, 2f\n"
5183 " mov 0, %0\n"
5184-" add %0, 1, %1\n"
5185+" addcc %0, 1, %1\n"
5186+
5187+#ifdef CONFIG_PAX_REFCOUNT
5188+" tvs %%icc, 6\n"
5189+#endif
5190+
5191 " cas [%2], %0, %1\n"
5192 " cmp %0, %1\n"
5193 " bne,pn %%icc, 1b\n"
5194@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5195 return tmp1;
5196 }
5197
5198-static void inline arch_read_unlock(arch_rwlock_t *lock)
5199+static inline void arch_read_unlock(arch_rwlock_t *lock)
5200 {
5201 unsigned long tmp1, tmp2;
5202
5203 __asm__ __volatile__(
5204 "1: lduw [%2], %0\n"
5205-" sub %0, 1, %1\n"
5206+" subcc %0, 1, %1\n"
5207+
5208+#ifdef CONFIG_PAX_REFCOUNT
5209+" tvs %%icc, 6\n"
5210+#endif
5211+
5212 " cas [%2], %0, %1\n"
5213 " cmp %0, %1\n"
5214 " bne,pn %%xcc, 1b\n"
5215@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
5216 : "memory");
5217 }
5218
5219-static void inline arch_write_lock(arch_rwlock_t *lock)
5220+static inline void arch_write_lock(arch_rwlock_t *lock)
5221 {
5222 unsigned long mask, tmp1, tmp2;
5223
5224@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
5225 : "memory");
5226 }
5227
5228-static void inline arch_write_unlock(arch_rwlock_t *lock)
5229+static inline void arch_write_unlock(arch_rwlock_t *lock)
5230 {
5231 __asm__ __volatile__(
5232 " stw %%g0, [%0]"
5233@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
5234 : "memory");
5235 }
5236
5237-static int inline arch_write_trylock(arch_rwlock_t *lock)
5238+static inline int arch_write_trylock(arch_rwlock_t *lock)
5239 {
5240 unsigned long mask, tmp1, tmp2, result;
5241
5242diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
5243index c2a1080..21ed218 100644
5244--- a/arch/sparc/include/asm/thread_info_32.h
5245+++ b/arch/sparc/include/asm/thread_info_32.h
5246@@ -50,6 +50,8 @@ struct thread_info {
5247 unsigned long w_saved;
5248
5249 struct restart_block restart_block;
5250+
5251+ unsigned long lowest_stack;
5252 };
5253
5254 /*
5255diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
5256index 01d057f..0a02f7e 100644
5257--- a/arch/sparc/include/asm/thread_info_64.h
5258+++ b/arch/sparc/include/asm/thread_info_64.h
5259@@ -63,6 +63,8 @@ struct thread_info {
5260 struct pt_regs *kern_una_regs;
5261 unsigned int kern_una_insn;
5262
5263+ unsigned long lowest_stack;
5264+
5265 unsigned long fpregs[0] __attribute__ ((aligned(64)));
5266 };
5267
5268diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
5269index e88fbe5..96b0ce5 100644
5270--- a/arch/sparc/include/asm/uaccess.h
5271+++ b/arch/sparc/include/asm/uaccess.h
5272@@ -1,5 +1,13 @@
5273 #ifndef ___ASM_SPARC_UACCESS_H
5274 #define ___ASM_SPARC_UACCESS_H
5275+
5276+#ifdef __KERNEL__
5277+#ifndef __ASSEMBLY__
5278+#include <linux/types.h>
5279+extern void check_object_size(const void *ptr, unsigned long n, bool to);
5280+#endif
5281+#endif
5282+
5283 #if defined(__sparc__) && defined(__arch64__)
5284 #include <asm/uaccess_64.h>
5285 #else
5286diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
5287index 8303ac4..07f333d 100644
5288--- a/arch/sparc/include/asm/uaccess_32.h
5289+++ b/arch/sparc/include/asm/uaccess_32.h
5290@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
5291
5292 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
5293 {
5294- if (n && __access_ok((unsigned long) to, n))
5295+ if ((long)n < 0)
5296+ return n;
5297+
5298+ if (n && __access_ok((unsigned long) to, n)) {
5299+ if (!__builtin_constant_p(n))
5300+ check_object_size(from, n, true);
5301 return __copy_user(to, (__force void __user *) from, n);
5302- else
5303+ } else
5304 return n;
5305 }
5306
5307 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
5308 {
5309+ if ((long)n < 0)
5310+ return n;
5311+
5312+ if (!__builtin_constant_p(n))
5313+ check_object_size(from, n, true);
5314+
5315 return __copy_user(to, (__force void __user *) from, n);
5316 }
5317
5318 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
5319 {
5320- if (n && __access_ok((unsigned long) from, n))
5321+ if ((long)n < 0)
5322+ return n;
5323+
5324+ if (n && __access_ok((unsigned long) from, n)) {
5325+ if (!__builtin_constant_p(n))
5326+ check_object_size(to, n, false);
5327 return __copy_user((__force void __user *) to, from, n);
5328- else
5329+ } else
5330 return n;
5331 }
5332
5333 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
5334 {
5335+ if ((long)n < 0)
5336+ return n;
5337+
5338 return __copy_user((__force void __user *) to, from, n);
5339 }
5340
5341diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
5342index 3e1449f..5293a0e 100644
5343--- a/arch/sparc/include/asm/uaccess_64.h
5344+++ b/arch/sparc/include/asm/uaccess_64.h
5345@@ -10,6 +10,7 @@
5346 #include <linux/compiler.h>
5347 #include <linux/string.h>
5348 #include <linux/thread_info.h>
5349+#include <linux/kernel.h>
5350 #include <asm/asi.h>
5351 #include <asm/system.h>
5352 #include <asm/spitfire.h>
5353@@ -213,8 +214,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
5354 static inline unsigned long __must_check
5355 copy_from_user(void *to, const void __user *from, unsigned long size)
5356 {
5357- unsigned long ret = ___copy_from_user(to, from, size);
5358+ unsigned long ret;
5359
5360+ if ((long)size < 0 || size > INT_MAX)
5361+ return size;
5362+
5363+ if (!__builtin_constant_p(size))
5364+ check_object_size(to, size, false);
5365+
5366+ ret = ___copy_from_user(to, from, size);
5367 if (unlikely(ret))
5368 ret = copy_from_user_fixup(to, from, size);
5369
5370@@ -230,8 +238,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
5371 static inline unsigned long __must_check
5372 copy_to_user(void __user *to, const void *from, unsigned long size)
5373 {
5374- unsigned long ret = ___copy_to_user(to, from, size);
5375+ unsigned long ret;
5376
5377+ if ((long)size < 0 || size > INT_MAX)
5378+ return size;
5379+
5380+ if (!__builtin_constant_p(size))
5381+ check_object_size(from, size, true);
5382+
5383+ ret = ___copy_to_user(to, from, size);
5384 if (unlikely(ret))
5385 ret = copy_to_user_fixup(to, from, size);
5386 return ret;
5387diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
5388index cb85458..e063f17 100644
5389--- a/arch/sparc/kernel/Makefile
5390+++ b/arch/sparc/kernel/Makefile
5391@@ -3,7 +3,7 @@
5392 #
5393
5394 asflags-y := -ansi
5395-ccflags-y := -Werror
5396+#ccflags-y := -Werror
5397
5398 extra-y := head_$(BITS).o
5399 extra-y += init_task.o
5400diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
5401index f793742..4d880af 100644
5402--- a/arch/sparc/kernel/process_32.c
5403+++ b/arch/sparc/kernel/process_32.c
5404@@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
5405 rw->ins[4], rw->ins[5],
5406 rw->ins[6],
5407 rw->ins[7]);
5408- printk("%pS\n", (void *) rw->ins[7]);
5409+ printk("%pA\n", (void *) rw->ins[7]);
5410 rw = (struct reg_window32 *) rw->ins[6];
5411 }
5412 spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
5413@@ -271,14 +271,14 @@ void show_regs(struct pt_regs *r)
5414
5415 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
5416 r->psr, r->pc, r->npc, r->y, print_tainted());
5417- printk("PC: <%pS>\n", (void *) r->pc);
5418+ printk("PC: <%pA>\n", (void *) r->pc);
5419 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5420 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
5421 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
5422 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5423 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
5424 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
5425- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
5426+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
5427
5428 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5429 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
5430@@ -313,7 +313,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5431 rw = (struct reg_window32 *) fp;
5432 pc = rw->ins[7];
5433 printk("[%08lx : ", pc);
5434- printk("%pS ] ", (void *) pc);
5435+ printk("%pA ] ", (void *) pc);
5436 fp = rw->ins[6];
5437 } while (++count < 16);
5438 printk("\n");
5439diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
5440index 39d8b05..d1a7d90 100644
5441--- a/arch/sparc/kernel/process_64.c
5442+++ b/arch/sparc/kernel/process_64.c
5443@@ -182,14 +182,14 @@ static void show_regwindow(struct pt_regs *regs)
5444 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
5445 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
5446 if (regs->tstate & TSTATE_PRIV)
5447- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
5448+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
5449 }
5450
5451 void show_regs(struct pt_regs *regs)
5452 {
5453 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
5454 regs->tpc, regs->tnpc, regs->y, print_tainted());
5455- printk("TPC: <%pS>\n", (void *) regs->tpc);
5456+ printk("TPC: <%pA>\n", (void *) regs->tpc);
5457 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
5458 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
5459 regs->u_regs[3]);
5460@@ -202,7 +202,7 @@ void show_regs(struct pt_regs *regs)
5461 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
5462 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
5463 regs->u_regs[15]);
5464- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
5465+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
5466 show_regwindow(regs);
5467 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
5468 }
5469@@ -287,7 +287,7 @@ void arch_trigger_all_cpu_backtrace(void)
5470 ((tp && tp->task) ? tp->task->pid : -1));
5471
5472 if (gp->tstate & TSTATE_PRIV) {
5473- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
5474+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
5475 (void *) gp->tpc,
5476 (void *) gp->o7,
5477 (void *) gp->i7,
5478diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
5479index 42b282f..28ce9f2 100644
5480--- a/arch/sparc/kernel/sys_sparc_32.c
5481+++ b/arch/sparc/kernel/sys_sparc_32.c
5482@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5483 if (ARCH_SUN4C && len > 0x20000000)
5484 return -ENOMEM;
5485 if (!addr)
5486- addr = TASK_UNMAPPED_BASE;
5487+ addr = current->mm->mmap_base;
5488
5489 if (flags & MAP_SHARED)
5490 addr = COLOUR_ALIGN(addr);
5491@@ -71,7 +71,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5492 }
5493 if (TASK_SIZE - PAGE_SIZE - len < addr)
5494 return -ENOMEM;
5495- if (!vmm || addr + len <= vmm->vm_start)
5496+ if (check_heap_stack_gap(vmm, addr, len))
5497 return addr;
5498 addr = vmm->vm_end;
5499 if (flags & MAP_SHARED)
5500diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
5501index 232df99..cee1f9c 100644
5502--- a/arch/sparc/kernel/sys_sparc_64.c
5503+++ b/arch/sparc/kernel/sys_sparc_64.c
5504@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5505 /* We do not accept a shared mapping if it would violate
5506 * cache aliasing constraints.
5507 */
5508- if ((flags & MAP_SHARED) &&
5509+ if ((filp || (flags & MAP_SHARED)) &&
5510 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5511 return -EINVAL;
5512 return addr;
5513@@ -139,6 +139,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5514 if (filp || (flags & MAP_SHARED))
5515 do_color_align = 1;
5516
5517+#ifdef CONFIG_PAX_RANDMMAP
5518+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
5519+#endif
5520+
5521 if (addr) {
5522 if (do_color_align)
5523 addr = COLOUR_ALIGN(addr, pgoff);
5524@@ -146,15 +150,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5525 addr = PAGE_ALIGN(addr);
5526
5527 vma = find_vma(mm, addr);
5528- if (task_size - len >= addr &&
5529- (!vma || addr + len <= vma->vm_start))
5530+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5531 return addr;
5532 }
5533
5534 if (len > mm->cached_hole_size) {
5535- start_addr = addr = mm->free_area_cache;
5536+ start_addr = addr = mm->free_area_cache;
5537 } else {
5538- start_addr = addr = TASK_UNMAPPED_BASE;
5539+ start_addr = addr = mm->mmap_base;
5540 mm->cached_hole_size = 0;
5541 }
5542
5543@@ -174,14 +177,14 @@ full_search:
5544 vma = find_vma(mm, VA_EXCLUDE_END);
5545 }
5546 if (unlikely(task_size < addr)) {
5547- if (start_addr != TASK_UNMAPPED_BASE) {
5548- start_addr = addr = TASK_UNMAPPED_BASE;
5549+ if (start_addr != mm->mmap_base) {
5550+ start_addr = addr = mm->mmap_base;
5551 mm->cached_hole_size = 0;
5552 goto full_search;
5553 }
5554 return -ENOMEM;
5555 }
5556- if (likely(!vma || addr + len <= vma->vm_start)) {
5557+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5558 /*
5559 * Remember the place where we stopped the search:
5560 */
5561@@ -215,7 +218,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5562 /* We do not accept a shared mapping if it would violate
5563 * cache aliasing constraints.
5564 */
5565- if ((flags & MAP_SHARED) &&
5566+ if ((filp || (flags & MAP_SHARED)) &&
5567 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5568 return -EINVAL;
5569 return addr;
5570@@ -236,8 +239,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5571 addr = PAGE_ALIGN(addr);
5572
5573 vma = find_vma(mm, addr);
5574- if (task_size - len >= addr &&
5575- (!vma || addr + len <= vma->vm_start))
5576+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5577 return addr;
5578 }
5579
5580@@ -258,7 +260,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5581 /* make sure it can fit in the remaining address space */
5582 if (likely(addr > len)) {
5583 vma = find_vma(mm, addr-len);
5584- if (!vma || addr <= vma->vm_start) {
5585+ if (check_heap_stack_gap(vma, addr - len, len)) {
5586 /* remember the address as a hint for next time */
5587 return (mm->free_area_cache = addr-len);
5588 }
5589@@ -267,18 +269,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5590 if (unlikely(mm->mmap_base < len))
5591 goto bottomup;
5592
5593- addr = mm->mmap_base-len;
5594- if (do_color_align)
5595- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5596+ addr = mm->mmap_base - len;
5597
5598 do {
5599+ if (do_color_align)
5600+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5601 /*
5602 * Lookup failure means no vma is above this address,
5603 * else if new region fits below vma->vm_start,
5604 * return with success:
5605 */
5606 vma = find_vma(mm, addr);
5607- if (likely(!vma || addr+len <= vma->vm_start)) {
5608+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5609 /* remember the address as a hint for next time */
5610 return (mm->free_area_cache = addr);
5611 }
5612@@ -288,10 +290,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5613 mm->cached_hole_size = vma->vm_start - addr;
5614
5615 /* try just below the current vma->vm_start */
5616- addr = vma->vm_start-len;
5617- if (do_color_align)
5618- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5619- } while (likely(len < vma->vm_start));
5620+ addr = skip_heap_stack_gap(vma, len);
5621+ } while (!IS_ERR_VALUE(addr));
5622
5623 bottomup:
5624 /*
5625@@ -390,6 +390,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5626 gap == RLIM_INFINITY ||
5627 sysctl_legacy_va_layout) {
5628 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
5629+
5630+#ifdef CONFIG_PAX_RANDMMAP
5631+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5632+ mm->mmap_base += mm->delta_mmap;
5633+#endif
5634+
5635 mm->get_unmapped_area = arch_get_unmapped_area;
5636 mm->unmap_area = arch_unmap_area;
5637 } else {
5638@@ -402,6 +408,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5639 gap = (task_size / 6 * 5);
5640
5641 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
5642+
5643+#ifdef CONFIG_PAX_RANDMMAP
5644+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5645+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
5646+#endif
5647+
5648 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
5649 mm->unmap_area = arch_unmap_area_topdown;
5650 }
5651diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
5652index 591f20c..0f1b925 100644
5653--- a/arch/sparc/kernel/traps_32.c
5654+++ b/arch/sparc/kernel/traps_32.c
5655@@ -45,6 +45,8 @@ static void instruction_dump(unsigned long *pc)
5656 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
5657 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
5658
5659+extern void gr_handle_kernel_exploit(void);
5660+
5661 void die_if_kernel(char *str, struct pt_regs *regs)
5662 {
5663 static int die_counter;
5664@@ -77,15 +79,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5665 count++ < 30 &&
5666 (((unsigned long) rw) >= PAGE_OFFSET) &&
5667 !(((unsigned long) rw) & 0x7)) {
5668- printk("Caller[%08lx]: %pS\n", rw->ins[7],
5669+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
5670 (void *) rw->ins[7]);
5671 rw = (struct reg_window32 *)rw->ins[6];
5672 }
5673 }
5674 printk("Instruction DUMP:");
5675 instruction_dump ((unsigned long *) regs->pc);
5676- if(regs->psr & PSR_PS)
5677+ if(regs->psr & PSR_PS) {
5678+ gr_handle_kernel_exploit();
5679 do_exit(SIGKILL);
5680+ }
5681 do_exit(SIGSEGV);
5682 }
5683
5684diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
5685index 0cbdaa4..438e4c9 100644
5686--- a/arch/sparc/kernel/traps_64.c
5687+++ b/arch/sparc/kernel/traps_64.c
5688@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
5689 i + 1,
5690 p->trapstack[i].tstate, p->trapstack[i].tpc,
5691 p->trapstack[i].tnpc, p->trapstack[i].tt);
5692- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
5693+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
5694 }
5695 }
5696
5697@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
5698
5699 lvl -= 0x100;
5700 if (regs->tstate & TSTATE_PRIV) {
5701+
5702+#ifdef CONFIG_PAX_REFCOUNT
5703+ if (lvl == 6)
5704+ pax_report_refcount_overflow(regs);
5705+#endif
5706+
5707 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
5708 die_if_kernel(buffer, regs);
5709 }
5710@@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
5711 void bad_trap_tl1(struct pt_regs *regs, long lvl)
5712 {
5713 char buffer[32];
5714-
5715+
5716 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
5717 0, lvl, SIGTRAP) == NOTIFY_STOP)
5718 return;
5719
5720+#ifdef CONFIG_PAX_REFCOUNT
5721+ if (lvl == 6)
5722+ pax_report_refcount_overflow(regs);
5723+#endif
5724+
5725 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
5726
5727 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
5728@@ -1141,7 +1152,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
5729 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
5730 printk("%s" "ERROR(%d): ",
5731 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
5732- printk("TPC<%pS>\n", (void *) regs->tpc);
5733+ printk("TPC<%pA>\n", (void *) regs->tpc);
5734 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
5735 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
5736 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
5737@@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5738 smp_processor_id(),
5739 (type & 0x1) ? 'I' : 'D',
5740 regs->tpc);
5741- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
5742+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
5743 panic("Irrecoverable Cheetah+ parity error.");
5744 }
5745
5746@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5747 smp_processor_id(),
5748 (type & 0x1) ? 'I' : 'D',
5749 regs->tpc);
5750- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
5751+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
5752 }
5753
5754 struct sun4v_error_entry {
5755@@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
5756
5757 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
5758 regs->tpc, tl);
5759- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
5760+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
5761 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5762- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
5763+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
5764 (void *) regs->u_regs[UREG_I7]);
5765 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
5766 "pte[%lx] error[%lx]\n",
5767@@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
5768
5769 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
5770 regs->tpc, tl);
5771- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
5772+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
5773 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5774- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
5775+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
5776 (void *) regs->u_regs[UREG_I7]);
5777 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
5778 "pte[%lx] error[%lx]\n",
5779@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5780 fp = (unsigned long)sf->fp + STACK_BIAS;
5781 }
5782
5783- printk(" [%016lx] %pS\n", pc, (void *) pc);
5784+ printk(" [%016lx] %pA\n", pc, (void *) pc);
5785 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
5786 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
5787 int index = tsk->curr_ret_stack;
5788 if (tsk->ret_stack && index >= graph) {
5789 pc = tsk->ret_stack[index - graph].ret;
5790- printk(" [%016lx] %pS\n", pc, (void *) pc);
5791+ printk(" [%016lx] %pA\n", pc, (void *) pc);
5792 graph++;
5793 }
5794 }
5795@@ -2226,6 +2237,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
5796 return (struct reg_window *) (fp + STACK_BIAS);
5797 }
5798
5799+extern void gr_handle_kernel_exploit(void);
5800+
5801 void die_if_kernel(char *str, struct pt_regs *regs)
5802 {
5803 static int die_counter;
5804@@ -2254,7 +2267,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5805 while (rw &&
5806 count++ < 30 &&
5807 kstack_valid(tp, (unsigned long) rw)) {
5808- printk("Caller[%016lx]: %pS\n", rw->ins[7],
5809+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
5810 (void *) rw->ins[7]);
5811
5812 rw = kernel_stack_up(rw);
5813@@ -2267,8 +2280,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5814 }
5815 user_instruction_dump ((unsigned int __user *) regs->tpc);
5816 }
5817- if (regs->tstate & TSTATE_PRIV)
5818+ if (regs->tstate & TSTATE_PRIV) {
5819+ gr_handle_kernel_exploit();
5820 do_exit(SIGKILL);
5821+ }
5822 do_exit(SIGSEGV);
5823 }
5824 EXPORT_SYMBOL(die_if_kernel);
5825diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
5826index 76e4ac1..78f8bb1 100644
5827--- a/arch/sparc/kernel/unaligned_64.c
5828+++ b/arch/sparc/kernel/unaligned_64.c
5829@@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs *regs)
5830 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
5831
5832 if (__ratelimit(&ratelimit)) {
5833- printk("Kernel unaligned access at TPC[%lx] %pS\n",
5834+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
5835 regs->tpc, (void *) regs->tpc);
5836 }
5837 }
5838diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
5839index a3fc437..fea9957 100644
5840--- a/arch/sparc/lib/Makefile
5841+++ b/arch/sparc/lib/Makefile
5842@@ -2,7 +2,7 @@
5843 #
5844
5845 asflags-y := -ansi -DST_DIV0=0x02
5846-ccflags-y := -Werror
5847+#ccflags-y := -Werror
5848
5849 lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
5850 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
5851diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
5852index 59186e0..f747d7a 100644
5853--- a/arch/sparc/lib/atomic_64.S
5854+++ b/arch/sparc/lib/atomic_64.S
5855@@ -18,7 +18,12 @@
5856 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5857 BACKOFF_SETUP(%o2)
5858 1: lduw [%o1], %g1
5859- add %g1, %o0, %g7
5860+ addcc %g1, %o0, %g7
5861+
5862+#ifdef CONFIG_PAX_REFCOUNT
5863+ tvs %icc, 6
5864+#endif
5865+
5866 cas [%o1], %g1, %g7
5867 cmp %g1, %g7
5868 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5869@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5870 2: BACKOFF_SPIN(%o2, %o3, 1b)
5871 .size atomic_add, .-atomic_add
5872
5873+ .globl atomic_add_unchecked
5874+ .type atomic_add_unchecked,#function
5875+atomic_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5876+ BACKOFF_SETUP(%o2)
5877+1: lduw [%o1], %g1
5878+ add %g1, %o0, %g7
5879+ cas [%o1], %g1, %g7
5880+ cmp %g1, %g7
5881+ bne,pn %icc, 2f
5882+ nop
5883+ retl
5884+ nop
5885+2: BACKOFF_SPIN(%o2, %o3, 1b)
5886+ .size atomic_add_unchecked, .-atomic_add_unchecked
5887+
5888 .globl atomic_sub
5889 .type atomic_sub,#function
5890 atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5891 BACKOFF_SETUP(%o2)
5892 1: lduw [%o1], %g1
5893- sub %g1, %o0, %g7
5894+ subcc %g1, %o0, %g7
5895+
5896+#ifdef CONFIG_PAX_REFCOUNT
5897+ tvs %icc, 6
5898+#endif
5899+
5900 cas [%o1], %g1, %g7
5901 cmp %g1, %g7
5902 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5903@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5904 2: BACKOFF_SPIN(%o2, %o3, 1b)
5905 .size atomic_sub, .-atomic_sub
5906
5907+ .globl atomic_sub_unchecked
5908+ .type atomic_sub_unchecked,#function
5909+atomic_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
5910+ BACKOFF_SETUP(%o2)
5911+1: lduw [%o1], %g1
5912+ sub %g1, %o0, %g7
5913+ cas [%o1], %g1, %g7
5914+ cmp %g1, %g7
5915+ bne,pn %icc, 2f
5916+ nop
5917+ retl
5918+ nop
5919+2: BACKOFF_SPIN(%o2, %o3, 1b)
5920+ .size atomic_sub_unchecked, .-atomic_sub_unchecked
5921+
5922 .globl atomic_add_ret
5923 .type atomic_add_ret,#function
5924 atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5925 BACKOFF_SETUP(%o2)
5926 1: lduw [%o1], %g1
5927- add %g1, %o0, %g7
5928+ addcc %g1, %o0, %g7
5929+
5930+#ifdef CONFIG_PAX_REFCOUNT
5931+ tvs %icc, 6
5932+#endif
5933+
5934 cas [%o1], %g1, %g7
5935 cmp %g1, %g7
5936 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5937@@ -58,12 +103,33 @@ atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5938 2: BACKOFF_SPIN(%o2, %o3, 1b)
5939 .size atomic_add_ret, .-atomic_add_ret
5940
5941+ .globl atomic_add_ret_unchecked
5942+ .type atomic_add_ret_unchecked,#function
5943+atomic_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5944+ BACKOFF_SETUP(%o2)
5945+1: lduw [%o1], %g1
5946+ addcc %g1, %o0, %g7
5947+ cas [%o1], %g1, %g7
5948+ cmp %g1, %g7
5949+ bne,pn %icc, 2f
5950+ add %g7, %o0, %g7
5951+ sra %g7, 0, %o0
5952+ retl
5953+ nop
5954+2: BACKOFF_SPIN(%o2, %o3, 1b)
5955+ .size atomic_add_ret_unchecked, .-atomic_add_ret_unchecked
5956+
5957 .globl atomic_sub_ret
5958 .type atomic_sub_ret,#function
5959 atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5960 BACKOFF_SETUP(%o2)
5961 1: lduw [%o1], %g1
5962- sub %g1, %o0, %g7
5963+ subcc %g1, %o0, %g7
5964+
5965+#ifdef CONFIG_PAX_REFCOUNT
5966+ tvs %icc, 6
5967+#endif
5968+
5969 cas [%o1], %g1, %g7
5970 cmp %g1, %g7
5971 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5972@@ -78,7 +144,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5973 atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5974 BACKOFF_SETUP(%o2)
5975 1: ldx [%o1], %g1
5976- add %g1, %o0, %g7
5977+ addcc %g1, %o0, %g7
5978+
5979+#ifdef CONFIG_PAX_REFCOUNT
5980+ tvs %xcc, 6
5981+#endif
5982+
5983 casx [%o1], %g1, %g7
5984 cmp %g1, %g7
5985 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5986@@ -88,12 +159,32 @@ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5987 2: BACKOFF_SPIN(%o2, %o3, 1b)
5988 .size atomic64_add, .-atomic64_add
5989
5990+ .globl atomic64_add_unchecked
5991+ .type atomic64_add_unchecked,#function
5992+atomic64_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5993+ BACKOFF_SETUP(%o2)
5994+1: ldx [%o1], %g1
5995+ addcc %g1, %o0, %g7
5996+ casx [%o1], %g1, %g7
5997+ cmp %g1, %g7
5998+ bne,pn %xcc, 2f
5999+ nop
6000+ retl
6001+ nop
6002+2: BACKOFF_SPIN(%o2, %o3, 1b)
6003+ .size atomic64_add_unchecked, .-atomic64_add_unchecked
6004+
6005 .globl atomic64_sub
6006 .type atomic64_sub,#function
6007 atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
6008 BACKOFF_SETUP(%o2)
6009 1: ldx [%o1], %g1
6010- sub %g1, %o0, %g7
6011+ subcc %g1, %o0, %g7
6012+
6013+#ifdef CONFIG_PAX_REFCOUNT
6014+ tvs %xcc, 6
6015+#endif
6016+
6017 casx [%o1], %g1, %g7
6018 cmp %g1, %g7
6019 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
6020@@ -103,12 +194,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
6021 2: BACKOFF_SPIN(%o2, %o3, 1b)
6022 .size atomic64_sub, .-atomic64_sub
6023
6024+ .globl atomic64_sub_unchecked
6025+ .type atomic64_sub_unchecked,#function
6026+atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
6027+ BACKOFF_SETUP(%o2)
6028+1: ldx [%o1], %g1
6029+ subcc %g1, %o0, %g7
6030+ casx [%o1], %g1, %g7
6031+ cmp %g1, %g7
6032+ bne,pn %xcc, 2f
6033+ nop
6034+ retl
6035+ nop
6036+2: BACKOFF_SPIN(%o2, %o3, 1b)
6037+ .size atomic64_sub_unchecked, .-atomic64_sub_unchecked
6038+
6039 .globl atomic64_add_ret
6040 .type atomic64_add_ret,#function
6041 atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
6042 BACKOFF_SETUP(%o2)
6043 1: ldx [%o1], %g1
6044- add %g1, %o0, %g7
6045+ addcc %g1, %o0, %g7
6046+
6047+#ifdef CONFIG_PAX_REFCOUNT
6048+ tvs %xcc, 6
6049+#endif
6050+
6051 casx [%o1], %g1, %g7
6052 cmp %g1, %g7
6053 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
6054@@ -118,12 +229,33 @@ atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
6055 2: BACKOFF_SPIN(%o2, %o3, 1b)
6056 .size atomic64_add_ret, .-atomic64_add_ret
6057
6058+ .globl atomic64_add_ret_unchecked
6059+ .type atomic64_add_ret_unchecked,#function
6060+atomic64_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
6061+ BACKOFF_SETUP(%o2)
6062+1: ldx [%o1], %g1
6063+ addcc %g1, %o0, %g7
6064+ casx [%o1], %g1, %g7
6065+ cmp %g1, %g7
6066+ bne,pn %xcc, 2f
6067+ add %g7, %o0, %g7
6068+ mov %g7, %o0
6069+ retl
6070+ nop
6071+2: BACKOFF_SPIN(%o2, %o3, 1b)
6072+ .size atomic64_add_ret_unchecked, .-atomic64_add_ret_unchecked
6073+
6074 .globl atomic64_sub_ret
6075 .type atomic64_sub_ret,#function
6076 atomic64_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
6077 BACKOFF_SETUP(%o2)
6078 1: ldx [%o1], %g1
6079- sub %g1, %o0, %g7
6080+ subcc %g1, %o0, %g7
6081+
6082+#ifdef CONFIG_PAX_REFCOUNT
6083+ tvs %xcc, 6
6084+#endif
6085+
6086 casx [%o1], %g1, %g7
6087 cmp %g1, %g7
6088 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
6089diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
6090index f73c224..662af10 100644
6091--- a/arch/sparc/lib/ksyms.c
6092+++ b/arch/sparc/lib/ksyms.c
6093@@ -136,12 +136,18 @@ EXPORT_SYMBOL(__downgrade_write);
6094
6095 /* Atomic counter implementation. */
6096 EXPORT_SYMBOL(atomic_add);
6097+EXPORT_SYMBOL(atomic_add_unchecked);
6098 EXPORT_SYMBOL(atomic_add_ret);
6099+EXPORT_SYMBOL(atomic_add_ret_unchecked);
6100 EXPORT_SYMBOL(atomic_sub);
6101+EXPORT_SYMBOL(atomic_sub_unchecked);
6102 EXPORT_SYMBOL(atomic_sub_ret);
6103 EXPORT_SYMBOL(atomic64_add);
6104+EXPORT_SYMBOL(atomic64_add_unchecked);
6105 EXPORT_SYMBOL(atomic64_add_ret);
6106+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
6107 EXPORT_SYMBOL(atomic64_sub);
6108+EXPORT_SYMBOL(atomic64_sub_unchecked);
6109 EXPORT_SYMBOL(atomic64_sub_ret);
6110
6111 /* Atomic bit operations. */
6112diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
6113index 301421c..e2535d1 100644
6114--- a/arch/sparc/mm/Makefile
6115+++ b/arch/sparc/mm/Makefile
6116@@ -2,7 +2,7 @@
6117 #
6118
6119 asflags-y := -ansi
6120-ccflags-y := -Werror
6121+#ccflags-y := -Werror
6122
6123 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
6124 obj-y += fault_$(BITS).o
6125diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
6126index 8023fd7..c8e89e9 100644
6127--- a/arch/sparc/mm/fault_32.c
6128+++ b/arch/sparc/mm/fault_32.c
6129@@ -21,6 +21,9 @@
6130 #include <linux/perf_event.h>
6131 #include <linux/interrupt.h>
6132 #include <linux/kdebug.h>
6133+#include <linux/slab.h>
6134+#include <linux/pagemap.h>
6135+#include <linux/compiler.h>
6136
6137 #include <asm/system.h>
6138 #include <asm/page.h>
6139@@ -208,6 +211,268 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
6140 return safe_compute_effective_address(regs, insn);
6141 }
6142
6143+#ifdef CONFIG_PAX_PAGEEXEC
6144+#ifdef CONFIG_PAX_DLRESOLVE
6145+static void pax_emuplt_close(struct vm_area_struct *vma)
6146+{
6147+ vma->vm_mm->call_dl_resolve = 0UL;
6148+}
6149+
6150+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
6151+{
6152+ unsigned int *kaddr;
6153+
6154+ vmf->page = alloc_page(GFP_HIGHUSER);
6155+ if (!vmf->page)
6156+ return VM_FAULT_OOM;
6157+
6158+ kaddr = kmap(vmf->page);
6159+ memset(kaddr, 0, PAGE_SIZE);
6160+ kaddr[0] = 0x9DE3BFA8U; /* save */
6161+ flush_dcache_page(vmf->page);
6162+ kunmap(vmf->page);
6163+ return VM_FAULT_MAJOR;
6164+}
6165+
6166+static const struct vm_operations_struct pax_vm_ops = {
6167+ .close = pax_emuplt_close,
6168+ .fault = pax_emuplt_fault
6169+};
6170+
6171+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6172+{
6173+ int ret;
6174+
6175+ INIT_LIST_HEAD(&vma->anon_vma_chain);
6176+ vma->vm_mm = current->mm;
6177+ vma->vm_start = addr;
6178+ vma->vm_end = addr + PAGE_SIZE;
6179+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6180+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6181+ vma->vm_ops = &pax_vm_ops;
6182+
6183+ ret = insert_vm_struct(current->mm, vma);
6184+ if (ret)
6185+ return ret;
6186+
6187+ ++current->mm->total_vm;
6188+ return 0;
6189+}
6190+#endif
6191+
6192+/*
6193+ * PaX: decide what to do with offenders (regs->pc = fault address)
6194+ *
6195+ * returns 1 when task should be killed
6196+ * 2 when patched PLT trampoline was detected
6197+ * 3 when unpatched PLT trampoline was detected
6198+ */
6199+static int pax_handle_fetch_fault(struct pt_regs *regs)
6200+{
6201+
6202+#ifdef CONFIG_PAX_EMUPLT
6203+ int err;
6204+
6205+ do { /* PaX: patched PLT emulation #1 */
6206+ unsigned int sethi1, sethi2, jmpl;
6207+
6208+ err = get_user(sethi1, (unsigned int *)regs->pc);
6209+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
6210+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
6211+
6212+ if (err)
6213+ break;
6214+
6215+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6216+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
6217+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
6218+ {
6219+ unsigned int addr;
6220+
6221+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6222+ addr = regs->u_regs[UREG_G1];
6223+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6224+ regs->pc = addr;
6225+ regs->npc = addr+4;
6226+ return 2;
6227+ }
6228+ } while (0);
6229+
6230+ { /* PaX: patched PLT emulation #2 */
6231+ unsigned int ba;
6232+
6233+ err = get_user(ba, (unsigned int *)regs->pc);
6234+
6235+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
6236+ unsigned int addr;
6237+
6238+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6239+ regs->pc = addr;
6240+ regs->npc = addr+4;
6241+ return 2;
6242+ }
6243+ }
6244+
6245+ do { /* PaX: patched PLT emulation #3 */
6246+ unsigned int sethi, jmpl, nop;
6247+
6248+ err = get_user(sethi, (unsigned int *)regs->pc);
6249+ err |= get_user(jmpl, (unsigned int *)(regs->pc+4));
6250+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
6251+
6252+ if (err)
6253+ break;
6254+
6255+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6256+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
6257+ nop == 0x01000000U)
6258+ {
6259+ unsigned int addr;
6260+
6261+ addr = (sethi & 0x003FFFFFU) << 10;
6262+ regs->u_regs[UREG_G1] = addr;
6263+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6264+ regs->pc = addr;
6265+ regs->npc = addr+4;
6266+ return 2;
6267+ }
6268+ } while (0);
6269+
6270+ do { /* PaX: unpatched PLT emulation step 1 */
6271+ unsigned int sethi, ba, nop;
6272+
6273+ err = get_user(sethi, (unsigned int *)regs->pc);
6274+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
6275+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
6276+
6277+ if (err)
6278+ break;
6279+
6280+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6281+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6282+ nop == 0x01000000U)
6283+ {
6284+ unsigned int addr, save, call;
6285+
6286+ if ((ba & 0xFFC00000U) == 0x30800000U)
6287+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6288+ else
6289+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
6290+
6291+ err = get_user(save, (unsigned int *)addr);
6292+ err |= get_user(call, (unsigned int *)(addr+4));
6293+ err |= get_user(nop, (unsigned int *)(addr+8));
6294+ if (err)
6295+ break;
6296+
6297+#ifdef CONFIG_PAX_DLRESOLVE
6298+ if (save == 0x9DE3BFA8U &&
6299+ (call & 0xC0000000U) == 0x40000000U &&
6300+ nop == 0x01000000U)
6301+ {
6302+ struct vm_area_struct *vma;
6303+ unsigned long call_dl_resolve;
6304+
6305+ down_read(&current->mm->mmap_sem);
6306+ call_dl_resolve = current->mm->call_dl_resolve;
6307+ up_read(&current->mm->mmap_sem);
6308+ if (likely(call_dl_resolve))
6309+ goto emulate;
6310+
6311+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6312+
6313+ down_write(&current->mm->mmap_sem);
6314+ if (current->mm->call_dl_resolve) {
6315+ call_dl_resolve = current->mm->call_dl_resolve;
6316+ up_write(&current->mm->mmap_sem);
6317+ if (vma)
6318+ kmem_cache_free(vm_area_cachep, vma);
6319+ goto emulate;
6320+ }
6321+
6322+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6323+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6324+ up_write(&current->mm->mmap_sem);
6325+ if (vma)
6326+ kmem_cache_free(vm_area_cachep, vma);
6327+ return 1;
6328+ }
6329+
6330+ if (pax_insert_vma(vma, call_dl_resolve)) {
6331+ up_write(&current->mm->mmap_sem);
6332+ kmem_cache_free(vm_area_cachep, vma);
6333+ return 1;
6334+ }
6335+
6336+ current->mm->call_dl_resolve = call_dl_resolve;
6337+ up_write(&current->mm->mmap_sem);
6338+
6339+emulate:
6340+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6341+ regs->pc = call_dl_resolve;
6342+ regs->npc = addr+4;
6343+ return 3;
6344+ }
6345+#endif
6346+
6347+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6348+ if ((save & 0xFFC00000U) == 0x05000000U &&
6349+ (call & 0xFFFFE000U) == 0x85C0A000U &&
6350+ nop == 0x01000000U)
6351+ {
6352+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6353+ regs->u_regs[UREG_G2] = addr + 4;
6354+ addr = (save & 0x003FFFFFU) << 10;
6355+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6356+ regs->pc = addr;
6357+ regs->npc = addr+4;
6358+ return 3;
6359+ }
6360+ }
6361+ } while (0);
6362+
6363+ do { /* PaX: unpatched PLT emulation step 2 */
6364+ unsigned int save, call, nop;
6365+
6366+ err = get_user(save, (unsigned int *)(regs->pc-4));
6367+ err |= get_user(call, (unsigned int *)regs->pc);
6368+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
6369+ if (err)
6370+ break;
6371+
6372+ if (save == 0x9DE3BFA8U &&
6373+ (call & 0xC0000000U) == 0x40000000U &&
6374+ nop == 0x01000000U)
6375+ {
6376+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
6377+
6378+ regs->u_regs[UREG_RETPC] = regs->pc;
6379+ regs->pc = dl_resolve;
6380+ regs->npc = dl_resolve+4;
6381+ return 3;
6382+ }
6383+ } while (0);
6384+#endif
6385+
6386+ return 1;
6387+}
6388+
6389+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6390+{
6391+ unsigned long i;
6392+
6393+ printk(KERN_ERR "PAX: bytes at PC: ");
6394+ for (i = 0; i < 8; i++) {
6395+ unsigned int c;
6396+ if (get_user(c, (unsigned int *)pc+i))
6397+ printk(KERN_CONT "???????? ");
6398+ else
6399+ printk(KERN_CONT "%08x ", c);
6400+ }
6401+ printk("\n");
6402+}
6403+#endif
6404+
6405 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
6406 int text_fault)
6407 {
6408@@ -280,6 +545,24 @@ good_area:
6409 if(!(vma->vm_flags & VM_WRITE))
6410 goto bad_area;
6411 } else {
6412+
6413+#ifdef CONFIG_PAX_PAGEEXEC
6414+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
6415+ up_read(&mm->mmap_sem);
6416+ switch (pax_handle_fetch_fault(regs)) {
6417+
6418+#ifdef CONFIG_PAX_EMUPLT
6419+ case 2:
6420+ case 3:
6421+ return;
6422+#endif
6423+
6424+ }
6425+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
6426+ do_group_exit(SIGKILL);
6427+ }
6428+#endif
6429+
6430 /* Allow reads even for write-only mappings */
6431 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
6432 goto bad_area;
6433diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
6434index 504c062..6fcb9c6 100644
6435--- a/arch/sparc/mm/fault_64.c
6436+++ b/arch/sparc/mm/fault_64.c
6437@@ -21,6 +21,9 @@
6438 #include <linux/kprobes.h>
6439 #include <linux/kdebug.h>
6440 #include <linux/percpu.h>
6441+#include <linux/slab.h>
6442+#include <linux/pagemap.h>
6443+#include <linux/compiler.h>
6444
6445 #include <asm/page.h>
6446 #include <asm/pgtable.h>
6447@@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
6448 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
6449 regs->tpc);
6450 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
6451- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
6452+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
6453 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
6454 dump_stack();
6455 unhandled_fault(regs->tpc, current, regs);
6456@@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
6457 show_regs(regs);
6458 }
6459
6460+#ifdef CONFIG_PAX_PAGEEXEC
6461+#ifdef CONFIG_PAX_DLRESOLVE
6462+static void pax_emuplt_close(struct vm_area_struct *vma)
6463+{
6464+ vma->vm_mm->call_dl_resolve = 0UL;
6465+}
6466+
6467+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
6468+{
6469+ unsigned int *kaddr;
6470+
6471+ vmf->page = alloc_page(GFP_HIGHUSER);
6472+ if (!vmf->page)
6473+ return VM_FAULT_OOM;
6474+
6475+ kaddr = kmap(vmf->page);
6476+ memset(kaddr, 0, PAGE_SIZE);
6477+ kaddr[0] = 0x9DE3BFA8U; /* save */
6478+ flush_dcache_page(vmf->page);
6479+ kunmap(vmf->page);
6480+ return VM_FAULT_MAJOR;
6481+}
6482+
6483+static const struct vm_operations_struct pax_vm_ops = {
6484+ .close = pax_emuplt_close,
6485+ .fault = pax_emuplt_fault
6486+};
6487+
6488+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6489+{
6490+ int ret;
6491+
6492+ INIT_LIST_HEAD(&vma->anon_vma_chain);
6493+ vma->vm_mm = current->mm;
6494+ vma->vm_start = addr;
6495+ vma->vm_end = addr + PAGE_SIZE;
6496+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6497+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6498+ vma->vm_ops = &pax_vm_ops;
6499+
6500+ ret = insert_vm_struct(current->mm, vma);
6501+ if (ret)
6502+ return ret;
6503+
6504+ ++current->mm->total_vm;
6505+ return 0;
6506+}
6507+#endif
6508+
6509+/*
6510+ * PaX: decide what to do with offenders (regs->tpc = fault address)
6511+ *
6512+ * returns 1 when task should be killed
6513+ * 2 when patched PLT trampoline was detected
6514+ * 3 when unpatched PLT trampoline was detected
6515+ */
6516+static int pax_handle_fetch_fault(struct pt_regs *regs)
6517+{
6518+
6519+#ifdef CONFIG_PAX_EMUPLT
6520+ int err;
6521+
6522+ do { /* PaX: patched PLT emulation #1 */
6523+ unsigned int sethi1, sethi2, jmpl;
6524+
6525+ err = get_user(sethi1, (unsigned int *)regs->tpc);
6526+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
6527+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
6528+
6529+ if (err)
6530+ break;
6531+
6532+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6533+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
6534+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
6535+ {
6536+ unsigned long addr;
6537+
6538+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6539+ addr = regs->u_regs[UREG_G1];
6540+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6541+
6542+ if (test_thread_flag(TIF_32BIT))
6543+ addr &= 0xFFFFFFFFUL;
6544+
6545+ regs->tpc = addr;
6546+ regs->tnpc = addr+4;
6547+ return 2;
6548+ }
6549+ } while (0);
6550+
6551+ { /* PaX: patched PLT emulation #2 */
6552+ unsigned int ba;
6553+
6554+ err = get_user(ba, (unsigned int *)regs->tpc);
6555+
6556+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
6557+ unsigned long addr;
6558+
6559+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6560+
6561+ if (test_thread_flag(TIF_32BIT))
6562+ addr &= 0xFFFFFFFFUL;
6563+
6564+ regs->tpc = addr;
6565+ regs->tnpc = addr+4;
6566+ return 2;
6567+ }
6568+ }
6569+
6570+ do { /* PaX: patched PLT emulation #3 */
6571+ unsigned int sethi, jmpl, nop;
6572+
6573+ err = get_user(sethi, (unsigned int *)regs->tpc);
6574+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+4));
6575+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6576+
6577+ if (err)
6578+ break;
6579+
6580+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6581+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
6582+ nop == 0x01000000U)
6583+ {
6584+ unsigned long addr;
6585+
6586+ addr = (sethi & 0x003FFFFFU) << 10;
6587+ regs->u_regs[UREG_G1] = addr;
6588+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6589+
6590+ if (test_thread_flag(TIF_32BIT))
6591+ addr &= 0xFFFFFFFFUL;
6592+
6593+ regs->tpc = addr;
6594+ regs->tnpc = addr+4;
6595+ return 2;
6596+ }
6597+ } while (0);
6598+
6599+ do { /* PaX: patched PLT emulation #4 */
6600+ unsigned int sethi, mov1, call, mov2;
6601+
6602+ err = get_user(sethi, (unsigned int *)regs->tpc);
6603+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
6604+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
6605+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
6606+
6607+ if (err)
6608+ break;
6609+
6610+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6611+ mov1 == 0x8210000FU &&
6612+ (call & 0xC0000000U) == 0x40000000U &&
6613+ mov2 == 0x9E100001U)
6614+ {
6615+ unsigned long addr;
6616+
6617+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
6618+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6619+
6620+ if (test_thread_flag(TIF_32BIT))
6621+ addr &= 0xFFFFFFFFUL;
6622+
6623+ regs->tpc = addr;
6624+ regs->tnpc = addr+4;
6625+ return 2;
6626+ }
6627+ } while (0);
6628+
6629+ do { /* PaX: patched PLT emulation #5 */
6630+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
6631+
6632+ err = get_user(sethi, (unsigned int *)regs->tpc);
6633+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6634+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6635+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
6636+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
6637+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
6638+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
6639+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
6640+
6641+ if (err)
6642+ break;
6643+
6644+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6645+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
6646+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6647+ (or1 & 0xFFFFE000U) == 0x82106000U &&
6648+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
6649+ sllx == 0x83287020U &&
6650+ jmpl == 0x81C04005U &&
6651+ nop == 0x01000000U)
6652+ {
6653+ unsigned long addr;
6654+
6655+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6656+ regs->u_regs[UREG_G1] <<= 32;
6657+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6658+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6659+ regs->tpc = addr;
6660+ regs->tnpc = addr+4;
6661+ return 2;
6662+ }
6663+ } while (0);
6664+
6665+ do { /* PaX: patched PLT emulation #6 */
6666+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
6667+
6668+ err = get_user(sethi, (unsigned int *)regs->tpc);
6669+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6670+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6671+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
6672+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
6673+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
6674+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
6675+
6676+ if (err)
6677+ break;
6678+
6679+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6680+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
6681+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6682+ sllx == 0x83287020U &&
6683+ (or & 0xFFFFE000U) == 0x8A116000U &&
6684+ jmpl == 0x81C04005U &&
6685+ nop == 0x01000000U)
6686+ {
6687+ unsigned long addr;
6688+
6689+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
6690+ regs->u_regs[UREG_G1] <<= 32;
6691+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
6692+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6693+ regs->tpc = addr;
6694+ regs->tnpc = addr+4;
6695+ return 2;
6696+ }
6697+ } while (0);
6698+
6699+ do { /* PaX: unpatched PLT emulation step 1 */
6700+ unsigned int sethi, ba, nop;
6701+
6702+ err = get_user(sethi, (unsigned int *)regs->tpc);
6703+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6704+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6705+
6706+ if (err)
6707+ break;
6708+
6709+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6710+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6711+ nop == 0x01000000U)
6712+ {
6713+ unsigned long addr;
6714+ unsigned int save, call;
6715+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
6716+
6717+ if ((ba & 0xFFC00000U) == 0x30800000U)
6718+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6719+ else
6720+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6721+
6722+ if (test_thread_flag(TIF_32BIT))
6723+ addr &= 0xFFFFFFFFUL;
6724+
6725+ err = get_user(save, (unsigned int *)addr);
6726+ err |= get_user(call, (unsigned int *)(addr+4));
6727+ err |= get_user(nop, (unsigned int *)(addr+8));
6728+ if (err)
6729+ break;
6730+
6731+#ifdef CONFIG_PAX_DLRESOLVE
6732+ if (save == 0x9DE3BFA8U &&
6733+ (call & 0xC0000000U) == 0x40000000U &&
6734+ nop == 0x01000000U)
6735+ {
6736+ struct vm_area_struct *vma;
6737+ unsigned long call_dl_resolve;
6738+
6739+ down_read(&current->mm->mmap_sem);
6740+ call_dl_resolve = current->mm->call_dl_resolve;
6741+ up_read(&current->mm->mmap_sem);
6742+ if (likely(call_dl_resolve))
6743+ goto emulate;
6744+
6745+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6746+
6747+ down_write(&current->mm->mmap_sem);
6748+ if (current->mm->call_dl_resolve) {
6749+ call_dl_resolve = current->mm->call_dl_resolve;
6750+ up_write(&current->mm->mmap_sem);
6751+ if (vma)
6752+ kmem_cache_free(vm_area_cachep, vma);
6753+ goto emulate;
6754+ }
6755+
6756+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6757+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6758+ up_write(&current->mm->mmap_sem);
6759+ if (vma)
6760+ kmem_cache_free(vm_area_cachep, vma);
6761+ return 1;
6762+ }
6763+
6764+ if (pax_insert_vma(vma, call_dl_resolve)) {
6765+ up_write(&current->mm->mmap_sem);
6766+ kmem_cache_free(vm_area_cachep, vma);
6767+ return 1;
6768+ }
6769+
6770+ current->mm->call_dl_resolve = call_dl_resolve;
6771+ up_write(&current->mm->mmap_sem);
6772+
6773+emulate:
6774+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6775+ regs->tpc = call_dl_resolve;
6776+ regs->tnpc = addr+4;
6777+ return 3;
6778+ }
6779+#endif
6780+
6781+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6782+ if ((save & 0xFFC00000U) == 0x05000000U &&
6783+ (call & 0xFFFFE000U) == 0x85C0A000U &&
6784+ nop == 0x01000000U)
6785+ {
6786+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6787+ regs->u_regs[UREG_G2] = addr + 4;
6788+ addr = (save & 0x003FFFFFU) << 10;
6789+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6790+
6791+ if (test_thread_flag(TIF_32BIT))
6792+ addr &= 0xFFFFFFFFUL;
6793+
6794+ regs->tpc = addr;
6795+ regs->tnpc = addr+4;
6796+ return 3;
6797+ }
6798+
6799+ /* PaX: 64-bit PLT stub */
6800+ err = get_user(sethi1, (unsigned int *)addr);
6801+ err |= get_user(sethi2, (unsigned int *)(addr+4));
6802+ err |= get_user(or1, (unsigned int *)(addr+8));
6803+ err |= get_user(or2, (unsigned int *)(addr+12));
6804+ err |= get_user(sllx, (unsigned int *)(addr+16));
6805+ err |= get_user(add, (unsigned int *)(addr+20));
6806+ err |= get_user(jmpl, (unsigned int *)(addr+24));
6807+ err |= get_user(nop, (unsigned int *)(addr+28));
6808+ if (err)
6809+ break;
6810+
6811+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
6812+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6813+ (or1 & 0xFFFFE000U) == 0x88112000U &&
6814+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
6815+ sllx == 0x89293020U &&
6816+ add == 0x8A010005U &&
6817+ jmpl == 0x89C14000U &&
6818+ nop == 0x01000000U)
6819+ {
6820+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6821+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6822+ regs->u_regs[UREG_G4] <<= 32;
6823+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6824+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
6825+ regs->u_regs[UREG_G4] = addr + 24;
6826+ addr = regs->u_regs[UREG_G5];
6827+ regs->tpc = addr;
6828+ regs->tnpc = addr+4;
6829+ return 3;
6830+ }
6831+ }
6832+ } while (0);
6833+
6834+#ifdef CONFIG_PAX_DLRESOLVE
6835+ do { /* PaX: unpatched PLT emulation step 2 */
6836+ unsigned int save, call, nop;
6837+
6838+ err = get_user(save, (unsigned int *)(regs->tpc-4));
6839+ err |= get_user(call, (unsigned int *)regs->tpc);
6840+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
6841+ if (err)
6842+ break;
6843+
6844+ if (save == 0x9DE3BFA8U &&
6845+ (call & 0xC0000000U) == 0x40000000U &&
6846+ nop == 0x01000000U)
6847+ {
6848+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6849+
6850+ if (test_thread_flag(TIF_32BIT))
6851+ dl_resolve &= 0xFFFFFFFFUL;
6852+
6853+ regs->u_regs[UREG_RETPC] = regs->tpc;
6854+ regs->tpc = dl_resolve;
6855+ regs->tnpc = dl_resolve+4;
6856+ return 3;
6857+ }
6858+ } while (0);
6859+#endif
6860+
6861+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
6862+ unsigned int sethi, ba, nop;
6863+
6864+ err = get_user(sethi, (unsigned int *)regs->tpc);
6865+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6866+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6867+
6868+ if (err)
6869+ break;
6870+
6871+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6872+ (ba & 0xFFF00000U) == 0x30600000U &&
6873+ nop == 0x01000000U)
6874+ {
6875+ unsigned long addr;
6876+
6877+ addr = (sethi & 0x003FFFFFU) << 10;
6878+ regs->u_regs[UREG_G1] = addr;
6879+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6880+
6881+ if (test_thread_flag(TIF_32BIT))
6882+ addr &= 0xFFFFFFFFUL;
6883+
6884+ regs->tpc = addr;
6885+ regs->tnpc = addr+4;
6886+ return 2;
6887+ }
6888+ } while (0);
6889+
6890+#endif
6891+
6892+ return 1;
6893+}
6894+
6895+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6896+{
6897+ unsigned long i;
6898+
6899+ printk(KERN_ERR "PAX: bytes at PC: ");
6900+ for (i = 0; i < 8; i++) {
6901+ unsigned int c;
6902+ if (get_user(c, (unsigned int *)pc+i))
6903+ printk(KERN_CONT "???????? ");
6904+ else
6905+ printk(KERN_CONT "%08x ", c);
6906+ }
6907+ printk("\n");
6908+}
6909+#endif
6910+
6911 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6912 {
6913 struct mm_struct *mm = current->mm;
6914@@ -340,6 +794,29 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6915 if (!vma)
6916 goto bad_area;
6917
6918+#ifdef CONFIG_PAX_PAGEEXEC
6919+ /* PaX: detect ITLB misses on non-exec pages */
6920+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
6921+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
6922+ {
6923+ if (address != regs->tpc)
6924+ goto good_area;
6925+
6926+ up_read(&mm->mmap_sem);
6927+ switch (pax_handle_fetch_fault(regs)) {
6928+
6929+#ifdef CONFIG_PAX_EMUPLT
6930+ case 2:
6931+ case 3:
6932+ return;
6933+#endif
6934+
6935+ }
6936+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
6937+ do_group_exit(SIGKILL);
6938+ }
6939+#endif
6940+
6941 /* Pure DTLB misses do not tell us whether the fault causing
6942 * load/store/atomic was a write or not, it only says that there
6943 * was no match. So in such a case we (carefully) read the
6944diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
6945index 07e1453..0a7d9e9 100644
6946--- a/arch/sparc/mm/hugetlbpage.c
6947+++ b/arch/sparc/mm/hugetlbpage.c
6948@@ -67,7 +67,7 @@ full_search:
6949 }
6950 return -ENOMEM;
6951 }
6952- if (likely(!vma || addr + len <= vma->vm_start)) {
6953+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6954 /*
6955 * Remember the place where we stopped the search:
6956 */
6957@@ -106,7 +106,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6958 /* make sure it can fit in the remaining address space */
6959 if (likely(addr > len)) {
6960 vma = find_vma(mm, addr-len);
6961- if (!vma || addr <= vma->vm_start) {
6962+ if (check_heap_stack_gap(vma, addr - len, len)) {
6963 /* remember the address as a hint for next time */
6964 return (mm->free_area_cache = addr-len);
6965 }
6966@@ -115,16 +115,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6967 if (unlikely(mm->mmap_base < len))
6968 goto bottomup;
6969
6970- addr = (mm->mmap_base-len) & HPAGE_MASK;
6971+ addr = mm->mmap_base - len;
6972
6973 do {
6974+ addr &= HPAGE_MASK;
6975 /*
6976 * Lookup failure means no vma is above this address,
6977 * else if new region fits below vma->vm_start,
6978 * return with success:
6979 */
6980 vma = find_vma(mm, addr);
6981- if (likely(!vma || addr+len <= vma->vm_start)) {
6982+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6983 /* remember the address as a hint for next time */
6984 return (mm->free_area_cache = addr);
6985 }
6986@@ -134,8 +135,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6987 mm->cached_hole_size = vma->vm_start - addr;
6988
6989 /* try just below the current vma->vm_start */
6990- addr = (vma->vm_start-len) & HPAGE_MASK;
6991- } while (likely(len < vma->vm_start));
6992+ addr = skip_heap_stack_gap(vma, len);
6993+ } while (!IS_ERR_VALUE(addr));
6994
6995 bottomup:
6996 /*
6997@@ -181,8 +182,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
6998 if (addr) {
6999 addr = ALIGN(addr, HPAGE_SIZE);
7000 vma = find_vma(mm, addr);
7001- if (task_size - len >= addr &&
7002- (!vma || addr + len <= vma->vm_start))
7003+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
7004 return addr;
7005 }
7006 if (mm->get_unmapped_area == arch_get_unmapped_area)
7007diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
7008index 7b00de6..78239f4 100644
7009--- a/arch/sparc/mm/init_32.c
7010+++ b/arch/sparc/mm/init_32.c
7011@@ -316,6 +316,9 @@ extern void device_scan(void);
7012 pgprot_t PAGE_SHARED __read_mostly;
7013 EXPORT_SYMBOL(PAGE_SHARED);
7014
7015+pgprot_t PAGE_SHARED_NOEXEC __read_mostly;
7016+EXPORT_SYMBOL(PAGE_SHARED_NOEXEC);
7017+
7018 void __init paging_init(void)
7019 {
7020 switch(sparc_cpu_model) {
7021@@ -344,17 +347,17 @@ void __init paging_init(void)
7022
7023 /* Initialize the protection map with non-constant, MMU dependent values. */
7024 protection_map[0] = PAGE_NONE;
7025- protection_map[1] = PAGE_READONLY;
7026- protection_map[2] = PAGE_COPY;
7027- protection_map[3] = PAGE_COPY;
7028+ protection_map[1] = PAGE_READONLY_NOEXEC;
7029+ protection_map[2] = PAGE_COPY_NOEXEC;
7030+ protection_map[3] = PAGE_COPY_NOEXEC;
7031 protection_map[4] = PAGE_READONLY;
7032 protection_map[5] = PAGE_READONLY;
7033 protection_map[6] = PAGE_COPY;
7034 protection_map[7] = PAGE_COPY;
7035 protection_map[8] = PAGE_NONE;
7036- protection_map[9] = PAGE_READONLY;
7037- protection_map[10] = PAGE_SHARED;
7038- protection_map[11] = PAGE_SHARED;
7039+ protection_map[9] = PAGE_READONLY_NOEXEC;
7040+ protection_map[10] = PAGE_SHARED_NOEXEC;
7041+ protection_map[11] = PAGE_SHARED_NOEXEC;
7042 protection_map[12] = PAGE_READONLY;
7043 protection_map[13] = PAGE_READONLY;
7044 protection_map[14] = PAGE_SHARED;
7045diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
7046index cbef74e..c38fead 100644
7047--- a/arch/sparc/mm/srmmu.c
7048+++ b/arch/sparc/mm/srmmu.c
7049@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
7050 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
7051 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
7052 BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY));
7053+
7054+#ifdef CONFIG_PAX_PAGEEXEC
7055+ PAGE_SHARED_NOEXEC = pgprot_val(SRMMU_PAGE_SHARED_NOEXEC);
7056+ BTFIXUPSET_INT(page_copy_noexec, pgprot_val(SRMMU_PAGE_COPY_NOEXEC));
7057+ BTFIXUPSET_INT(page_readonly_noexec, pgprot_val(SRMMU_PAGE_RDONLY_NOEXEC));
7058+#endif
7059+
7060 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
7061 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
7062
7063diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
7064index 27fe667..36d474c 100644
7065--- a/arch/tile/include/asm/atomic_64.h
7066+++ b/arch/tile/include/asm/atomic_64.h
7067@@ -142,6 +142,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
7068
7069 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
7070
7071+#define atomic64_read_unchecked(v) atomic64_read(v)
7072+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7073+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7074+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7075+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7076+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7077+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7078+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7079+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7080+
7081 /* Atomic dec and inc don't implement barrier, so provide them if needed. */
7082 #define smp_mb__before_atomic_dec() smp_mb()
7083 #define smp_mb__after_atomic_dec() smp_mb()
7084diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
7085index 392e533..536b092 100644
7086--- a/arch/tile/include/asm/cache.h
7087+++ b/arch/tile/include/asm/cache.h
7088@@ -15,11 +15,12 @@
7089 #ifndef _ASM_TILE_CACHE_H
7090 #define _ASM_TILE_CACHE_H
7091
7092+#include <linux/const.h>
7093 #include <arch/chip.h>
7094
7095 /* bytes per L1 data cache line */
7096 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
7097-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7098+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7099
7100 /* bytes per L2 cache line */
7101 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
7102diff --git a/arch/um/Makefile b/arch/um/Makefile
7103index 28688e6..4c0aa1c 100644
7104--- a/arch/um/Makefile
7105+++ b/arch/um/Makefile
7106@@ -61,6 +61,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
7107 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
7108 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
7109
7110+ifdef CONSTIFY_PLUGIN
7111+USER_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7112+endif
7113+
7114 #This will adjust *FLAGS accordingly to the platform.
7115 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
7116
7117diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
7118index 19e1bdd..3665b77 100644
7119--- a/arch/um/include/asm/cache.h
7120+++ b/arch/um/include/asm/cache.h
7121@@ -1,6 +1,7 @@
7122 #ifndef __UM_CACHE_H
7123 #define __UM_CACHE_H
7124
7125+#include <linux/const.h>
7126
7127 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
7128 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
7129@@ -12,6 +13,6 @@
7130 # define L1_CACHE_SHIFT 5
7131 #endif
7132
7133-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7134+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7135
7136 #endif
7137diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
7138index 6c03acd..a5e0215 100644
7139--- a/arch/um/include/asm/kmap_types.h
7140+++ b/arch/um/include/asm/kmap_types.h
7141@@ -23,6 +23,7 @@ enum km_type {
7142 KM_IRQ1,
7143 KM_SOFTIRQ0,
7144 KM_SOFTIRQ1,
7145+ KM_CLEARPAGE,
7146 KM_TYPE_NR
7147 };
7148
7149diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
7150index 7cfc3ce..cbd1a58 100644
7151--- a/arch/um/include/asm/page.h
7152+++ b/arch/um/include/asm/page.h
7153@@ -14,6 +14,9 @@
7154 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
7155 #define PAGE_MASK (~(PAGE_SIZE-1))
7156
7157+#define ktla_ktva(addr) (addr)
7158+#define ktva_ktla(addr) (addr)
7159+
7160 #ifndef __ASSEMBLY__
7161
7162 struct page;
7163diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
7164index 0032f92..cd151e0 100644
7165--- a/arch/um/include/asm/pgtable-3level.h
7166+++ b/arch/um/include/asm/pgtable-3level.h
7167@@ -58,6 +58,7 @@
7168 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
7169 #define pud_populate(mm, pud, pmd) \
7170 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
7171+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
7172
7173 #ifdef CONFIG_64BIT
7174 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
7175diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
7176index 69f2490..2634831 100644
7177--- a/arch/um/kernel/process.c
7178+++ b/arch/um/kernel/process.c
7179@@ -408,22 +408,6 @@ int singlestepping(void * t)
7180 return 2;
7181 }
7182
7183-/*
7184- * Only x86 and x86_64 have an arch_align_stack().
7185- * All other arches have "#define arch_align_stack(x) (x)"
7186- * in their asm/system.h
7187- * As this is included in UML from asm-um/system-generic.h,
7188- * we can use it to behave as the subarch does.
7189- */
7190-#ifndef arch_align_stack
7191-unsigned long arch_align_stack(unsigned long sp)
7192-{
7193- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
7194- sp -= get_random_int() % 8192;
7195- return sp & ~0xf;
7196-}
7197-#endif
7198-
7199 unsigned long get_wchan(struct task_struct *p)
7200 {
7201 unsigned long stack_page, sp, ip;
7202diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
7203index ad8f795..2c7eec6 100644
7204--- a/arch/unicore32/include/asm/cache.h
7205+++ b/arch/unicore32/include/asm/cache.h
7206@@ -12,8 +12,10 @@
7207 #ifndef __UNICORE_CACHE_H__
7208 #define __UNICORE_CACHE_H__
7209
7210-#define L1_CACHE_SHIFT (5)
7211-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7212+#include <linux/const.h>
7213+
7214+#define L1_CACHE_SHIFT 5
7215+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7216
7217 /*
7218 * Memory returned by kmalloc() may be used for DMA, so we must make
7219diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
7220index 5bed94e..fbcf200 100644
7221--- a/arch/x86/Kconfig
7222+++ b/arch/x86/Kconfig
7223@@ -226,7 +226,7 @@ config X86_HT
7224
7225 config X86_32_LAZY_GS
7226 def_bool y
7227- depends on X86_32 && !CC_STACKPROTECTOR
7228+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
7229
7230 config ARCH_HWEIGHT_CFLAGS
7231 string
7232@@ -1058,7 +1058,7 @@ choice
7233
7234 config NOHIGHMEM
7235 bool "off"
7236- depends on !X86_NUMAQ
7237+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7238 ---help---
7239 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
7240 However, the address space of 32-bit x86 processors is only 4
7241@@ -1095,7 +1095,7 @@ config NOHIGHMEM
7242
7243 config HIGHMEM4G
7244 bool "4GB"
7245- depends on !X86_NUMAQ
7246+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7247 ---help---
7248 Select this if you have a 32-bit processor and between 1 and 4
7249 gigabytes of physical RAM.
7250@@ -1149,7 +1149,7 @@ config PAGE_OFFSET
7251 hex
7252 default 0xB0000000 if VMSPLIT_3G_OPT
7253 default 0x80000000 if VMSPLIT_2G
7254- default 0x78000000 if VMSPLIT_2G_OPT
7255+ default 0x70000000 if VMSPLIT_2G_OPT
7256 default 0x40000000 if VMSPLIT_1G
7257 default 0xC0000000
7258 depends on X86_32
7259@@ -1539,6 +1539,7 @@ config SECCOMP
7260
7261 config CC_STACKPROTECTOR
7262 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
7263+ depends on X86_64 || !PAX_MEMORY_UDEREF
7264 ---help---
7265 This option turns on the -fstack-protector GCC feature. This
7266 feature puts, at the beginning of functions, a canary value on
7267@@ -1596,6 +1597,7 @@ config KEXEC_JUMP
7268 config PHYSICAL_START
7269 hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
7270 default "0x1000000"
7271+ range 0x400000 0x40000000
7272 ---help---
7273 This gives the physical address where the kernel is loaded.
7274
7275@@ -1659,6 +1661,7 @@ config X86_NEED_RELOCS
7276 config PHYSICAL_ALIGN
7277 hex "Alignment value to which kernel should be aligned" if X86_32
7278 default "0x1000000"
7279+ range 0x400000 0x1000000 if PAX_KERNEXEC
7280 range 0x2000 0x1000000
7281 ---help---
7282 This value puts the alignment restrictions on physical address
7283@@ -1690,9 +1693,10 @@ config HOTPLUG_CPU
7284 Say N if you want to disable CPU hotplug.
7285
7286 config COMPAT_VDSO
7287- def_bool y
7288+ def_bool n
7289 prompt "Compat VDSO support"
7290 depends on X86_32 || IA32_EMULATION
7291+ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
7292 ---help---
7293 Map the 32-bit VDSO to the predictable old-style address too.
7294
7295diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
7296index 3c57033..22d44aa 100644
7297--- a/arch/x86/Kconfig.cpu
7298+++ b/arch/x86/Kconfig.cpu
7299@@ -335,7 +335,7 @@ config X86_PPRO_FENCE
7300
7301 config X86_F00F_BUG
7302 def_bool y
7303- depends on M586MMX || M586TSC || M586 || M486 || M386
7304+ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
7305
7306 config X86_INVD_BUG
7307 def_bool y
7308@@ -359,7 +359,7 @@ config X86_POPAD_OK
7309
7310 config X86_ALIGNMENT_16
7311 def_bool y
7312- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7313+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7314
7315 config X86_INTEL_USERCOPY
7316 def_bool y
7317@@ -405,7 +405,7 @@ config X86_CMPXCHG64
7318 # generates cmov.
7319 config X86_CMOV
7320 def_bool y
7321- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7322+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7323
7324 config X86_MINIMUM_CPU_FAMILY
7325 int
7326diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
7327index e46c214..7c72b55 100644
7328--- a/arch/x86/Kconfig.debug
7329+++ b/arch/x86/Kconfig.debug
7330@@ -84,7 +84,7 @@ config X86_PTDUMP
7331 config DEBUG_RODATA
7332 bool "Write protect kernel read-only data structures"
7333 default y
7334- depends on DEBUG_KERNEL
7335+ depends on DEBUG_KERNEL && BROKEN
7336 ---help---
7337 Mark the kernel read-only data as write-protected in the pagetables,
7338 in order to catch accidental (and incorrect) writes to such const
7339@@ -102,7 +102,7 @@ config DEBUG_RODATA_TEST
7340
7341 config DEBUG_SET_MODULE_RONX
7342 bool "Set loadable kernel module data as NX and text as RO"
7343- depends on MODULES
7344+ depends on MODULES && BROKEN
7345 ---help---
7346 This option helps catch unintended modifications to loadable
7347 kernel module's text and read-only data. It also prevents execution
7348diff --git a/arch/x86/Makefile b/arch/x86/Makefile
7349index 209ba12..15140db 100644
7350--- a/arch/x86/Makefile
7351+++ b/arch/x86/Makefile
7352@@ -46,6 +46,7 @@ else
7353 UTS_MACHINE := x86_64
7354 CHECKFLAGS += -D__x86_64__ -m64
7355
7356+ biarch := $(call cc-option,-m64)
7357 KBUILD_AFLAGS += -m64
7358 KBUILD_CFLAGS += -m64
7359
7360@@ -201,3 +202,12 @@ define archhelp
7361 echo ' FDARGS="..." arguments for the booted kernel'
7362 echo ' FDINITRD=file initrd for the booted kernel'
7363 endef
7364+
7365+define OLD_LD
7366+
7367+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
7368+*** Please upgrade your binutils to 2.18 or newer
7369+endef
7370+
7371+archprepare:
7372+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
7373diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
7374index 5a747dd..ff7b12c 100644
7375--- a/arch/x86/boot/Makefile
7376+++ b/arch/x86/boot/Makefile
7377@@ -64,6 +64,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
7378 $(call cc-option, -fno-stack-protector) \
7379 $(call cc-option, -mpreferred-stack-boundary=2)
7380 KBUILD_CFLAGS += $(call cc-option, -m32)
7381+ifdef CONSTIFY_PLUGIN
7382+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7383+endif
7384 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7385 GCOV_PROFILE := n
7386
7387diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
7388index 878e4b9..20537ab 100644
7389--- a/arch/x86/boot/bitops.h
7390+++ b/arch/x86/boot/bitops.h
7391@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7392 u8 v;
7393 const u32 *p = (const u32 *)addr;
7394
7395- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7396+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7397 return v;
7398 }
7399
7400@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7401
7402 static inline void set_bit(int nr, void *addr)
7403 {
7404- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7405+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7406 }
7407
7408 #endif /* BOOT_BITOPS_H */
7409diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
7410index c7093bd..d4247ffe0 100644
7411--- a/arch/x86/boot/boot.h
7412+++ b/arch/x86/boot/boot.h
7413@@ -85,7 +85,7 @@ static inline void io_delay(void)
7414 static inline u16 ds(void)
7415 {
7416 u16 seg;
7417- asm("movw %%ds,%0" : "=rm" (seg));
7418+ asm volatile("movw %%ds,%0" : "=rm" (seg));
7419 return seg;
7420 }
7421
7422@@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t addr)
7423 static inline int memcmp(const void *s1, const void *s2, size_t len)
7424 {
7425 u8 diff;
7426- asm("repe; cmpsb; setnz %0"
7427+ asm volatile("repe; cmpsb; setnz %0"
7428 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
7429 return diff;
7430 }
7431diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
7432index fd55a2f..217b501 100644
7433--- a/arch/x86/boot/compressed/Makefile
7434+++ b/arch/x86/boot/compressed/Makefile
7435@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
7436 KBUILD_CFLAGS += $(cflags-y)
7437 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
7438 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
7439+ifdef CONSTIFY_PLUGIN
7440+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7441+endif
7442
7443 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7444 GCOV_PROFILE := n
7445diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
7446index c85e3ac..6f5aa80 100644
7447--- a/arch/x86/boot/compressed/head_32.S
7448+++ b/arch/x86/boot/compressed/head_32.S
7449@@ -106,7 +106,7 @@ preferred_addr:
7450 notl %eax
7451 andl %eax, %ebx
7452 #else
7453- movl $LOAD_PHYSICAL_ADDR, %ebx
7454+ movl $____LOAD_PHYSICAL_ADDR, %ebx
7455 #endif
7456
7457 /* Target address to relocate to for decompression */
7458@@ -192,7 +192,7 @@ relocated:
7459 * and where it was actually loaded.
7460 */
7461 movl %ebp, %ebx
7462- subl $LOAD_PHYSICAL_ADDR, %ebx
7463+ subl $____LOAD_PHYSICAL_ADDR, %ebx
7464 jz 2f /* Nothing to be done if loaded at compiled addr. */
7465 /*
7466 * Process relocations.
7467@@ -200,8 +200,7 @@ relocated:
7468
7469 1: subl $4, %edi
7470 movl (%edi), %ecx
7471- testl %ecx, %ecx
7472- jz 2f
7473+ jecxz 2f
7474 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
7475 jmp 1b
7476 2:
7477diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
7478index 87e03a1..0d94c76 100644
7479--- a/arch/x86/boot/compressed/head_64.S
7480+++ b/arch/x86/boot/compressed/head_64.S
7481@@ -91,7 +91,7 @@ ENTRY(startup_32)
7482 notl %eax
7483 andl %eax, %ebx
7484 #else
7485- movl $LOAD_PHYSICAL_ADDR, %ebx
7486+ movl $____LOAD_PHYSICAL_ADDR, %ebx
7487 #endif
7488
7489 /* Target address to relocate to for decompression */
7490@@ -263,7 +263,7 @@ preferred_addr:
7491 notq %rax
7492 andq %rax, %rbp
7493 #else
7494- movq $LOAD_PHYSICAL_ADDR, %rbp
7495+ movq $____LOAD_PHYSICAL_ADDR, %rbp
7496 #endif
7497
7498 /* Target address to relocate to for decompression */
7499diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
7500index 7116dcb..d9ae1d7 100644
7501--- a/arch/x86/boot/compressed/misc.c
7502+++ b/arch/x86/boot/compressed/misc.c
7503@@ -310,7 +310,7 @@ static void parse_elf(void *output)
7504 case PT_LOAD:
7505 #ifdef CONFIG_RELOCATABLE
7506 dest = output;
7507- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
7508+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
7509 #else
7510 dest = (void *)(phdr->p_paddr);
7511 #endif
7512@@ -365,7 +365,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
7513 error("Destination address too large");
7514 #endif
7515 #ifndef CONFIG_RELOCATABLE
7516- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
7517+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
7518 error("Wrong destination address");
7519 #endif
7520
7521diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
7522index 89bbf4e..869908e 100644
7523--- a/arch/x86/boot/compressed/relocs.c
7524+++ b/arch/x86/boot/compressed/relocs.c
7525@@ -13,8 +13,11 @@
7526
7527 static void die(char *fmt, ...);
7528
7529+#include "../../../../include/generated/autoconf.h"
7530+
7531 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
7532 static Elf32_Ehdr ehdr;
7533+static Elf32_Phdr *phdr;
7534 static unsigned long reloc_count, reloc_idx;
7535 static unsigned long *relocs;
7536
7537@@ -270,9 +273,39 @@ static void read_ehdr(FILE *fp)
7538 }
7539 }
7540
7541+static void read_phdrs(FILE *fp)
7542+{
7543+ unsigned int i;
7544+
7545+ phdr = calloc(ehdr.e_phnum, sizeof(Elf32_Phdr));
7546+ if (!phdr) {
7547+ die("Unable to allocate %d program headers\n",
7548+ ehdr.e_phnum);
7549+ }
7550+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
7551+ die("Seek to %d failed: %s\n",
7552+ ehdr.e_phoff, strerror(errno));
7553+ }
7554+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
7555+ die("Cannot read ELF program headers: %s\n",
7556+ strerror(errno));
7557+ }
7558+ for(i = 0; i < ehdr.e_phnum; i++) {
7559+ phdr[i].p_type = elf32_to_cpu(phdr[i].p_type);
7560+ phdr[i].p_offset = elf32_to_cpu(phdr[i].p_offset);
7561+ phdr[i].p_vaddr = elf32_to_cpu(phdr[i].p_vaddr);
7562+ phdr[i].p_paddr = elf32_to_cpu(phdr[i].p_paddr);
7563+ phdr[i].p_filesz = elf32_to_cpu(phdr[i].p_filesz);
7564+ phdr[i].p_memsz = elf32_to_cpu(phdr[i].p_memsz);
7565+ phdr[i].p_flags = elf32_to_cpu(phdr[i].p_flags);
7566+ phdr[i].p_align = elf32_to_cpu(phdr[i].p_align);
7567+ }
7568+
7569+}
7570+
7571 static void read_shdrs(FILE *fp)
7572 {
7573- int i;
7574+ unsigned int i;
7575 Elf32_Shdr shdr;
7576
7577 secs = calloc(ehdr.e_shnum, sizeof(struct section));
7578@@ -307,7 +340,7 @@ static void read_shdrs(FILE *fp)
7579
7580 static void read_strtabs(FILE *fp)
7581 {
7582- int i;
7583+ unsigned int i;
7584 for (i = 0; i < ehdr.e_shnum; i++) {
7585 struct section *sec = &secs[i];
7586 if (sec->shdr.sh_type != SHT_STRTAB) {
7587@@ -332,7 +365,7 @@ static void read_strtabs(FILE *fp)
7588
7589 static void read_symtabs(FILE *fp)
7590 {
7591- int i,j;
7592+ unsigned int i,j;
7593 for (i = 0; i < ehdr.e_shnum; i++) {
7594 struct section *sec = &secs[i];
7595 if (sec->shdr.sh_type != SHT_SYMTAB) {
7596@@ -365,7 +398,9 @@ static void read_symtabs(FILE *fp)
7597
7598 static void read_relocs(FILE *fp)
7599 {
7600- int i,j;
7601+ unsigned int i,j;
7602+ uint32_t base;
7603+
7604 for (i = 0; i < ehdr.e_shnum; i++) {
7605 struct section *sec = &secs[i];
7606 if (sec->shdr.sh_type != SHT_REL) {
7607@@ -385,9 +420,18 @@ static void read_relocs(FILE *fp)
7608 die("Cannot read symbol table: %s\n",
7609 strerror(errno));
7610 }
7611+ base = 0;
7612+ for (j = 0; j < ehdr.e_phnum; j++) {
7613+ if (phdr[j].p_type != PT_LOAD )
7614+ continue;
7615+ 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)
7616+ continue;
7617+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
7618+ break;
7619+ }
7620 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
7621 Elf32_Rel *rel = &sec->reltab[j];
7622- rel->r_offset = elf32_to_cpu(rel->r_offset);
7623+ rel->r_offset = elf32_to_cpu(rel->r_offset) + base;
7624 rel->r_info = elf32_to_cpu(rel->r_info);
7625 }
7626 }
7627@@ -396,14 +440,14 @@ static void read_relocs(FILE *fp)
7628
7629 static void print_absolute_symbols(void)
7630 {
7631- int i;
7632+ unsigned int i;
7633 printf("Absolute symbols\n");
7634 printf(" Num: Value Size Type Bind Visibility Name\n");
7635 for (i = 0; i < ehdr.e_shnum; i++) {
7636 struct section *sec = &secs[i];
7637 char *sym_strtab;
7638 Elf32_Sym *sh_symtab;
7639- int j;
7640+ unsigned int j;
7641
7642 if (sec->shdr.sh_type != SHT_SYMTAB) {
7643 continue;
7644@@ -431,14 +475,14 @@ static void print_absolute_symbols(void)
7645
7646 static void print_absolute_relocs(void)
7647 {
7648- int i, printed = 0;
7649+ unsigned int i, printed = 0;
7650
7651 for (i = 0; i < ehdr.e_shnum; i++) {
7652 struct section *sec = &secs[i];
7653 struct section *sec_applies, *sec_symtab;
7654 char *sym_strtab;
7655 Elf32_Sym *sh_symtab;
7656- int j;
7657+ unsigned int j;
7658 if (sec->shdr.sh_type != SHT_REL) {
7659 continue;
7660 }
7661@@ -499,13 +543,13 @@ static void print_absolute_relocs(void)
7662
7663 static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7664 {
7665- int i;
7666+ unsigned int i;
7667 /* Walk through the relocations */
7668 for (i = 0; i < ehdr.e_shnum; i++) {
7669 char *sym_strtab;
7670 Elf32_Sym *sh_symtab;
7671 struct section *sec_applies, *sec_symtab;
7672- int j;
7673+ unsigned int j;
7674 struct section *sec = &secs[i];
7675
7676 if (sec->shdr.sh_type != SHT_REL) {
7677@@ -530,6 +574,22 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7678 !is_rel_reloc(sym_name(sym_strtab, sym))) {
7679 continue;
7680 }
7681+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
7682+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
7683+ continue;
7684+
7685+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
7686+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
7687+ if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
7688+ continue;
7689+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
7690+ continue;
7691+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
7692+ continue;
7693+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
7694+ continue;
7695+#endif
7696+
7697 switch (r_type) {
7698 case R_386_NONE:
7699 case R_386_PC32:
7700@@ -571,7 +631,7 @@ static int cmp_relocs(const void *va, const void *vb)
7701
7702 static void emit_relocs(int as_text)
7703 {
7704- int i;
7705+ unsigned int i;
7706 /* Count how many relocations I have and allocate space for them. */
7707 reloc_count = 0;
7708 walk_relocs(count_reloc);
7709@@ -665,6 +725,7 @@ int main(int argc, char **argv)
7710 fname, strerror(errno));
7711 }
7712 read_ehdr(fp);
7713+ read_phdrs(fp);
7714 read_shdrs(fp);
7715 read_strtabs(fp);
7716 read_symtabs(fp);
7717diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
7718index 4d3ff03..e4972ff 100644
7719--- a/arch/x86/boot/cpucheck.c
7720+++ b/arch/x86/boot/cpucheck.c
7721@@ -74,7 +74,7 @@ static int has_fpu(void)
7722 u16 fcw = -1, fsw = -1;
7723 u32 cr0;
7724
7725- asm("movl %%cr0,%0" : "=r" (cr0));
7726+ asm volatile("movl %%cr0,%0" : "=r" (cr0));
7727 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
7728 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
7729 asm volatile("movl %0,%%cr0" : : "r" (cr0));
7730@@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
7731 {
7732 u32 f0, f1;
7733
7734- asm("pushfl ; "
7735+ asm volatile("pushfl ; "
7736 "pushfl ; "
7737 "popl %0 ; "
7738 "movl %0,%1 ; "
7739@@ -115,7 +115,7 @@ static void get_flags(void)
7740 set_bit(X86_FEATURE_FPU, cpu.flags);
7741
7742 if (has_eflag(X86_EFLAGS_ID)) {
7743- asm("cpuid"
7744+ asm volatile("cpuid"
7745 : "=a" (max_intel_level),
7746 "=b" (cpu_vendor[0]),
7747 "=d" (cpu_vendor[1]),
7748@@ -124,7 +124,7 @@ static void get_flags(void)
7749
7750 if (max_intel_level >= 0x00000001 &&
7751 max_intel_level <= 0x0000ffff) {
7752- asm("cpuid"
7753+ asm volatile("cpuid"
7754 : "=a" (tfms),
7755 "=c" (cpu.flags[4]),
7756 "=d" (cpu.flags[0])
7757@@ -136,7 +136,7 @@ static void get_flags(void)
7758 cpu.model += ((tfms >> 16) & 0xf) << 4;
7759 }
7760
7761- asm("cpuid"
7762+ asm volatile("cpuid"
7763 : "=a" (max_amd_level)
7764 : "a" (0x80000000)
7765 : "ebx", "ecx", "edx");
7766@@ -144,7 +144,7 @@ static void get_flags(void)
7767 if (max_amd_level >= 0x80000001 &&
7768 max_amd_level <= 0x8000ffff) {
7769 u32 eax = 0x80000001;
7770- asm("cpuid"
7771+ asm volatile("cpuid"
7772 : "+a" (eax),
7773 "=c" (cpu.flags[6]),
7774 "=d" (cpu.flags[1])
7775@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7776 u32 ecx = MSR_K7_HWCR;
7777 u32 eax, edx;
7778
7779- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7780+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7781 eax &= ~(1 << 15);
7782- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7783+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7784
7785 get_flags(); /* Make sure it really did something */
7786 err = check_flags();
7787@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7788 u32 ecx = MSR_VIA_FCR;
7789 u32 eax, edx;
7790
7791- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7792+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7793 eax |= (1<<1)|(1<<7);
7794- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7795+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7796
7797 set_bit(X86_FEATURE_CX8, cpu.flags);
7798 err = check_flags();
7799@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7800 u32 eax, edx;
7801 u32 level = 1;
7802
7803- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7804- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7805- asm("cpuid"
7806+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7807+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7808+ asm volatile("cpuid"
7809 : "+a" (level), "=d" (cpu.flags[0])
7810 : : "ecx", "ebx");
7811- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7812+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7813
7814 err = check_flags();
7815 }
7816diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
7817index f1bbeeb..aff09cb 100644
7818--- a/arch/x86/boot/header.S
7819+++ b/arch/x86/boot/header.S
7820@@ -372,7 +372,7 @@ setup_data: .quad 0 # 64-bit physical pointer to
7821 # single linked list of
7822 # struct setup_data
7823
7824-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
7825+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
7826
7827 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
7828 #define VO_INIT_SIZE (VO__end - VO__text)
7829diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
7830index db75d07..8e6d0af 100644
7831--- a/arch/x86/boot/memory.c
7832+++ b/arch/x86/boot/memory.c
7833@@ -19,7 +19,7 @@
7834
7835 static int detect_memory_e820(void)
7836 {
7837- int count = 0;
7838+ unsigned int count = 0;
7839 struct biosregs ireg, oreg;
7840 struct e820entry *desc = boot_params.e820_map;
7841 static struct e820entry buf; /* static so it is zeroed */
7842diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
7843index 11e8c6e..fdbb1ed 100644
7844--- a/arch/x86/boot/video-vesa.c
7845+++ b/arch/x86/boot/video-vesa.c
7846@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
7847
7848 boot_params.screen_info.vesapm_seg = oreg.es;
7849 boot_params.screen_info.vesapm_off = oreg.di;
7850+ boot_params.screen_info.vesapm_size = oreg.cx;
7851 }
7852
7853 /*
7854diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
7855index 43eda28..5ab5fdb 100644
7856--- a/arch/x86/boot/video.c
7857+++ b/arch/x86/boot/video.c
7858@@ -96,7 +96,7 @@ static void store_mode_params(void)
7859 static unsigned int get_entry(void)
7860 {
7861 char entry_buf[4];
7862- int i, len = 0;
7863+ unsigned int i, len = 0;
7864 int key;
7865 unsigned int v;
7866
7867diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
7868index 5b577d5..3c1fed4 100644
7869--- a/arch/x86/crypto/aes-x86_64-asm_64.S
7870+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
7871@@ -8,6 +8,8 @@
7872 * including this sentence is retained in full.
7873 */
7874
7875+#include <asm/alternative-asm.h>
7876+
7877 .extern crypto_ft_tab
7878 .extern crypto_it_tab
7879 .extern crypto_fl_tab
7880@@ -71,6 +73,8 @@ FUNC: movq r1,r2; \
7881 je B192; \
7882 leaq 32(r9),r9;
7883
7884+#define ret pax_force_retaddr 0, 1; ret
7885+
7886 #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
7887 movq r1,r2; \
7888 movq r3,r4; \
7889diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
7890index be6d9e3..21fbbca 100644
7891--- a/arch/x86/crypto/aesni-intel_asm.S
7892+++ b/arch/x86/crypto/aesni-intel_asm.S
7893@@ -31,6 +31,7 @@
7894
7895 #include <linux/linkage.h>
7896 #include <asm/inst.h>
7897+#include <asm/alternative-asm.h>
7898
7899 #ifdef __x86_64__
7900 .data
7901@@ -1436,7 +1437,9 @@ _return_T_done_decrypt:
7902 pop %r14
7903 pop %r13
7904 pop %r12
7905+ pax_force_retaddr 0, 1
7906 ret
7907+ENDPROC(aesni_gcm_dec)
7908
7909
7910 /*****************************************************************************
7911@@ -1699,7 +1702,9 @@ _return_T_done_encrypt:
7912 pop %r14
7913 pop %r13
7914 pop %r12
7915+ pax_force_retaddr 0, 1
7916 ret
7917+ENDPROC(aesni_gcm_enc)
7918
7919 #endif
7920
7921@@ -1714,6 +1719,7 @@ _key_expansion_256a:
7922 pxor %xmm1, %xmm0
7923 movaps %xmm0, (TKEYP)
7924 add $0x10, TKEYP
7925+ pax_force_retaddr_bts
7926 ret
7927
7928 .align 4
7929@@ -1738,6 +1744,7 @@ _key_expansion_192a:
7930 shufps $0b01001110, %xmm2, %xmm1
7931 movaps %xmm1, 0x10(TKEYP)
7932 add $0x20, TKEYP
7933+ pax_force_retaddr_bts
7934 ret
7935
7936 .align 4
7937@@ -1757,6 +1764,7 @@ _key_expansion_192b:
7938
7939 movaps %xmm0, (TKEYP)
7940 add $0x10, TKEYP
7941+ pax_force_retaddr_bts
7942 ret
7943
7944 .align 4
7945@@ -1769,6 +1777,7 @@ _key_expansion_256b:
7946 pxor %xmm1, %xmm2
7947 movaps %xmm2, (TKEYP)
7948 add $0x10, TKEYP
7949+ pax_force_retaddr_bts
7950 ret
7951
7952 /*
7953@@ -1881,7 +1890,9 @@ ENTRY(aesni_set_key)
7954 #ifndef __x86_64__
7955 popl KEYP
7956 #endif
7957+ pax_force_retaddr 0, 1
7958 ret
7959+ENDPROC(aesni_set_key)
7960
7961 /*
7962 * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)
7963@@ -1902,7 +1913,9 @@ ENTRY(aesni_enc)
7964 popl KLEN
7965 popl KEYP
7966 #endif
7967+ pax_force_retaddr 0, 1
7968 ret
7969+ENDPROC(aesni_enc)
7970
7971 /*
7972 * _aesni_enc1: internal ABI
7973@@ -1959,6 +1972,7 @@ _aesni_enc1:
7974 AESENC KEY STATE
7975 movaps 0x70(TKEYP), KEY
7976 AESENCLAST KEY STATE
7977+ pax_force_retaddr_bts
7978 ret
7979
7980 /*
7981@@ -2067,6 +2081,7 @@ _aesni_enc4:
7982 AESENCLAST KEY STATE2
7983 AESENCLAST KEY STATE3
7984 AESENCLAST KEY STATE4
7985+ pax_force_retaddr_bts
7986 ret
7987
7988 /*
7989@@ -2089,7 +2104,9 @@ ENTRY(aesni_dec)
7990 popl KLEN
7991 popl KEYP
7992 #endif
7993+ pax_force_retaddr 0, 1
7994 ret
7995+ENDPROC(aesni_dec)
7996
7997 /*
7998 * _aesni_dec1: internal ABI
7999@@ -2146,6 +2163,7 @@ _aesni_dec1:
8000 AESDEC KEY STATE
8001 movaps 0x70(TKEYP), KEY
8002 AESDECLAST KEY STATE
8003+ pax_force_retaddr_bts
8004 ret
8005
8006 /*
8007@@ -2254,6 +2272,7 @@ _aesni_dec4:
8008 AESDECLAST KEY STATE2
8009 AESDECLAST KEY STATE3
8010 AESDECLAST KEY STATE4
8011+ pax_force_retaddr_bts
8012 ret
8013
8014 /*
8015@@ -2311,7 +2330,9 @@ ENTRY(aesni_ecb_enc)
8016 popl KEYP
8017 popl LEN
8018 #endif
8019+ pax_force_retaddr 0, 1
8020 ret
8021+ENDPROC(aesni_ecb_enc)
8022
8023 /*
8024 * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
8025@@ -2369,7 +2390,9 @@ ENTRY(aesni_ecb_dec)
8026 popl KEYP
8027 popl LEN
8028 #endif
8029+ pax_force_retaddr 0, 1
8030 ret
8031+ENDPROC(aesni_ecb_dec)
8032
8033 /*
8034 * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
8035@@ -2410,7 +2433,9 @@ ENTRY(aesni_cbc_enc)
8036 popl LEN
8037 popl IVP
8038 #endif
8039+ pax_force_retaddr 0, 1
8040 ret
8041+ENDPROC(aesni_cbc_enc)
8042
8043 /*
8044 * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
8045@@ -2498,7 +2523,9 @@ ENTRY(aesni_cbc_dec)
8046 popl LEN
8047 popl IVP
8048 #endif
8049+ pax_force_retaddr 0, 1
8050 ret
8051+ENDPROC(aesni_cbc_dec)
8052
8053 #ifdef __x86_64__
8054 .align 16
8055@@ -2524,6 +2551,7 @@ _aesni_inc_init:
8056 mov $1, TCTR_LOW
8057 MOVQ_R64_XMM TCTR_LOW INC
8058 MOVQ_R64_XMM CTR TCTR_LOW
8059+ pax_force_retaddr_bts
8060 ret
8061
8062 /*
8063@@ -2552,6 +2580,7 @@ _aesni_inc:
8064 .Linc_low:
8065 movaps CTR, IV
8066 PSHUFB_XMM BSWAP_MASK IV
8067+ pax_force_retaddr_bts
8068 ret
8069
8070 /*
8071@@ -2612,5 +2641,7 @@ ENTRY(aesni_ctr_enc)
8072 .Lctr_enc_ret:
8073 movups IV, (IVP)
8074 .Lctr_enc_just_ret:
8075+ pax_force_retaddr 0, 1
8076 ret
8077+ENDPROC(aesni_ctr_enc)
8078 #endif
8079diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
8080index 545d0ce..14841a6 100644
8081--- a/arch/x86/crypto/aesni-intel_glue.c
8082+++ b/arch/x86/crypto/aesni-intel_glue.c
8083@@ -929,6 +929,8 @@ out_free_ablkcipher:
8084 }
8085
8086 static int rfc4106_set_key(struct crypto_aead *parent, const u8 *key,
8087+ unsigned int key_len) __size_overflow(3);
8088+static int rfc4106_set_key(struct crypto_aead *parent, const u8 *key,
8089 unsigned int key_len)
8090 {
8091 int ret = 0;
8092diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
8093index 391d245..67f35c2 100644
8094--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
8095+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
8096@@ -20,6 +20,8 @@
8097 *
8098 */
8099
8100+#include <asm/alternative-asm.h>
8101+
8102 .file "blowfish-x86_64-asm.S"
8103 .text
8104
8105@@ -151,9 +153,11 @@ __blowfish_enc_blk:
8106 jnz __enc_xor;
8107
8108 write_block();
8109+ pax_force_retaddr 0, 1
8110 ret;
8111 __enc_xor:
8112 xor_block();
8113+ pax_force_retaddr 0, 1
8114 ret;
8115
8116 .align 8
8117@@ -188,6 +192,7 @@ blowfish_dec_blk:
8118
8119 movq %r11, %rbp;
8120
8121+ pax_force_retaddr 0, 1
8122 ret;
8123
8124 /**********************************************************************
8125@@ -342,6 +347,7 @@ __blowfish_enc_blk_4way:
8126
8127 popq %rbx;
8128 popq %rbp;
8129+ pax_force_retaddr 0, 1
8130 ret;
8131
8132 __enc_xor4:
8133@@ -349,6 +355,7 @@ __enc_xor4:
8134
8135 popq %rbx;
8136 popq %rbp;
8137+ pax_force_retaddr 0, 1
8138 ret;
8139
8140 .align 8
8141@@ -386,5 +393,6 @@ blowfish_dec_blk_4way:
8142 popq %rbx;
8143 popq %rbp;
8144
8145+ pax_force_retaddr 0, 1
8146 ret;
8147
8148diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
8149index 6214a9b..1f4fc9a 100644
8150--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
8151+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
8152@@ -1,3 +1,5 @@
8153+#include <asm/alternative-asm.h>
8154+
8155 # enter ECRYPT_encrypt_bytes
8156 .text
8157 .p2align 5
8158@@ -790,6 +792,7 @@ ECRYPT_encrypt_bytes:
8159 add %r11,%rsp
8160 mov %rdi,%rax
8161 mov %rsi,%rdx
8162+ pax_force_retaddr 0, 1
8163 ret
8164 # bytesatleast65:
8165 ._bytesatleast65:
8166@@ -891,6 +894,7 @@ ECRYPT_keysetup:
8167 add %r11,%rsp
8168 mov %rdi,%rax
8169 mov %rsi,%rdx
8170+ pax_force_retaddr
8171 ret
8172 # enter ECRYPT_ivsetup
8173 .text
8174@@ -917,4 +921,5 @@ ECRYPT_ivsetup:
8175 add %r11,%rsp
8176 mov %rdi,%rax
8177 mov %rsi,%rdx
8178+ pax_force_retaddr
8179 ret
8180diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
8181index 7f24a15..9cd3ffe 100644
8182--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
8183+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
8184@@ -24,6 +24,8 @@
8185 *
8186 */
8187
8188+#include <asm/alternative-asm.h>
8189+
8190 .file "serpent-sse2-x86_64-asm_64.S"
8191 .text
8192
8193@@ -695,12 +697,14 @@ __serpent_enc_blk_8way:
8194 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
8195 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
8196
8197+ pax_force_retaddr
8198 ret;
8199
8200 __enc_xor8:
8201 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
8202 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
8203
8204+ pax_force_retaddr
8205 ret;
8206
8207 .align 8
8208@@ -758,4 +762,5 @@ serpent_dec_blk_8way:
8209 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
8210 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
8211
8212+ pax_force_retaddr
8213 ret;
8214diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
8215index b2c2f57..8470cab 100644
8216--- a/arch/x86/crypto/sha1_ssse3_asm.S
8217+++ b/arch/x86/crypto/sha1_ssse3_asm.S
8218@@ -28,6 +28,8 @@
8219 * (at your option) any later version.
8220 */
8221
8222+#include <asm/alternative-asm.h>
8223+
8224 #define CTX %rdi // arg1
8225 #define BUF %rsi // arg2
8226 #define CNT %rdx // arg3
8227@@ -104,6 +106,7 @@
8228 pop %r12
8229 pop %rbp
8230 pop %rbx
8231+ pax_force_retaddr 0, 1
8232 ret
8233
8234 .size \name, .-\name
8235diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8236index 5b012a2..36d5364 100644
8237--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8238+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8239@@ -20,6 +20,8 @@
8240 *
8241 */
8242
8243+#include <asm/alternative-asm.h>
8244+
8245 .file "twofish-x86_64-asm-3way.S"
8246 .text
8247
8248@@ -260,6 +262,7 @@ __twofish_enc_blk_3way:
8249 popq %r13;
8250 popq %r14;
8251 popq %r15;
8252+ pax_force_retaddr 0, 1
8253 ret;
8254
8255 __enc_xor3:
8256@@ -271,6 +274,7 @@ __enc_xor3:
8257 popq %r13;
8258 popq %r14;
8259 popq %r15;
8260+ pax_force_retaddr 0, 1
8261 ret;
8262
8263 .global twofish_dec_blk_3way
8264@@ -312,5 +316,6 @@ twofish_dec_blk_3way:
8265 popq %r13;
8266 popq %r14;
8267 popq %r15;
8268+ pax_force_retaddr 0, 1
8269 ret;
8270
8271diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
8272index 7bcf3fc..f53832f 100644
8273--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
8274+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
8275@@ -21,6 +21,7 @@
8276 .text
8277
8278 #include <asm/asm-offsets.h>
8279+#include <asm/alternative-asm.h>
8280
8281 #define a_offset 0
8282 #define b_offset 4
8283@@ -268,6 +269,7 @@ twofish_enc_blk:
8284
8285 popq R1
8286 movq $1,%rax
8287+ pax_force_retaddr 0, 1
8288 ret
8289
8290 twofish_dec_blk:
8291@@ -319,4 +321,5 @@ twofish_dec_blk:
8292
8293 popq R1
8294 movq $1,%rax
8295+ pax_force_retaddr 0, 1
8296 ret
8297diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
8298index 39e4909..887aa7e 100644
8299--- a/arch/x86/ia32/ia32_aout.c
8300+++ b/arch/x86/ia32/ia32_aout.c
8301@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
8302 unsigned long dump_start, dump_size;
8303 struct user32 dump;
8304
8305+ memset(&dump, 0, sizeof(dump));
8306+
8307 fs = get_fs();
8308 set_fs(KERNEL_DS);
8309 has_dumped = 1;
8310diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
8311index 6557769..ef6ae89 100644
8312--- a/arch/x86/ia32/ia32_signal.c
8313+++ b/arch/x86/ia32/ia32_signal.c
8314@@ -169,7 +169,7 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
8315 }
8316 seg = get_fs();
8317 set_fs(KERNEL_DS);
8318- ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
8319+ ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
8320 set_fs(seg);
8321 if (ret >= 0 && uoss_ptr) {
8322 if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
8323@@ -370,7 +370,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
8324 */
8325 static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8326 size_t frame_size,
8327- void **fpstate)
8328+ void __user **fpstate)
8329 {
8330 unsigned long sp;
8331
8332@@ -391,7 +391,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8333
8334 if (used_math()) {
8335 sp = sp - sig_xstate_ia32_size;
8336- *fpstate = (struct _fpstate_ia32 *) sp;
8337+ *fpstate = (struct _fpstate_ia32 __user *) sp;
8338 if (save_i387_xstate_ia32(*fpstate) < 0)
8339 return (void __user *) -1L;
8340 }
8341@@ -399,7 +399,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8342 sp -= frame_size;
8343 /* Align the stack pointer according to the i386 ABI,
8344 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
8345- sp = ((sp + 4) & -16ul) - 4;
8346+ sp = ((sp - 12) & -16ul) - 4;
8347 return (void __user *) sp;
8348 }
8349
8350@@ -457,7 +457,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
8351 * These are actually not used anymore, but left because some
8352 * gdb versions depend on them as a marker.
8353 */
8354- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8355+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8356 } put_user_catch(err);
8357
8358 if (err)
8359@@ -499,7 +499,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8360 0xb8,
8361 __NR_ia32_rt_sigreturn,
8362 0x80cd,
8363- 0,
8364+ 0
8365 };
8366
8367 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
8368@@ -529,16 +529,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8369
8370 if (ka->sa.sa_flags & SA_RESTORER)
8371 restorer = ka->sa.sa_restorer;
8372+ else if (current->mm->context.vdso)
8373+ /* Return stub is in 32bit vsyscall page */
8374+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
8375 else
8376- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
8377- rt_sigreturn);
8378+ restorer = &frame->retcode;
8379 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
8380
8381 /*
8382 * Not actually used anymore, but left because some gdb
8383 * versions need it.
8384 */
8385- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8386+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8387 } put_user_catch(err);
8388
8389 if (err)
8390diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
8391index e3e7340..05ed805 100644
8392--- a/arch/x86/ia32/ia32entry.S
8393+++ b/arch/x86/ia32/ia32entry.S
8394@@ -13,8 +13,10 @@
8395 #include <asm/thread_info.h>
8396 #include <asm/segment.h>
8397 #include <asm/irqflags.h>
8398+#include <asm/pgtable.h>
8399 #include <linux/linkage.h>
8400 #include <linux/err.h>
8401+#include <asm/alternative-asm.h>
8402
8403 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
8404 #include <linux/elf-em.h>
8405@@ -94,6 +96,32 @@ ENTRY(native_irq_enable_sysexit)
8406 ENDPROC(native_irq_enable_sysexit)
8407 #endif
8408
8409+ .macro pax_enter_kernel_user
8410+ pax_set_fptr_mask
8411+#ifdef CONFIG_PAX_MEMORY_UDEREF
8412+ call pax_enter_kernel_user
8413+#endif
8414+ .endm
8415+
8416+ .macro pax_exit_kernel_user
8417+#ifdef CONFIG_PAX_MEMORY_UDEREF
8418+ call pax_exit_kernel_user
8419+#endif
8420+#ifdef CONFIG_PAX_RANDKSTACK
8421+ pushq %rax
8422+ pushq %r11
8423+ call pax_randomize_kstack
8424+ popq %r11
8425+ popq %rax
8426+#endif
8427+ .endm
8428+
8429+.macro pax_erase_kstack
8430+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
8431+ call pax_erase_kstack
8432+#endif
8433+.endm
8434+
8435 /*
8436 * 32bit SYSENTER instruction entry.
8437 *
8438@@ -120,12 +148,6 @@ ENTRY(ia32_sysenter_target)
8439 CFI_REGISTER rsp,rbp
8440 SWAPGS_UNSAFE_STACK
8441 movq PER_CPU_VAR(kernel_stack), %rsp
8442- addq $(KERNEL_STACK_OFFSET),%rsp
8443- /*
8444- * No need to follow this irqs on/off section: the syscall
8445- * disabled irqs, here we enable it straight after entry:
8446- */
8447- ENABLE_INTERRUPTS(CLBR_NONE)
8448 movl %ebp,%ebp /* zero extension */
8449 pushq_cfi $__USER32_DS
8450 /*CFI_REL_OFFSET ss,0*/
8451@@ -133,24 +155,39 @@ ENTRY(ia32_sysenter_target)
8452 CFI_REL_OFFSET rsp,0
8453 pushfq_cfi
8454 /*CFI_REL_OFFSET rflags,0*/
8455- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
8456- CFI_REGISTER rip,r10
8457+ orl $X86_EFLAGS_IF,(%rsp)
8458+ GET_THREAD_INFO(%r11)
8459+ movl TI_sysenter_return(%r11), %r11d
8460+ CFI_REGISTER rip,r11
8461 pushq_cfi $__USER32_CS
8462 /*CFI_REL_OFFSET cs,0*/
8463 movl %eax, %eax
8464- pushq_cfi %r10
8465+ pushq_cfi %r11
8466 CFI_REL_OFFSET rip,0
8467 pushq_cfi %rax
8468 cld
8469 SAVE_ARGS 0,1,0
8470+ pax_enter_kernel_user
8471+ /*
8472+ * No need to follow this irqs on/off section: the syscall
8473+ * disabled irqs, here we enable it straight after entry:
8474+ */
8475+ ENABLE_INTERRUPTS(CLBR_NONE)
8476 /* no need to do an access_ok check here because rbp has been
8477 32bit zero extended */
8478+
8479+#ifdef CONFIG_PAX_MEMORY_UDEREF
8480+ mov $PAX_USER_SHADOW_BASE,%r11
8481+ add %r11,%rbp
8482+#endif
8483+
8484 1: movl (%rbp),%ebp
8485 .section __ex_table,"a"
8486 .quad 1b,ia32_badarg
8487 .previous
8488- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8489- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8490+ GET_THREAD_INFO(%r11)
8491+ orl $TS_COMPAT,TI_status(%r11)
8492+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8493 CFI_REMEMBER_STATE
8494 jnz sysenter_tracesys
8495 cmpq $(IA32_NR_syscalls-1),%rax
8496@@ -160,12 +197,15 @@ sysenter_do_call:
8497 sysenter_dispatch:
8498 call *ia32_sys_call_table(,%rax,8)
8499 movq %rax,RAX-ARGOFFSET(%rsp)
8500+ GET_THREAD_INFO(%r11)
8501 DISABLE_INTERRUPTS(CLBR_NONE)
8502 TRACE_IRQS_OFF
8503- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8504+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8505 jnz sysexit_audit
8506 sysexit_from_sys_call:
8507- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8508+ pax_exit_kernel_user
8509+ pax_erase_kstack
8510+ andl $~TS_COMPAT,TI_status(%r11)
8511 /* clear IF, that popfq doesn't enable interrupts early */
8512 andl $~0x200,EFLAGS-R11(%rsp)
8513 movl RIP-R11(%rsp),%edx /* User %eip */
8514@@ -191,6 +231,9 @@ sysexit_from_sys_call:
8515 movl %eax,%esi /* 2nd arg: syscall number */
8516 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
8517 call __audit_syscall_entry
8518+
8519+ pax_erase_kstack
8520+
8521 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
8522 cmpq $(IA32_NR_syscalls-1),%rax
8523 ja ia32_badsys
8524@@ -202,7 +245,7 @@ sysexit_from_sys_call:
8525 .endm
8526
8527 .macro auditsys_exit exit
8528- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8529+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8530 jnz ia32_ret_from_sys_call
8531 TRACE_IRQS_ON
8532 sti
8533@@ -213,11 +256,12 @@ sysexit_from_sys_call:
8534 1: setbe %al /* 1 if error, 0 if not */
8535 movzbl %al,%edi /* zero-extend that into %edi */
8536 call __audit_syscall_exit
8537+ GET_THREAD_INFO(%r11)
8538 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
8539 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
8540 cli
8541 TRACE_IRQS_OFF
8542- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8543+ testl %edi,TI_flags(%r11)
8544 jz \exit
8545 CLEAR_RREGS -ARGOFFSET
8546 jmp int_with_check
8547@@ -235,7 +279,7 @@ sysexit_audit:
8548
8549 sysenter_tracesys:
8550 #ifdef CONFIG_AUDITSYSCALL
8551- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8552+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8553 jz sysenter_auditsys
8554 #endif
8555 SAVE_REST
8556@@ -243,6 +287,9 @@ sysenter_tracesys:
8557 movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
8558 movq %rsp,%rdi /* &pt_regs -> arg1 */
8559 call syscall_trace_enter
8560+
8561+ pax_erase_kstack
8562+
8563 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8564 RESTORE_REST
8565 cmpq $(IA32_NR_syscalls-1),%rax
8566@@ -274,19 +321,20 @@ ENDPROC(ia32_sysenter_target)
8567 ENTRY(ia32_cstar_target)
8568 CFI_STARTPROC32 simple
8569 CFI_SIGNAL_FRAME
8570- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
8571+ CFI_DEF_CFA rsp,0
8572 CFI_REGISTER rip,rcx
8573 /*CFI_REGISTER rflags,r11*/
8574 SWAPGS_UNSAFE_STACK
8575 movl %esp,%r8d
8576 CFI_REGISTER rsp,r8
8577 movq PER_CPU_VAR(kernel_stack),%rsp
8578+ SAVE_ARGS 8*6,0,0
8579+ pax_enter_kernel_user
8580 /*
8581 * No need to follow this irqs on/off section: the syscall
8582 * disabled irqs and here we enable it straight after entry:
8583 */
8584 ENABLE_INTERRUPTS(CLBR_NONE)
8585- SAVE_ARGS 8,0,0
8586 movl %eax,%eax /* zero extension */
8587 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
8588 movq %rcx,RIP-ARGOFFSET(%rsp)
8589@@ -302,12 +350,19 @@ ENTRY(ia32_cstar_target)
8590 /* no need to do an access_ok check here because r8 has been
8591 32bit zero extended */
8592 /* hardware stack frame is complete now */
8593+
8594+#ifdef CONFIG_PAX_MEMORY_UDEREF
8595+ mov $PAX_USER_SHADOW_BASE,%r11
8596+ add %r11,%r8
8597+#endif
8598+
8599 1: movl (%r8),%r9d
8600 .section __ex_table,"a"
8601 .quad 1b,ia32_badarg
8602 .previous
8603- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8604- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8605+ GET_THREAD_INFO(%r11)
8606+ orl $TS_COMPAT,TI_status(%r11)
8607+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8608 CFI_REMEMBER_STATE
8609 jnz cstar_tracesys
8610 cmpq $IA32_NR_syscalls-1,%rax
8611@@ -317,12 +372,15 @@ cstar_do_call:
8612 cstar_dispatch:
8613 call *ia32_sys_call_table(,%rax,8)
8614 movq %rax,RAX-ARGOFFSET(%rsp)
8615+ GET_THREAD_INFO(%r11)
8616 DISABLE_INTERRUPTS(CLBR_NONE)
8617 TRACE_IRQS_OFF
8618- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8619+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8620 jnz sysretl_audit
8621 sysretl_from_sys_call:
8622- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8623+ pax_exit_kernel_user
8624+ pax_erase_kstack
8625+ andl $~TS_COMPAT,TI_status(%r11)
8626 RESTORE_ARGS 0,-ARG_SKIP,0,0,0
8627 movl RIP-ARGOFFSET(%rsp),%ecx
8628 CFI_REGISTER rip,rcx
8629@@ -350,7 +408,7 @@ sysretl_audit:
8630
8631 cstar_tracesys:
8632 #ifdef CONFIG_AUDITSYSCALL
8633- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8634+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8635 jz cstar_auditsys
8636 #endif
8637 xchgl %r9d,%ebp
8638@@ -359,6 +417,9 @@ cstar_tracesys:
8639 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8640 movq %rsp,%rdi /* &pt_regs -> arg1 */
8641 call syscall_trace_enter
8642+
8643+ pax_erase_kstack
8644+
8645 LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
8646 RESTORE_REST
8647 xchgl %ebp,%r9d
8648@@ -404,19 +465,21 @@ ENTRY(ia32_syscall)
8649 CFI_REL_OFFSET rip,RIP-RIP
8650 PARAVIRT_ADJUST_EXCEPTION_FRAME
8651 SWAPGS
8652- /*
8653- * No need to follow this irqs on/off section: the syscall
8654- * disabled irqs and here we enable it straight after entry:
8655- */
8656- ENABLE_INTERRUPTS(CLBR_NONE)
8657 movl %eax,%eax
8658 pushq_cfi %rax
8659 cld
8660 /* note the registers are not zero extended to the sf.
8661 this could be a problem. */
8662 SAVE_ARGS 0,1,0
8663- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8664- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8665+ pax_enter_kernel_user
8666+ /*
8667+ * No need to follow this irqs on/off section: the syscall
8668+ * disabled irqs and here we enable it straight after entry:
8669+ */
8670+ ENABLE_INTERRUPTS(CLBR_NONE)
8671+ GET_THREAD_INFO(%r11)
8672+ orl $TS_COMPAT,TI_status(%r11)
8673+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8674 jnz ia32_tracesys
8675 cmpq $(IA32_NR_syscalls-1),%rax
8676 ja ia32_badsys
8677@@ -435,6 +498,9 @@ ia32_tracesys:
8678 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8679 movq %rsp,%rdi /* &pt_regs -> arg1 */
8680 call syscall_trace_enter
8681+
8682+ pax_erase_kstack
8683+
8684 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8685 RESTORE_REST
8686 cmpq $(IA32_NR_syscalls-1),%rax
8687diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
8688index f6f5c53..b358b28 100644
8689--- a/arch/x86/ia32/sys_ia32.c
8690+++ b/arch/x86/ia32/sys_ia32.c
8691@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
8692 */
8693 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
8694 {
8695- typeof(ubuf->st_uid) uid = 0;
8696- typeof(ubuf->st_gid) gid = 0;
8697+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
8698+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
8699 SET_UID(uid, stat->uid);
8700 SET_GID(gid, stat->gid);
8701 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
8702@@ -308,8 +308,8 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
8703 }
8704 set_fs(KERNEL_DS);
8705 ret = sys_rt_sigprocmask(how,
8706- set ? (sigset_t __user *)&s : NULL,
8707- oset ? (sigset_t __user *)&s : NULL,
8708+ set ? (sigset_t __force_user *)&s : NULL,
8709+ oset ? (sigset_t __force_user *)&s : NULL,
8710 sigsetsize);
8711 set_fs(old_fs);
8712 if (ret)
8713@@ -332,7 +332,7 @@ asmlinkage long sys32_alarm(unsigned int seconds)
8714 return alarm_setitimer(seconds);
8715 }
8716
8717-asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr,
8718+asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,
8719 int options)
8720 {
8721 return compat_sys_wait4(pid, stat_addr, options, NULL);
8722@@ -353,7 +353,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
8723 mm_segment_t old_fs = get_fs();
8724
8725 set_fs(KERNEL_DS);
8726- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
8727+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
8728 set_fs(old_fs);
8729 if (put_compat_timespec(&t, interval))
8730 return -EFAULT;
8731@@ -369,7 +369,7 @@ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
8732 mm_segment_t old_fs = get_fs();
8733
8734 set_fs(KERNEL_DS);
8735- ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
8736+ ret = sys_rt_sigpending((sigset_t __force_user *)&s, sigsetsize);
8737 set_fs(old_fs);
8738 if (!ret) {
8739 switch (_NSIG_WORDS) {
8740@@ -394,7 +394,7 @@ asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,
8741 if (copy_siginfo_from_user32(&info, uinfo))
8742 return -EFAULT;
8743 set_fs(KERNEL_DS);
8744- ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
8745+ ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force_user *)&info);
8746 set_fs(old_fs);
8747 return ret;
8748 }
8749@@ -439,7 +439,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd,
8750 return -EFAULT;
8751
8752 set_fs(KERNEL_DS);
8753- ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
8754+ ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __force_user *)&of : NULL,
8755 count);
8756 set_fs(old_fs);
8757
8758diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
8759index 952bd01..7692c6f 100644
8760--- a/arch/x86/include/asm/alternative-asm.h
8761+++ b/arch/x86/include/asm/alternative-asm.h
8762@@ -15,6 +15,45 @@
8763 .endm
8764 #endif
8765
8766+#ifdef KERNEXEC_PLUGIN
8767+ .macro pax_force_retaddr_bts rip=0
8768+ btsq $63,\rip(%rsp)
8769+ .endm
8770+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
8771+ .macro pax_force_retaddr rip=0, reload=0
8772+ btsq $63,\rip(%rsp)
8773+ .endm
8774+ .macro pax_force_fptr ptr
8775+ btsq $63,\ptr
8776+ .endm
8777+ .macro pax_set_fptr_mask
8778+ .endm
8779+#endif
8780+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
8781+ .macro pax_force_retaddr rip=0, reload=0
8782+ .if \reload
8783+ pax_set_fptr_mask
8784+ .endif
8785+ orq %r10,\rip(%rsp)
8786+ .endm
8787+ .macro pax_force_fptr ptr
8788+ orq %r10,\ptr
8789+ .endm
8790+ .macro pax_set_fptr_mask
8791+ movabs $0x8000000000000000,%r10
8792+ .endm
8793+#endif
8794+#else
8795+ .macro pax_force_retaddr rip=0, reload=0
8796+ .endm
8797+ .macro pax_force_fptr ptr
8798+ .endm
8799+ .macro pax_force_retaddr_bts rip=0
8800+ .endm
8801+ .macro pax_set_fptr_mask
8802+ .endm
8803+#endif
8804+
8805 .macro altinstruction_entry orig alt feature orig_len alt_len
8806 .long \orig - .
8807 .long \alt - .
8808diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
8809index 37ad100..7d47faa 100644
8810--- a/arch/x86/include/asm/alternative.h
8811+++ b/arch/x86/include/asm/alternative.h
8812@@ -89,7 +89,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
8813 ".section .discard,\"aw\",@progbits\n" \
8814 " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
8815 ".previous\n" \
8816- ".section .altinstr_replacement, \"ax\"\n" \
8817+ ".section .altinstr_replacement, \"a\"\n" \
8818 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
8819 ".previous"
8820
8821diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
8822index 3ab9bdd..238033e 100644
8823--- a/arch/x86/include/asm/apic.h
8824+++ b/arch/x86/include/asm/apic.h
8825@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
8826
8827 #ifdef CONFIG_X86_LOCAL_APIC
8828
8829-extern unsigned int apic_verbosity;
8830+extern int apic_verbosity;
8831 extern int local_apic_timer_c2_ok;
8832
8833 extern int disable_apic;
8834diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
8835index 20370c6..a2eb9b0 100644
8836--- a/arch/x86/include/asm/apm.h
8837+++ b/arch/x86/include/asm/apm.h
8838@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
8839 __asm__ __volatile__(APM_DO_ZERO_SEGS
8840 "pushl %%edi\n\t"
8841 "pushl %%ebp\n\t"
8842- "lcall *%%cs:apm_bios_entry\n\t"
8843+ "lcall *%%ss:apm_bios_entry\n\t"
8844 "setc %%al\n\t"
8845 "popl %%ebp\n\t"
8846 "popl %%edi\n\t"
8847@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
8848 __asm__ __volatile__(APM_DO_ZERO_SEGS
8849 "pushl %%edi\n\t"
8850 "pushl %%ebp\n\t"
8851- "lcall *%%cs:apm_bios_entry\n\t"
8852+ "lcall *%%ss:apm_bios_entry\n\t"
8853 "setc %%bl\n\t"
8854 "popl %%ebp\n\t"
8855 "popl %%edi\n\t"
8856diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
8857index 58cb6d4..ca9010d 100644
8858--- a/arch/x86/include/asm/atomic.h
8859+++ b/arch/x86/include/asm/atomic.h
8860@@ -22,7 +22,18 @@
8861 */
8862 static inline int atomic_read(const atomic_t *v)
8863 {
8864- return (*(volatile int *)&(v)->counter);
8865+ return (*(volatile const int *)&(v)->counter);
8866+}
8867+
8868+/**
8869+ * atomic_read_unchecked - read atomic variable
8870+ * @v: pointer of type atomic_unchecked_t
8871+ *
8872+ * Atomically reads the value of @v.
8873+ */
8874+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
8875+{
8876+ return (*(volatile const int *)&(v)->counter);
8877 }
8878
8879 /**
8880@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i)
8881 }
8882
8883 /**
8884+ * atomic_set_unchecked - set atomic variable
8885+ * @v: pointer of type atomic_unchecked_t
8886+ * @i: required value
8887+ *
8888+ * Atomically sets the value of @v to @i.
8889+ */
8890+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
8891+{
8892+ v->counter = i;
8893+}
8894+
8895+/**
8896 * atomic_add - add integer to atomic variable
8897 * @i: integer value to add
8898 * @v: pointer of type atomic_t
8899@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *v, int i)
8900 */
8901 static inline void atomic_add(int i, atomic_t *v)
8902 {
8903- asm volatile(LOCK_PREFIX "addl %1,%0"
8904+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8905+
8906+#ifdef CONFIG_PAX_REFCOUNT
8907+ "jno 0f\n"
8908+ LOCK_PREFIX "subl %1,%0\n"
8909+ "int $4\n0:\n"
8910+ _ASM_EXTABLE(0b, 0b)
8911+#endif
8912+
8913+ : "+m" (v->counter)
8914+ : "ir" (i));
8915+}
8916+
8917+/**
8918+ * atomic_add_unchecked - add integer to atomic variable
8919+ * @i: integer value to add
8920+ * @v: pointer of type atomic_unchecked_t
8921+ *
8922+ * Atomically adds @i to @v.
8923+ */
8924+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
8925+{
8926+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8927 : "+m" (v->counter)
8928 : "ir" (i));
8929 }
8930@@ -60,7 +105,29 @@ static inline void atomic_add(int i, atomic_t *v)
8931 */
8932 static inline void atomic_sub(int i, atomic_t *v)
8933 {
8934- asm volatile(LOCK_PREFIX "subl %1,%0"
8935+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8936+
8937+#ifdef CONFIG_PAX_REFCOUNT
8938+ "jno 0f\n"
8939+ LOCK_PREFIX "addl %1,%0\n"
8940+ "int $4\n0:\n"
8941+ _ASM_EXTABLE(0b, 0b)
8942+#endif
8943+
8944+ : "+m" (v->counter)
8945+ : "ir" (i));
8946+}
8947+
8948+/**
8949+ * atomic_sub_unchecked - subtract integer from atomic variable
8950+ * @i: integer value to subtract
8951+ * @v: pointer of type atomic_unchecked_t
8952+ *
8953+ * Atomically subtracts @i from @v.
8954+ */
8955+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
8956+{
8957+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8958 : "+m" (v->counter)
8959 : "ir" (i));
8960 }
8961@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8962 {
8963 unsigned char c;
8964
8965- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
8966+ asm volatile(LOCK_PREFIX "subl %2,%0\n"
8967+
8968+#ifdef CONFIG_PAX_REFCOUNT
8969+ "jno 0f\n"
8970+ LOCK_PREFIX "addl %2,%0\n"
8971+ "int $4\n0:\n"
8972+ _ASM_EXTABLE(0b, 0b)
8973+#endif
8974+
8975+ "sete %1\n"
8976 : "+m" (v->counter), "=qm" (c)
8977 : "ir" (i) : "memory");
8978 return c;
8979@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8980 */
8981 static inline void atomic_inc(atomic_t *v)
8982 {
8983- asm volatile(LOCK_PREFIX "incl %0"
8984+ asm volatile(LOCK_PREFIX "incl %0\n"
8985+
8986+#ifdef CONFIG_PAX_REFCOUNT
8987+ "jno 0f\n"
8988+ LOCK_PREFIX "decl %0\n"
8989+ "int $4\n0:\n"
8990+ _ASM_EXTABLE(0b, 0b)
8991+#endif
8992+
8993+ : "+m" (v->counter));
8994+}
8995+
8996+/**
8997+ * atomic_inc_unchecked - increment atomic variable
8998+ * @v: pointer of type atomic_unchecked_t
8999+ *
9000+ * Atomically increments @v by 1.
9001+ */
9002+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9003+{
9004+ asm volatile(LOCK_PREFIX "incl %0\n"
9005 : "+m" (v->counter));
9006 }
9007
9008@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *v)
9009 */
9010 static inline void atomic_dec(atomic_t *v)
9011 {
9012- asm volatile(LOCK_PREFIX "decl %0"
9013+ asm volatile(LOCK_PREFIX "decl %0\n"
9014+
9015+#ifdef CONFIG_PAX_REFCOUNT
9016+ "jno 0f\n"
9017+ LOCK_PREFIX "incl %0\n"
9018+ "int $4\n0:\n"
9019+ _ASM_EXTABLE(0b, 0b)
9020+#endif
9021+
9022+ : "+m" (v->counter));
9023+}
9024+
9025+/**
9026+ * atomic_dec_unchecked - decrement atomic variable
9027+ * @v: pointer of type atomic_unchecked_t
9028+ *
9029+ * Atomically decrements @v by 1.
9030+ */
9031+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9032+{
9033+ asm volatile(LOCK_PREFIX "decl %0\n"
9034 : "+m" (v->counter));
9035 }
9036
9037@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
9038 {
9039 unsigned char c;
9040
9041- asm volatile(LOCK_PREFIX "decl %0; sete %1"
9042+ asm volatile(LOCK_PREFIX "decl %0\n"
9043+
9044+#ifdef CONFIG_PAX_REFCOUNT
9045+ "jno 0f\n"
9046+ LOCK_PREFIX "incl %0\n"
9047+ "int $4\n0:\n"
9048+ _ASM_EXTABLE(0b, 0b)
9049+#endif
9050+
9051+ "sete %1\n"
9052 : "+m" (v->counter), "=qm" (c)
9053 : : "memory");
9054 return c != 0;
9055@@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
9056 {
9057 unsigned char c;
9058
9059- asm volatile(LOCK_PREFIX "incl %0; sete %1"
9060+ asm volatile(LOCK_PREFIX "incl %0\n"
9061+
9062+#ifdef CONFIG_PAX_REFCOUNT
9063+ "jno 0f\n"
9064+ LOCK_PREFIX "decl %0\n"
9065+ "int $4\n0:\n"
9066+ _ASM_EXTABLE(0b, 0b)
9067+#endif
9068+
9069+ "sete %1\n"
9070+ : "+m" (v->counter), "=qm" (c)
9071+ : : "memory");
9072+ return c != 0;
9073+}
9074+
9075+/**
9076+ * atomic_inc_and_test_unchecked - increment and test
9077+ * @v: pointer of type atomic_unchecked_t
9078+ *
9079+ * Atomically increments @v by 1
9080+ * and returns true if the result is zero, or false for all
9081+ * other cases.
9082+ */
9083+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9084+{
9085+ unsigned char c;
9086+
9087+ asm volatile(LOCK_PREFIX "incl %0\n"
9088+ "sete %1\n"
9089 : "+m" (v->counter), "=qm" (c)
9090 : : "memory");
9091 return c != 0;
9092@@ -157,7 +310,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
9093 {
9094 unsigned char c;
9095
9096- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
9097+ asm volatile(LOCK_PREFIX "addl %2,%0\n"
9098+
9099+#ifdef CONFIG_PAX_REFCOUNT
9100+ "jno 0f\n"
9101+ LOCK_PREFIX "subl %2,%0\n"
9102+ "int $4\n0:\n"
9103+ _ASM_EXTABLE(0b, 0b)
9104+#endif
9105+
9106+ "sets %1\n"
9107 : "+m" (v->counter), "=qm" (c)
9108 : "ir" (i) : "memory");
9109 return c;
9110@@ -179,7 +341,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
9111 goto no_xadd;
9112 #endif
9113 /* Modern 486+ processor */
9114- return i + xadd(&v->counter, i);
9115+ return i + xadd_check_overflow(&v->counter, i);
9116
9117 #ifdef CONFIG_M386
9118 no_xadd: /* Legacy 386 processor */
9119@@ -192,6 +354,34 @@ no_xadd: /* Legacy 386 processor */
9120 }
9121
9122 /**
9123+ * atomic_add_return_unchecked - add integer and return
9124+ * @i: integer value to add
9125+ * @v: pointer of type atomic_unchecked_t
9126+ *
9127+ * Atomically adds @i to @v and returns @i + @v
9128+ */
9129+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
9130+{
9131+#ifdef CONFIG_M386
9132+ int __i;
9133+ unsigned long flags;
9134+ if (unlikely(boot_cpu_data.x86 <= 3))
9135+ goto no_xadd;
9136+#endif
9137+ /* Modern 486+ processor */
9138+ return i + xadd(&v->counter, i);
9139+
9140+#ifdef CONFIG_M386
9141+no_xadd: /* Legacy 386 processor */
9142+ raw_local_irq_save(flags);
9143+ __i = atomic_read_unchecked(v);
9144+ atomic_set_unchecked(v, i + __i);
9145+ raw_local_irq_restore(flags);
9146+ return i + __i;
9147+#endif
9148+}
9149+
9150+/**
9151 * atomic_sub_return - subtract integer and return
9152 * @v: pointer of type atomic_t
9153 * @i: integer value to subtract
9154@@ -204,6 +394,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
9155 }
9156
9157 #define atomic_inc_return(v) (atomic_add_return(1, v))
9158+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9159+{
9160+ return atomic_add_return_unchecked(1, v);
9161+}
9162 #define atomic_dec_return(v) (atomic_sub_return(1, v))
9163
9164 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
9165@@ -211,11 +405,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
9166 return cmpxchg(&v->counter, old, new);
9167 }
9168
9169+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9170+{
9171+ return cmpxchg(&v->counter, old, new);
9172+}
9173+
9174 static inline int atomic_xchg(atomic_t *v, int new)
9175 {
9176 return xchg(&v->counter, new);
9177 }
9178
9179+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9180+{
9181+ return xchg(&v->counter, new);
9182+}
9183+
9184 /**
9185 * __atomic_add_unless - add unless the number is already a given value
9186 * @v: pointer of type atomic_t
9187@@ -227,12 +431,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
9188 */
9189 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9190 {
9191- int c, old;
9192+ int c, old, new;
9193 c = atomic_read(v);
9194 for (;;) {
9195- if (unlikely(c == (u)))
9196+ if (unlikely(c == u))
9197 break;
9198- old = atomic_cmpxchg((v), c, c + (a));
9199+
9200+ asm volatile("addl %2,%0\n"
9201+
9202+#ifdef CONFIG_PAX_REFCOUNT
9203+ "jno 0f\n"
9204+ "subl %2,%0\n"
9205+ "int $4\n0:\n"
9206+ _ASM_EXTABLE(0b, 0b)
9207+#endif
9208+
9209+ : "=r" (new)
9210+ : "0" (c), "ir" (a));
9211+
9212+ old = atomic_cmpxchg(v, c, new);
9213 if (likely(old == c))
9214 break;
9215 c = old;
9216@@ -240,6 +457,48 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9217 return c;
9218 }
9219
9220+/**
9221+ * atomic_inc_not_zero_hint - increment if not null
9222+ * @v: pointer of type atomic_t
9223+ * @hint: probable value of the atomic before the increment
9224+ *
9225+ * This version of atomic_inc_not_zero() gives a hint of probable
9226+ * value of the atomic. This helps processor to not read the memory
9227+ * before doing the atomic read/modify/write cycle, lowering
9228+ * number of bus transactions on some arches.
9229+ *
9230+ * Returns: 0 if increment was not done, 1 otherwise.
9231+ */
9232+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
9233+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
9234+{
9235+ int val, c = hint, new;
9236+
9237+ /* sanity test, should be removed by compiler if hint is a constant */
9238+ if (!hint)
9239+ return __atomic_add_unless(v, 1, 0);
9240+
9241+ do {
9242+ asm volatile("incl %0\n"
9243+
9244+#ifdef CONFIG_PAX_REFCOUNT
9245+ "jno 0f\n"
9246+ "decl %0\n"
9247+ "int $4\n0:\n"
9248+ _ASM_EXTABLE(0b, 0b)
9249+#endif
9250+
9251+ : "=r" (new)
9252+ : "0" (c));
9253+
9254+ val = atomic_cmpxchg(v, c, new);
9255+ if (val == c)
9256+ return 1;
9257+ c = val;
9258+ } while (c);
9259+
9260+ return 0;
9261+}
9262
9263 /*
9264 * atomic_dec_if_positive - decrement by 1 if old value positive
9265diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
9266index fa13f0e..27c2e08 100644
9267--- a/arch/x86/include/asm/atomic64_32.h
9268+++ b/arch/x86/include/asm/atomic64_32.h
9269@@ -12,6 +12,14 @@ typedef struct {
9270 u64 __aligned(8) counter;
9271 } atomic64_t;
9272
9273+#ifdef CONFIG_PAX_REFCOUNT
9274+typedef struct {
9275+ u64 __aligned(8) counter;
9276+} atomic64_unchecked_t;
9277+#else
9278+typedef atomic64_t atomic64_unchecked_t;
9279+#endif
9280+
9281 #define ATOMIC64_INIT(val) { (val) }
9282
9283 #ifdef CONFIG_X86_CMPXCHG64
9284@@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
9285 }
9286
9287 /**
9288+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
9289+ * @p: pointer to type atomic64_unchecked_t
9290+ * @o: expected value
9291+ * @n: new value
9292+ *
9293+ * Atomically sets @v to @n if it was equal to @o and returns
9294+ * the old value.
9295+ */
9296+
9297+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
9298+{
9299+ return cmpxchg64(&v->counter, o, n);
9300+}
9301+
9302+/**
9303 * atomic64_xchg - xchg atomic64 variable
9304 * @v: pointer to type atomic64_t
9305 * @n: value to assign
9306@@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64_t *v, long long i)
9307 }
9308
9309 /**
9310+ * atomic64_set_unchecked - set atomic64 variable
9311+ * @v: pointer to type atomic64_unchecked_t
9312+ * @n: value to assign
9313+ *
9314+ * Atomically sets the value of @v to @n.
9315+ */
9316+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
9317+{
9318+ unsigned high = (unsigned)(i >> 32);
9319+ unsigned low = (unsigned)i;
9320+ asm volatile(ATOMIC64_ALTERNATIVE(set)
9321+ : "+b" (low), "+c" (high)
9322+ : "S" (v)
9323+ : "eax", "edx", "memory"
9324+ );
9325+}
9326+
9327+/**
9328 * atomic64_read - read atomic64 variable
9329 * @v: pointer to type atomic64_t
9330 *
9331@@ -93,6 +134,22 @@ static inline long long atomic64_read(const atomic64_t *v)
9332 }
9333
9334 /**
9335+ * atomic64_read_unchecked - read atomic64 variable
9336+ * @v: pointer to type atomic64_unchecked_t
9337+ *
9338+ * Atomically reads the value of @v and returns it.
9339+ */
9340+static inline long long atomic64_read_unchecked(atomic64_unchecked_t *v)
9341+{
9342+ long long r;
9343+ asm volatile(ATOMIC64_ALTERNATIVE(read_unchecked)
9344+ : "=A" (r), "+c" (v)
9345+ : : "memory"
9346+ );
9347+ return r;
9348+ }
9349+
9350+/**
9351 * atomic64_add_return - add and return
9352 * @i: integer value to add
9353 * @v: pointer to type atomic64_t
9354@@ -108,6 +165,22 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
9355 return i;
9356 }
9357
9358+/**
9359+ * atomic64_add_return_unchecked - add and return
9360+ * @i: integer value to add
9361+ * @v: pointer to type atomic64_unchecked_t
9362+ *
9363+ * Atomically adds @i to @v and returns @i + *@v
9364+ */
9365+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
9366+{
9367+ asm volatile(ATOMIC64_ALTERNATIVE(add_return_unchecked)
9368+ : "+A" (i), "+c" (v)
9369+ : : "memory"
9370+ );
9371+ return i;
9372+}
9373+
9374 /*
9375 * Other variants with different arithmetic operators:
9376 */
9377@@ -131,6 +204,17 @@ static inline long long atomic64_inc_return(atomic64_t *v)
9378 return a;
9379 }
9380
9381+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9382+{
9383+ long long a;
9384+ asm volatile(ATOMIC64_ALTERNATIVE(inc_return_unchecked)
9385+ : "=A" (a)
9386+ : "S" (v)
9387+ : "memory", "ecx"
9388+ );
9389+ return a;
9390+}
9391+
9392 static inline long long atomic64_dec_return(atomic64_t *v)
9393 {
9394 long long a;
9395@@ -159,6 +243,22 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
9396 }
9397
9398 /**
9399+ * atomic64_add_unchecked - add integer to atomic64 variable
9400+ * @i: integer value to add
9401+ * @v: pointer to type atomic64_unchecked_t
9402+ *
9403+ * Atomically adds @i to @v.
9404+ */
9405+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
9406+{
9407+ asm volatile(ATOMIC64_ALTERNATIVE_(add_unchecked, add_return_unchecked)
9408+ : "+A" (i), "+c" (v)
9409+ : : "memory"
9410+ );
9411+ return i;
9412+}
9413+
9414+/**
9415 * atomic64_sub - subtract the atomic64 variable
9416 * @i: integer value to subtract
9417 * @v: pointer to type atomic64_t
9418diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
9419index 0e1cbfc..5623683 100644
9420--- a/arch/x86/include/asm/atomic64_64.h
9421+++ b/arch/x86/include/asm/atomic64_64.h
9422@@ -18,7 +18,19 @@
9423 */
9424 static inline long atomic64_read(const atomic64_t *v)
9425 {
9426- return (*(volatile long *)&(v)->counter);
9427+ return (*(volatile const long *)&(v)->counter);
9428+}
9429+
9430+/**
9431+ * atomic64_read_unchecked - read atomic64 variable
9432+ * @v: pointer of type atomic64_unchecked_t
9433+ *
9434+ * Atomically reads the value of @v.
9435+ * Doesn't imply a read memory barrier.
9436+ */
9437+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9438+{
9439+ return (*(volatile const long *)&(v)->counter);
9440 }
9441
9442 /**
9443@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
9444 }
9445
9446 /**
9447+ * atomic64_set_unchecked - set atomic64 variable
9448+ * @v: pointer to type atomic64_unchecked_t
9449+ * @i: required value
9450+ *
9451+ * Atomically sets the value of @v to @i.
9452+ */
9453+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9454+{
9455+ v->counter = i;
9456+}
9457+
9458+/**
9459 * atomic64_add - add integer to atomic64 variable
9460 * @i: integer value to add
9461 * @v: pointer to type atomic64_t
9462@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
9463 */
9464 static inline void atomic64_add(long i, atomic64_t *v)
9465 {
9466+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
9467+
9468+#ifdef CONFIG_PAX_REFCOUNT
9469+ "jno 0f\n"
9470+ LOCK_PREFIX "subq %1,%0\n"
9471+ "int $4\n0:\n"
9472+ _ASM_EXTABLE(0b, 0b)
9473+#endif
9474+
9475+ : "=m" (v->counter)
9476+ : "er" (i), "m" (v->counter));
9477+}
9478+
9479+/**
9480+ * atomic64_add_unchecked - add integer to atomic64 variable
9481+ * @i: integer value to add
9482+ * @v: pointer to type atomic64_unchecked_t
9483+ *
9484+ * Atomically adds @i to @v.
9485+ */
9486+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
9487+{
9488 asm volatile(LOCK_PREFIX "addq %1,%0"
9489 : "=m" (v->counter)
9490 : "er" (i), "m" (v->counter));
9491@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
9492 */
9493 static inline void atomic64_sub(long i, atomic64_t *v)
9494 {
9495- asm volatile(LOCK_PREFIX "subq %1,%0"
9496+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
9497+
9498+#ifdef CONFIG_PAX_REFCOUNT
9499+ "jno 0f\n"
9500+ LOCK_PREFIX "addq %1,%0\n"
9501+ "int $4\n0:\n"
9502+ _ASM_EXTABLE(0b, 0b)
9503+#endif
9504+
9505+ : "=m" (v->counter)
9506+ : "er" (i), "m" (v->counter));
9507+}
9508+
9509+/**
9510+ * atomic64_sub_unchecked - subtract the atomic64 variable
9511+ * @i: integer value to subtract
9512+ * @v: pointer to type atomic64_unchecked_t
9513+ *
9514+ * Atomically subtracts @i from @v.
9515+ */
9516+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
9517+{
9518+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
9519 : "=m" (v->counter)
9520 : "er" (i), "m" (v->counter));
9521 }
9522@@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9523 {
9524 unsigned char c;
9525
9526- asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
9527+ asm volatile(LOCK_PREFIX "subq %2,%0\n"
9528+
9529+#ifdef CONFIG_PAX_REFCOUNT
9530+ "jno 0f\n"
9531+ LOCK_PREFIX "addq %2,%0\n"
9532+ "int $4\n0:\n"
9533+ _ASM_EXTABLE(0b, 0b)
9534+#endif
9535+
9536+ "sete %1\n"
9537 : "=m" (v->counter), "=qm" (c)
9538 : "er" (i), "m" (v->counter) : "memory");
9539 return c;
9540@@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9541 */
9542 static inline void atomic64_inc(atomic64_t *v)
9543 {
9544+ asm volatile(LOCK_PREFIX "incq %0\n"
9545+
9546+#ifdef CONFIG_PAX_REFCOUNT
9547+ "jno 0f\n"
9548+ LOCK_PREFIX "decq %0\n"
9549+ "int $4\n0:\n"
9550+ _ASM_EXTABLE(0b, 0b)
9551+#endif
9552+
9553+ : "=m" (v->counter)
9554+ : "m" (v->counter));
9555+}
9556+
9557+/**
9558+ * atomic64_inc_unchecked - increment atomic64 variable
9559+ * @v: pointer to type atomic64_unchecked_t
9560+ *
9561+ * Atomically increments @v by 1.
9562+ */
9563+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9564+{
9565 asm volatile(LOCK_PREFIX "incq %0"
9566 : "=m" (v->counter)
9567 : "m" (v->counter));
9568@@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64_t *v)
9569 */
9570 static inline void atomic64_dec(atomic64_t *v)
9571 {
9572- asm volatile(LOCK_PREFIX "decq %0"
9573+ asm volatile(LOCK_PREFIX "decq %0\n"
9574+
9575+#ifdef CONFIG_PAX_REFCOUNT
9576+ "jno 0f\n"
9577+ LOCK_PREFIX "incq %0\n"
9578+ "int $4\n0:\n"
9579+ _ASM_EXTABLE(0b, 0b)
9580+#endif
9581+
9582+ : "=m" (v->counter)
9583+ : "m" (v->counter));
9584+}
9585+
9586+/**
9587+ * atomic64_dec_unchecked - decrement atomic64 variable
9588+ * @v: pointer to type atomic64_t
9589+ *
9590+ * Atomically decrements @v by 1.
9591+ */
9592+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9593+{
9594+ asm volatile(LOCK_PREFIX "decq %0\n"
9595 : "=m" (v->counter)
9596 : "m" (v->counter));
9597 }
9598@@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
9599 {
9600 unsigned char c;
9601
9602- asm volatile(LOCK_PREFIX "decq %0; sete %1"
9603+ asm volatile(LOCK_PREFIX "decq %0\n"
9604+
9605+#ifdef CONFIG_PAX_REFCOUNT
9606+ "jno 0f\n"
9607+ LOCK_PREFIX "incq %0\n"
9608+ "int $4\n0:\n"
9609+ _ASM_EXTABLE(0b, 0b)
9610+#endif
9611+
9612+ "sete %1\n"
9613 : "=m" (v->counter), "=qm" (c)
9614 : "m" (v->counter) : "memory");
9615 return c != 0;
9616@@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
9617 {
9618 unsigned char c;
9619
9620- asm volatile(LOCK_PREFIX "incq %0; sete %1"
9621+ asm volatile(LOCK_PREFIX "incq %0\n"
9622+
9623+#ifdef CONFIG_PAX_REFCOUNT
9624+ "jno 0f\n"
9625+ LOCK_PREFIX "decq %0\n"
9626+ "int $4\n0:\n"
9627+ _ASM_EXTABLE(0b, 0b)
9628+#endif
9629+
9630+ "sete %1\n"
9631 : "=m" (v->counter), "=qm" (c)
9632 : "m" (v->counter) : "memory");
9633 return c != 0;
9634@@ -155,7 +292,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9635 {
9636 unsigned char c;
9637
9638- asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
9639+ asm volatile(LOCK_PREFIX "addq %2,%0\n"
9640+
9641+#ifdef CONFIG_PAX_REFCOUNT
9642+ "jno 0f\n"
9643+ LOCK_PREFIX "subq %2,%0\n"
9644+ "int $4\n0:\n"
9645+ _ASM_EXTABLE(0b, 0b)
9646+#endif
9647+
9648+ "sets %1\n"
9649 : "=m" (v->counter), "=qm" (c)
9650 : "er" (i), "m" (v->counter) : "memory");
9651 return c;
9652@@ -170,6 +316,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9653 */
9654 static inline long atomic64_add_return(long i, atomic64_t *v)
9655 {
9656+ return i + xadd_check_overflow(&v->counter, i);
9657+}
9658+
9659+/**
9660+ * atomic64_add_return_unchecked - add and return
9661+ * @i: integer value to add
9662+ * @v: pointer to type atomic64_unchecked_t
9663+ *
9664+ * Atomically adds @i to @v and returns @i + @v
9665+ */
9666+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
9667+{
9668 return i + xadd(&v->counter, i);
9669 }
9670
9671@@ -179,6 +337,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
9672 }
9673
9674 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
9675+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9676+{
9677+ return atomic64_add_return_unchecked(1, v);
9678+}
9679 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
9680
9681 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9682@@ -186,6 +348,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9683 return cmpxchg(&v->counter, old, new);
9684 }
9685
9686+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
9687+{
9688+ return cmpxchg(&v->counter, old, new);
9689+}
9690+
9691 static inline long atomic64_xchg(atomic64_t *v, long new)
9692 {
9693 return xchg(&v->counter, new);
9694@@ -202,17 +369,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
9695 */
9696 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
9697 {
9698- long c, old;
9699+ long c, old, new;
9700 c = atomic64_read(v);
9701 for (;;) {
9702- if (unlikely(c == (u)))
9703+ if (unlikely(c == u))
9704 break;
9705- old = atomic64_cmpxchg((v), c, c + (a));
9706+
9707+ asm volatile("add %2,%0\n"
9708+
9709+#ifdef CONFIG_PAX_REFCOUNT
9710+ "jno 0f\n"
9711+ "sub %2,%0\n"
9712+ "int $4\n0:\n"
9713+ _ASM_EXTABLE(0b, 0b)
9714+#endif
9715+
9716+ : "=r" (new)
9717+ : "0" (c), "ir" (a));
9718+
9719+ old = atomic64_cmpxchg(v, c, new);
9720 if (likely(old == c))
9721 break;
9722 c = old;
9723 }
9724- return c != (u);
9725+ return c != u;
9726 }
9727
9728 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9729diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
9730index b97596e..9bd48b06 100644
9731--- a/arch/x86/include/asm/bitops.h
9732+++ b/arch/x86/include/asm/bitops.h
9733@@ -38,7 +38,7 @@
9734 * a mask operation on a byte.
9735 */
9736 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
9737-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
9738+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
9739 #define CONST_MASK(nr) (1 << ((nr) & 7))
9740
9741 /**
9742diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
9743index 5e1a2ee..c9f9533 100644
9744--- a/arch/x86/include/asm/boot.h
9745+++ b/arch/x86/include/asm/boot.h
9746@@ -11,10 +11,15 @@
9747 #include <asm/pgtable_types.h>
9748
9749 /* Physical address where kernel should be loaded. */
9750-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9751+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9752 + (CONFIG_PHYSICAL_ALIGN - 1)) \
9753 & ~(CONFIG_PHYSICAL_ALIGN - 1))
9754
9755+#ifndef __ASSEMBLY__
9756+extern unsigned char __LOAD_PHYSICAL_ADDR[];
9757+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
9758+#endif
9759+
9760 /* Minimum kernel alignment, as a power of two */
9761 #ifdef CONFIG_X86_64
9762 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
9763diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
9764index 48f99f1..d78ebf9 100644
9765--- a/arch/x86/include/asm/cache.h
9766+++ b/arch/x86/include/asm/cache.h
9767@@ -5,12 +5,13 @@
9768
9769 /* L1 cache line size */
9770 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
9771-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9772+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9773
9774 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9775+#define __read_only __attribute__((__section__(".data..read_only")))
9776
9777 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
9778-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
9779+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
9780
9781 #ifdef CONFIG_X86_VSMP
9782 #ifdef CONFIG_SMP
9783diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
9784index 4e12668..501d239 100644
9785--- a/arch/x86/include/asm/cacheflush.h
9786+++ b/arch/x86/include/asm/cacheflush.h
9787@@ -26,7 +26,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
9788 unsigned long pg_flags = pg->flags & _PGMT_MASK;
9789
9790 if (pg_flags == _PGMT_DEFAULT)
9791- return -1;
9792+ return ~0UL;
9793 else if (pg_flags == _PGMT_WC)
9794 return _PAGE_CACHE_WC;
9795 else if (pg_flags == _PGMT_UC_MINUS)
9796diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
9797index 46fc474..b02b0f9 100644
9798--- a/arch/x86/include/asm/checksum_32.h
9799+++ b/arch/x86/include/asm/checksum_32.h
9800@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
9801 int len, __wsum sum,
9802 int *src_err_ptr, int *dst_err_ptr);
9803
9804+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
9805+ int len, __wsum sum,
9806+ int *src_err_ptr, int *dst_err_ptr);
9807+
9808+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
9809+ int len, __wsum sum,
9810+ int *src_err_ptr, int *dst_err_ptr);
9811+
9812 /*
9813 * Note: when you get a NULL pointer exception here this means someone
9814 * passed in an incorrect kernel address to one of these functions.
9815@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
9816 int *err_ptr)
9817 {
9818 might_sleep();
9819- return csum_partial_copy_generic((__force void *)src, dst,
9820+ return csum_partial_copy_generic_from_user((__force void *)src, dst,
9821 len, sum, err_ptr, NULL);
9822 }
9823
9824@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
9825 {
9826 might_sleep();
9827 if (access_ok(VERIFY_WRITE, dst, len))
9828- return csum_partial_copy_generic(src, (__force void *)dst,
9829+ return csum_partial_copy_generic_to_user(src, (__force void *)dst,
9830 len, sum, NULL, err_ptr);
9831
9832 if (len)
9833diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
9834index 99480e5..d81165b 100644
9835--- a/arch/x86/include/asm/cmpxchg.h
9836+++ b/arch/x86/include/asm/cmpxchg.h
9837@@ -14,8 +14,12 @@ extern void __cmpxchg_wrong_size(void)
9838 __compiletime_error("Bad argument size for cmpxchg");
9839 extern void __xadd_wrong_size(void)
9840 __compiletime_error("Bad argument size for xadd");
9841+extern void __xadd_check_overflow_wrong_size(void)
9842+ __compiletime_error("Bad argument size for xadd_check_overflow");
9843 extern void __add_wrong_size(void)
9844 __compiletime_error("Bad argument size for add");
9845+extern void __add_check_overflow_wrong_size(void)
9846+ __compiletime_error("Bad argument size for add_check_overflow");
9847
9848 /*
9849 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
9850@@ -67,6 +71,34 @@ extern void __add_wrong_size(void)
9851 __ret; \
9852 })
9853
9854+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
9855+ ({ \
9856+ __typeof__ (*(ptr)) __ret = (arg); \
9857+ switch (sizeof(*(ptr))) { \
9858+ case __X86_CASE_L: \
9859+ asm volatile (lock #op "l %0, %1\n" \
9860+ "jno 0f\n" \
9861+ "mov %0,%1\n" \
9862+ "int $4\n0:\n" \
9863+ _ASM_EXTABLE(0b, 0b) \
9864+ : "+r" (__ret), "+m" (*(ptr)) \
9865+ : : "memory", "cc"); \
9866+ break; \
9867+ case __X86_CASE_Q: \
9868+ asm volatile (lock #op "q %q0, %1\n" \
9869+ "jno 0f\n" \
9870+ "mov %0,%1\n" \
9871+ "int $4\n0:\n" \
9872+ _ASM_EXTABLE(0b, 0b) \
9873+ : "+r" (__ret), "+m" (*(ptr)) \
9874+ : : "memory", "cc"); \
9875+ break; \
9876+ default: \
9877+ __ ## op ## _check_overflow_wrong_size(); \
9878+ } \
9879+ __ret; \
9880+ })
9881+
9882 /*
9883 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
9884 * Since this is generally used to protect other memory information, we
9885@@ -167,6 +199,9 @@ extern void __add_wrong_size(void)
9886 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
9887 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
9888
9889+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
9890+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
9891+
9892 #define __add(ptr, inc, lock) \
9893 ({ \
9894 __typeof__ (*(ptr)) __ret = (inc); \
9895diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
9896index 8d67d42..183d0eb 100644
9897--- a/arch/x86/include/asm/cpufeature.h
9898+++ b/arch/x86/include/asm/cpufeature.h
9899@@ -367,7 +367,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
9900 ".section .discard,\"aw\",@progbits\n"
9901 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
9902 ".previous\n"
9903- ".section .altinstr_replacement,\"ax\"\n"
9904+ ".section .altinstr_replacement,\"a\"\n"
9905 "3: movb $1,%0\n"
9906 "4:\n"
9907 ".previous\n"
9908diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
9909index e95822d..a90010e 100644
9910--- a/arch/x86/include/asm/desc.h
9911+++ b/arch/x86/include/asm/desc.h
9912@@ -4,6 +4,7 @@
9913 #include <asm/desc_defs.h>
9914 #include <asm/ldt.h>
9915 #include <asm/mmu.h>
9916+#include <asm/pgtable.h>
9917
9918 #include <linux/smp.h>
9919
9920@@ -16,6 +17,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
9921
9922 desc->type = (info->read_exec_only ^ 1) << 1;
9923 desc->type |= info->contents << 2;
9924+ desc->type |= info->seg_not_present ^ 1;
9925
9926 desc->s = 1;
9927 desc->dpl = 0x3;
9928@@ -34,19 +36,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
9929 }
9930
9931 extern struct desc_ptr idt_descr;
9932-extern gate_desc idt_table[];
9933 extern struct desc_ptr nmi_idt_descr;
9934-extern gate_desc nmi_idt_table[];
9935-
9936-struct gdt_page {
9937- struct desc_struct gdt[GDT_ENTRIES];
9938-} __attribute__((aligned(PAGE_SIZE)));
9939-
9940-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
9941+extern gate_desc idt_table[256];
9942+extern gate_desc nmi_idt_table[256];
9943
9944+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
9945 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
9946 {
9947- return per_cpu(gdt_page, cpu).gdt;
9948+ return cpu_gdt_table[cpu];
9949 }
9950
9951 #ifdef CONFIG_X86_64
9952@@ -71,8 +68,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
9953 unsigned long base, unsigned dpl, unsigned flags,
9954 unsigned short seg)
9955 {
9956- gate->a = (seg << 16) | (base & 0xffff);
9957- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
9958+ gate->gate.offset_low = base;
9959+ gate->gate.seg = seg;
9960+ gate->gate.reserved = 0;
9961+ gate->gate.type = type;
9962+ gate->gate.s = 0;
9963+ gate->gate.dpl = dpl;
9964+ gate->gate.p = 1;
9965+ gate->gate.offset_high = base >> 16;
9966 }
9967
9968 #endif
9969@@ -117,12 +120,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
9970
9971 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
9972 {
9973+ pax_open_kernel();
9974 memcpy(&idt[entry], gate, sizeof(*gate));
9975+ pax_close_kernel();
9976 }
9977
9978 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
9979 {
9980+ pax_open_kernel();
9981 memcpy(&ldt[entry], desc, 8);
9982+ pax_close_kernel();
9983 }
9984
9985 static inline void
9986@@ -136,7 +143,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
9987 default: size = sizeof(*gdt); break;
9988 }
9989
9990+ pax_open_kernel();
9991 memcpy(&gdt[entry], desc, size);
9992+ pax_close_kernel();
9993 }
9994
9995 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
9996@@ -209,7 +218,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
9997
9998 static inline void native_load_tr_desc(void)
9999 {
10000+ pax_open_kernel();
10001 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
10002+ pax_close_kernel();
10003 }
10004
10005 static inline void native_load_gdt(const struct desc_ptr *dtr)
10006@@ -246,8 +257,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
10007 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
10008 unsigned int i;
10009
10010+ pax_open_kernel();
10011 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
10012 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
10013+ pax_close_kernel();
10014 }
10015
10016 #define _LDT_empty(info) \
10017@@ -310,7 +323,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
10018 }
10019
10020 #ifdef CONFIG_X86_64
10021-static inline void set_nmi_gate(int gate, void *addr)
10022+static inline void set_nmi_gate(int gate, const void *addr)
10023 {
10024 gate_desc s;
10025
10026@@ -319,7 +332,7 @@ static inline void set_nmi_gate(int gate, void *addr)
10027 }
10028 #endif
10029
10030-static inline void _set_gate(int gate, unsigned type, void *addr,
10031+static inline void _set_gate(int gate, unsigned type, const void *addr,
10032 unsigned dpl, unsigned ist, unsigned seg)
10033 {
10034 gate_desc s;
10035@@ -338,7 +351,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
10036 * Pentium F0 0F bugfix can have resulted in the mapped
10037 * IDT being write-protected.
10038 */
10039-static inline void set_intr_gate(unsigned int n, void *addr)
10040+static inline void set_intr_gate(unsigned int n, const void *addr)
10041 {
10042 BUG_ON((unsigned)n > 0xFF);
10043 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
10044@@ -368,19 +381,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
10045 /*
10046 * This routine sets up an interrupt gate at directory privilege level 3.
10047 */
10048-static inline void set_system_intr_gate(unsigned int n, void *addr)
10049+static inline void set_system_intr_gate(unsigned int n, const void *addr)
10050 {
10051 BUG_ON((unsigned)n > 0xFF);
10052 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
10053 }
10054
10055-static inline void set_system_trap_gate(unsigned int n, void *addr)
10056+static inline void set_system_trap_gate(unsigned int n, const void *addr)
10057 {
10058 BUG_ON((unsigned)n > 0xFF);
10059 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
10060 }
10061
10062-static inline void set_trap_gate(unsigned int n, void *addr)
10063+static inline void set_trap_gate(unsigned int n, const void *addr)
10064 {
10065 BUG_ON((unsigned)n > 0xFF);
10066 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
10067@@ -389,19 +402,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
10068 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
10069 {
10070 BUG_ON((unsigned)n > 0xFF);
10071- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
10072+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
10073 }
10074
10075-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
10076+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
10077 {
10078 BUG_ON((unsigned)n > 0xFF);
10079 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
10080 }
10081
10082-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
10083+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
10084 {
10085 BUG_ON((unsigned)n > 0xFF);
10086 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
10087 }
10088
10089+#ifdef CONFIG_X86_32
10090+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
10091+{
10092+ struct desc_struct d;
10093+
10094+ if (likely(limit))
10095+ limit = (limit - 1UL) >> PAGE_SHIFT;
10096+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
10097+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
10098+}
10099+#endif
10100+
10101 #endif /* _ASM_X86_DESC_H */
10102diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
10103index 278441f..b95a174 100644
10104--- a/arch/x86/include/asm/desc_defs.h
10105+++ b/arch/x86/include/asm/desc_defs.h
10106@@ -31,6 +31,12 @@ struct desc_struct {
10107 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
10108 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
10109 };
10110+ struct {
10111+ u16 offset_low;
10112+ u16 seg;
10113+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
10114+ unsigned offset_high: 16;
10115+ } gate;
10116 };
10117 } __attribute__((packed));
10118
10119diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
10120index 3778256..c5d4fce 100644
10121--- a/arch/x86/include/asm/e820.h
10122+++ b/arch/x86/include/asm/e820.h
10123@@ -69,7 +69,7 @@ struct e820map {
10124 #define ISA_START_ADDRESS 0xa0000
10125 #define ISA_END_ADDRESS 0x100000
10126
10127-#define BIOS_BEGIN 0x000a0000
10128+#define BIOS_BEGIN 0x000c0000
10129 #define BIOS_END 0x00100000
10130
10131 #define BIOS_ROM_BASE 0xffe00000
10132diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
10133index 5f962df..7289f09 100644
10134--- a/arch/x86/include/asm/elf.h
10135+++ b/arch/x86/include/asm/elf.h
10136@@ -238,7 +238,25 @@ extern int force_personality32;
10137 the loader. We need to make sure that it is out of the way of the program
10138 that it will "exec", and that there is sufficient room for the brk. */
10139
10140+#ifdef CONFIG_PAX_SEGMEXEC
10141+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
10142+#else
10143 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
10144+#endif
10145+
10146+#ifdef CONFIG_PAX_ASLR
10147+#ifdef CONFIG_X86_32
10148+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
10149+
10150+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
10151+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
10152+#else
10153+#define PAX_ELF_ET_DYN_BASE 0x400000UL
10154+
10155+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
10156+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
10157+#endif
10158+#endif
10159
10160 /* This yields a mask that user programs can use to figure out what
10161 instruction set this CPU supports. This could be done in user space,
10162@@ -291,9 +309,7 @@ do { \
10163
10164 #define ARCH_DLINFO \
10165 do { \
10166- if (vdso_enabled) \
10167- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
10168- (unsigned long)current->mm->context.vdso); \
10169+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
10170 } while (0)
10171
10172 #define AT_SYSINFO 32
10173@@ -304,7 +320,7 @@ do { \
10174
10175 #endif /* !CONFIG_X86_32 */
10176
10177-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
10178+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
10179
10180 #define VDSO_ENTRY \
10181 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
10182@@ -318,9 +334,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
10183 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
10184 #define compat_arch_setup_additional_pages syscall32_setup_pages
10185
10186-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
10187-#define arch_randomize_brk arch_randomize_brk
10188-
10189 /*
10190 * True on X86_32 or when emulating IA32 on X86_64
10191 */
10192diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
10193index cc70c1c..d96d011 100644
10194--- a/arch/x86/include/asm/emergency-restart.h
10195+++ b/arch/x86/include/asm/emergency-restart.h
10196@@ -15,6 +15,6 @@ enum reboot_type {
10197
10198 extern enum reboot_type reboot_type;
10199
10200-extern void machine_emergency_restart(void);
10201+extern void machine_emergency_restart(void) __noreturn;
10202
10203 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
10204diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
10205index dbe82a5..c6d8a00 100644
10206--- a/arch/x86/include/asm/floppy.h
10207+++ b/arch/x86/include/asm/floppy.h
10208@@ -157,6 +157,7 @@ static unsigned long dma_mem_alloc(unsigned long size)
10209 }
10210
10211
10212+static unsigned long vdma_mem_alloc(unsigned long size) __size_overflow(1);
10213 static unsigned long vdma_mem_alloc(unsigned long size)
10214 {
10215 return (unsigned long)vmalloc(size);
10216diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
10217index d09bb03..4ea4194 100644
10218--- a/arch/x86/include/asm/futex.h
10219+++ b/arch/x86/include/asm/futex.h
10220@@ -12,16 +12,18 @@
10221 #include <asm/system.h>
10222
10223 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
10224+ typecheck(u32 __user *, uaddr); \
10225 asm volatile("1:\t" insn "\n" \
10226 "2:\t.section .fixup,\"ax\"\n" \
10227 "3:\tmov\t%3, %1\n" \
10228 "\tjmp\t2b\n" \
10229 "\t.previous\n" \
10230 _ASM_EXTABLE(1b, 3b) \
10231- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
10232+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr))\
10233 : "i" (-EFAULT), "0" (oparg), "1" (0))
10234
10235 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
10236+ typecheck(u32 __user *, uaddr); \
10237 asm volatile("1:\tmovl %2, %0\n" \
10238 "\tmovl\t%0, %3\n" \
10239 "\t" insn "\n" \
10240@@ -34,7 +36,7 @@
10241 _ASM_EXTABLE(1b, 4b) \
10242 _ASM_EXTABLE(2b, 4b) \
10243 : "=&a" (oldval), "=&r" (ret), \
10244- "+m" (*uaddr), "=&r" (tem) \
10245+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
10246 : "r" (oparg), "i" (-EFAULT), "1" (0))
10247
10248 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10249@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10250
10251 switch (op) {
10252 case FUTEX_OP_SET:
10253- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
10254+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
10255 break;
10256 case FUTEX_OP_ADD:
10257- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
10258+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
10259 uaddr, oparg);
10260 break;
10261 case FUTEX_OP_OR:
10262@@ -123,13 +125,13 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
10263 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
10264 return -EFAULT;
10265
10266- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
10267+ asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
10268 "2:\t.section .fixup, \"ax\"\n"
10269 "3:\tmov %3, %0\n"
10270 "\tjmp 2b\n"
10271 "\t.previous\n"
10272 _ASM_EXTABLE(1b, 3b)
10273- : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
10274+ : "+r" (ret), "=a" (oldval), "+m" (*(u32 __user *)____m(uaddr))
10275 : "i" (-EFAULT), "r" (newval), "1" (oldval)
10276 : "memory"
10277 );
10278diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
10279index eb92a6e..b98b2f4 100644
10280--- a/arch/x86/include/asm/hw_irq.h
10281+++ b/arch/x86/include/asm/hw_irq.h
10282@@ -136,8 +136,8 @@ extern void setup_ioapic_dest(void);
10283 extern void enable_IO_APIC(void);
10284
10285 /* Statistics */
10286-extern atomic_t irq_err_count;
10287-extern atomic_t irq_mis_count;
10288+extern atomic_unchecked_t irq_err_count;
10289+extern atomic_unchecked_t irq_mis_count;
10290
10291 /* EISA */
10292 extern void eisa_set_level_irq(unsigned int irq);
10293diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
10294index 2479049..3fb9795 100644
10295--- a/arch/x86/include/asm/i387.h
10296+++ b/arch/x86/include/asm/i387.h
10297@@ -93,6 +93,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
10298 {
10299 int err;
10300
10301+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10302+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10303+ fx = (struct i387_fxsave_struct __user *)((void *)fx + PAX_USER_SHADOW_BASE);
10304+#endif
10305+
10306 /* See comment in fxsave() below. */
10307 #ifdef CONFIG_AS_FXSAVEQ
10308 asm volatile("1: fxrstorq %[fx]\n\t"
10309@@ -122,6 +127,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
10310 {
10311 int err;
10312
10313+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10314+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10315+ fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
10316+#endif
10317+
10318 /*
10319 * Clear the bytes not touched by the fxsave and reserved
10320 * for the SW usage.
10321@@ -278,7 +288,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
10322 "emms\n\t" /* clear stack tags */
10323 "fildl %P[addr]", /* set F?P to defined value */
10324 X86_FEATURE_FXSAVE_LEAK,
10325- [addr] "m" (tsk->thread.fpu.has_fpu));
10326+ [addr] "m" (init_tss[smp_processor_id()].x86_tss.sp0));
10327
10328 return fpu_restore_checking(&tsk->thread.fpu);
10329 }
10330@@ -445,7 +455,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
10331 static inline bool interrupted_user_mode(void)
10332 {
10333 struct pt_regs *regs = get_irq_regs();
10334- return regs && user_mode_vm(regs);
10335+ return regs && user_mode(regs);
10336 }
10337
10338 /*
10339diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
10340index d8e8eef..99f81ae 100644
10341--- a/arch/x86/include/asm/io.h
10342+++ b/arch/x86/include/asm/io.h
10343@@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
10344
10345 #include <linux/vmalloc.h>
10346
10347+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
10348+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
10349+{
10350+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10351+}
10352+
10353+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
10354+{
10355+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10356+}
10357+
10358 /*
10359 * Convert a virtual cached pointer to an uncached pointer
10360 */
10361diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
10362index bba3cf8..06bc8da 100644
10363--- a/arch/x86/include/asm/irqflags.h
10364+++ b/arch/x86/include/asm/irqflags.h
10365@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
10366 sti; \
10367 sysexit
10368
10369+#define GET_CR0_INTO_RDI mov %cr0, %rdi
10370+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
10371+#define GET_CR3_INTO_RDI mov %cr3, %rdi
10372+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
10373+
10374 #else
10375 #define INTERRUPT_RETURN iret
10376 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
10377diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
10378index 5478825..839e88c 100644
10379--- a/arch/x86/include/asm/kprobes.h
10380+++ b/arch/x86/include/asm/kprobes.h
10381@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
10382 #define RELATIVEJUMP_SIZE 5
10383 #define RELATIVECALL_OPCODE 0xe8
10384 #define RELATIVE_ADDR_SIZE 4
10385-#define MAX_STACK_SIZE 64
10386-#define MIN_STACK_SIZE(ADDR) \
10387- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
10388- THREAD_SIZE - (unsigned long)(ADDR))) \
10389- ? (MAX_STACK_SIZE) \
10390- : (((unsigned long)current_thread_info()) + \
10391- THREAD_SIZE - (unsigned long)(ADDR)))
10392+#define MAX_STACK_SIZE 64UL
10393+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
10394
10395 #define flush_insn_slot(p) do { } while (0)
10396
10397diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
10398index 52d6640..136b3bd 100644
10399--- a/arch/x86/include/asm/kvm_host.h
10400+++ b/arch/x86/include/asm/kvm_host.h
10401@@ -663,7 +663,7 @@ struct kvm_x86_ops {
10402 int (*check_intercept)(struct kvm_vcpu *vcpu,
10403 struct x86_instruction_info *info,
10404 enum x86_intercept_stage stage);
10405-};
10406+} __do_const;
10407
10408 struct kvm_arch_async_pf {
10409 u32 token;
10410@@ -694,7 +694,7 @@ void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages);
10411 int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3);
10412
10413 int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa,
10414- const void *val, int bytes);
10415+ const void *val, int bytes) __size_overflow(2);
10416 u8 kvm_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn);
10417
10418 extern bool tdp_enabled;
10419@@ -781,7 +781,7 @@ int fx_init(struct kvm_vcpu *vcpu);
10420
10421 void kvm_mmu_flush_tlb(struct kvm_vcpu *vcpu);
10422 void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
10423- const u8 *new, int bytes);
10424+ const u8 *new, int bytes) __size_overflow(2);
10425 int kvm_mmu_unprotect_page(struct kvm *kvm, gfn_t gfn);
10426 int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva);
10427 void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu);
10428diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
10429index 9cdae5d..300d20f 100644
10430--- a/arch/x86/include/asm/local.h
10431+++ b/arch/x86/include/asm/local.h
10432@@ -18,26 +18,58 @@ typedef struct {
10433
10434 static inline void local_inc(local_t *l)
10435 {
10436- asm volatile(_ASM_INC "%0"
10437+ asm volatile(_ASM_INC "%0\n"
10438+
10439+#ifdef CONFIG_PAX_REFCOUNT
10440+ "jno 0f\n"
10441+ _ASM_DEC "%0\n"
10442+ "int $4\n0:\n"
10443+ _ASM_EXTABLE(0b, 0b)
10444+#endif
10445+
10446 : "+m" (l->a.counter));
10447 }
10448
10449 static inline void local_dec(local_t *l)
10450 {
10451- asm volatile(_ASM_DEC "%0"
10452+ asm volatile(_ASM_DEC "%0\n"
10453+
10454+#ifdef CONFIG_PAX_REFCOUNT
10455+ "jno 0f\n"
10456+ _ASM_INC "%0\n"
10457+ "int $4\n0:\n"
10458+ _ASM_EXTABLE(0b, 0b)
10459+#endif
10460+
10461 : "+m" (l->a.counter));
10462 }
10463
10464 static inline void local_add(long i, local_t *l)
10465 {
10466- asm volatile(_ASM_ADD "%1,%0"
10467+ asm volatile(_ASM_ADD "%1,%0\n"
10468+
10469+#ifdef CONFIG_PAX_REFCOUNT
10470+ "jno 0f\n"
10471+ _ASM_SUB "%1,%0\n"
10472+ "int $4\n0:\n"
10473+ _ASM_EXTABLE(0b, 0b)
10474+#endif
10475+
10476 : "+m" (l->a.counter)
10477 : "ir" (i));
10478 }
10479
10480 static inline void local_sub(long i, local_t *l)
10481 {
10482- asm volatile(_ASM_SUB "%1,%0"
10483+ asm volatile(_ASM_SUB "%1,%0\n"
10484+
10485+#ifdef CONFIG_PAX_REFCOUNT
10486+ "jno 0f\n"
10487+ _ASM_ADD "%1,%0\n"
10488+ "int $4\n0:\n"
10489+ _ASM_EXTABLE(0b, 0b)
10490+#endif
10491+
10492 : "+m" (l->a.counter)
10493 : "ir" (i));
10494 }
10495@@ -55,7 +87,16 @@ static inline int local_sub_and_test(long i, local_t *l)
10496 {
10497 unsigned char c;
10498
10499- asm volatile(_ASM_SUB "%2,%0; sete %1"
10500+ asm volatile(_ASM_SUB "%2,%0\n"
10501+
10502+#ifdef CONFIG_PAX_REFCOUNT
10503+ "jno 0f\n"
10504+ _ASM_ADD "%2,%0\n"
10505+ "int $4\n0:\n"
10506+ _ASM_EXTABLE(0b, 0b)
10507+#endif
10508+
10509+ "sete %1\n"
10510 : "+m" (l->a.counter), "=qm" (c)
10511 : "ir" (i) : "memory");
10512 return c;
10513@@ -73,7 +114,16 @@ static inline int local_dec_and_test(local_t *l)
10514 {
10515 unsigned char c;
10516
10517- asm volatile(_ASM_DEC "%0; sete %1"
10518+ asm volatile(_ASM_DEC "%0\n"
10519+
10520+#ifdef CONFIG_PAX_REFCOUNT
10521+ "jno 0f\n"
10522+ _ASM_INC "%0\n"
10523+ "int $4\n0:\n"
10524+ _ASM_EXTABLE(0b, 0b)
10525+#endif
10526+
10527+ "sete %1\n"
10528 : "+m" (l->a.counter), "=qm" (c)
10529 : : "memory");
10530 return c != 0;
10531@@ -91,7 +141,16 @@ static inline int local_inc_and_test(local_t *l)
10532 {
10533 unsigned char c;
10534
10535- asm volatile(_ASM_INC "%0; sete %1"
10536+ asm volatile(_ASM_INC "%0\n"
10537+
10538+#ifdef CONFIG_PAX_REFCOUNT
10539+ "jno 0f\n"
10540+ _ASM_DEC "%0\n"
10541+ "int $4\n0:\n"
10542+ _ASM_EXTABLE(0b, 0b)
10543+#endif
10544+
10545+ "sete %1\n"
10546 : "+m" (l->a.counter), "=qm" (c)
10547 : : "memory");
10548 return c != 0;
10549@@ -110,7 +169,16 @@ static inline int local_add_negative(long i, local_t *l)
10550 {
10551 unsigned char c;
10552
10553- asm volatile(_ASM_ADD "%2,%0; sets %1"
10554+ asm volatile(_ASM_ADD "%2,%0\n"
10555+
10556+#ifdef CONFIG_PAX_REFCOUNT
10557+ "jno 0f\n"
10558+ _ASM_SUB "%2,%0\n"
10559+ "int $4\n0:\n"
10560+ _ASM_EXTABLE(0b, 0b)
10561+#endif
10562+
10563+ "sets %1\n"
10564 : "+m" (l->a.counter), "=qm" (c)
10565 : "ir" (i) : "memory");
10566 return c;
10567@@ -133,7 +201,15 @@ static inline long local_add_return(long i, local_t *l)
10568 #endif
10569 /* Modern 486+ processor */
10570 __i = i;
10571- asm volatile(_ASM_XADD "%0, %1;"
10572+ asm volatile(_ASM_XADD "%0, %1\n"
10573+
10574+#ifdef CONFIG_PAX_REFCOUNT
10575+ "jno 0f\n"
10576+ _ASM_MOV "%0,%1\n"
10577+ "int $4\n0:\n"
10578+ _ASM_EXTABLE(0b, 0b)
10579+#endif
10580+
10581 : "+r" (i), "+m" (l->a.counter)
10582 : : "memory");
10583 return i + __i;
10584diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
10585index 593e51d..fa69c9a 100644
10586--- a/arch/x86/include/asm/mman.h
10587+++ b/arch/x86/include/asm/mman.h
10588@@ -5,4 +5,14 @@
10589
10590 #include <asm-generic/mman.h>
10591
10592+#ifdef __KERNEL__
10593+#ifndef __ASSEMBLY__
10594+#ifdef CONFIG_X86_32
10595+#define arch_mmap_check i386_mmap_check
10596+int i386_mmap_check(unsigned long addr, unsigned long len,
10597+ unsigned long flags);
10598+#endif
10599+#endif
10600+#endif
10601+
10602 #endif /* _ASM_X86_MMAN_H */
10603diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
10604index 5f55e69..e20bfb1 100644
10605--- a/arch/x86/include/asm/mmu.h
10606+++ b/arch/x86/include/asm/mmu.h
10607@@ -9,7 +9,7 @@
10608 * we put the segment information here.
10609 */
10610 typedef struct {
10611- void *ldt;
10612+ struct desc_struct *ldt;
10613 int size;
10614
10615 #ifdef CONFIG_X86_64
10616@@ -18,7 +18,19 @@ typedef struct {
10617 #endif
10618
10619 struct mutex lock;
10620- void *vdso;
10621+ unsigned long vdso;
10622+
10623+#ifdef CONFIG_X86_32
10624+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
10625+ unsigned long user_cs_base;
10626+ unsigned long user_cs_limit;
10627+
10628+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10629+ cpumask_t cpu_user_cs_mask;
10630+#endif
10631+
10632+#endif
10633+#endif
10634 } mm_context_t;
10635
10636 #ifdef CONFIG_SMP
10637diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
10638index 6902152..399f3a2 100644
10639--- a/arch/x86/include/asm/mmu_context.h
10640+++ b/arch/x86/include/asm/mmu_context.h
10641@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *mm);
10642
10643 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
10644 {
10645+
10646+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10647+ unsigned int i;
10648+ pgd_t *pgd;
10649+
10650+ pax_open_kernel();
10651+ pgd = get_cpu_pgd(smp_processor_id());
10652+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
10653+ set_pgd_batched(pgd+i, native_make_pgd(0));
10654+ pax_close_kernel();
10655+#endif
10656+
10657 #ifdef CONFIG_SMP
10658 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
10659 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
10660@@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10661 struct task_struct *tsk)
10662 {
10663 unsigned cpu = smp_processor_id();
10664+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10665+ int tlbstate = TLBSTATE_OK;
10666+#endif
10667
10668 if (likely(prev != next)) {
10669 #ifdef CONFIG_SMP
10670+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10671+ tlbstate = percpu_read(cpu_tlbstate.state);
10672+#endif
10673 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10674 percpu_write(cpu_tlbstate.active_mm, next);
10675 #endif
10676 cpumask_set_cpu(cpu, mm_cpumask(next));
10677
10678 /* Re-load page tables */
10679+#ifdef CONFIG_PAX_PER_CPU_PGD
10680+ pax_open_kernel();
10681+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10682+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10683+ pax_close_kernel();
10684+ load_cr3(get_cpu_pgd(cpu));
10685+#else
10686 load_cr3(next->pgd);
10687+#endif
10688
10689 /* stop flush ipis for the previous mm */
10690 cpumask_clear_cpu(cpu, mm_cpumask(prev));
10691@@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10692 */
10693 if (unlikely(prev->context.ldt != next->context.ldt))
10694 load_LDT_nolock(&next->context);
10695- }
10696+
10697+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10698+ if (!(__supported_pte_mask & _PAGE_NX)) {
10699+ smp_mb__before_clear_bit();
10700+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
10701+ smp_mb__after_clear_bit();
10702+ cpu_set(cpu, next->context.cpu_user_cs_mask);
10703+ }
10704+#endif
10705+
10706+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10707+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
10708+ prev->context.user_cs_limit != next->context.user_cs_limit))
10709+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10710 #ifdef CONFIG_SMP
10711+ else if (unlikely(tlbstate != TLBSTATE_OK))
10712+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10713+#endif
10714+#endif
10715+
10716+ }
10717 else {
10718+
10719+#ifdef CONFIG_PAX_PER_CPU_PGD
10720+ pax_open_kernel();
10721+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10722+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10723+ pax_close_kernel();
10724+ load_cr3(get_cpu_pgd(cpu));
10725+#endif
10726+
10727+#ifdef CONFIG_SMP
10728 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10729 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
10730
10731@@ -64,11 +119,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10732 * tlb flush IPI delivery. We must reload CR3
10733 * to make sure to use no freed page tables.
10734 */
10735+
10736+#ifndef CONFIG_PAX_PER_CPU_PGD
10737 load_cr3(next->pgd);
10738+#endif
10739+
10740 load_LDT_nolock(&next->context);
10741+
10742+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
10743+ if (!(__supported_pte_mask & _PAGE_NX))
10744+ cpu_set(cpu, next->context.cpu_user_cs_mask);
10745+#endif
10746+
10747+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10748+#ifdef CONFIG_PAX_PAGEEXEC
10749+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
10750+#endif
10751+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10752+#endif
10753+
10754 }
10755+#endif
10756 }
10757-#endif
10758 }
10759
10760 #define activate_mm(prev, next) \
10761diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
10762index 9eae775..c914fea 100644
10763--- a/arch/x86/include/asm/module.h
10764+++ b/arch/x86/include/asm/module.h
10765@@ -5,6 +5,7 @@
10766
10767 #ifdef CONFIG_X86_64
10768 /* X86_64 does not define MODULE_PROC_FAMILY */
10769+#define MODULE_PROC_FAMILY ""
10770 #elif defined CONFIG_M386
10771 #define MODULE_PROC_FAMILY "386 "
10772 #elif defined CONFIG_M486
10773@@ -59,8 +60,20 @@
10774 #error unknown processor family
10775 #endif
10776
10777-#ifdef CONFIG_X86_32
10778-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
10779+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
10780+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
10781+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
10782+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
10783+#else
10784+#define MODULE_PAX_KERNEXEC ""
10785 #endif
10786
10787+#ifdef CONFIG_PAX_MEMORY_UDEREF
10788+#define MODULE_PAX_UDEREF "UDEREF "
10789+#else
10790+#define MODULE_PAX_UDEREF ""
10791+#endif
10792+
10793+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
10794+
10795 #endif /* _ASM_X86_MODULE_H */
10796diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
10797index 7639dbf..e08a58c 100644
10798--- a/arch/x86/include/asm/page_64_types.h
10799+++ b/arch/x86/include/asm/page_64_types.h
10800@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
10801
10802 /* duplicated to the one in bootmem.h */
10803 extern unsigned long max_pfn;
10804-extern unsigned long phys_base;
10805+extern const unsigned long phys_base;
10806
10807 extern unsigned long __phys_addr(unsigned long);
10808 #define __phys_reloc_hide(x) (x)
10809diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
10810index a7d2db9..edb023e 100644
10811--- a/arch/x86/include/asm/paravirt.h
10812+++ b/arch/x86/include/asm/paravirt.h
10813@@ -667,6 +667,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
10814 val);
10815 }
10816
10817+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
10818+{
10819+ pgdval_t val = native_pgd_val(pgd);
10820+
10821+ if (sizeof(pgdval_t) > sizeof(long))
10822+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
10823+ val, (u64)val >> 32);
10824+ else
10825+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
10826+ val);
10827+}
10828+
10829 static inline void pgd_clear(pgd_t *pgdp)
10830 {
10831 set_pgd(pgdp, __pgd(0));
10832@@ -748,6 +760,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
10833 pv_mmu_ops.set_fixmap(idx, phys, flags);
10834 }
10835
10836+#ifdef CONFIG_PAX_KERNEXEC
10837+static inline unsigned long pax_open_kernel(void)
10838+{
10839+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
10840+}
10841+
10842+static inline unsigned long pax_close_kernel(void)
10843+{
10844+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
10845+}
10846+#else
10847+static inline unsigned long pax_open_kernel(void) { return 0; }
10848+static inline unsigned long pax_close_kernel(void) { return 0; }
10849+#endif
10850+
10851 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
10852
10853 static inline int arch_spin_is_locked(struct arch_spinlock *lock)
10854@@ -964,7 +991,7 @@ extern void default_banner(void);
10855
10856 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
10857 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
10858-#define PARA_INDIRECT(addr) *%cs:addr
10859+#define PARA_INDIRECT(addr) *%ss:addr
10860 #endif
10861
10862 #define INTERRUPT_RETURN \
10863@@ -1041,6 +1068,21 @@ extern void default_banner(void);
10864 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
10865 CLBR_NONE, \
10866 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
10867+
10868+#define GET_CR0_INTO_RDI \
10869+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
10870+ mov %rax,%rdi
10871+
10872+#define SET_RDI_INTO_CR0 \
10873+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
10874+
10875+#define GET_CR3_INTO_RDI \
10876+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
10877+ mov %rax,%rdi
10878+
10879+#define SET_RDI_INTO_CR3 \
10880+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
10881+
10882 #endif /* CONFIG_X86_32 */
10883
10884 #endif /* __ASSEMBLY__ */
10885diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
10886index 8e8b9a4..f07d725 100644
10887--- a/arch/x86/include/asm/paravirt_types.h
10888+++ b/arch/x86/include/asm/paravirt_types.h
10889@@ -84,20 +84,20 @@ struct pv_init_ops {
10890 */
10891 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
10892 unsigned long addr, unsigned len);
10893-};
10894+} __no_const;
10895
10896
10897 struct pv_lazy_ops {
10898 /* Set deferred update mode, used for batching operations. */
10899 void (*enter)(void);
10900 void (*leave)(void);
10901-};
10902+} __no_const;
10903
10904 struct pv_time_ops {
10905 unsigned long long (*sched_clock)(void);
10906 unsigned long long (*steal_clock)(int cpu);
10907 unsigned long (*get_tsc_khz)(void);
10908-};
10909+} __no_const;
10910
10911 struct pv_cpu_ops {
10912 /* hooks for various privileged instructions */
10913@@ -193,7 +193,7 @@ struct pv_cpu_ops {
10914
10915 void (*start_context_switch)(struct task_struct *prev);
10916 void (*end_context_switch)(struct task_struct *next);
10917-};
10918+} __no_const;
10919
10920 struct pv_irq_ops {
10921 /*
10922@@ -224,7 +224,7 @@ struct pv_apic_ops {
10923 unsigned long start_eip,
10924 unsigned long start_esp);
10925 #endif
10926-};
10927+} __no_const;
10928
10929 struct pv_mmu_ops {
10930 unsigned long (*read_cr2)(void);
10931@@ -313,6 +313,7 @@ struct pv_mmu_ops {
10932 struct paravirt_callee_save make_pud;
10933
10934 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
10935+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
10936 #endif /* PAGETABLE_LEVELS == 4 */
10937 #endif /* PAGETABLE_LEVELS >= 3 */
10938
10939@@ -324,6 +325,12 @@ struct pv_mmu_ops {
10940 an mfn. We can tell which is which from the index. */
10941 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
10942 phys_addr_t phys, pgprot_t flags);
10943+
10944+#ifdef CONFIG_PAX_KERNEXEC
10945+ unsigned long (*pax_open_kernel)(void);
10946+ unsigned long (*pax_close_kernel)(void);
10947+#endif
10948+
10949 };
10950
10951 struct arch_spinlock;
10952@@ -334,7 +341,7 @@ struct pv_lock_ops {
10953 void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
10954 int (*spin_trylock)(struct arch_spinlock *lock);
10955 void (*spin_unlock)(struct arch_spinlock *lock);
10956-};
10957+} __no_const;
10958
10959 /* This contains all the paravirt structures: we get a convenient
10960 * number for each function using the offset which we use to indicate
10961diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
10962index b4389a4..7024269 100644
10963--- a/arch/x86/include/asm/pgalloc.h
10964+++ b/arch/x86/include/asm/pgalloc.h
10965@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
10966 pmd_t *pmd, pte_t *pte)
10967 {
10968 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10969+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
10970+}
10971+
10972+static inline void pmd_populate_user(struct mm_struct *mm,
10973+ pmd_t *pmd, pte_t *pte)
10974+{
10975+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10976 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
10977 }
10978
10979@@ -99,12 +106,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
10980
10981 #ifdef CONFIG_X86_PAE
10982 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
10983+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
10984+{
10985+ pud_populate(mm, pudp, pmd);
10986+}
10987 #else /* !CONFIG_X86_PAE */
10988 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
10989 {
10990 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
10991 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
10992 }
10993+
10994+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
10995+{
10996+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
10997+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
10998+}
10999 #endif /* CONFIG_X86_PAE */
11000
11001 #if PAGETABLE_LEVELS > 3
11002@@ -114,6 +131,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
11003 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
11004 }
11005
11006+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
11007+{
11008+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
11009+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
11010+}
11011+
11012 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
11013 {
11014 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
11015diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
11016index 98391db..8f6984e 100644
11017--- a/arch/x86/include/asm/pgtable-2level.h
11018+++ b/arch/x86/include/asm/pgtable-2level.h
11019@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
11020
11021 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11022 {
11023+ pax_open_kernel();
11024 *pmdp = pmd;
11025+ pax_close_kernel();
11026 }
11027
11028 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
11029diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
11030index effff47..f9e4035 100644
11031--- a/arch/x86/include/asm/pgtable-3level.h
11032+++ b/arch/x86/include/asm/pgtable-3level.h
11033@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
11034
11035 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11036 {
11037+ pax_open_kernel();
11038 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
11039+ pax_close_kernel();
11040 }
11041
11042 static inline void native_set_pud(pud_t *pudp, pud_t pud)
11043 {
11044+ pax_open_kernel();
11045 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
11046+ pax_close_kernel();
11047 }
11048
11049 /*
11050diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
11051index 49afb3f..ed14d07 100644
11052--- a/arch/x86/include/asm/pgtable.h
11053+++ b/arch/x86/include/asm/pgtable.h
11054@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
11055
11056 #ifndef __PAGETABLE_PUD_FOLDED
11057 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
11058+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
11059 #define pgd_clear(pgd) native_pgd_clear(pgd)
11060 #endif
11061
11062@@ -81,12 +82,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
11063
11064 #define arch_end_context_switch(prev) do {} while(0)
11065
11066+#define pax_open_kernel() native_pax_open_kernel()
11067+#define pax_close_kernel() native_pax_close_kernel()
11068 #endif /* CONFIG_PARAVIRT */
11069
11070+#define __HAVE_ARCH_PAX_OPEN_KERNEL
11071+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
11072+
11073+#ifdef CONFIG_PAX_KERNEXEC
11074+static inline unsigned long native_pax_open_kernel(void)
11075+{
11076+ unsigned long cr0;
11077+
11078+ preempt_disable();
11079+ barrier();
11080+ cr0 = read_cr0() ^ X86_CR0_WP;
11081+ BUG_ON(unlikely(cr0 & X86_CR0_WP));
11082+ write_cr0(cr0);
11083+ return cr0 ^ X86_CR0_WP;
11084+}
11085+
11086+static inline unsigned long native_pax_close_kernel(void)
11087+{
11088+ unsigned long cr0;
11089+
11090+ cr0 = read_cr0() ^ X86_CR0_WP;
11091+ BUG_ON(unlikely(!(cr0 & X86_CR0_WP)));
11092+ write_cr0(cr0);
11093+ barrier();
11094+ preempt_enable_no_resched();
11095+ return cr0 ^ X86_CR0_WP;
11096+}
11097+#else
11098+static inline unsigned long native_pax_open_kernel(void) { return 0; }
11099+static inline unsigned long native_pax_close_kernel(void) { return 0; }
11100+#endif
11101+
11102 /*
11103 * The following only work if pte_present() is true.
11104 * Undefined behaviour if not..
11105 */
11106+static inline int pte_user(pte_t pte)
11107+{
11108+ return pte_val(pte) & _PAGE_USER;
11109+}
11110+
11111 static inline int pte_dirty(pte_t pte)
11112 {
11113 return pte_flags(pte) & _PAGE_DIRTY;
11114@@ -196,9 +236,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
11115 return pte_clear_flags(pte, _PAGE_RW);
11116 }
11117
11118+static inline pte_t pte_mkread(pte_t pte)
11119+{
11120+ return __pte(pte_val(pte) | _PAGE_USER);
11121+}
11122+
11123 static inline pte_t pte_mkexec(pte_t pte)
11124 {
11125- return pte_clear_flags(pte, _PAGE_NX);
11126+#ifdef CONFIG_X86_PAE
11127+ if (__supported_pte_mask & _PAGE_NX)
11128+ return pte_clear_flags(pte, _PAGE_NX);
11129+ else
11130+#endif
11131+ return pte_set_flags(pte, _PAGE_USER);
11132+}
11133+
11134+static inline pte_t pte_exprotect(pte_t pte)
11135+{
11136+#ifdef CONFIG_X86_PAE
11137+ if (__supported_pte_mask & _PAGE_NX)
11138+ return pte_set_flags(pte, _PAGE_NX);
11139+ else
11140+#endif
11141+ return pte_clear_flags(pte, _PAGE_USER);
11142 }
11143
11144 static inline pte_t pte_mkdirty(pte_t pte)
11145@@ -390,6 +450,15 @@ pte_t *populate_extra_pte(unsigned long vaddr);
11146 #endif
11147
11148 #ifndef __ASSEMBLY__
11149+
11150+#ifdef CONFIG_PAX_PER_CPU_PGD
11151+extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
11152+static inline pgd_t *get_cpu_pgd(unsigned int cpu)
11153+{
11154+ return cpu_pgd[cpu];
11155+}
11156+#endif
11157+
11158 #include <linux/mm_types.h>
11159
11160 static inline int pte_none(pte_t pte)
11161@@ -560,7 +629,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
11162
11163 static inline int pgd_bad(pgd_t pgd)
11164 {
11165- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
11166+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
11167 }
11168
11169 static inline int pgd_none(pgd_t pgd)
11170@@ -583,7 +652,12 @@ static inline int pgd_none(pgd_t pgd)
11171 * pgd_offset() returns a (pgd_t *)
11172 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
11173 */
11174-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
11175+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
11176+
11177+#ifdef CONFIG_PAX_PER_CPU_PGD
11178+#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
11179+#endif
11180+
11181 /*
11182 * a shortcut which implies the use of the kernel's pgd, instead
11183 * of a process's
11184@@ -594,6 +668,20 @@ static inline int pgd_none(pgd_t pgd)
11185 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
11186 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
11187
11188+#ifdef CONFIG_X86_32
11189+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
11190+#else
11191+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
11192+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
11193+
11194+#ifdef CONFIG_PAX_MEMORY_UDEREF
11195+#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT)
11196+#else
11197+#define PAX_USER_SHADOW_BASE (_AC(0,UL))
11198+#endif
11199+
11200+#endif
11201+
11202 #ifndef __ASSEMBLY__
11203
11204 extern int direct_gbpages;
11205@@ -758,11 +846,23 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
11206 * dst and src can be on the same page, but the range must not overlap,
11207 * and must not cross a page boundary.
11208 */
11209-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
11210+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
11211 {
11212- memcpy(dst, src, count * sizeof(pgd_t));
11213+ pax_open_kernel();
11214+ while (count--)
11215+ *dst++ = *src++;
11216+ pax_close_kernel();
11217 }
11218
11219+#ifdef CONFIG_PAX_PER_CPU_PGD
11220+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11221+#endif
11222+
11223+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11224+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11225+#else
11226+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) {}
11227+#endif
11228
11229 #include <asm-generic/pgtable.h>
11230 #endif /* __ASSEMBLY__ */
11231diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
11232index 0c92113..34a77c6 100644
11233--- a/arch/x86/include/asm/pgtable_32.h
11234+++ b/arch/x86/include/asm/pgtable_32.h
11235@@ -25,9 +25,6 @@
11236 struct mm_struct;
11237 struct vm_area_struct;
11238
11239-extern pgd_t swapper_pg_dir[1024];
11240-extern pgd_t initial_page_table[1024];
11241-
11242 static inline void pgtable_cache_init(void) { }
11243 static inline void check_pgt_cache(void) { }
11244 void paging_init(void);
11245@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11246 # include <asm/pgtable-2level.h>
11247 #endif
11248
11249+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
11250+extern pgd_t initial_page_table[PTRS_PER_PGD];
11251+#ifdef CONFIG_X86_PAE
11252+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
11253+#endif
11254+
11255 #if defined(CONFIG_HIGHPTE)
11256 #define pte_offset_map(dir, address) \
11257 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
11258@@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11259 /* Clear a kernel PTE and flush it from the TLB */
11260 #define kpte_clear_flush(ptep, vaddr) \
11261 do { \
11262+ pax_open_kernel(); \
11263 pte_clear(&init_mm, (vaddr), (ptep)); \
11264+ pax_close_kernel(); \
11265 __flush_tlb_one((vaddr)); \
11266 } while (0)
11267
11268@@ -74,6 +79,9 @@ do { \
11269
11270 #endif /* !__ASSEMBLY__ */
11271
11272+#define HAVE_ARCH_UNMAPPED_AREA
11273+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
11274+
11275 /*
11276 * kern_addr_valid() is (1) for FLATMEM and (0) for
11277 * SPARSEMEM and DISCONTIGMEM
11278diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
11279index ed5903b..c7fe163 100644
11280--- a/arch/x86/include/asm/pgtable_32_types.h
11281+++ b/arch/x86/include/asm/pgtable_32_types.h
11282@@ -8,7 +8,7 @@
11283 */
11284 #ifdef CONFIG_X86_PAE
11285 # include <asm/pgtable-3level_types.h>
11286-# define PMD_SIZE (1UL << PMD_SHIFT)
11287+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
11288 # define PMD_MASK (~(PMD_SIZE - 1))
11289 #else
11290 # include <asm/pgtable-2level_types.h>
11291@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
11292 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
11293 #endif
11294
11295+#ifdef CONFIG_PAX_KERNEXEC
11296+#ifndef __ASSEMBLY__
11297+extern unsigned char MODULES_EXEC_VADDR[];
11298+extern unsigned char MODULES_EXEC_END[];
11299+#endif
11300+#include <asm/boot.h>
11301+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
11302+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
11303+#else
11304+#define ktla_ktva(addr) (addr)
11305+#define ktva_ktla(addr) (addr)
11306+#endif
11307+
11308 #define MODULES_VADDR VMALLOC_START
11309 #define MODULES_END VMALLOC_END
11310 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
11311diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
11312index 975f709..9f779c9 100644
11313--- a/arch/x86/include/asm/pgtable_64.h
11314+++ b/arch/x86/include/asm/pgtable_64.h
11315@@ -16,10 +16,14 @@
11316
11317 extern pud_t level3_kernel_pgt[512];
11318 extern pud_t level3_ident_pgt[512];
11319+extern pud_t level3_vmalloc_start_pgt[512];
11320+extern pud_t level3_vmalloc_end_pgt[512];
11321+extern pud_t level3_vmemmap_pgt[512];
11322+extern pud_t level2_vmemmap_pgt[512];
11323 extern pmd_t level2_kernel_pgt[512];
11324 extern pmd_t level2_fixmap_pgt[512];
11325-extern pmd_t level2_ident_pgt[512];
11326-extern pgd_t init_level4_pgt[];
11327+extern pmd_t level2_ident_pgt[512*2];
11328+extern pgd_t init_level4_pgt[512];
11329
11330 #define swapper_pg_dir init_level4_pgt
11331
11332@@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
11333
11334 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11335 {
11336+ pax_open_kernel();
11337 *pmdp = pmd;
11338+ pax_close_kernel();
11339 }
11340
11341 static inline void native_pmd_clear(pmd_t *pmd)
11342@@ -97,7 +103,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
11343
11344 static inline void native_set_pud(pud_t *pudp, pud_t pud)
11345 {
11346+ pax_open_kernel();
11347 *pudp = pud;
11348+ pax_close_kernel();
11349 }
11350
11351 static inline void native_pud_clear(pud_t *pud)
11352@@ -107,6 +115,13 @@ static inline void native_pud_clear(pud_t *pud)
11353
11354 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
11355 {
11356+ pax_open_kernel();
11357+ *pgdp = pgd;
11358+ pax_close_kernel();
11359+}
11360+
11361+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
11362+{
11363 *pgdp = pgd;
11364 }
11365
11366diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
11367index 766ea16..5b96cb3 100644
11368--- a/arch/x86/include/asm/pgtable_64_types.h
11369+++ b/arch/x86/include/asm/pgtable_64_types.h
11370@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
11371 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
11372 #define MODULES_END _AC(0xffffffffff000000, UL)
11373 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
11374+#define MODULES_EXEC_VADDR MODULES_VADDR
11375+#define MODULES_EXEC_END MODULES_END
11376+
11377+#define ktla_ktva(addr) (addr)
11378+#define ktva_ktla(addr) (addr)
11379
11380 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
11381diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
11382index 013286a..8b42f4f 100644
11383--- a/arch/x86/include/asm/pgtable_types.h
11384+++ b/arch/x86/include/asm/pgtable_types.h
11385@@ -16,13 +16,12 @@
11386 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
11387 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
11388 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
11389-#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
11390+#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
11391 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
11392 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
11393 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
11394-#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
11395-#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
11396-#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
11397+#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
11398+#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
11399 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
11400
11401 /* If _PAGE_BIT_PRESENT is clear, we use these: */
11402@@ -40,7 +39,6 @@
11403 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
11404 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
11405 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
11406-#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
11407 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
11408 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
11409 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
11410@@ -57,8 +55,10 @@
11411
11412 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
11413 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
11414-#else
11415+#elif defined(CONFIG_KMEMCHECK)
11416 #define _PAGE_NX (_AT(pteval_t, 0))
11417+#else
11418+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
11419 #endif
11420
11421 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
11422@@ -96,6 +96,9 @@
11423 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
11424 _PAGE_ACCESSED)
11425
11426+#define PAGE_READONLY_NOEXEC PAGE_READONLY
11427+#define PAGE_SHARED_NOEXEC PAGE_SHARED
11428+
11429 #define __PAGE_KERNEL_EXEC \
11430 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
11431 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
11432@@ -106,7 +109,7 @@
11433 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
11434 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
11435 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
11436-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
11437+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
11438 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
11439 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
11440 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
11441@@ -168,8 +171,8 @@
11442 * bits are combined, this will alow user to access the high address mapped
11443 * VDSO in the presence of CONFIG_COMPAT_VDSO
11444 */
11445-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
11446-#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
11447+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11448+#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11449 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
11450 #endif
11451
11452@@ -207,7 +210,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
11453 {
11454 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
11455 }
11456+#endif
11457
11458+#if PAGETABLE_LEVELS == 3
11459+#include <asm-generic/pgtable-nopud.h>
11460+#endif
11461+
11462+#if PAGETABLE_LEVELS == 2
11463+#include <asm-generic/pgtable-nopmd.h>
11464+#endif
11465+
11466+#ifndef __ASSEMBLY__
11467 #if PAGETABLE_LEVELS > 3
11468 typedef struct { pudval_t pud; } pud_t;
11469
11470@@ -221,8 +234,6 @@ static inline pudval_t native_pud_val(pud_t pud)
11471 return pud.pud;
11472 }
11473 #else
11474-#include <asm-generic/pgtable-nopud.h>
11475-
11476 static inline pudval_t native_pud_val(pud_t pud)
11477 {
11478 return native_pgd_val(pud.pgd);
11479@@ -242,8 +253,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
11480 return pmd.pmd;
11481 }
11482 #else
11483-#include <asm-generic/pgtable-nopmd.h>
11484-
11485 static inline pmdval_t native_pmd_val(pmd_t pmd)
11486 {
11487 return native_pgd_val(pmd.pud.pgd);
11488@@ -283,7 +292,6 @@ typedef struct page *pgtable_t;
11489
11490 extern pteval_t __supported_pte_mask;
11491 extern void set_nx(void);
11492-extern int nx_enabled;
11493
11494 #define pgprot_writecombine pgprot_writecombine
11495 extern pgprot_t pgprot_writecombine(pgprot_t prot);
11496diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
11497index 58545c9..fe6fc38e 100644
11498--- a/arch/x86/include/asm/processor.h
11499+++ b/arch/x86/include/asm/processor.h
11500@@ -266,7 +266,7 @@ struct tss_struct {
11501
11502 } ____cacheline_aligned;
11503
11504-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
11505+extern struct tss_struct init_tss[NR_CPUS];
11506
11507 /*
11508 * Save the original ist values for checking stack pointers during debugging
11509@@ -860,11 +860,18 @@ static inline void spin_lock_prefetch(const void *x)
11510 */
11511 #define TASK_SIZE PAGE_OFFSET
11512 #define TASK_SIZE_MAX TASK_SIZE
11513+
11514+#ifdef CONFIG_PAX_SEGMEXEC
11515+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
11516+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
11517+#else
11518 #define STACK_TOP TASK_SIZE
11519-#define STACK_TOP_MAX STACK_TOP
11520+#endif
11521+
11522+#define STACK_TOP_MAX TASK_SIZE
11523
11524 #define INIT_THREAD { \
11525- .sp0 = sizeof(init_stack) + (long)&init_stack, \
11526+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11527 .vm86_info = NULL, \
11528 .sysenter_cs = __KERNEL_CS, \
11529 .io_bitmap_ptr = NULL, \
11530@@ -878,7 +885,7 @@ static inline void spin_lock_prefetch(const void *x)
11531 */
11532 #define INIT_TSS { \
11533 .x86_tss = { \
11534- .sp0 = sizeof(init_stack) + (long)&init_stack, \
11535+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11536 .ss0 = __KERNEL_DS, \
11537 .ss1 = __KERNEL_CS, \
11538 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
11539@@ -889,11 +896,7 @@ static inline void spin_lock_prefetch(const void *x)
11540 extern unsigned long thread_saved_pc(struct task_struct *tsk);
11541
11542 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
11543-#define KSTK_TOP(info) \
11544-({ \
11545- unsigned long *__ptr = (unsigned long *)(info); \
11546- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
11547-})
11548+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
11549
11550 /*
11551 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
11552@@ -908,7 +911,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11553 #define task_pt_regs(task) \
11554 ({ \
11555 struct pt_regs *__regs__; \
11556- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
11557+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
11558 __regs__ - 1; \
11559 })
11560
11561@@ -918,13 +921,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11562 /*
11563 * User space process size. 47bits minus one guard page.
11564 */
11565-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
11566+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
11567
11568 /* This decides where the kernel will search for a free chunk of vm
11569 * space during mmap's.
11570 */
11571 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
11572- 0xc0000000 : 0xFFFFe000)
11573+ 0xc0000000 : 0xFFFFf000)
11574
11575 #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \
11576 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
11577@@ -935,11 +938,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11578 #define STACK_TOP_MAX TASK_SIZE_MAX
11579
11580 #define INIT_THREAD { \
11581- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11582+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11583 }
11584
11585 #define INIT_TSS { \
11586- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11587+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11588 }
11589
11590 /*
11591@@ -961,6 +964,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
11592 */
11593 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
11594
11595+#ifdef CONFIG_PAX_SEGMEXEC
11596+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
11597+#endif
11598+
11599 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
11600
11601 /* Get/set a process' ability to use the timestamp counter instruction */
11602diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
11603index 3566454..4bdfb8c 100644
11604--- a/arch/x86/include/asm/ptrace.h
11605+++ b/arch/x86/include/asm/ptrace.h
11606@@ -156,28 +156,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
11607 }
11608
11609 /*
11610- * user_mode_vm(regs) determines whether a register set came from user mode.
11611+ * user_mode(regs) determines whether a register set came from user mode.
11612 * This is true if V8086 mode was enabled OR if the register set was from
11613 * protected mode with RPL-3 CS value. This tricky test checks that with
11614 * one comparison. Many places in the kernel can bypass this full check
11615- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
11616+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
11617+ * be used.
11618 */
11619-static inline int user_mode(struct pt_regs *regs)
11620+static inline int user_mode_novm(struct pt_regs *regs)
11621 {
11622 #ifdef CONFIG_X86_32
11623 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
11624 #else
11625- return !!(regs->cs & 3);
11626+ return !!(regs->cs & SEGMENT_RPL_MASK);
11627 #endif
11628 }
11629
11630-static inline int user_mode_vm(struct pt_regs *regs)
11631+static inline int user_mode(struct pt_regs *regs)
11632 {
11633 #ifdef CONFIG_X86_32
11634 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
11635 USER_RPL;
11636 #else
11637- return user_mode(regs);
11638+ return user_mode_novm(regs);
11639 #endif
11640 }
11641
11642@@ -193,15 +194,16 @@ static inline int v8086_mode(struct pt_regs *regs)
11643 #ifdef CONFIG_X86_64
11644 static inline bool user_64bit_mode(struct pt_regs *regs)
11645 {
11646+ unsigned long cs = regs->cs & 0xffff;
11647 #ifndef CONFIG_PARAVIRT
11648 /*
11649 * On non-paravirt systems, this is the only long mode CPL 3
11650 * selector. We do not allow long mode selectors in the LDT.
11651 */
11652- return regs->cs == __USER_CS;
11653+ return cs == __USER_CS;
11654 #else
11655 /* Headers are too twisted for this to go in paravirt.h. */
11656- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
11657+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
11658 #endif
11659 }
11660 #endif
11661diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
11662index 92f29706..a79cbbb 100644
11663--- a/arch/x86/include/asm/reboot.h
11664+++ b/arch/x86/include/asm/reboot.h
11665@@ -6,19 +6,19 @@
11666 struct pt_regs;
11667
11668 struct machine_ops {
11669- void (*restart)(char *cmd);
11670- void (*halt)(void);
11671- void (*power_off)(void);
11672+ void (* __noreturn restart)(char *cmd);
11673+ void (* __noreturn halt)(void);
11674+ void (* __noreturn power_off)(void);
11675 void (*shutdown)(void);
11676 void (*crash_shutdown)(struct pt_regs *);
11677- void (*emergency_restart)(void);
11678-};
11679+ void (* __noreturn emergency_restart)(void);
11680+} __no_const;
11681
11682 extern struct machine_ops machine_ops;
11683
11684 void native_machine_crash_shutdown(struct pt_regs *regs);
11685 void native_machine_shutdown(void);
11686-void machine_real_restart(unsigned int type);
11687+void machine_real_restart(unsigned int type) __noreturn;
11688 /* These must match dispatch_table in reboot_32.S */
11689 #define MRR_BIOS 0
11690 #define MRR_APM 1
11691diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
11692index 2dbe4a7..ce1db00 100644
11693--- a/arch/x86/include/asm/rwsem.h
11694+++ b/arch/x86/include/asm/rwsem.h
11695@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
11696 {
11697 asm volatile("# beginning down_read\n\t"
11698 LOCK_PREFIX _ASM_INC "(%1)\n\t"
11699+
11700+#ifdef CONFIG_PAX_REFCOUNT
11701+ "jno 0f\n"
11702+ LOCK_PREFIX _ASM_DEC "(%1)\n"
11703+ "int $4\n0:\n"
11704+ _ASM_EXTABLE(0b, 0b)
11705+#endif
11706+
11707 /* adds 0x00000001 */
11708 " jns 1f\n"
11709 " call call_rwsem_down_read_failed\n"
11710@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
11711 "1:\n\t"
11712 " mov %1,%2\n\t"
11713 " add %3,%2\n\t"
11714+
11715+#ifdef CONFIG_PAX_REFCOUNT
11716+ "jno 0f\n"
11717+ "sub %3,%2\n"
11718+ "int $4\n0:\n"
11719+ _ASM_EXTABLE(0b, 0b)
11720+#endif
11721+
11722 " jle 2f\n\t"
11723 LOCK_PREFIX " cmpxchg %2,%0\n\t"
11724 " jnz 1b\n\t"
11725@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
11726 long tmp;
11727 asm volatile("# beginning down_write\n\t"
11728 LOCK_PREFIX " xadd %1,(%2)\n\t"
11729+
11730+#ifdef CONFIG_PAX_REFCOUNT
11731+ "jno 0f\n"
11732+ "mov %1,(%2)\n"
11733+ "int $4\n0:\n"
11734+ _ASM_EXTABLE(0b, 0b)
11735+#endif
11736+
11737 /* adds 0xffff0001, returns the old value */
11738 " test %1,%1\n\t"
11739 /* was the count 0 before? */
11740@@ -141,6 +165,14 @@ static inline void __up_read(struct rw_semaphore *sem)
11741 long tmp;
11742 asm volatile("# beginning __up_read\n\t"
11743 LOCK_PREFIX " xadd %1,(%2)\n\t"
11744+
11745+#ifdef CONFIG_PAX_REFCOUNT
11746+ "jno 0f\n"
11747+ "mov %1,(%2)\n"
11748+ "int $4\n0:\n"
11749+ _ASM_EXTABLE(0b, 0b)
11750+#endif
11751+
11752 /* subtracts 1, returns the old value */
11753 " jns 1f\n\t"
11754 " call call_rwsem_wake\n" /* expects old value in %edx */
11755@@ -159,6 +191,14 @@ static inline void __up_write(struct rw_semaphore *sem)
11756 long tmp;
11757 asm volatile("# beginning __up_write\n\t"
11758 LOCK_PREFIX " xadd %1,(%2)\n\t"
11759+
11760+#ifdef CONFIG_PAX_REFCOUNT
11761+ "jno 0f\n"
11762+ "mov %1,(%2)\n"
11763+ "int $4\n0:\n"
11764+ _ASM_EXTABLE(0b, 0b)
11765+#endif
11766+
11767 /* subtracts 0xffff0001, returns the old value */
11768 " jns 1f\n\t"
11769 " call call_rwsem_wake\n" /* expects old value in %edx */
11770@@ -176,6 +216,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11771 {
11772 asm volatile("# beginning __downgrade_write\n\t"
11773 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
11774+
11775+#ifdef CONFIG_PAX_REFCOUNT
11776+ "jno 0f\n"
11777+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
11778+ "int $4\n0:\n"
11779+ _ASM_EXTABLE(0b, 0b)
11780+#endif
11781+
11782 /*
11783 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
11784 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
11785@@ -194,7 +242,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11786 */
11787 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
11788 {
11789- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
11790+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
11791+
11792+#ifdef CONFIG_PAX_REFCOUNT
11793+ "jno 0f\n"
11794+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
11795+ "int $4\n0:\n"
11796+ _ASM_EXTABLE(0b, 0b)
11797+#endif
11798+
11799 : "+m" (sem->count)
11800 : "er" (delta));
11801 }
11802@@ -204,7 +260,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
11803 */
11804 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
11805 {
11806- return delta + xadd(&sem->count, delta);
11807+ return delta + xadd_check_overflow(&sem->count, delta);
11808 }
11809
11810 #endif /* __KERNEL__ */
11811diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
11812index 5e64171..f58957e 100644
11813--- a/arch/x86/include/asm/segment.h
11814+++ b/arch/x86/include/asm/segment.h
11815@@ -64,10 +64,15 @@
11816 * 26 - ESPFIX small SS
11817 * 27 - per-cpu [ offset to per-cpu data area ]
11818 * 28 - stack_canary-20 [ for stack protector ]
11819- * 29 - unused
11820- * 30 - unused
11821+ * 29 - PCI BIOS CS
11822+ * 30 - PCI BIOS DS
11823 * 31 - TSS for double fault handler
11824 */
11825+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
11826+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
11827+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
11828+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
11829+
11830 #define GDT_ENTRY_TLS_MIN 6
11831 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
11832
11833@@ -79,6 +84,8 @@
11834
11835 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
11836
11837+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
11838+
11839 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
11840
11841 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
11842@@ -104,6 +111,12 @@
11843 #define __KERNEL_STACK_CANARY 0
11844 #endif
11845
11846+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
11847+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
11848+
11849+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
11850+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
11851+
11852 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
11853
11854 /*
11855@@ -141,7 +154,7 @@
11856 */
11857
11858 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
11859-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
11860+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
11861
11862
11863 #else
11864@@ -165,6 +178,8 @@
11865 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
11866 #define __USER32_DS __USER_DS
11867
11868+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
11869+
11870 #define GDT_ENTRY_TSS 8 /* needs two entries */
11871 #define GDT_ENTRY_LDT 10 /* needs two entries */
11872 #define GDT_ENTRY_TLS_MIN 12
11873@@ -185,6 +200,7 @@
11874 #endif
11875
11876 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
11877+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
11878 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
11879 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
11880 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
11881diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
11882index 0434c40..1714bf0 100644
11883--- a/arch/x86/include/asm/smp.h
11884+++ b/arch/x86/include/asm/smp.h
11885@@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
11886 /* cpus sharing the last level cache: */
11887 DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
11888 DECLARE_PER_CPU(u16, cpu_llc_id);
11889-DECLARE_PER_CPU(int, cpu_number);
11890+DECLARE_PER_CPU(unsigned int, cpu_number);
11891
11892 static inline struct cpumask *cpu_sibling_mask(int cpu)
11893 {
11894@@ -77,7 +77,7 @@ struct smp_ops {
11895
11896 void (*send_call_func_ipi)(const struct cpumask *mask);
11897 void (*send_call_func_single_ipi)(int cpu);
11898-};
11899+} __no_const;
11900
11901 /* Globals due to paravirt */
11902 extern void set_cpu_sibling_map(int cpu);
11903@@ -192,14 +192,8 @@ extern unsigned disabled_cpus __cpuinitdata;
11904 extern int safe_smp_processor_id(void);
11905
11906 #elif defined(CONFIG_X86_64_SMP)
11907-#define raw_smp_processor_id() (percpu_read(cpu_number))
11908-
11909-#define stack_smp_processor_id() \
11910-({ \
11911- struct thread_info *ti; \
11912- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
11913- ti->cpu; \
11914-})
11915+#define raw_smp_processor_id() (percpu_read(cpu_number))
11916+#define stack_smp_processor_id() raw_smp_processor_id()
11917 #define safe_smp_processor_id() smp_processor_id()
11918
11919 #endif
11920diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
11921index a82c2bf..2198f61 100644
11922--- a/arch/x86/include/asm/spinlock.h
11923+++ b/arch/x86/include/asm/spinlock.h
11924@@ -175,6 +175,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
11925 static inline void arch_read_lock(arch_rwlock_t *rw)
11926 {
11927 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
11928+
11929+#ifdef CONFIG_PAX_REFCOUNT
11930+ "jno 0f\n"
11931+ LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
11932+ "int $4\n0:\n"
11933+ _ASM_EXTABLE(0b, 0b)
11934+#endif
11935+
11936 "jns 1f\n"
11937 "call __read_lock_failed\n\t"
11938 "1:\n"
11939@@ -184,6 +192,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
11940 static inline void arch_write_lock(arch_rwlock_t *rw)
11941 {
11942 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
11943+
11944+#ifdef CONFIG_PAX_REFCOUNT
11945+ "jno 0f\n"
11946+ LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
11947+ "int $4\n0:\n"
11948+ _ASM_EXTABLE(0b, 0b)
11949+#endif
11950+
11951 "jz 1f\n"
11952 "call __write_lock_failed\n\t"
11953 "1:\n"
11954@@ -213,13 +229,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
11955
11956 static inline void arch_read_unlock(arch_rwlock_t *rw)
11957 {
11958- asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
11959+ asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
11960+
11961+#ifdef CONFIG_PAX_REFCOUNT
11962+ "jno 0f\n"
11963+ LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
11964+ "int $4\n0:\n"
11965+ _ASM_EXTABLE(0b, 0b)
11966+#endif
11967+
11968 :"+m" (rw->lock) : : "memory");
11969 }
11970
11971 static inline void arch_write_unlock(arch_rwlock_t *rw)
11972 {
11973- asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
11974+ asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
11975+
11976+#ifdef CONFIG_PAX_REFCOUNT
11977+ "jno 0f\n"
11978+ LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
11979+ "int $4\n0:\n"
11980+ _ASM_EXTABLE(0b, 0b)
11981+#endif
11982+
11983 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
11984 }
11985
11986diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
11987index 1575177..cb23f52 100644
11988--- a/arch/x86/include/asm/stackprotector.h
11989+++ b/arch/x86/include/asm/stackprotector.h
11990@@ -48,7 +48,7 @@
11991 * head_32 for boot CPU and setup_per_cpu_areas() for others.
11992 */
11993 #define GDT_STACK_CANARY_INIT \
11994- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
11995+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
11996
11997 /*
11998 * Initialize the stackprotector canary value.
11999@@ -113,7 +113,7 @@ static inline void setup_stack_canary_segment(int cpu)
12000
12001 static inline void load_stack_canary_segment(void)
12002 {
12003-#ifdef CONFIG_X86_32
12004+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
12005 asm volatile ("mov %0, %%gs" : : "r" (0));
12006 #endif
12007 }
12008diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
12009index 70bbe39..4ae2bd4 100644
12010--- a/arch/x86/include/asm/stacktrace.h
12011+++ b/arch/x86/include/asm/stacktrace.h
12012@@ -11,28 +11,20 @@
12013
12014 extern int kstack_depth_to_print;
12015
12016-struct thread_info;
12017+struct task_struct;
12018 struct stacktrace_ops;
12019
12020-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
12021- unsigned long *stack,
12022- unsigned long bp,
12023- const struct stacktrace_ops *ops,
12024- void *data,
12025- unsigned long *end,
12026- int *graph);
12027+typedef unsigned long walk_stack_t(struct task_struct *task,
12028+ void *stack_start,
12029+ unsigned long *stack,
12030+ unsigned long bp,
12031+ const struct stacktrace_ops *ops,
12032+ void *data,
12033+ unsigned long *end,
12034+ int *graph);
12035
12036-extern unsigned long
12037-print_context_stack(struct thread_info *tinfo,
12038- unsigned long *stack, unsigned long bp,
12039- const struct stacktrace_ops *ops, void *data,
12040- unsigned long *end, int *graph);
12041-
12042-extern unsigned long
12043-print_context_stack_bp(struct thread_info *tinfo,
12044- unsigned long *stack, unsigned long bp,
12045- const struct stacktrace_ops *ops, void *data,
12046- unsigned long *end, int *graph);
12047+extern walk_stack_t print_context_stack;
12048+extern walk_stack_t print_context_stack_bp;
12049
12050 /* Generic stack tracer with callbacks */
12051
12052@@ -40,7 +32,7 @@ struct stacktrace_ops {
12053 void (*address)(void *data, unsigned long address, int reliable);
12054 /* On negative return stop dumping */
12055 int (*stack)(void *data, char *name);
12056- walk_stack_t walk_stack;
12057+ walk_stack_t *walk_stack;
12058 };
12059
12060 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
12061diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
12062index cb23852..2dde194 100644
12063--- a/arch/x86/include/asm/sys_ia32.h
12064+++ b/arch/x86/include/asm/sys_ia32.h
12065@@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int, compat_sigset_t __user *,
12066 compat_sigset_t __user *, unsigned int);
12067 asmlinkage long sys32_alarm(unsigned int);
12068
12069-asmlinkage long sys32_waitpid(compat_pid_t, unsigned int *, int);
12070+asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);
12071 asmlinkage long sys32_sysfs(int, u32, u32);
12072
12073 asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
12074diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h
12075index f1d8b44..a4de8b7 100644
12076--- a/arch/x86/include/asm/syscalls.h
12077+++ b/arch/x86/include/asm/syscalls.h
12078@@ -30,7 +30,7 @@ long sys_clone(unsigned long, unsigned long, void __user *,
12079 void __user *, struct pt_regs *);
12080
12081 /* kernel/ldt.c */
12082-asmlinkage int sys_modify_ldt(int, void __user *, unsigned long);
12083+asmlinkage int sys_modify_ldt(int, void __user *, unsigned long) __size_overflow(3);
12084
12085 /* kernel/signal.c */
12086 long sys_rt_sigreturn(struct pt_regs *);
12087diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h
12088index 2d2f01c..f985723 100644
12089--- a/arch/x86/include/asm/system.h
12090+++ b/arch/x86/include/asm/system.h
12091@@ -129,7 +129,7 @@ do { \
12092 "call __switch_to\n\t" \
12093 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
12094 __switch_canary \
12095- "movq %P[thread_info](%%rsi),%%r8\n\t" \
12096+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
12097 "movq %%rax,%%rdi\n\t" \
12098 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
12099 "jnz ret_from_fork\n\t" \
12100@@ -140,7 +140,7 @@ do { \
12101 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
12102 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
12103 [_tif_fork] "i" (_TIF_FORK), \
12104- [thread_info] "i" (offsetof(struct task_struct, stack)), \
12105+ [thread_info] "m" (current_tinfo), \
12106 [current_task] "m" (current_task) \
12107 __switch_canary_iparam \
12108 : "memory", "cc" __EXTRA_CLOBBER)
12109@@ -200,7 +200,7 @@ static inline unsigned long get_limit(unsigned long segment)
12110 {
12111 unsigned long __limit;
12112 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
12113- return __limit + 1;
12114+ return __limit;
12115 }
12116
12117 static inline void native_clts(void)
12118@@ -397,13 +397,13 @@ void enable_hlt(void);
12119
12120 void cpu_idle_wait(void);
12121
12122-extern unsigned long arch_align_stack(unsigned long sp);
12123+#define arch_align_stack(x) ((x) & ~0xfUL)
12124 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
12125
12126 void default_idle(void);
12127 bool set_pm_idle_to_default(void);
12128
12129-void stop_this_cpu(void *dummy);
12130+void stop_this_cpu(void *dummy) __noreturn;
12131
12132 /*
12133 * Force strict CPU ordering.
12134diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
12135index cfd8144..1b1127d 100644
12136--- a/arch/x86/include/asm/thread_info.h
12137+++ b/arch/x86/include/asm/thread_info.h
12138@@ -10,6 +10,7 @@
12139 #include <linux/compiler.h>
12140 #include <asm/page.h>
12141 #include <asm/types.h>
12142+#include <asm/percpu.h>
12143
12144 /*
12145 * low level task data that entry.S needs immediate access to
12146@@ -24,7 +25,6 @@ struct exec_domain;
12147 #include <linux/atomic.h>
12148
12149 struct thread_info {
12150- struct task_struct *task; /* main task structure */
12151 struct exec_domain *exec_domain; /* execution domain */
12152 __u32 flags; /* low level flags */
12153 __u32 status; /* thread synchronous flags */
12154@@ -34,19 +34,13 @@ struct thread_info {
12155 mm_segment_t addr_limit;
12156 struct restart_block restart_block;
12157 void __user *sysenter_return;
12158-#ifdef CONFIG_X86_32
12159- unsigned long previous_esp; /* ESP of the previous stack in
12160- case of nested (IRQ) stacks
12161- */
12162- __u8 supervisor_stack[0];
12163-#endif
12164+ unsigned long lowest_stack;
12165 unsigned int sig_on_uaccess_error:1;
12166 unsigned int uaccess_err:1; /* uaccess failed */
12167 };
12168
12169-#define INIT_THREAD_INFO(tsk) \
12170+#define INIT_THREAD_INFO \
12171 { \
12172- .task = &tsk, \
12173 .exec_domain = &default_exec_domain, \
12174 .flags = 0, \
12175 .cpu = 0, \
12176@@ -57,7 +51,7 @@ struct thread_info {
12177 }, \
12178 }
12179
12180-#define init_thread_info (init_thread_union.thread_info)
12181+#define init_thread_info (init_thread_union.stack)
12182 #define init_stack (init_thread_union.stack)
12183
12184 #else /* !__ASSEMBLY__ */
12185@@ -169,45 +163,40 @@ struct thread_info {
12186 ret; \
12187 })
12188
12189-#ifdef CONFIG_X86_32
12190-
12191-#define STACK_WARN (THREAD_SIZE/8)
12192-/*
12193- * macros/functions for gaining access to the thread information structure
12194- *
12195- * preempt_count needs to be 1 initially, until the scheduler is functional.
12196- */
12197-#ifndef __ASSEMBLY__
12198-
12199-
12200-/* how to get the current stack pointer from C */
12201-register unsigned long current_stack_pointer asm("esp") __used;
12202-
12203-/* how to get the thread information struct from C */
12204-static inline struct thread_info *current_thread_info(void)
12205-{
12206- return (struct thread_info *)
12207- (current_stack_pointer & ~(THREAD_SIZE - 1));
12208-}
12209-
12210-#else /* !__ASSEMBLY__ */
12211-
12212+#ifdef __ASSEMBLY__
12213 /* how to get the thread information struct from ASM */
12214 #define GET_THREAD_INFO(reg) \
12215- movl $-THREAD_SIZE, reg; \
12216- andl %esp, reg
12217+ mov PER_CPU_VAR(current_tinfo), reg
12218
12219 /* use this one if reg already contains %esp */
12220-#define GET_THREAD_INFO_WITH_ESP(reg) \
12221- andl $-THREAD_SIZE, reg
12222+#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
12223+#else
12224+/* how to get the thread information struct from C */
12225+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
12226+
12227+static __always_inline struct thread_info *current_thread_info(void)
12228+{
12229+ return percpu_read_stable(current_tinfo);
12230+}
12231+#endif
12232+
12233+#ifdef CONFIG_X86_32
12234+
12235+#define STACK_WARN (THREAD_SIZE/8)
12236+/*
12237+ * macros/functions for gaining access to the thread information structure
12238+ *
12239+ * preempt_count needs to be 1 initially, until the scheduler is functional.
12240+ */
12241+#ifndef __ASSEMBLY__
12242+
12243+/* how to get the current stack pointer from C */
12244+register unsigned long current_stack_pointer asm("esp") __used;
12245
12246 #endif
12247
12248 #else /* X86_32 */
12249
12250-#include <asm/percpu.h>
12251-#define KERNEL_STACK_OFFSET (5*8)
12252-
12253 /*
12254 * macros/functions for gaining access to the thread information structure
12255 * preempt_count needs to be 1 initially, until the scheduler is functional.
12256@@ -215,27 +204,8 @@ static inline struct thread_info *current_thread_info(void)
12257 #ifndef __ASSEMBLY__
12258 DECLARE_PER_CPU(unsigned long, kernel_stack);
12259
12260-static inline struct thread_info *current_thread_info(void)
12261-{
12262- struct thread_info *ti;
12263- ti = (void *)(percpu_read_stable(kernel_stack) +
12264- KERNEL_STACK_OFFSET - THREAD_SIZE);
12265- return ti;
12266-}
12267-
12268-#else /* !__ASSEMBLY__ */
12269-
12270-/* how to get the thread information struct from ASM */
12271-#define GET_THREAD_INFO(reg) \
12272- movq PER_CPU_VAR(kernel_stack),reg ; \
12273- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
12274-
12275-/*
12276- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
12277- * a certain register (to be used in assembler memory operands).
12278- */
12279-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
12280-
12281+/* how to get the current stack pointer from C */
12282+register unsigned long current_stack_pointer asm("rsp") __used;
12283 #endif
12284
12285 #endif /* !X86_32 */
12286@@ -269,5 +239,16 @@ extern void arch_task_cache_init(void);
12287 extern void free_thread_info(struct thread_info *ti);
12288 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
12289 #define arch_task_cache_init arch_task_cache_init
12290+
12291+#define __HAVE_THREAD_FUNCTIONS
12292+#define task_thread_info(task) (&(task)->tinfo)
12293+#define task_stack_page(task) ((task)->stack)
12294+#define setup_thread_stack(p, org) do {} while (0)
12295+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
12296+
12297+#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
12298+extern struct task_struct *alloc_task_struct_node(int node);
12299+extern void free_task_struct(struct task_struct *);
12300+
12301 #endif
12302 #endif /* _ASM_X86_THREAD_INFO_H */
12303diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
12304index 8be5f54..7ae826d 100644
12305--- a/arch/x86/include/asm/uaccess.h
12306+++ b/arch/x86/include/asm/uaccess.h
12307@@ -7,12 +7,15 @@
12308 #include <linux/compiler.h>
12309 #include <linux/thread_info.h>
12310 #include <linux/string.h>
12311+#include <linux/sched.h>
12312 #include <asm/asm.h>
12313 #include <asm/page.h>
12314
12315 #define VERIFY_READ 0
12316 #define VERIFY_WRITE 1
12317
12318+extern void check_object_size(const void *ptr, unsigned long n, bool to);
12319+
12320 /*
12321 * The fs value determines whether argument validity checking should be
12322 * performed or not. If get_fs() == USER_DS, checking is performed, with
12323@@ -28,7 +31,12 @@
12324
12325 #define get_ds() (KERNEL_DS)
12326 #define get_fs() (current_thread_info()->addr_limit)
12327+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12328+void __set_fs(mm_segment_t x);
12329+void set_fs(mm_segment_t x);
12330+#else
12331 #define set_fs(x) (current_thread_info()->addr_limit = (x))
12332+#endif
12333
12334 #define segment_eq(a, b) ((a).seg == (b).seg)
12335
12336@@ -76,7 +84,33 @@
12337 * checks that the pointer is in the user space range - after calling
12338 * this function, memory access functions may still return -EFAULT.
12339 */
12340-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12341+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12342+#define access_ok(type, addr, size) \
12343+({ \
12344+ long __size = size; \
12345+ unsigned long __addr = (unsigned long)addr; \
12346+ unsigned long __addr_ao = __addr & PAGE_MASK; \
12347+ unsigned long __end_ao = __addr + __size - 1; \
12348+ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
12349+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
12350+ while(__addr_ao <= __end_ao) { \
12351+ char __c_ao; \
12352+ __addr_ao += PAGE_SIZE; \
12353+ if (__size > PAGE_SIZE) \
12354+ cond_resched(); \
12355+ if (__get_user(__c_ao, (char __user *)__addr)) \
12356+ break; \
12357+ if (type != VERIFY_WRITE) { \
12358+ __addr = __addr_ao; \
12359+ continue; \
12360+ } \
12361+ if (__put_user(__c_ao, (char __user *)__addr)) \
12362+ break; \
12363+ __addr = __addr_ao; \
12364+ } \
12365+ } \
12366+ __ret_ao; \
12367+})
12368
12369 /*
12370 * The exception table consists of pairs of addresses: the first is the
12371@@ -182,12 +216,20 @@ extern int __get_user_bad(void);
12372 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
12373 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
12374
12375-
12376+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12377+#define __copyuser_seg "gs;"
12378+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
12379+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
12380+#else
12381+#define __copyuser_seg
12382+#define __COPYUSER_SET_ES
12383+#define __COPYUSER_RESTORE_ES
12384+#endif
12385
12386 #ifdef CONFIG_X86_32
12387 #define __put_user_asm_u64(x, addr, err, errret) \
12388- asm volatile("1: movl %%eax,0(%2)\n" \
12389- "2: movl %%edx,4(%2)\n" \
12390+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
12391+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
12392 "3:\n" \
12393 ".section .fixup,\"ax\"\n" \
12394 "4: movl %3,%0\n" \
12395@@ -199,8 +241,8 @@ extern int __get_user_bad(void);
12396 : "A" (x), "r" (addr), "i" (errret), "0" (err))
12397
12398 #define __put_user_asm_ex_u64(x, addr) \
12399- asm volatile("1: movl %%eax,0(%1)\n" \
12400- "2: movl %%edx,4(%1)\n" \
12401+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
12402+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
12403 "3:\n" \
12404 _ASM_EXTABLE(1b, 2b - 1b) \
12405 _ASM_EXTABLE(2b, 3b - 2b) \
12406@@ -252,7 +294,7 @@ extern void __put_user_8(void);
12407 __typeof__(*(ptr)) __pu_val; \
12408 __chk_user_ptr(ptr); \
12409 might_fault(); \
12410- __pu_val = x; \
12411+ __pu_val = (x); \
12412 switch (sizeof(*(ptr))) { \
12413 case 1: \
12414 __put_user_x(1, __pu_val, ptr, __ret_pu); \
12415@@ -373,7 +415,7 @@ do { \
12416 } while (0)
12417
12418 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12419- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
12420+ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
12421 "2:\n" \
12422 ".section .fixup,\"ax\"\n" \
12423 "3: mov %3,%0\n" \
12424@@ -381,7 +423,7 @@ do { \
12425 " jmp 2b\n" \
12426 ".previous\n" \
12427 _ASM_EXTABLE(1b, 3b) \
12428- : "=r" (err), ltype(x) \
12429+ : "=r" (err), ltype (x) \
12430 : "m" (__m(addr)), "i" (errret), "0" (err))
12431
12432 #define __get_user_size_ex(x, ptr, size) \
12433@@ -406,7 +448,7 @@ do { \
12434 } while (0)
12435
12436 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
12437- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
12438+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
12439 "2:\n" \
12440 _ASM_EXTABLE(1b, 2b - 1b) \
12441 : ltype(x) : "m" (__m(addr)))
12442@@ -423,13 +465,24 @@ do { \
12443 int __gu_err; \
12444 unsigned long __gu_val; \
12445 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
12446- (x) = (__force __typeof__(*(ptr)))__gu_val; \
12447+ (x) = (__typeof__(*(ptr)))__gu_val; \
12448 __gu_err; \
12449 })
12450
12451 /* FIXME: this hack is definitely wrong -AK */
12452 struct __large_struct { unsigned long buf[100]; };
12453-#define __m(x) (*(struct __large_struct __user *)(x))
12454+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12455+#define ____m(x) \
12456+({ \
12457+ unsigned long ____x = (unsigned long)(x); \
12458+ if (____x < PAX_USER_SHADOW_BASE) \
12459+ ____x += PAX_USER_SHADOW_BASE; \
12460+ (void __user *)____x; \
12461+})
12462+#else
12463+#define ____m(x) (x)
12464+#endif
12465+#define __m(x) (*(struct __large_struct __user *)____m(x))
12466
12467 /*
12468 * Tell gcc we read from memory instead of writing: this is because
12469@@ -437,7 +490,7 @@ struct __large_struct { unsigned long buf[100]; };
12470 * aliasing issues.
12471 */
12472 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12473- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
12474+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
12475 "2:\n" \
12476 ".section .fixup,\"ax\"\n" \
12477 "3: mov %3,%0\n" \
12478@@ -445,10 +498,10 @@ struct __large_struct { unsigned long buf[100]; };
12479 ".previous\n" \
12480 _ASM_EXTABLE(1b, 3b) \
12481 : "=r"(err) \
12482- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
12483+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
12484
12485 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
12486- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
12487+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
12488 "2:\n" \
12489 _ASM_EXTABLE(1b, 2b - 1b) \
12490 : : ltype(x), "m" (__m(addr)))
12491@@ -487,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
12492 * On error, the variable @x is set to zero.
12493 */
12494
12495+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12496+#define __get_user(x, ptr) get_user((x), (ptr))
12497+#else
12498 #define __get_user(x, ptr) \
12499 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
12500+#endif
12501
12502 /**
12503 * __put_user: - Write a simple value into user space, with less checking.
12504@@ -510,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
12505 * Returns zero on success, or -EFAULT on error.
12506 */
12507
12508+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12509+#define __put_user(x, ptr) put_user((x), (ptr))
12510+#else
12511 #define __put_user(x, ptr) \
12512 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
12513+#endif
12514
12515 #define __get_user_unaligned __get_user
12516 #define __put_user_unaligned __put_user
12517@@ -529,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
12518 #define get_user_ex(x, ptr) do { \
12519 unsigned long __gue_val; \
12520 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
12521- (x) = (__force __typeof__(*(ptr)))__gue_val; \
12522+ (x) = (__typeof__(*(ptr)))__gue_val; \
12523 } while (0)
12524
12525 #ifdef CONFIG_X86_WP_WORKS_OK
12526diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
12527index 566e803..7183d0b 100644
12528--- a/arch/x86/include/asm/uaccess_32.h
12529+++ b/arch/x86/include/asm/uaccess_32.h
12530@@ -11,15 +11,15 @@
12531 #include <asm/page.h>
12532
12533 unsigned long __must_check __copy_to_user_ll
12534- (void __user *to, const void *from, unsigned long n);
12535+ (void __user *to, const void *from, unsigned long n) __size_overflow(3);
12536 unsigned long __must_check __copy_from_user_ll
12537- (void *to, const void __user *from, unsigned long n);
12538+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12539 unsigned long __must_check __copy_from_user_ll_nozero
12540- (void *to, const void __user *from, unsigned long n);
12541+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12542 unsigned long __must_check __copy_from_user_ll_nocache
12543- (void *to, const void __user *from, unsigned long n);
12544+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12545 unsigned long __must_check __copy_from_user_ll_nocache_nozero
12546- (void *to, const void __user *from, unsigned long n);
12547+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12548
12549 /**
12550 * __copy_to_user_inatomic: - Copy a block of data into user space, with less checking.
12551@@ -41,8 +41,13 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
12552 */
12553
12554 static __always_inline unsigned long __must_check
12555+__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) __size_overflow(3);
12556+static __always_inline unsigned long __must_check
12557 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12558 {
12559+ if ((long)n < 0)
12560+ return n;
12561+
12562 if (__builtin_constant_p(n)) {
12563 unsigned long ret;
12564
12565@@ -61,6 +66,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12566 return ret;
12567 }
12568 }
12569+ if (!__builtin_constant_p(n))
12570+ check_object_size(from, n, true);
12571 return __copy_to_user_ll(to, from, n);
12572 }
12573
12574@@ -79,15 +86,23 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12575 * On success, this will be zero.
12576 */
12577 static __always_inline unsigned long __must_check
12578+__copy_to_user(void __user *to, const void *from, unsigned long n) __size_overflow(3);
12579+static __always_inline unsigned long __must_check
12580 __copy_to_user(void __user *to, const void *from, unsigned long n)
12581 {
12582 might_fault();
12583+
12584 return __copy_to_user_inatomic(to, from, n);
12585 }
12586
12587 static __always_inline unsigned long
12588+__copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) __size_overflow(3);
12589+static __always_inline unsigned long
12590 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
12591 {
12592+ if ((long)n < 0)
12593+ return n;
12594+
12595 /* Avoid zeroing the tail if the copy fails..
12596 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
12597 * but as the zeroing behaviour is only significant when n is not
12598@@ -134,9 +149,15 @@ __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
12599 * for explanation of why this is needed.
12600 */
12601 static __always_inline unsigned long
12602+__copy_from_user(void *to, const void __user *from, unsigned long n) __size_overflow(3);
12603+static __always_inline unsigned long
12604 __copy_from_user(void *to, const void __user *from, unsigned long n)
12605 {
12606 might_fault();
12607+
12608+ if ((long)n < 0)
12609+ return n;
12610+
12611 if (__builtin_constant_p(n)) {
12612 unsigned long ret;
12613
12614@@ -152,13 +173,21 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
12615 return ret;
12616 }
12617 }
12618+ if (!__builtin_constant_p(n))
12619+ check_object_size(to, n, false);
12620 return __copy_from_user_ll(to, from, n);
12621 }
12622
12623 static __always_inline unsigned long __copy_from_user_nocache(void *to,
12624+ const void __user *from, unsigned long n) __size_overflow(3);
12625+static __always_inline unsigned long __copy_from_user_nocache(void *to,
12626 const void __user *from, unsigned long n)
12627 {
12628 might_fault();
12629+
12630+ if ((long)n < 0)
12631+ return n;
12632+
12633 if (__builtin_constant_p(n)) {
12634 unsigned long ret;
12635
12636@@ -179,17 +208,24 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
12637
12638 static __always_inline unsigned long
12639 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
12640+ unsigned long n) __size_overflow(3);
12641+static __always_inline unsigned long
12642+__copy_from_user_inatomic_nocache(void *to, const void __user *from,
12643 unsigned long n)
12644 {
12645- return __copy_from_user_ll_nocache_nozero(to, from, n);
12646+ if ((long)n < 0)
12647+ return n;
12648+
12649+ return __copy_from_user_ll_nocache_nozero(to, from, n);
12650 }
12651
12652-unsigned long __must_check copy_to_user(void __user *to,
12653- const void *from, unsigned long n);
12654-unsigned long __must_check _copy_from_user(void *to,
12655- const void __user *from,
12656- unsigned long n);
12657-
12658+extern void copy_to_user_overflow(void)
12659+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
12660+ __compiletime_error("copy_to_user() buffer size is not provably correct")
12661+#else
12662+ __compiletime_warning("copy_to_user() buffer size is not provably correct")
12663+#endif
12664+;
12665
12666 extern void copy_from_user_overflow(void)
12667 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
12668@@ -199,17 +235,65 @@ extern void copy_from_user_overflow(void)
12669 #endif
12670 ;
12671
12672-static inline unsigned long __must_check copy_from_user(void *to,
12673- const void __user *from,
12674- unsigned long n)
12675+/**
12676+ * copy_to_user: - Copy a block of data into user space.
12677+ * @to: Destination address, in user space.
12678+ * @from: Source address, in kernel space.
12679+ * @n: Number of bytes to copy.
12680+ *
12681+ * Context: User context only. This function may sleep.
12682+ *
12683+ * Copy data from kernel space to user space.
12684+ *
12685+ * Returns number of bytes that could not be copied.
12686+ * On success, this will be zero.
12687+ */
12688+static inline unsigned long __must_check
12689+copy_to_user(void __user *to, const void *from, unsigned long n) __size_overflow(3);
12690+static inline unsigned long __must_check
12691+copy_to_user(void __user *to, const void *from, unsigned long n)
12692+{
12693+ int sz = __compiletime_object_size(from);
12694+
12695+ if (unlikely(sz != -1 && sz < n))
12696+ copy_to_user_overflow();
12697+ else if (access_ok(VERIFY_WRITE, to, n))
12698+ n = __copy_to_user(to, from, n);
12699+ return n;
12700+}
12701+
12702+/**
12703+ * copy_from_user: - Copy a block of data from user space.
12704+ * @to: Destination address, in kernel space.
12705+ * @from: Source address, in user space.
12706+ * @n: Number of bytes to copy.
12707+ *
12708+ * Context: User context only. This function may sleep.
12709+ *
12710+ * Copy data from user space to kernel space.
12711+ *
12712+ * Returns number of bytes that could not be copied.
12713+ * On success, this will be zero.
12714+ *
12715+ * If some data could not be copied, this function will pad the copied
12716+ * data to the requested size using zero bytes.
12717+ */
12718+static inline unsigned long __must_check
12719+copy_from_user(void *to, const void __user *from, unsigned long n) __size_overflow(3);
12720+static inline unsigned long __must_check
12721+copy_from_user(void *to, const void __user *from, unsigned long n)
12722 {
12723 int sz = __compiletime_object_size(to);
12724
12725- if (likely(sz == -1 || sz >= n))
12726- n = _copy_from_user(to, from, n);
12727- else
12728+ if (unlikely(sz != -1 && sz < n))
12729 copy_from_user_overflow();
12730-
12731+ else if (access_ok(VERIFY_READ, from, n))
12732+ n = __copy_from_user(to, from, n);
12733+ else if ((long)n > 0) {
12734+ if (!__builtin_constant_p(n))
12735+ check_object_size(to, n, false);
12736+ memset(to, 0, n);
12737+ }
12738 return n;
12739 }
12740
12741@@ -235,7 +319,7 @@ long __must_check __strncpy_from_user(char *dst,
12742 #define strlen_user(str) strnlen_user(str, LONG_MAX)
12743
12744 long strnlen_user(const char __user *str, long n);
12745-unsigned long __must_check clear_user(void __user *mem, unsigned long len);
12746-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
12747+unsigned long __must_check clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12748+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12749
12750 #endif /* _ASM_X86_UACCESS_32_H */
12751diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
12752index 1c66d30..e294b5f 100644
12753--- a/arch/x86/include/asm/uaccess_64.h
12754+++ b/arch/x86/include/asm/uaccess_64.h
12755@@ -10,6 +10,9 @@
12756 #include <asm/alternative.h>
12757 #include <asm/cpufeature.h>
12758 #include <asm/page.h>
12759+#include <asm/pgtable.h>
12760+
12761+#define set_fs(x) (current_thread_info()->addr_limit = (x))
12762
12763 /*
12764 * Copy To/From Userspace
12765@@ -17,12 +20,14 @@
12766
12767 /* Handles exceptions in both to and from, but doesn't do access_ok */
12768 __must_check unsigned long
12769-copy_user_generic_string(void *to, const void *from, unsigned len);
12770+copy_user_generic_string(void *to, const void *from, unsigned long len) __size_overflow(3);
12771 __must_check unsigned long
12772-copy_user_generic_unrolled(void *to, const void *from, unsigned len);
12773+copy_user_generic_unrolled(void *to, const void *from, unsigned long len) __size_overflow(3);
12774
12775 static __always_inline __must_check unsigned long
12776-copy_user_generic(void *to, const void *from, unsigned len)
12777+copy_user_generic(void *to, const void *from, unsigned long len) __size_overflow(3);
12778+static __always_inline __must_check unsigned long
12779+copy_user_generic(void *to, const void *from, unsigned long len)
12780 {
12781 unsigned ret;
12782
12783@@ -32,142 +37,237 @@ copy_user_generic(void *to, const void *from, unsigned len)
12784 ASM_OUTPUT2("=a" (ret), "=D" (to), "=S" (from),
12785 "=d" (len)),
12786 "1" (to), "2" (from), "3" (len)
12787- : "memory", "rcx", "r8", "r9", "r10", "r11");
12788+ : "memory", "rcx", "r8", "r9", "r11");
12789 return ret;
12790 }
12791
12792+static __always_inline __must_check unsigned long
12793+__copy_to_user(void __user *to, const void *from, unsigned long len) __size_overflow(3);
12794+static __always_inline __must_check unsigned long
12795+__copy_from_user(void *to, const void __user *from, unsigned long len) __size_overflow(3);
12796 __must_check unsigned long
12797-_copy_to_user(void __user *to, const void *from, unsigned len);
12798-__must_check unsigned long
12799-_copy_from_user(void *to, const void __user *from, unsigned len);
12800-__must_check unsigned long
12801-copy_in_user(void __user *to, const void __user *from, unsigned len);
12802+copy_in_user(void __user *to, const void __user *from, unsigned long len) __size_overflow(3);
12803
12804 static inline unsigned long __must_check copy_from_user(void *to,
12805 const void __user *from,
12806+ unsigned long n) __size_overflow(3);
12807+static inline unsigned long __must_check copy_from_user(void *to,
12808+ const void __user *from,
12809 unsigned long n)
12810 {
12811- int sz = __compiletime_object_size(to);
12812-
12813 might_fault();
12814- if (likely(sz == -1 || sz >= n))
12815- n = _copy_from_user(to, from, n);
12816-#ifdef CONFIG_DEBUG_VM
12817- else
12818- WARN(1, "Buffer overflow detected!\n");
12819-#endif
12820+
12821+ if (access_ok(VERIFY_READ, from, n))
12822+ n = __copy_from_user(to, from, n);
12823+ else if (n < INT_MAX) {
12824+ if (!__builtin_constant_p(n))
12825+ check_object_size(to, n, false);
12826+ memset(to, 0, n);
12827+ }
12828 return n;
12829 }
12830
12831 static __always_inline __must_check
12832-int copy_to_user(void __user *dst, const void *src, unsigned size)
12833+int copy_to_user(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12834+static __always_inline __must_check
12835+int copy_to_user(void __user *dst, const void *src, unsigned long size)
12836 {
12837 might_fault();
12838
12839- return _copy_to_user(dst, src, size);
12840+ if (access_ok(VERIFY_WRITE, dst, size))
12841+ size = __copy_to_user(dst, src, size);
12842+ return size;
12843 }
12844
12845 static __always_inline __must_check
12846-int __copy_from_user(void *dst, const void __user *src, unsigned size)
12847+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
12848+static __always_inline __must_check
12849+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
12850 {
12851- int ret = 0;
12852+ int sz = __compiletime_object_size(dst);
12853+ unsigned ret = 0;
12854
12855 might_fault();
12856- if (!__builtin_constant_p(size))
12857- return copy_user_generic(dst, (__force void *)src, size);
12858+
12859+ if (size > INT_MAX)
12860+ return size;
12861+
12862+#ifdef CONFIG_PAX_MEMORY_UDEREF
12863+ if (!__access_ok(VERIFY_READ, src, size))
12864+ return size;
12865+#endif
12866+
12867+ if (unlikely(sz != -1 && sz < size)) {
12868+#ifdef CONFIG_DEBUG_VM
12869+ WARN(1, "Buffer overflow detected!\n");
12870+#endif
12871+ return size;
12872+ }
12873+
12874+ if (!__builtin_constant_p(size)) {
12875+ check_object_size(dst, size, false);
12876+
12877+#ifdef CONFIG_PAX_MEMORY_UDEREF
12878+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12879+ src += PAX_USER_SHADOW_BASE;
12880+#endif
12881+
12882+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12883+ }
12884 switch (size) {
12885- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
12886+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
12887 ret, "b", "b", "=q", 1);
12888 return ret;
12889- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
12890+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
12891 ret, "w", "w", "=r", 2);
12892 return ret;
12893- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
12894+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
12895 ret, "l", "k", "=r", 4);
12896 return ret;
12897- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
12898+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12899 ret, "q", "", "=r", 8);
12900 return ret;
12901 case 10:
12902- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12903+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12904 ret, "q", "", "=r", 10);
12905 if (unlikely(ret))
12906 return ret;
12907 __get_user_asm(*(u16 *)(8 + (char *)dst),
12908- (u16 __user *)(8 + (char __user *)src),
12909+ (const u16 __user *)(8 + (const char __user *)src),
12910 ret, "w", "w", "=r", 2);
12911 return ret;
12912 case 16:
12913- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12914+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12915 ret, "q", "", "=r", 16);
12916 if (unlikely(ret))
12917 return ret;
12918 __get_user_asm(*(u64 *)(8 + (char *)dst),
12919- (u64 __user *)(8 + (char __user *)src),
12920+ (const u64 __user *)(8 + (const char __user *)src),
12921 ret, "q", "", "=r", 8);
12922 return ret;
12923 default:
12924- return copy_user_generic(dst, (__force void *)src, size);
12925+
12926+#ifdef CONFIG_PAX_MEMORY_UDEREF
12927+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12928+ src += PAX_USER_SHADOW_BASE;
12929+#endif
12930+
12931+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12932 }
12933 }
12934
12935 static __always_inline __must_check
12936-int __copy_to_user(void __user *dst, const void *src, unsigned size)
12937+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12938+static __always_inline __must_check
12939+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
12940 {
12941- int ret = 0;
12942+ int sz = __compiletime_object_size(src);
12943+ unsigned ret = 0;
12944
12945 might_fault();
12946- if (!__builtin_constant_p(size))
12947- return copy_user_generic((__force void *)dst, src, size);
12948+
12949+ if (size > INT_MAX)
12950+ return size;
12951+
12952+#ifdef CONFIG_PAX_MEMORY_UDEREF
12953+ if (!__access_ok(VERIFY_WRITE, dst, size))
12954+ return size;
12955+#endif
12956+
12957+ if (unlikely(sz != -1 && sz < size)) {
12958+#ifdef CONFIG_DEBUG_VM
12959+ WARN(1, "Buffer overflow detected!\n");
12960+#endif
12961+ return size;
12962+ }
12963+
12964+ if (!__builtin_constant_p(size)) {
12965+ check_object_size(src, size, true);
12966+
12967+#ifdef CONFIG_PAX_MEMORY_UDEREF
12968+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12969+ dst += PAX_USER_SHADOW_BASE;
12970+#endif
12971+
12972+ return copy_user_generic((__force_kernel void *)dst, src, size);
12973+ }
12974 switch (size) {
12975- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
12976+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
12977 ret, "b", "b", "iq", 1);
12978 return ret;
12979- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
12980+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
12981 ret, "w", "w", "ir", 2);
12982 return ret;
12983- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
12984+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
12985 ret, "l", "k", "ir", 4);
12986 return ret;
12987- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
12988+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12989 ret, "q", "", "er", 8);
12990 return ret;
12991 case 10:
12992- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
12993+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12994 ret, "q", "", "er", 10);
12995 if (unlikely(ret))
12996 return ret;
12997 asm("":::"memory");
12998- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
12999+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
13000 ret, "w", "w", "ir", 2);
13001 return ret;
13002 case 16:
13003- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
13004+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
13005 ret, "q", "", "er", 16);
13006 if (unlikely(ret))
13007 return ret;
13008 asm("":::"memory");
13009- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
13010+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
13011 ret, "q", "", "er", 8);
13012 return ret;
13013 default:
13014- return copy_user_generic((__force void *)dst, src, size);
13015+
13016+#ifdef CONFIG_PAX_MEMORY_UDEREF
13017+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13018+ dst += PAX_USER_SHADOW_BASE;
13019+#endif
13020+
13021+ return copy_user_generic((__force_kernel void *)dst, src, size);
13022 }
13023 }
13024
13025 static __always_inline __must_check
13026-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13027+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size) __size_overflow(3);
13028+static __always_inline __must_check
13029+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size)
13030 {
13031- int ret = 0;
13032+ unsigned ret = 0;
13033
13034 might_fault();
13035- if (!__builtin_constant_p(size))
13036- return copy_user_generic((__force void *)dst,
13037- (__force void *)src, size);
13038+
13039+ if (size > INT_MAX)
13040+ return size;
13041+
13042+#ifdef CONFIG_PAX_MEMORY_UDEREF
13043+ if (!__access_ok(VERIFY_READ, src, size))
13044+ return size;
13045+ if (!__access_ok(VERIFY_WRITE, dst, size))
13046+ return size;
13047+#endif
13048+
13049+ if (!__builtin_constant_p(size)) {
13050+
13051+#ifdef CONFIG_PAX_MEMORY_UDEREF
13052+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
13053+ src += PAX_USER_SHADOW_BASE;
13054+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13055+ dst += PAX_USER_SHADOW_BASE;
13056+#endif
13057+
13058+ return copy_user_generic((__force_kernel void *)dst,
13059+ (__force_kernel const void *)src, size);
13060+ }
13061 switch (size) {
13062 case 1: {
13063 u8 tmp;
13064- __get_user_asm(tmp, (u8 __user *)src,
13065+ __get_user_asm(tmp, (const u8 __user *)src,
13066 ret, "b", "b", "=q", 1);
13067 if (likely(!ret))
13068 __put_user_asm(tmp, (u8 __user *)dst,
13069@@ -176,7 +276,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13070 }
13071 case 2: {
13072 u16 tmp;
13073- __get_user_asm(tmp, (u16 __user *)src,
13074+ __get_user_asm(tmp, (const u16 __user *)src,
13075 ret, "w", "w", "=r", 2);
13076 if (likely(!ret))
13077 __put_user_asm(tmp, (u16 __user *)dst,
13078@@ -186,7 +286,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13079
13080 case 4: {
13081 u32 tmp;
13082- __get_user_asm(tmp, (u32 __user *)src,
13083+ __get_user_asm(tmp, (const u32 __user *)src,
13084 ret, "l", "k", "=r", 4);
13085 if (likely(!ret))
13086 __put_user_asm(tmp, (u32 __user *)dst,
13087@@ -195,7 +295,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13088 }
13089 case 8: {
13090 u64 tmp;
13091- __get_user_asm(tmp, (u64 __user *)src,
13092+ __get_user_asm(tmp, (const u64 __user *)src,
13093 ret, "q", "", "=r", 8);
13094 if (likely(!ret))
13095 __put_user_asm(tmp, (u64 __user *)dst,
13096@@ -203,8 +303,16 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13097 return ret;
13098 }
13099 default:
13100- return copy_user_generic((__force void *)dst,
13101- (__force void *)src, size);
13102+
13103+#ifdef CONFIG_PAX_MEMORY_UDEREF
13104+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
13105+ src += PAX_USER_SHADOW_BASE;
13106+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13107+ dst += PAX_USER_SHADOW_BASE;
13108+#endif
13109+
13110+ return copy_user_generic((__force_kernel void *)dst,
13111+ (__force_kernel const void *)src, size);
13112 }
13113 }
13114
13115@@ -215,39 +323,83 @@ __strncpy_from_user(char *dst, const char __user *src, long count);
13116 __must_check long strnlen_user(const char __user *str, long n);
13117 __must_check long __strnlen_user(const char __user *str, long n);
13118 __must_check long strlen_user(const char __user *str);
13119-__must_check unsigned long clear_user(void __user *mem, unsigned long len);
13120-__must_check unsigned long __clear_user(void __user *mem, unsigned long len);
13121+__must_check unsigned long clear_user(void __user *mem, unsigned long len) __size_overflow(2);
13122+__must_check unsigned long __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
13123
13124 static __must_check __always_inline int
13125-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
13126+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
13127+static __must_check __always_inline int
13128+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
13129 {
13130- return copy_user_generic(dst, (__force const void *)src, size);
13131+ if (size > INT_MAX)
13132+ return size;
13133+
13134+#ifdef CONFIG_PAX_MEMORY_UDEREF
13135+ if (!__access_ok(VERIFY_READ, src, size))
13136+ return size;
13137+
13138+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
13139+ src += PAX_USER_SHADOW_BASE;
13140+#endif
13141+
13142+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
13143 }
13144
13145-static __must_check __always_inline int
13146-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
13147+static __must_check __always_inline unsigned long
13148+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
13149+static __must_check __always_inline unsigned long
13150+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
13151 {
13152- return copy_user_generic((__force void *)dst, src, size);
13153+ if (size > INT_MAX)
13154+ return size;
13155+
13156+#ifdef CONFIG_PAX_MEMORY_UDEREF
13157+ if (!__access_ok(VERIFY_WRITE, dst, size))
13158+ return size;
13159+
13160+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13161+ dst += PAX_USER_SHADOW_BASE;
13162+#endif
13163+
13164+ return copy_user_generic((__force_kernel void *)dst, src, size);
13165 }
13166
13167-extern long __copy_user_nocache(void *dst, const void __user *src,
13168- unsigned size, int zerorest);
13169+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
13170+ unsigned long size, int zerorest) __size_overflow(3);
13171
13172-static inline int
13173-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
13174+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
13175+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
13176 {
13177 might_sleep();
13178+
13179+ if (size > INT_MAX)
13180+ return size;
13181+
13182+#ifdef CONFIG_PAX_MEMORY_UDEREF
13183+ if (!__access_ok(VERIFY_READ, src, size))
13184+ return size;
13185+#endif
13186+
13187 return __copy_user_nocache(dst, src, size, 1);
13188 }
13189
13190-static inline int
13191-__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
13192- unsigned size)
13193+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
13194+ unsigned long size) __size_overflow(3);
13195+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
13196+ unsigned long size)
13197 {
13198+ if (size > INT_MAX)
13199+ return size;
13200+
13201+#ifdef CONFIG_PAX_MEMORY_UDEREF
13202+ if (!__access_ok(VERIFY_READ, src, size))
13203+ return size;
13204+#endif
13205+
13206 return __copy_user_nocache(dst, src, size, 0);
13207 }
13208
13209-unsigned long
13210-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
13211+extern unsigned long
13212+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
13213
13214 #endif /* _ASM_X86_UACCESS_64_H */
13215diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
13216index bb05228..d763d5b 100644
13217--- a/arch/x86/include/asm/vdso.h
13218+++ b/arch/x86/include/asm/vdso.h
13219@@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
13220 #define VDSO32_SYMBOL(base, name) \
13221 ({ \
13222 extern const char VDSO32_##name[]; \
13223- (void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
13224+ (void __user *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
13225 })
13226 #endif
13227
13228diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
13229index a609c39..7a68dc7 100644
13230--- a/arch/x86/include/asm/x86_init.h
13231+++ b/arch/x86/include/asm/x86_init.h
13232@@ -29,7 +29,7 @@ struct x86_init_mpparse {
13233 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
13234 void (*find_smp_config)(void);
13235 void (*get_smp_config)(unsigned int early);
13236-};
13237+} __no_const;
13238
13239 /**
13240 * struct x86_init_resources - platform specific resource related ops
13241@@ -43,7 +43,7 @@ struct x86_init_resources {
13242 void (*probe_roms)(void);
13243 void (*reserve_resources)(void);
13244 char *(*memory_setup)(void);
13245-};
13246+} __no_const;
13247
13248 /**
13249 * struct x86_init_irqs - platform specific interrupt setup
13250@@ -56,7 +56,7 @@ struct x86_init_irqs {
13251 void (*pre_vector_init)(void);
13252 void (*intr_init)(void);
13253 void (*trap_init)(void);
13254-};
13255+} __no_const;
13256
13257 /**
13258 * struct x86_init_oem - oem platform specific customizing functions
13259@@ -66,7 +66,7 @@ struct x86_init_irqs {
13260 struct x86_init_oem {
13261 void (*arch_setup)(void);
13262 void (*banner)(void);
13263-};
13264+} __no_const;
13265
13266 /**
13267 * struct x86_init_mapping - platform specific initial kernel pagetable setup
13268@@ -77,7 +77,7 @@ struct x86_init_oem {
13269 */
13270 struct x86_init_mapping {
13271 void (*pagetable_reserve)(u64 start, u64 end);
13272-};
13273+} __no_const;
13274
13275 /**
13276 * struct x86_init_paging - platform specific paging functions
13277@@ -87,7 +87,7 @@ struct x86_init_mapping {
13278 struct x86_init_paging {
13279 void (*pagetable_setup_start)(pgd_t *base);
13280 void (*pagetable_setup_done)(pgd_t *base);
13281-};
13282+} __no_const;
13283
13284 /**
13285 * struct x86_init_timers - platform specific timer setup
13286@@ -102,7 +102,7 @@ struct x86_init_timers {
13287 void (*tsc_pre_init)(void);
13288 void (*timer_init)(void);
13289 void (*wallclock_init)(void);
13290-};
13291+} __no_const;
13292
13293 /**
13294 * struct x86_init_iommu - platform specific iommu setup
13295@@ -110,7 +110,7 @@ struct x86_init_timers {
13296 */
13297 struct x86_init_iommu {
13298 int (*iommu_init)(void);
13299-};
13300+} __no_const;
13301
13302 /**
13303 * struct x86_init_pci - platform specific pci init functions
13304@@ -124,7 +124,7 @@ struct x86_init_pci {
13305 int (*init)(void);
13306 void (*init_irq)(void);
13307 void (*fixup_irqs)(void);
13308-};
13309+} __no_const;
13310
13311 /**
13312 * struct x86_init_ops - functions for platform specific setup
13313@@ -140,7 +140,7 @@ struct x86_init_ops {
13314 struct x86_init_timers timers;
13315 struct x86_init_iommu iommu;
13316 struct x86_init_pci pci;
13317-};
13318+} __no_const;
13319
13320 /**
13321 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
13322@@ -149,7 +149,7 @@ struct x86_init_ops {
13323 struct x86_cpuinit_ops {
13324 void (*setup_percpu_clockev)(void);
13325 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
13326-};
13327+} __no_const;
13328
13329 /**
13330 * struct x86_platform_ops - platform specific runtime functions
13331@@ -171,7 +171,7 @@ struct x86_platform_ops {
13332 void (*nmi_init)(void);
13333 unsigned char (*get_nmi_reason)(void);
13334 int (*i8042_detect)(void);
13335-};
13336+} __no_const;
13337
13338 struct pci_dev;
13339
13340@@ -180,7 +180,7 @@ struct x86_msi_ops {
13341 void (*teardown_msi_irq)(unsigned int irq);
13342 void (*teardown_msi_irqs)(struct pci_dev *dev);
13343 void (*restore_msi_irqs)(struct pci_dev *dev, int irq);
13344-};
13345+} __no_const;
13346
13347 extern struct x86_init_ops x86_init;
13348 extern struct x86_cpuinit_ops x86_cpuinit;
13349diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
13350index c6ce245..ffbdab7 100644
13351--- a/arch/x86/include/asm/xsave.h
13352+++ b/arch/x86/include/asm/xsave.h
13353@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13354 {
13355 int err;
13356
13357+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13358+ if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
13359+ buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
13360+#endif
13361+
13362 /*
13363 * Clear the xsave header first, so that reserved fields are
13364 * initialized to zero.
13365@@ -96,10 +101,15 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13366 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
13367 {
13368 int err;
13369- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
13370+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
13371 u32 lmask = mask;
13372 u32 hmask = mask >> 32;
13373
13374+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13375+ if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
13376+ xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
13377+#endif
13378+
13379 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
13380 "2:\n"
13381 ".section .fixup,\"ax\"\n"
13382diff --git a/arch/x86/kernel/acpi/realmode/Makefile b/arch/x86/kernel/acpi/realmode/Makefile
13383index 6a564ac..9b1340c 100644
13384--- a/arch/x86/kernel/acpi/realmode/Makefile
13385+++ b/arch/x86/kernel/acpi/realmode/Makefile
13386@@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D_WAKEUP -D__KERNEL__ \
13387 $(call cc-option, -fno-stack-protector) \
13388 $(call cc-option, -mpreferred-stack-boundary=2)
13389 KBUILD_CFLAGS += $(call cc-option, -m32)
13390+ifdef CONSTIFY_PLUGIN
13391+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
13392+endif
13393 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
13394 GCOV_PROFILE := n
13395
13396diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S
13397index b4fd836..4358fe3 100644
13398--- a/arch/x86/kernel/acpi/realmode/wakeup.S
13399+++ b/arch/x86/kernel/acpi/realmode/wakeup.S
13400@@ -108,6 +108,9 @@ wakeup_code:
13401 /* Do any other stuff... */
13402
13403 #ifndef CONFIG_64BIT
13404+ /* Recheck NX bit overrides (64bit path does this in trampoline */
13405+ call verify_cpu
13406+
13407 /* This could also be done in C code... */
13408 movl pmode_cr3, %eax
13409 movl %eax, %cr3
13410@@ -131,6 +134,7 @@ wakeup_code:
13411 movl pmode_cr0, %eax
13412 movl %eax, %cr0
13413 jmp pmode_return
13414+# include "../../verify_cpu.S"
13415 #else
13416 pushw $0
13417 pushw trampoline_segment
13418diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
13419index 103b6ab..2004d0a 100644
13420--- a/arch/x86/kernel/acpi/sleep.c
13421+++ b/arch/x86/kernel/acpi/sleep.c
13422@@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
13423 header->trampoline_segment = trampoline_address() >> 4;
13424 #ifdef CONFIG_SMP
13425 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
13426+
13427+ pax_open_kernel();
13428 early_gdt_descr.address =
13429 (unsigned long)get_cpu_gdt_table(smp_processor_id());
13430+ pax_close_kernel();
13431+
13432 initial_gs = per_cpu_offset(smp_processor_id());
13433 #endif
13434 initial_code = (unsigned long)wakeup_long64;
13435diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
13436index 13ab720..95d5442 100644
13437--- a/arch/x86/kernel/acpi/wakeup_32.S
13438+++ b/arch/x86/kernel/acpi/wakeup_32.S
13439@@ -30,13 +30,11 @@ wakeup_pmode_return:
13440 # and restore the stack ... but you need gdt for this to work
13441 movl saved_context_esp, %esp
13442
13443- movl %cs:saved_magic, %eax
13444- cmpl $0x12345678, %eax
13445+ cmpl $0x12345678, saved_magic
13446 jne bogus_magic
13447
13448 # jump to place where we left off
13449- movl saved_eip, %eax
13450- jmp *%eax
13451+ jmp *(saved_eip)
13452
13453 bogus_magic:
13454 jmp bogus_magic
13455diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
13456index 1f84794..e23f862 100644
13457--- a/arch/x86/kernel/alternative.c
13458+++ b/arch/x86/kernel/alternative.c
13459@@ -276,6 +276,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
13460 */
13461 for (a = start; a < end; a++) {
13462 instr = (u8 *)&a->instr_offset + a->instr_offset;
13463+
13464+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13465+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13466+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
13467+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13468+#endif
13469+
13470 replacement = (u8 *)&a->repl_offset + a->repl_offset;
13471 BUG_ON(a->replacementlen > a->instrlen);
13472 BUG_ON(a->instrlen > sizeof(insnbuf));
13473@@ -307,10 +314,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
13474 for (poff = start; poff < end; poff++) {
13475 u8 *ptr = (u8 *)poff + *poff;
13476
13477+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13478+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13479+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
13480+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13481+#endif
13482+
13483 if (!*poff || ptr < text || ptr >= text_end)
13484 continue;
13485 /* turn DS segment override prefix into lock prefix */
13486- if (*ptr == 0x3e)
13487+ if (*ktla_ktva(ptr) == 0x3e)
13488 text_poke(ptr, ((unsigned char []){0xf0}), 1);
13489 };
13490 mutex_unlock(&text_mutex);
13491@@ -328,10 +341,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
13492 for (poff = start; poff < end; poff++) {
13493 u8 *ptr = (u8 *)poff + *poff;
13494
13495+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13496+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13497+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
13498+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13499+#endif
13500+
13501 if (!*poff || ptr < text || ptr >= text_end)
13502 continue;
13503 /* turn lock prefix into DS segment override prefix */
13504- if (*ptr == 0xf0)
13505+ if (*ktla_ktva(ptr) == 0xf0)
13506 text_poke(ptr, ((unsigned char []){0x3E}), 1);
13507 };
13508 mutex_unlock(&text_mutex);
13509@@ -500,7 +519,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
13510
13511 BUG_ON(p->len > MAX_PATCH_LEN);
13512 /* prep the buffer with the original instructions */
13513- memcpy(insnbuf, p->instr, p->len);
13514+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
13515 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
13516 (unsigned long)p->instr, p->len);
13517
13518@@ -568,7 +587,7 @@ void __init alternative_instructions(void)
13519 if (smp_alt_once)
13520 free_init_pages("SMP alternatives",
13521 (unsigned long)__smp_locks,
13522- (unsigned long)__smp_locks_end);
13523+ PAGE_ALIGN((unsigned long)__smp_locks_end));
13524
13525 restart_nmi();
13526 }
13527@@ -585,13 +604,17 @@ void __init alternative_instructions(void)
13528 * instructions. And on the local CPU you need to be protected again NMI or MCE
13529 * handlers seeing an inconsistent instruction while you patch.
13530 */
13531-void *__init_or_module text_poke_early(void *addr, const void *opcode,
13532+void *__kprobes text_poke_early(void *addr, const void *opcode,
13533 size_t len)
13534 {
13535 unsigned long flags;
13536 local_irq_save(flags);
13537- memcpy(addr, opcode, len);
13538+
13539+ pax_open_kernel();
13540+ memcpy(ktla_ktva(addr), opcode, len);
13541 sync_core();
13542+ pax_close_kernel();
13543+
13544 local_irq_restore(flags);
13545 /* Could also do a CLFLUSH here to speed up CPU recovery; but
13546 that causes hangs on some VIA CPUs. */
13547@@ -613,36 +636,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
13548 */
13549 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
13550 {
13551- unsigned long flags;
13552- char *vaddr;
13553+ unsigned char *vaddr = ktla_ktva(addr);
13554 struct page *pages[2];
13555- int i;
13556+ size_t i;
13557
13558 if (!core_kernel_text((unsigned long)addr)) {
13559- pages[0] = vmalloc_to_page(addr);
13560- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
13561+ pages[0] = vmalloc_to_page(vaddr);
13562+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
13563 } else {
13564- pages[0] = virt_to_page(addr);
13565+ pages[0] = virt_to_page(vaddr);
13566 WARN_ON(!PageReserved(pages[0]));
13567- pages[1] = virt_to_page(addr + PAGE_SIZE);
13568+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
13569 }
13570 BUG_ON(!pages[0]);
13571- local_irq_save(flags);
13572- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
13573- if (pages[1])
13574- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
13575- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
13576- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
13577- clear_fixmap(FIX_TEXT_POKE0);
13578- if (pages[1])
13579- clear_fixmap(FIX_TEXT_POKE1);
13580- local_flush_tlb();
13581- sync_core();
13582- /* Could also do a CLFLUSH here to speed up CPU recovery; but
13583- that causes hangs on some VIA CPUs. */
13584+ text_poke_early(addr, opcode, len);
13585 for (i = 0; i < len; i++)
13586- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
13587- local_irq_restore(flags);
13588+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
13589 return addr;
13590 }
13591
13592diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
13593index 5b3f88e..61232b4 100644
13594--- a/arch/x86/kernel/apic/apic.c
13595+++ b/arch/x86/kernel/apic/apic.c
13596@@ -184,7 +184,7 @@ int first_system_vector = 0xfe;
13597 /*
13598 * Debug level, exported for io_apic.c
13599 */
13600-unsigned int apic_verbosity;
13601+int apic_verbosity;
13602
13603 int pic_mode;
13604
13605@@ -1912,7 +1912,7 @@ void smp_error_interrupt(struct pt_regs *regs)
13606 apic_write(APIC_ESR, 0);
13607 v1 = apic_read(APIC_ESR);
13608 ack_APIC_irq();
13609- atomic_inc(&irq_err_count);
13610+ atomic_inc_unchecked(&irq_err_count);
13611
13612 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
13613 smp_processor_id(), v0 , v1);
13614diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
13615index fb07275..e06bb59 100644
13616--- a/arch/x86/kernel/apic/io_apic.c
13617+++ b/arch/x86/kernel/apic/io_apic.c
13618@@ -1096,7 +1096,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
13619 }
13620 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
13621
13622-void lock_vector_lock(void)
13623+void lock_vector_lock(void) __acquires(vector_lock)
13624 {
13625 /* Used to the online set of cpus does not change
13626 * during assign_irq_vector.
13627@@ -1104,7 +1104,7 @@ void lock_vector_lock(void)
13628 raw_spin_lock(&vector_lock);
13629 }
13630
13631-void unlock_vector_lock(void)
13632+void unlock_vector_lock(void) __releases(vector_lock)
13633 {
13634 raw_spin_unlock(&vector_lock);
13635 }
13636@@ -2510,7 +2510,7 @@ static void ack_apic_edge(struct irq_data *data)
13637 ack_APIC_irq();
13638 }
13639
13640-atomic_t irq_mis_count;
13641+atomic_unchecked_t irq_mis_count;
13642
13643 static void ack_apic_level(struct irq_data *data)
13644 {
13645@@ -2576,7 +2576,7 @@ static void ack_apic_level(struct irq_data *data)
13646 * at the cpu.
13647 */
13648 if (!(v & (1 << (i & 0x1f)))) {
13649- atomic_inc(&irq_mis_count);
13650+ atomic_inc_unchecked(&irq_mis_count);
13651
13652 eoi_ioapic_irq(irq, cfg);
13653 }
13654diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
13655index f76623c..aab694f 100644
13656--- a/arch/x86/kernel/apm_32.c
13657+++ b/arch/x86/kernel/apm_32.c
13658@@ -411,7 +411,7 @@ static DEFINE_MUTEX(apm_mutex);
13659 * This is for buggy BIOS's that refer to (real mode) segment 0x40
13660 * even though they are called in protected mode.
13661 */
13662-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
13663+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
13664 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
13665
13666 static const char driver_version[] = "1.16ac"; /* no spaces */
13667@@ -589,7 +589,10 @@ static long __apm_bios_call(void *_call)
13668 BUG_ON(cpu != 0);
13669 gdt = get_cpu_gdt_table(cpu);
13670 save_desc_40 = gdt[0x40 / 8];
13671+
13672+ pax_open_kernel();
13673 gdt[0x40 / 8] = bad_bios_desc;
13674+ pax_close_kernel();
13675
13676 apm_irq_save(flags);
13677 APM_DO_SAVE_SEGS;
13678@@ -598,7 +601,11 @@ static long __apm_bios_call(void *_call)
13679 &call->esi);
13680 APM_DO_RESTORE_SEGS;
13681 apm_irq_restore(flags);
13682+
13683+ pax_open_kernel();
13684 gdt[0x40 / 8] = save_desc_40;
13685+ pax_close_kernel();
13686+
13687 put_cpu();
13688
13689 return call->eax & 0xff;
13690@@ -665,7 +672,10 @@ static long __apm_bios_call_simple(void *_call)
13691 BUG_ON(cpu != 0);
13692 gdt = get_cpu_gdt_table(cpu);
13693 save_desc_40 = gdt[0x40 / 8];
13694+
13695+ pax_open_kernel();
13696 gdt[0x40 / 8] = bad_bios_desc;
13697+ pax_close_kernel();
13698
13699 apm_irq_save(flags);
13700 APM_DO_SAVE_SEGS;
13701@@ -673,7 +683,11 @@ static long __apm_bios_call_simple(void *_call)
13702 &call->eax);
13703 APM_DO_RESTORE_SEGS;
13704 apm_irq_restore(flags);
13705+
13706+ pax_open_kernel();
13707 gdt[0x40 / 8] = save_desc_40;
13708+ pax_close_kernel();
13709+
13710 put_cpu();
13711 return error;
13712 }
13713@@ -2347,12 +2361,15 @@ static int __init apm_init(void)
13714 * code to that CPU.
13715 */
13716 gdt = get_cpu_gdt_table(0);
13717+
13718+ pax_open_kernel();
13719 set_desc_base(&gdt[APM_CS >> 3],
13720 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
13721 set_desc_base(&gdt[APM_CS_16 >> 3],
13722 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
13723 set_desc_base(&gdt[APM_DS >> 3],
13724 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
13725+ pax_close_kernel();
13726
13727 proc_create("apm", 0, NULL, &apm_file_ops);
13728
13729diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
13730index 68de2dc..1f3c720 100644
13731--- a/arch/x86/kernel/asm-offsets.c
13732+++ b/arch/x86/kernel/asm-offsets.c
13733@@ -33,6 +33,8 @@ void common(void) {
13734 OFFSET(TI_status, thread_info, status);
13735 OFFSET(TI_addr_limit, thread_info, addr_limit);
13736 OFFSET(TI_preempt_count, thread_info, preempt_count);
13737+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
13738+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
13739
13740 BLANK();
13741 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
13742@@ -53,8 +55,26 @@ void common(void) {
13743 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
13744 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
13745 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
13746+
13747+#ifdef CONFIG_PAX_KERNEXEC
13748+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
13749 #endif
13750
13751+#ifdef CONFIG_PAX_MEMORY_UDEREF
13752+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
13753+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
13754+#ifdef CONFIG_X86_64
13755+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
13756+#endif
13757+#endif
13758+
13759+#endif
13760+
13761+ BLANK();
13762+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
13763+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
13764+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
13765+
13766 #ifdef CONFIG_XEN
13767 BLANK();
13768 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
13769diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
13770index 834e897..dacddc8 100644
13771--- a/arch/x86/kernel/asm-offsets_64.c
13772+++ b/arch/x86/kernel/asm-offsets_64.c
13773@@ -70,6 +70,7 @@ int main(void)
13774 BLANK();
13775 #undef ENTRY
13776
13777+ DEFINE(TSS_size, sizeof(struct tss_struct));
13778 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
13779 BLANK();
13780
13781diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
13782index 25f24dc..4094a7f 100644
13783--- a/arch/x86/kernel/cpu/Makefile
13784+++ b/arch/x86/kernel/cpu/Makefile
13785@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
13786 CFLAGS_REMOVE_perf_event.o = -pg
13787 endif
13788
13789-# Make sure load_percpu_segment has no stackprotector
13790-nostackp := $(call cc-option, -fno-stack-protector)
13791-CFLAGS_common.o := $(nostackp)
13792-
13793 obj-y := intel_cacheinfo.o scattered.o topology.o
13794 obj-y += proc.o capflags.o powerflags.o common.o
13795 obj-y += vmware.o hypervisor.o sched.o mshyperv.o
13796diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
13797index 80ab83d..0a7b34e 100644
13798--- a/arch/x86/kernel/cpu/amd.c
13799+++ b/arch/x86/kernel/cpu/amd.c
13800@@ -670,7 +670,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
13801 unsigned int size)
13802 {
13803 /* AMD errata T13 (order #21922) */
13804- if ((c->x86 == 6)) {
13805+ if (c->x86 == 6) {
13806 /* Duron Rev A0 */
13807 if (c->x86_model == 3 && c->x86_mask == 0)
13808 size = 64;
13809diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
13810index 1a810e4..9fa8201 100644
13811--- a/arch/x86/kernel/cpu/common.c
13812+++ b/arch/x86/kernel/cpu/common.c
13813@@ -84,60 +84,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
13814
13815 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
13816
13817-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
13818-#ifdef CONFIG_X86_64
13819- /*
13820- * We need valid kernel segments for data and code in long mode too
13821- * IRET will check the segment types kkeil 2000/10/28
13822- * Also sysret mandates a special GDT layout
13823- *
13824- * TLS descriptors are currently at a different place compared to i386.
13825- * Hopefully nobody expects them at a fixed place (Wine?)
13826- */
13827- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
13828- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
13829- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
13830- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
13831- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
13832- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
13833-#else
13834- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
13835- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13836- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
13837- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
13838- /*
13839- * Segments used for calling PnP BIOS have byte granularity.
13840- * They code segments and data segments have fixed 64k limits,
13841- * the transfer segment sizes are set at run time.
13842- */
13843- /* 32-bit code */
13844- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13845- /* 16-bit code */
13846- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13847- /* 16-bit data */
13848- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
13849- /* 16-bit data */
13850- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
13851- /* 16-bit data */
13852- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
13853- /*
13854- * The APM segments have byte granularity and their bases
13855- * are set at run time. All have 64k limits.
13856- */
13857- /* 32-bit code */
13858- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13859- /* 16-bit code */
13860- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13861- /* data */
13862- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
13863-
13864- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13865- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13866- GDT_STACK_CANARY_INIT
13867-#endif
13868-} };
13869-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
13870-
13871 static int __init x86_xsave_setup(char *s)
13872 {
13873 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
13874@@ -372,7 +318,7 @@ void switch_to_new_gdt(int cpu)
13875 {
13876 struct desc_ptr gdt_descr;
13877
13878- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
13879+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
13880 gdt_descr.size = GDT_SIZE - 1;
13881 load_gdt(&gdt_descr);
13882 /* Reload the per-cpu base */
13883@@ -839,6 +785,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
13884 /* Filter out anything that depends on CPUID levels we don't have */
13885 filter_cpuid_features(c, true);
13886
13887+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
13888+ setup_clear_cpu_cap(X86_FEATURE_SEP);
13889+#endif
13890+
13891 /* If the model name is still unset, do table lookup. */
13892 if (!c->x86_model_id[0]) {
13893 const char *p;
13894@@ -1019,10 +969,12 @@ static __init int setup_disablecpuid(char *arg)
13895 }
13896 __setup("clearcpuid=", setup_disablecpuid);
13897
13898+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
13899+EXPORT_PER_CPU_SYMBOL(current_tinfo);
13900+
13901 #ifdef CONFIG_X86_64
13902 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
13903-struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1,
13904- (unsigned long) nmi_idt_table };
13905+struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) nmi_idt_table };
13906
13907 DEFINE_PER_CPU_FIRST(union irq_stack_union,
13908 irq_stack_union) __aligned(PAGE_SIZE);
13909@@ -1036,7 +988,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
13910 EXPORT_PER_CPU_SYMBOL(current_task);
13911
13912 DEFINE_PER_CPU(unsigned long, kernel_stack) =
13913- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
13914+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
13915 EXPORT_PER_CPU_SYMBOL(kernel_stack);
13916
13917 DEFINE_PER_CPU(char *, irq_stack_ptr) =
13918@@ -1126,7 +1078,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
13919 {
13920 memset(regs, 0, sizeof(struct pt_regs));
13921 regs->fs = __KERNEL_PERCPU;
13922- regs->gs = __KERNEL_STACK_CANARY;
13923+ savesegment(gs, regs->gs);
13924
13925 return regs;
13926 }
13927@@ -1181,7 +1133,7 @@ void __cpuinit cpu_init(void)
13928 int i;
13929
13930 cpu = stack_smp_processor_id();
13931- t = &per_cpu(init_tss, cpu);
13932+ t = init_tss + cpu;
13933 oist = &per_cpu(orig_ist, cpu);
13934
13935 #ifdef CONFIG_NUMA
13936@@ -1207,7 +1159,7 @@ void __cpuinit cpu_init(void)
13937 switch_to_new_gdt(cpu);
13938 loadsegment(fs, 0);
13939
13940- load_idt((const struct desc_ptr *)&idt_descr);
13941+ load_idt(&idt_descr);
13942
13943 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
13944 syscall_init();
13945@@ -1216,7 +1168,6 @@ void __cpuinit cpu_init(void)
13946 wrmsrl(MSR_KERNEL_GS_BASE, 0);
13947 barrier();
13948
13949- x86_configure_nx();
13950 if (cpu != 0)
13951 enable_x2apic();
13952
13953@@ -1272,7 +1223,7 @@ void __cpuinit cpu_init(void)
13954 {
13955 int cpu = smp_processor_id();
13956 struct task_struct *curr = current;
13957- struct tss_struct *t = &per_cpu(init_tss, cpu);
13958+ struct tss_struct *t = init_tss + cpu;
13959 struct thread_struct *thread = &curr->thread;
13960
13961 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
13962diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
13963index 3e6ff6c..54b4992 100644
13964--- a/arch/x86/kernel/cpu/intel.c
13965+++ b/arch/x86/kernel/cpu/intel.c
13966@@ -174,7 +174,7 @@ static void __cpuinit trap_init_f00f_bug(void)
13967 * Update the IDT descriptor and reload the IDT so that
13968 * it uses the read-only mapped virtual address.
13969 */
13970- idt_descr.address = fix_to_virt(FIX_F00F_IDT);
13971+ idt_descr.address = (struct desc_struct *)fix_to_virt(FIX_F00F_IDT);
13972 load_idt(&idt_descr);
13973 }
13974 #endif
13975diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13976index fc4beb3..f20a5a7 100644
13977--- a/arch/x86/kernel/cpu/mcheck/mce-inject.c
13978+++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13979@@ -199,6 +199,8 @@ static void raise_mce(struct mce *m)
13980
13981 /* Error injection interface */
13982 static ssize_t mce_write(struct file *filp, const char __user *ubuf,
13983+ size_t usize, loff_t *off) __size_overflow(3);
13984+static ssize_t mce_write(struct file *filp, const char __user *ubuf,
13985 size_t usize, loff_t *off)
13986 {
13987 struct mce m;
13988diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
13989index 5a11ae2..a1a1c8a 100644
13990--- a/arch/x86/kernel/cpu/mcheck/mce.c
13991+++ b/arch/x86/kernel/cpu/mcheck/mce.c
13992@@ -42,6 +42,7 @@
13993 #include <asm/processor.h>
13994 #include <asm/mce.h>
13995 #include <asm/msr.h>
13996+#include <asm/local.h>
13997
13998 #include "mce-internal.h"
13999
14000@@ -250,7 +251,7 @@ static void print_mce(struct mce *m)
14001 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
14002 m->cs, m->ip);
14003
14004- if (m->cs == __KERNEL_CS)
14005+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
14006 print_symbol("{%s}", m->ip);
14007 pr_cont("\n");
14008 }
14009@@ -283,10 +284,10 @@ static void print_mce(struct mce *m)
14010
14011 #define PANIC_TIMEOUT 5 /* 5 seconds */
14012
14013-static atomic_t mce_paniced;
14014+static atomic_unchecked_t mce_paniced;
14015
14016 static int fake_panic;
14017-static atomic_t mce_fake_paniced;
14018+static atomic_unchecked_t mce_fake_paniced;
14019
14020 /* Panic in progress. Enable interrupts and wait for final IPI */
14021 static void wait_for_panic(void)
14022@@ -310,7 +311,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
14023 /*
14024 * Make sure only one CPU runs in machine check panic
14025 */
14026- if (atomic_inc_return(&mce_paniced) > 1)
14027+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
14028 wait_for_panic();
14029 barrier();
14030
14031@@ -318,7 +319,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
14032 console_verbose();
14033 } else {
14034 /* Don't log too much for fake panic */
14035- if (atomic_inc_return(&mce_fake_paniced) > 1)
14036+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
14037 return;
14038 }
14039 /* First print corrected ones that are still unlogged */
14040@@ -658,7 +659,7 @@ static int mce_timed_out(u64 *t)
14041 * might have been modified by someone else.
14042 */
14043 rmb();
14044- if (atomic_read(&mce_paniced))
14045+ if (atomic_read_unchecked(&mce_paniced))
14046 wait_for_panic();
14047 if (!monarch_timeout)
14048 goto out;
14049@@ -1446,7 +1447,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
14050 }
14051
14052 /* Call the installed machine check handler for this CPU setup. */
14053-void (*machine_check_vector)(struct pt_regs *, long error_code) =
14054+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
14055 unexpected_machine_check;
14056
14057 /*
14058@@ -1469,7 +1470,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
14059 return;
14060 }
14061
14062+ pax_open_kernel();
14063 machine_check_vector = do_machine_check;
14064+ pax_close_kernel();
14065
14066 __mcheck_cpu_init_generic();
14067 __mcheck_cpu_init_vendor(c);
14068@@ -1483,7 +1486,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
14069 */
14070
14071 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
14072-static int mce_chrdev_open_count; /* #times opened */
14073+static local_t mce_chrdev_open_count; /* #times opened */
14074 static int mce_chrdev_open_exclu; /* already open exclusive? */
14075
14076 static int mce_chrdev_open(struct inode *inode, struct file *file)
14077@@ -1491,7 +1494,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
14078 spin_lock(&mce_chrdev_state_lock);
14079
14080 if (mce_chrdev_open_exclu ||
14081- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
14082+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
14083 spin_unlock(&mce_chrdev_state_lock);
14084
14085 return -EBUSY;
14086@@ -1499,7 +1502,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
14087
14088 if (file->f_flags & O_EXCL)
14089 mce_chrdev_open_exclu = 1;
14090- mce_chrdev_open_count++;
14091+ local_inc(&mce_chrdev_open_count);
14092
14093 spin_unlock(&mce_chrdev_state_lock);
14094
14095@@ -1510,7 +1513,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
14096 {
14097 spin_lock(&mce_chrdev_state_lock);
14098
14099- mce_chrdev_open_count--;
14100+ local_dec(&mce_chrdev_open_count);
14101 mce_chrdev_open_exclu = 0;
14102
14103 spin_unlock(&mce_chrdev_state_lock);
14104@@ -2229,7 +2232,7 @@ struct dentry *mce_get_debugfs_dir(void)
14105 static void mce_reset(void)
14106 {
14107 cpu_missing = 0;
14108- atomic_set(&mce_fake_paniced, 0);
14109+ atomic_set_unchecked(&mce_fake_paniced, 0);
14110 atomic_set(&mce_executing, 0);
14111 atomic_set(&mce_callin, 0);
14112 atomic_set(&global_nwo, 0);
14113diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
14114index 5c0e653..0882b0a 100644
14115--- a/arch/x86/kernel/cpu/mcheck/p5.c
14116+++ b/arch/x86/kernel/cpu/mcheck/p5.c
14117@@ -12,6 +12,7 @@
14118 #include <asm/system.h>
14119 #include <asm/mce.h>
14120 #include <asm/msr.h>
14121+#include <asm/pgtable.h>
14122
14123 /* By default disabled */
14124 int mce_p5_enabled __read_mostly;
14125@@ -50,7 +51,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
14126 if (!cpu_has(c, X86_FEATURE_MCE))
14127 return;
14128
14129+ pax_open_kernel();
14130 machine_check_vector = pentium_machine_check;
14131+ pax_close_kernel();
14132 /* Make sure the vector pointer is visible before we enable MCEs: */
14133 wmb();
14134
14135diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
14136index 54060f5..c1a7577 100644
14137--- a/arch/x86/kernel/cpu/mcheck/winchip.c
14138+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
14139@@ -11,6 +11,7 @@
14140 #include <asm/system.h>
14141 #include <asm/mce.h>
14142 #include <asm/msr.h>
14143+#include <asm/pgtable.h>
14144
14145 /* Machine check handler for WinChip C6: */
14146 static void winchip_machine_check(struct pt_regs *regs, long error_code)
14147@@ -24,7 +25,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
14148 {
14149 u32 lo, hi;
14150
14151+ pax_open_kernel();
14152 machine_check_vector = winchip_machine_check;
14153+ pax_close_kernel();
14154 /* Make sure the vector pointer is visible before we enable MCEs: */
14155 wmb();
14156
14157diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
14158index 7928963..1b16001 100644
14159--- a/arch/x86/kernel/cpu/mtrr/if.c
14160+++ b/arch/x86/kernel/cpu/mtrr/if.c
14161@@ -91,6 +91,8 @@ mtrr_file_del(unsigned long base, unsigned long size,
14162 * "base=%Lx size=%Lx type=%s" or "disable=%d"
14163 */
14164 static ssize_t
14165+mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos) __size_overflow(3);
14166+static ssize_t
14167 mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos)
14168 {
14169 int i, err;
14170diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
14171index 6b96110..0da73eb 100644
14172--- a/arch/x86/kernel/cpu/mtrr/main.c
14173+++ b/arch/x86/kernel/cpu/mtrr/main.c
14174@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
14175 u64 size_or_mask, size_and_mask;
14176 static bool mtrr_aps_delayed_init;
14177
14178-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
14179+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
14180
14181 const struct mtrr_ops *mtrr_if;
14182
14183diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
14184index df5e41f..816c719 100644
14185--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
14186+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
14187@@ -25,7 +25,7 @@ struct mtrr_ops {
14188 int (*validate_add_page)(unsigned long base, unsigned long size,
14189 unsigned int type);
14190 int (*have_wrcomb)(void);
14191-};
14192+} __do_const;
14193
14194 extern int generic_get_free_region(unsigned long base, unsigned long size,
14195 int replace_reg);
14196diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
14197index 5adce10..99284ec 100644
14198--- a/arch/x86/kernel/cpu/perf_event.c
14199+++ b/arch/x86/kernel/cpu/perf_event.c
14200@@ -1665,7 +1665,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
14201 break;
14202
14203 perf_callchain_store(entry, frame.return_address);
14204- fp = frame.next_frame;
14205+ fp = (const void __force_user *)frame.next_frame;
14206 }
14207 }
14208
14209diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
14210index 13ad899..f642b9a 100644
14211--- a/arch/x86/kernel/crash.c
14212+++ b/arch/x86/kernel/crash.c
14213@@ -36,10 +36,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
14214 {
14215 #ifdef CONFIG_X86_32
14216 struct pt_regs fixed_regs;
14217-#endif
14218
14219-#ifdef CONFIG_X86_32
14220- if (!user_mode_vm(regs)) {
14221+ if (!user_mode(regs)) {
14222 crash_fixup_ss_esp(&fixed_regs, regs);
14223 regs = &fixed_regs;
14224 }
14225diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
14226index 37250fe..bf2ec74 100644
14227--- a/arch/x86/kernel/doublefault_32.c
14228+++ b/arch/x86/kernel/doublefault_32.c
14229@@ -11,7 +11,7 @@
14230
14231 #define DOUBLEFAULT_STACKSIZE (1024)
14232 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
14233-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
14234+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
14235
14236 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
14237
14238@@ -21,7 +21,7 @@ static void doublefault_fn(void)
14239 unsigned long gdt, tss;
14240
14241 store_gdt(&gdt_desc);
14242- gdt = gdt_desc.address;
14243+ gdt = (unsigned long)gdt_desc.address;
14244
14245 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
14246
14247@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
14248 /* 0x2 bit is always set */
14249 .flags = X86_EFLAGS_SF | 0x2,
14250 .sp = STACK_START,
14251- .es = __USER_DS,
14252+ .es = __KERNEL_DS,
14253 .cs = __KERNEL_CS,
14254 .ss = __KERNEL_DS,
14255- .ds = __USER_DS,
14256+ .ds = __KERNEL_DS,
14257 .fs = __KERNEL_PERCPU,
14258
14259 .__cr3 = __pa_nodebug(swapper_pg_dir),
14260diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
14261index 4025fe4..d8451c6 100644
14262--- a/arch/x86/kernel/dumpstack.c
14263+++ b/arch/x86/kernel/dumpstack.c
14264@@ -2,6 +2,9 @@
14265 * Copyright (C) 1991, 1992 Linus Torvalds
14266 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
14267 */
14268+#ifdef CONFIG_GRKERNSEC_HIDESYM
14269+#define __INCLUDED_BY_HIDESYM 1
14270+#endif
14271 #include <linux/kallsyms.h>
14272 #include <linux/kprobes.h>
14273 #include <linux/uaccess.h>
14274@@ -35,9 +38,8 @@ void printk_address(unsigned long address, int reliable)
14275 static void
14276 print_ftrace_graph_addr(unsigned long addr, void *data,
14277 const struct stacktrace_ops *ops,
14278- struct thread_info *tinfo, int *graph)
14279+ struct task_struct *task, int *graph)
14280 {
14281- struct task_struct *task = tinfo->task;
14282 unsigned long ret_addr;
14283 int index = task->curr_ret_stack;
14284
14285@@ -58,7 +60,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14286 static inline void
14287 print_ftrace_graph_addr(unsigned long addr, void *data,
14288 const struct stacktrace_ops *ops,
14289- struct thread_info *tinfo, int *graph)
14290+ struct task_struct *task, int *graph)
14291 { }
14292 #endif
14293
14294@@ -69,10 +71,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14295 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
14296 */
14297
14298-static inline int valid_stack_ptr(struct thread_info *tinfo,
14299- void *p, unsigned int size, void *end)
14300+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
14301 {
14302- void *t = tinfo;
14303 if (end) {
14304 if (p < end && p >= (end-THREAD_SIZE))
14305 return 1;
14306@@ -83,14 +83,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
14307 }
14308
14309 unsigned long
14310-print_context_stack(struct thread_info *tinfo,
14311+print_context_stack(struct task_struct *task, void *stack_start,
14312 unsigned long *stack, unsigned long bp,
14313 const struct stacktrace_ops *ops, void *data,
14314 unsigned long *end, int *graph)
14315 {
14316 struct stack_frame *frame = (struct stack_frame *)bp;
14317
14318- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
14319+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
14320 unsigned long addr;
14321
14322 addr = *stack;
14323@@ -102,7 +102,7 @@ print_context_stack(struct thread_info *tinfo,
14324 } else {
14325 ops->address(data, addr, 0);
14326 }
14327- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14328+ print_ftrace_graph_addr(addr, data, ops, task, graph);
14329 }
14330 stack++;
14331 }
14332@@ -111,7 +111,7 @@ print_context_stack(struct thread_info *tinfo,
14333 EXPORT_SYMBOL_GPL(print_context_stack);
14334
14335 unsigned long
14336-print_context_stack_bp(struct thread_info *tinfo,
14337+print_context_stack_bp(struct task_struct *task, void *stack_start,
14338 unsigned long *stack, unsigned long bp,
14339 const struct stacktrace_ops *ops, void *data,
14340 unsigned long *end, int *graph)
14341@@ -119,7 +119,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14342 struct stack_frame *frame = (struct stack_frame *)bp;
14343 unsigned long *ret_addr = &frame->return_address;
14344
14345- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
14346+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
14347 unsigned long addr = *ret_addr;
14348
14349 if (!__kernel_text_address(addr))
14350@@ -128,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14351 ops->address(data, addr, 1);
14352 frame = frame->next_frame;
14353 ret_addr = &frame->return_address;
14354- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14355+ print_ftrace_graph_addr(addr, data, ops, task, graph);
14356 }
14357
14358 return (unsigned long)frame;
14359@@ -186,7 +186,7 @@ void dump_stack(void)
14360
14361 bp = stack_frame(current, NULL);
14362 printk("Pid: %d, comm: %.20s %s %s %.*s\n",
14363- current->pid, current->comm, print_tainted(),
14364+ task_pid_nr(current), current->comm, print_tainted(),
14365 init_utsname()->release,
14366 (int)strcspn(init_utsname()->version, " "),
14367 init_utsname()->version);
14368@@ -222,6 +222,8 @@ unsigned __kprobes long oops_begin(void)
14369 }
14370 EXPORT_SYMBOL_GPL(oops_begin);
14371
14372+extern void gr_handle_kernel_exploit(void);
14373+
14374 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14375 {
14376 if (regs && kexec_should_crash(current))
14377@@ -243,7 +245,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14378 panic("Fatal exception in interrupt");
14379 if (panic_on_oops)
14380 panic("Fatal exception");
14381- do_exit(signr);
14382+
14383+ gr_handle_kernel_exploit();
14384+
14385+ do_group_exit(signr);
14386 }
14387
14388 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14389@@ -270,7 +275,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14390
14391 show_registers(regs);
14392 #ifdef CONFIG_X86_32
14393- if (user_mode_vm(regs)) {
14394+ if (user_mode(regs)) {
14395 sp = regs->sp;
14396 ss = regs->ss & 0xffff;
14397 } else {
14398@@ -298,7 +303,7 @@ void die(const char *str, struct pt_regs *regs, long err)
14399 unsigned long flags = oops_begin();
14400 int sig = SIGSEGV;
14401
14402- if (!user_mode_vm(regs))
14403+ if (!user_mode(regs))
14404 report_bug(regs->ip, regs);
14405
14406 if (__die(str, regs, err))
14407diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
14408index c99f9ed..2a15d80 100644
14409--- a/arch/x86/kernel/dumpstack_32.c
14410+++ b/arch/x86/kernel/dumpstack_32.c
14411@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14412 bp = stack_frame(task, regs);
14413
14414 for (;;) {
14415- struct thread_info *context;
14416+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14417
14418- context = (struct thread_info *)
14419- ((unsigned long)stack & (~(THREAD_SIZE - 1)));
14420- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
14421+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14422
14423- stack = (unsigned long *)context->previous_esp;
14424- if (!stack)
14425+ if (stack_start == task_stack_page(task))
14426 break;
14427+ stack = *(unsigned long **)stack_start;
14428 if (ops->stack(data, "IRQ") < 0)
14429 break;
14430 touch_nmi_watchdog();
14431@@ -96,21 +94,22 @@ void show_registers(struct pt_regs *regs)
14432 * When in-kernel, we also print out the stack and code at the
14433 * time of the fault..
14434 */
14435- if (!user_mode_vm(regs)) {
14436+ if (!user_mode(regs)) {
14437 unsigned int code_prologue = code_bytes * 43 / 64;
14438 unsigned int code_len = code_bytes;
14439 unsigned char c;
14440 u8 *ip;
14441+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
14442
14443 printk(KERN_EMERG "Stack:\n");
14444 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
14445
14446 printk(KERN_EMERG "Code: ");
14447
14448- ip = (u8 *)regs->ip - code_prologue;
14449+ ip = (u8 *)regs->ip - code_prologue + cs_base;
14450 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
14451 /* try starting at IP */
14452- ip = (u8 *)regs->ip;
14453+ ip = (u8 *)regs->ip + cs_base;
14454 code_len = code_len - code_prologue + 1;
14455 }
14456 for (i = 0; i < code_len; i++, ip++) {
14457@@ -119,7 +118,7 @@ void show_registers(struct pt_regs *regs)
14458 printk(KERN_CONT " Bad EIP value.");
14459 break;
14460 }
14461- if (ip == (u8 *)regs->ip)
14462+ if (ip == (u8 *)regs->ip + cs_base)
14463 printk(KERN_CONT "<%02x> ", c);
14464 else
14465 printk(KERN_CONT "%02x ", c);
14466@@ -132,6 +131,7 @@ int is_valid_bugaddr(unsigned long ip)
14467 {
14468 unsigned short ud2;
14469
14470+ ip = ktla_ktva(ip);
14471 if (ip < PAGE_OFFSET)
14472 return 0;
14473 if (probe_kernel_address((unsigned short *)ip, ud2))
14474@@ -139,3 +139,15 @@ int is_valid_bugaddr(unsigned long ip)
14475
14476 return ud2 == 0x0b0f;
14477 }
14478+
14479+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14480+void pax_check_alloca(unsigned long size)
14481+{
14482+ unsigned long sp = (unsigned long)&sp, stack_left;
14483+
14484+ /* all kernel stacks are of the same size */
14485+ stack_left = sp & (THREAD_SIZE - 1);
14486+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14487+}
14488+EXPORT_SYMBOL(pax_check_alloca);
14489+#endif
14490diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
14491index 17107bd..b2deecf 100644
14492--- a/arch/x86/kernel/dumpstack_64.c
14493+++ b/arch/x86/kernel/dumpstack_64.c
14494@@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14495 unsigned long *irq_stack_end =
14496 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
14497 unsigned used = 0;
14498- struct thread_info *tinfo;
14499 int graph = 0;
14500 unsigned long dummy;
14501+ void *stack_start;
14502
14503 if (!task)
14504 task = current;
14505@@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14506 * current stack address. If the stacks consist of nested
14507 * exceptions
14508 */
14509- tinfo = task_thread_info(task);
14510 for (;;) {
14511 char *id;
14512 unsigned long *estack_end;
14513+
14514 estack_end = in_exception_stack(cpu, (unsigned long)stack,
14515 &used, &id);
14516
14517@@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14518 if (ops->stack(data, id) < 0)
14519 break;
14520
14521- bp = ops->walk_stack(tinfo, stack, bp, ops,
14522+ bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
14523 data, estack_end, &graph);
14524 ops->stack(data, "<EOE>");
14525 /*
14526@@ -172,7 +172,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14527 if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
14528 if (ops->stack(data, "IRQ") < 0)
14529 break;
14530- bp = ops->walk_stack(tinfo, stack, bp,
14531+ bp = ops->walk_stack(task, irq_stack, stack, bp,
14532 ops, data, irq_stack_end, &graph);
14533 /*
14534 * We link to the next stack (which would be
14535@@ -191,7 +191,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14536 /*
14537 * This handles the process stack:
14538 */
14539- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
14540+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14541+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14542 put_cpu();
14543 }
14544 EXPORT_SYMBOL(dump_trace);
14545@@ -305,3 +306,50 @@ int is_valid_bugaddr(unsigned long ip)
14546
14547 return ud2 == 0x0b0f;
14548 }
14549+
14550+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14551+void pax_check_alloca(unsigned long size)
14552+{
14553+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
14554+ unsigned cpu, used;
14555+ char *id;
14556+
14557+ /* check the process stack first */
14558+ stack_start = (unsigned long)task_stack_page(current);
14559+ stack_end = stack_start + THREAD_SIZE;
14560+ if (likely(stack_start <= sp && sp < stack_end)) {
14561+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
14562+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14563+ return;
14564+ }
14565+
14566+ cpu = get_cpu();
14567+
14568+ /* check the irq stacks */
14569+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
14570+ stack_start = stack_end - IRQ_STACK_SIZE;
14571+ if (stack_start <= sp && sp < stack_end) {
14572+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
14573+ put_cpu();
14574+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14575+ return;
14576+ }
14577+
14578+ /* check the exception stacks */
14579+ used = 0;
14580+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
14581+ stack_start = stack_end - EXCEPTION_STKSZ;
14582+ if (stack_end && stack_start <= sp && sp < stack_end) {
14583+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
14584+ put_cpu();
14585+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14586+ return;
14587+ }
14588+
14589+ put_cpu();
14590+
14591+ /* unknown stack */
14592+ BUG();
14593+}
14594+EXPORT_SYMBOL(pax_check_alloca);
14595+#endif
14596diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
14597index 9b9f18b..9fcaa04 100644
14598--- a/arch/x86/kernel/early_printk.c
14599+++ b/arch/x86/kernel/early_printk.c
14600@@ -7,6 +7,7 @@
14601 #include <linux/pci_regs.h>
14602 #include <linux/pci_ids.h>
14603 #include <linux/errno.h>
14604+#include <linux/sched.h>
14605 #include <asm/io.h>
14606 #include <asm/processor.h>
14607 #include <asm/fcntl.h>
14608diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
14609index 7b784f4..76aaad7 100644
14610--- a/arch/x86/kernel/entry_32.S
14611+++ b/arch/x86/kernel/entry_32.S
14612@@ -179,13 +179,146 @@
14613 /*CFI_REL_OFFSET gs, PT_GS*/
14614 .endm
14615 .macro SET_KERNEL_GS reg
14616+
14617+#ifdef CONFIG_CC_STACKPROTECTOR
14618 movl $(__KERNEL_STACK_CANARY), \reg
14619+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
14620+ movl $(__USER_DS), \reg
14621+#else
14622+ xorl \reg, \reg
14623+#endif
14624+
14625 movl \reg, %gs
14626 .endm
14627
14628 #endif /* CONFIG_X86_32_LAZY_GS */
14629
14630-.macro SAVE_ALL
14631+.macro pax_enter_kernel
14632+#ifdef CONFIG_PAX_KERNEXEC
14633+ call pax_enter_kernel
14634+#endif
14635+.endm
14636+
14637+.macro pax_exit_kernel
14638+#ifdef CONFIG_PAX_KERNEXEC
14639+ call pax_exit_kernel
14640+#endif
14641+.endm
14642+
14643+#ifdef CONFIG_PAX_KERNEXEC
14644+ENTRY(pax_enter_kernel)
14645+#ifdef CONFIG_PARAVIRT
14646+ pushl %eax
14647+ pushl %ecx
14648+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
14649+ mov %eax, %esi
14650+#else
14651+ mov %cr0, %esi
14652+#endif
14653+ bts $16, %esi
14654+ jnc 1f
14655+ mov %cs, %esi
14656+ cmp $__KERNEL_CS, %esi
14657+ jz 3f
14658+ ljmp $__KERNEL_CS, $3f
14659+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
14660+2:
14661+#ifdef CONFIG_PARAVIRT
14662+ mov %esi, %eax
14663+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
14664+#else
14665+ mov %esi, %cr0
14666+#endif
14667+3:
14668+#ifdef CONFIG_PARAVIRT
14669+ popl %ecx
14670+ popl %eax
14671+#endif
14672+ ret
14673+ENDPROC(pax_enter_kernel)
14674+
14675+ENTRY(pax_exit_kernel)
14676+#ifdef CONFIG_PARAVIRT
14677+ pushl %eax
14678+ pushl %ecx
14679+#endif
14680+ mov %cs, %esi
14681+ cmp $__KERNEXEC_KERNEL_CS, %esi
14682+ jnz 2f
14683+#ifdef CONFIG_PARAVIRT
14684+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
14685+ mov %eax, %esi
14686+#else
14687+ mov %cr0, %esi
14688+#endif
14689+ btr $16, %esi
14690+ ljmp $__KERNEL_CS, $1f
14691+1:
14692+#ifdef CONFIG_PARAVIRT
14693+ mov %esi, %eax
14694+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
14695+#else
14696+ mov %esi, %cr0
14697+#endif
14698+2:
14699+#ifdef CONFIG_PARAVIRT
14700+ popl %ecx
14701+ popl %eax
14702+#endif
14703+ ret
14704+ENDPROC(pax_exit_kernel)
14705+#endif
14706+
14707+.macro pax_erase_kstack
14708+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14709+ call pax_erase_kstack
14710+#endif
14711+.endm
14712+
14713+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14714+/*
14715+ * ebp: thread_info
14716+ * ecx, edx: can be clobbered
14717+ */
14718+ENTRY(pax_erase_kstack)
14719+ pushl %edi
14720+ pushl %eax
14721+
14722+ mov TI_lowest_stack(%ebp), %edi
14723+ mov $-0xBEEF, %eax
14724+ std
14725+
14726+1: mov %edi, %ecx
14727+ and $THREAD_SIZE_asm - 1, %ecx
14728+ shr $2, %ecx
14729+ repne scasl
14730+ jecxz 2f
14731+
14732+ cmp $2*16, %ecx
14733+ jc 2f
14734+
14735+ mov $2*16, %ecx
14736+ repe scasl
14737+ jecxz 2f
14738+ jne 1b
14739+
14740+2: cld
14741+ mov %esp, %ecx
14742+ sub %edi, %ecx
14743+ shr $2, %ecx
14744+ rep stosl
14745+
14746+ mov TI_task_thread_sp0(%ebp), %edi
14747+ sub $128, %edi
14748+ mov %edi, TI_lowest_stack(%ebp)
14749+
14750+ popl %eax
14751+ popl %edi
14752+ ret
14753+ENDPROC(pax_erase_kstack)
14754+#endif
14755+
14756+.macro __SAVE_ALL _DS
14757 cld
14758 PUSH_GS
14759 pushl_cfi %fs
14760@@ -208,7 +341,7 @@
14761 CFI_REL_OFFSET ecx, 0
14762 pushl_cfi %ebx
14763 CFI_REL_OFFSET ebx, 0
14764- movl $(__USER_DS), %edx
14765+ movl $\_DS, %edx
14766 movl %edx, %ds
14767 movl %edx, %es
14768 movl $(__KERNEL_PERCPU), %edx
14769@@ -216,6 +349,15 @@
14770 SET_KERNEL_GS %edx
14771 .endm
14772
14773+.macro SAVE_ALL
14774+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
14775+ __SAVE_ALL __KERNEL_DS
14776+ pax_enter_kernel
14777+#else
14778+ __SAVE_ALL __USER_DS
14779+#endif
14780+.endm
14781+
14782 .macro RESTORE_INT_REGS
14783 popl_cfi %ebx
14784 CFI_RESTORE ebx
14785@@ -301,7 +443,7 @@ ENTRY(ret_from_fork)
14786 popfl_cfi
14787 jmp syscall_exit
14788 CFI_ENDPROC
14789-END(ret_from_fork)
14790+ENDPROC(ret_from_fork)
14791
14792 /*
14793 * Interrupt exit functions should be protected against kprobes
14794@@ -335,7 +477,15 @@ resume_userspace_sig:
14795 andl $SEGMENT_RPL_MASK, %eax
14796 #endif
14797 cmpl $USER_RPL, %eax
14798+
14799+#ifdef CONFIG_PAX_KERNEXEC
14800+ jae resume_userspace
14801+
14802+ PAX_EXIT_KERNEL
14803+ jmp resume_kernel
14804+#else
14805 jb resume_kernel # not returning to v8086 or userspace
14806+#endif
14807
14808 ENTRY(resume_userspace)
14809 LOCKDEP_SYS_EXIT
14810@@ -347,8 +497,8 @@ ENTRY(resume_userspace)
14811 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
14812 # int/exception return?
14813 jne work_pending
14814- jmp restore_all
14815-END(ret_from_exception)
14816+ jmp restore_all_pax
14817+ENDPROC(ret_from_exception)
14818
14819 #ifdef CONFIG_PREEMPT
14820 ENTRY(resume_kernel)
14821@@ -363,7 +513,7 @@ need_resched:
14822 jz restore_all
14823 call preempt_schedule_irq
14824 jmp need_resched
14825-END(resume_kernel)
14826+ENDPROC(resume_kernel)
14827 #endif
14828 CFI_ENDPROC
14829 /*
14830@@ -397,23 +547,34 @@ sysenter_past_esp:
14831 /*CFI_REL_OFFSET cs, 0*/
14832 /*
14833 * Push current_thread_info()->sysenter_return to the stack.
14834- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
14835- * pushed above; +8 corresponds to copy_thread's esp0 setting.
14836 */
14837- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
14838+ pushl_cfi $0
14839 CFI_REL_OFFSET eip, 0
14840
14841 pushl_cfi %eax
14842 SAVE_ALL
14843+ GET_THREAD_INFO(%ebp)
14844+ movl TI_sysenter_return(%ebp),%ebp
14845+ movl %ebp,PT_EIP(%esp)
14846 ENABLE_INTERRUPTS(CLBR_NONE)
14847
14848 /*
14849 * Load the potential sixth argument from user stack.
14850 * Careful about security.
14851 */
14852+ movl PT_OLDESP(%esp),%ebp
14853+
14854+#ifdef CONFIG_PAX_MEMORY_UDEREF
14855+ mov PT_OLDSS(%esp),%ds
14856+1: movl %ds:(%ebp),%ebp
14857+ push %ss
14858+ pop %ds
14859+#else
14860 cmpl $__PAGE_OFFSET-3,%ebp
14861 jae syscall_fault
14862 1: movl (%ebp),%ebp
14863+#endif
14864+
14865 movl %ebp,PT_EBP(%esp)
14866 .section __ex_table,"a"
14867 .align 4
14868@@ -436,12 +597,24 @@ sysenter_do_call:
14869 testl $_TIF_ALLWORK_MASK, %ecx
14870 jne sysexit_audit
14871 sysenter_exit:
14872+
14873+#ifdef CONFIG_PAX_RANDKSTACK
14874+ pushl_cfi %eax
14875+ movl %esp, %eax
14876+ call pax_randomize_kstack
14877+ popl_cfi %eax
14878+#endif
14879+
14880+ pax_erase_kstack
14881+
14882 /* if something modifies registers it must also disable sysexit */
14883 movl PT_EIP(%esp), %edx
14884 movl PT_OLDESP(%esp), %ecx
14885 xorl %ebp,%ebp
14886 TRACE_IRQS_ON
14887 1: mov PT_FS(%esp), %fs
14888+2: mov PT_DS(%esp), %ds
14889+3: mov PT_ES(%esp), %es
14890 PTGS_TO_GS
14891 ENABLE_INTERRUPTS_SYSEXIT
14892
14893@@ -458,6 +631,9 @@ sysenter_audit:
14894 movl %eax,%edx /* 2nd arg: syscall number */
14895 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
14896 call __audit_syscall_entry
14897+
14898+ pax_erase_kstack
14899+
14900 pushl_cfi %ebx
14901 movl PT_EAX(%esp),%eax /* reload syscall number */
14902 jmp sysenter_do_call
14903@@ -483,11 +659,17 @@ sysexit_audit:
14904
14905 CFI_ENDPROC
14906 .pushsection .fixup,"ax"
14907-2: movl $0,PT_FS(%esp)
14908+4: movl $0,PT_FS(%esp)
14909+ jmp 1b
14910+5: movl $0,PT_DS(%esp)
14911+ jmp 1b
14912+6: movl $0,PT_ES(%esp)
14913 jmp 1b
14914 .section __ex_table,"a"
14915 .align 4
14916- .long 1b,2b
14917+ .long 1b,4b
14918+ .long 2b,5b
14919+ .long 3b,6b
14920 .popsection
14921 PTGS_TO_GS_EX
14922 ENDPROC(ia32_sysenter_target)
14923@@ -520,6 +702,15 @@ syscall_exit:
14924 testl $_TIF_ALLWORK_MASK, %ecx # current->work
14925 jne syscall_exit_work
14926
14927+restore_all_pax:
14928+
14929+#ifdef CONFIG_PAX_RANDKSTACK
14930+ movl %esp, %eax
14931+ call pax_randomize_kstack
14932+#endif
14933+
14934+ pax_erase_kstack
14935+
14936 restore_all:
14937 TRACE_IRQS_IRET
14938 restore_all_notrace:
14939@@ -579,14 +770,34 @@ ldt_ss:
14940 * compensating for the offset by changing to the ESPFIX segment with
14941 * a base address that matches for the difference.
14942 */
14943-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
14944+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
14945 mov %esp, %edx /* load kernel esp */
14946 mov PT_OLDESP(%esp), %eax /* load userspace esp */
14947 mov %dx, %ax /* eax: new kernel esp */
14948 sub %eax, %edx /* offset (low word is 0) */
14949+#ifdef CONFIG_SMP
14950+ movl PER_CPU_VAR(cpu_number), %ebx
14951+ shll $PAGE_SHIFT_asm, %ebx
14952+ addl $cpu_gdt_table, %ebx
14953+#else
14954+ movl $cpu_gdt_table, %ebx
14955+#endif
14956 shr $16, %edx
14957- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
14958- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
14959+
14960+#ifdef CONFIG_PAX_KERNEXEC
14961+ mov %cr0, %esi
14962+ btr $16, %esi
14963+ mov %esi, %cr0
14964+#endif
14965+
14966+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
14967+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
14968+
14969+#ifdef CONFIG_PAX_KERNEXEC
14970+ bts $16, %esi
14971+ mov %esi, %cr0
14972+#endif
14973+
14974 pushl_cfi $__ESPFIX_SS
14975 pushl_cfi %eax /* new kernel esp */
14976 /* Disable interrupts, but do not irqtrace this section: we
14977@@ -615,38 +826,30 @@ work_resched:
14978 movl TI_flags(%ebp), %ecx
14979 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
14980 # than syscall tracing?
14981- jz restore_all
14982+ jz restore_all_pax
14983 testb $_TIF_NEED_RESCHED, %cl
14984 jnz work_resched
14985
14986 work_notifysig: # deal with pending signals and
14987 # notify-resume requests
14988+ movl %esp, %eax
14989 #ifdef CONFIG_VM86
14990 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
14991- movl %esp, %eax
14992- jne work_notifysig_v86 # returning to kernel-space or
14993+ jz 1f # returning to kernel-space or
14994 # vm86-space
14995- TRACE_IRQS_ON
14996- ENABLE_INTERRUPTS(CLBR_NONE)
14997- xorl %edx, %edx
14998- call do_notify_resume
14999- jmp resume_userspace_sig
15000
15001- ALIGN
15002-work_notifysig_v86:
15003 pushl_cfi %ecx # save ti_flags for do_notify_resume
15004 call save_v86_state # %eax contains pt_regs pointer
15005 popl_cfi %ecx
15006 movl %eax, %esp
15007-#else
15008- movl %esp, %eax
15009+1:
15010 #endif
15011 TRACE_IRQS_ON
15012 ENABLE_INTERRUPTS(CLBR_NONE)
15013 xorl %edx, %edx
15014 call do_notify_resume
15015 jmp resume_userspace_sig
15016-END(work_pending)
15017+ENDPROC(work_pending)
15018
15019 # perform syscall exit tracing
15020 ALIGN
15021@@ -654,11 +857,14 @@ syscall_trace_entry:
15022 movl $-ENOSYS,PT_EAX(%esp)
15023 movl %esp, %eax
15024 call syscall_trace_enter
15025+
15026+ pax_erase_kstack
15027+
15028 /* What it returned is what we'll actually use. */
15029 cmpl $(NR_syscalls), %eax
15030 jnae syscall_call
15031 jmp syscall_exit
15032-END(syscall_trace_entry)
15033+ENDPROC(syscall_trace_entry)
15034
15035 # perform syscall exit tracing
15036 ALIGN
15037@@ -671,20 +877,24 @@ syscall_exit_work:
15038 movl %esp, %eax
15039 call syscall_trace_leave
15040 jmp resume_userspace
15041-END(syscall_exit_work)
15042+ENDPROC(syscall_exit_work)
15043 CFI_ENDPROC
15044
15045 RING0_INT_FRAME # can't unwind into user space anyway
15046 syscall_fault:
15047+#ifdef CONFIG_PAX_MEMORY_UDEREF
15048+ push %ss
15049+ pop %ds
15050+#endif
15051 GET_THREAD_INFO(%ebp)
15052 movl $-EFAULT,PT_EAX(%esp)
15053 jmp resume_userspace
15054-END(syscall_fault)
15055+ENDPROC(syscall_fault)
15056
15057 syscall_badsys:
15058 movl $-ENOSYS,PT_EAX(%esp)
15059 jmp resume_userspace
15060-END(syscall_badsys)
15061+ENDPROC(syscall_badsys)
15062 CFI_ENDPROC
15063 /*
15064 * End of kprobes section
15065@@ -756,6 +966,36 @@ ENTRY(ptregs_clone)
15066 CFI_ENDPROC
15067 ENDPROC(ptregs_clone)
15068
15069+ ALIGN;
15070+ENTRY(kernel_execve)
15071+ CFI_STARTPROC
15072+ pushl_cfi %ebp
15073+ sub $PT_OLDSS+4,%esp
15074+ pushl_cfi %edi
15075+ pushl_cfi %ecx
15076+ pushl_cfi %eax
15077+ lea 3*4(%esp),%edi
15078+ mov $PT_OLDSS/4+1,%ecx
15079+ xorl %eax,%eax
15080+ rep stosl
15081+ popl_cfi %eax
15082+ popl_cfi %ecx
15083+ popl_cfi %edi
15084+ movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
15085+ pushl_cfi %esp
15086+ call sys_execve
15087+ add $4,%esp
15088+ CFI_ADJUST_CFA_OFFSET -4
15089+ GET_THREAD_INFO(%ebp)
15090+ test %eax,%eax
15091+ jz syscall_exit
15092+ add $PT_OLDSS+4,%esp
15093+ CFI_ADJUST_CFA_OFFSET -PT_OLDSS-4
15094+ popl_cfi %ebp
15095+ ret
15096+ CFI_ENDPROC
15097+ENDPROC(kernel_execve)
15098+
15099 .macro FIXUP_ESPFIX_STACK
15100 /*
15101 * Switch back for ESPFIX stack to the normal zerobased stack
15102@@ -765,8 +1005,15 @@ ENDPROC(ptregs_clone)
15103 * normal stack and adjusts ESP with the matching offset.
15104 */
15105 /* fixup the stack */
15106- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
15107- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
15108+#ifdef CONFIG_SMP
15109+ movl PER_CPU_VAR(cpu_number), %ebx
15110+ shll $PAGE_SHIFT_asm, %ebx
15111+ addl $cpu_gdt_table, %ebx
15112+#else
15113+ movl $cpu_gdt_table, %ebx
15114+#endif
15115+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
15116+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
15117 shl $16, %eax
15118 addl %esp, %eax /* the adjusted stack pointer */
15119 pushl_cfi $__KERNEL_DS
15120@@ -819,7 +1066,7 @@ vector=vector+1
15121 .endr
15122 2: jmp common_interrupt
15123 .endr
15124-END(irq_entries_start)
15125+ENDPROC(irq_entries_start)
15126
15127 .previous
15128 END(interrupt)
15129@@ -867,7 +1114,7 @@ ENTRY(coprocessor_error)
15130 pushl_cfi $do_coprocessor_error
15131 jmp error_code
15132 CFI_ENDPROC
15133-END(coprocessor_error)
15134+ENDPROC(coprocessor_error)
15135
15136 ENTRY(simd_coprocessor_error)
15137 RING0_INT_FRAME
15138@@ -888,7 +1135,7 @@ ENTRY(simd_coprocessor_error)
15139 #endif
15140 jmp error_code
15141 CFI_ENDPROC
15142-END(simd_coprocessor_error)
15143+ENDPROC(simd_coprocessor_error)
15144
15145 ENTRY(device_not_available)
15146 RING0_INT_FRAME
15147@@ -896,7 +1143,7 @@ ENTRY(device_not_available)
15148 pushl_cfi $do_device_not_available
15149 jmp error_code
15150 CFI_ENDPROC
15151-END(device_not_available)
15152+ENDPROC(device_not_available)
15153
15154 #ifdef CONFIG_PARAVIRT
15155 ENTRY(native_iret)
15156@@ -905,12 +1152,12 @@ ENTRY(native_iret)
15157 .align 4
15158 .long native_iret, iret_exc
15159 .previous
15160-END(native_iret)
15161+ENDPROC(native_iret)
15162
15163 ENTRY(native_irq_enable_sysexit)
15164 sti
15165 sysexit
15166-END(native_irq_enable_sysexit)
15167+ENDPROC(native_irq_enable_sysexit)
15168 #endif
15169
15170 ENTRY(overflow)
15171@@ -919,7 +1166,7 @@ ENTRY(overflow)
15172 pushl_cfi $do_overflow
15173 jmp error_code
15174 CFI_ENDPROC
15175-END(overflow)
15176+ENDPROC(overflow)
15177
15178 ENTRY(bounds)
15179 RING0_INT_FRAME
15180@@ -927,7 +1174,7 @@ ENTRY(bounds)
15181 pushl_cfi $do_bounds
15182 jmp error_code
15183 CFI_ENDPROC
15184-END(bounds)
15185+ENDPROC(bounds)
15186
15187 ENTRY(invalid_op)
15188 RING0_INT_FRAME
15189@@ -935,7 +1182,7 @@ ENTRY(invalid_op)
15190 pushl_cfi $do_invalid_op
15191 jmp error_code
15192 CFI_ENDPROC
15193-END(invalid_op)
15194+ENDPROC(invalid_op)
15195
15196 ENTRY(coprocessor_segment_overrun)
15197 RING0_INT_FRAME
15198@@ -943,35 +1190,35 @@ ENTRY(coprocessor_segment_overrun)
15199 pushl_cfi $do_coprocessor_segment_overrun
15200 jmp error_code
15201 CFI_ENDPROC
15202-END(coprocessor_segment_overrun)
15203+ENDPROC(coprocessor_segment_overrun)
15204
15205 ENTRY(invalid_TSS)
15206 RING0_EC_FRAME
15207 pushl_cfi $do_invalid_TSS
15208 jmp error_code
15209 CFI_ENDPROC
15210-END(invalid_TSS)
15211+ENDPROC(invalid_TSS)
15212
15213 ENTRY(segment_not_present)
15214 RING0_EC_FRAME
15215 pushl_cfi $do_segment_not_present
15216 jmp error_code
15217 CFI_ENDPROC
15218-END(segment_not_present)
15219+ENDPROC(segment_not_present)
15220
15221 ENTRY(stack_segment)
15222 RING0_EC_FRAME
15223 pushl_cfi $do_stack_segment
15224 jmp error_code
15225 CFI_ENDPROC
15226-END(stack_segment)
15227+ENDPROC(stack_segment)
15228
15229 ENTRY(alignment_check)
15230 RING0_EC_FRAME
15231 pushl_cfi $do_alignment_check
15232 jmp error_code
15233 CFI_ENDPROC
15234-END(alignment_check)
15235+ENDPROC(alignment_check)
15236
15237 ENTRY(divide_error)
15238 RING0_INT_FRAME
15239@@ -979,7 +1226,7 @@ ENTRY(divide_error)
15240 pushl_cfi $do_divide_error
15241 jmp error_code
15242 CFI_ENDPROC
15243-END(divide_error)
15244+ENDPROC(divide_error)
15245
15246 #ifdef CONFIG_X86_MCE
15247 ENTRY(machine_check)
15248@@ -988,7 +1235,7 @@ ENTRY(machine_check)
15249 pushl_cfi machine_check_vector
15250 jmp error_code
15251 CFI_ENDPROC
15252-END(machine_check)
15253+ENDPROC(machine_check)
15254 #endif
15255
15256 ENTRY(spurious_interrupt_bug)
15257@@ -997,7 +1244,7 @@ ENTRY(spurious_interrupt_bug)
15258 pushl_cfi $do_spurious_interrupt_bug
15259 jmp error_code
15260 CFI_ENDPROC
15261-END(spurious_interrupt_bug)
15262+ENDPROC(spurious_interrupt_bug)
15263 /*
15264 * End of kprobes section
15265 */
15266@@ -1112,7 +1359,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector, XEN_HVM_EVTCHN_CALLBACK,
15267
15268 ENTRY(mcount)
15269 ret
15270-END(mcount)
15271+ENDPROC(mcount)
15272
15273 ENTRY(ftrace_caller)
15274 cmpl $0, function_trace_stop
15275@@ -1141,7 +1388,7 @@ ftrace_graph_call:
15276 .globl ftrace_stub
15277 ftrace_stub:
15278 ret
15279-END(ftrace_caller)
15280+ENDPROC(ftrace_caller)
15281
15282 #else /* ! CONFIG_DYNAMIC_FTRACE */
15283
15284@@ -1177,7 +1424,7 @@ trace:
15285 popl %ecx
15286 popl %eax
15287 jmp ftrace_stub
15288-END(mcount)
15289+ENDPROC(mcount)
15290 #endif /* CONFIG_DYNAMIC_FTRACE */
15291 #endif /* CONFIG_FUNCTION_TRACER */
15292
15293@@ -1198,7 +1445,7 @@ ENTRY(ftrace_graph_caller)
15294 popl %ecx
15295 popl %eax
15296 ret
15297-END(ftrace_graph_caller)
15298+ENDPROC(ftrace_graph_caller)
15299
15300 .globl return_to_handler
15301 return_to_handler:
15302@@ -1253,15 +1500,18 @@ error_code:
15303 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
15304 REG_TO_PTGS %ecx
15305 SET_KERNEL_GS %ecx
15306- movl $(__USER_DS), %ecx
15307+ movl $(__KERNEL_DS), %ecx
15308 movl %ecx, %ds
15309 movl %ecx, %es
15310+
15311+ pax_enter_kernel
15312+
15313 TRACE_IRQS_OFF
15314 movl %esp,%eax # pt_regs pointer
15315 call *%edi
15316 jmp ret_from_exception
15317 CFI_ENDPROC
15318-END(page_fault)
15319+ENDPROC(page_fault)
15320
15321 /*
15322 * Debug traps and NMI can happen at the one SYSENTER instruction
15323@@ -1303,7 +1553,7 @@ debug_stack_correct:
15324 call do_debug
15325 jmp ret_from_exception
15326 CFI_ENDPROC
15327-END(debug)
15328+ENDPROC(debug)
15329
15330 /*
15331 * NMI is doubly nasty. It can happen _while_ we're handling
15332@@ -1340,6 +1590,9 @@ nmi_stack_correct:
15333 xorl %edx,%edx # zero error code
15334 movl %esp,%eax # pt_regs pointer
15335 call do_nmi
15336+
15337+ pax_exit_kernel
15338+
15339 jmp restore_all_notrace
15340 CFI_ENDPROC
15341
15342@@ -1376,12 +1629,15 @@ nmi_espfix_stack:
15343 FIXUP_ESPFIX_STACK # %eax == %esp
15344 xorl %edx,%edx # zero error code
15345 call do_nmi
15346+
15347+ pax_exit_kernel
15348+
15349 RESTORE_REGS
15350 lss 12+4(%esp), %esp # back to espfix stack
15351 CFI_ADJUST_CFA_OFFSET -24
15352 jmp irq_return
15353 CFI_ENDPROC
15354-END(nmi)
15355+ENDPROC(nmi)
15356
15357 ENTRY(int3)
15358 RING0_INT_FRAME
15359@@ -1393,14 +1649,14 @@ ENTRY(int3)
15360 call do_int3
15361 jmp ret_from_exception
15362 CFI_ENDPROC
15363-END(int3)
15364+ENDPROC(int3)
15365
15366 ENTRY(general_protection)
15367 RING0_EC_FRAME
15368 pushl_cfi $do_general_protection
15369 jmp error_code
15370 CFI_ENDPROC
15371-END(general_protection)
15372+ENDPROC(general_protection)
15373
15374 #ifdef CONFIG_KVM_GUEST
15375 ENTRY(async_page_fault)
15376@@ -1408,7 +1664,7 @@ ENTRY(async_page_fault)
15377 pushl_cfi $do_async_page_fault
15378 jmp error_code
15379 CFI_ENDPROC
15380-END(async_page_fault)
15381+ENDPROC(async_page_fault)
15382 #endif
15383
15384 /*
15385diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
15386index 1333d98..b340ca2 100644
15387--- a/arch/x86/kernel/entry_64.S
15388+++ b/arch/x86/kernel/entry_64.S
15389@@ -56,6 +56,8 @@
15390 #include <asm/ftrace.h>
15391 #include <asm/percpu.h>
15392 #include <linux/err.h>
15393+#include <asm/pgtable.h>
15394+#include <asm/alternative-asm.h>
15395
15396 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
15397 #include <linux/elf-em.h>
15398@@ -69,8 +71,9 @@
15399 #ifdef CONFIG_FUNCTION_TRACER
15400 #ifdef CONFIG_DYNAMIC_FTRACE
15401 ENTRY(mcount)
15402+ pax_force_retaddr
15403 retq
15404-END(mcount)
15405+ENDPROC(mcount)
15406
15407 ENTRY(ftrace_caller)
15408 cmpl $0, function_trace_stop
15409@@ -93,8 +96,9 @@ GLOBAL(ftrace_graph_call)
15410 #endif
15411
15412 GLOBAL(ftrace_stub)
15413+ pax_force_retaddr
15414 retq
15415-END(ftrace_caller)
15416+ENDPROC(ftrace_caller)
15417
15418 #else /* ! CONFIG_DYNAMIC_FTRACE */
15419 ENTRY(mcount)
15420@@ -113,6 +117,7 @@ ENTRY(mcount)
15421 #endif
15422
15423 GLOBAL(ftrace_stub)
15424+ pax_force_retaddr
15425 retq
15426
15427 trace:
15428@@ -122,12 +127,13 @@ trace:
15429 movq 8(%rbp), %rsi
15430 subq $MCOUNT_INSN_SIZE, %rdi
15431
15432+ pax_force_fptr ftrace_trace_function
15433 call *ftrace_trace_function
15434
15435 MCOUNT_RESTORE_FRAME
15436
15437 jmp ftrace_stub
15438-END(mcount)
15439+ENDPROC(mcount)
15440 #endif /* CONFIG_DYNAMIC_FTRACE */
15441 #endif /* CONFIG_FUNCTION_TRACER */
15442
15443@@ -147,8 +153,9 @@ ENTRY(ftrace_graph_caller)
15444
15445 MCOUNT_RESTORE_FRAME
15446
15447+ pax_force_retaddr
15448 retq
15449-END(ftrace_graph_caller)
15450+ENDPROC(ftrace_graph_caller)
15451
15452 GLOBAL(return_to_handler)
15453 subq $24, %rsp
15454@@ -164,6 +171,7 @@ GLOBAL(return_to_handler)
15455 movq 8(%rsp), %rdx
15456 movq (%rsp), %rax
15457 addq $24, %rsp
15458+ pax_force_fptr %rdi
15459 jmp *%rdi
15460 #endif
15461
15462@@ -179,6 +187,282 @@ ENTRY(native_usergs_sysret64)
15463 ENDPROC(native_usergs_sysret64)
15464 #endif /* CONFIG_PARAVIRT */
15465
15466+ .macro ljmpq sel, off
15467+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
15468+ .byte 0x48; ljmp *1234f(%rip)
15469+ .pushsection .rodata
15470+ .align 16
15471+ 1234: .quad \off; .word \sel
15472+ .popsection
15473+#else
15474+ pushq $\sel
15475+ pushq $\off
15476+ lretq
15477+#endif
15478+ .endm
15479+
15480+ .macro pax_enter_kernel
15481+ pax_set_fptr_mask
15482+#ifdef CONFIG_PAX_KERNEXEC
15483+ call pax_enter_kernel
15484+#endif
15485+ .endm
15486+
15487+ .macro pax_exit_kernel
15488+#ifdef CONFIG_PAX_KERNEXEC
15489+ call pax_exit_kernel
15490+#endif
15491+ .endm
15492+
15493+#ifdef CONFIG_PAX_KERNEXEC
15494+ENTRY(pax_enter_kernel)
15495+ pushq %rdi
15496+
15497+#ifdef CONFIG_PARAVIRT
15498+ PV_SAVE_REGS(CLBR_RDI)
15499+#endif
15500+
15501+ GET_CR0_INTO_RDI
15502+ bts $16,%rdi
15503+ jnc 3f
15504+ mov %cs,%edi
15505+ cmp $__KERNEL_CS,%edi
15506+ jnz 2f
15507+1:
15508+
15509+#ifdef CONFIG_PARAVIRT
15510+ PV_RESTORE_REGS(CLBR_RDI)
15511+#endif
15512+
15513+ popq %rdi
15514+ pax_force_retaddr
15515+ retq
15516+
15517+2: ljmpq __KERNEL_CS,1f
15518+3: ljmpq __KERNEXEC_KERNEL_CS,4f
15519+4: SET_RDI_INTO_CR0
15520+ jmp 1b
15521+ENDPROC(pax_enter_kernel)
15522+
15523+ENTRY(pax_exit_kernel)
15524+ pushq %rdi
15525+
15526+#ifdef CONFIG_PARAVIRT
15527+ PV_SAVE_REGS(CLBR_RDI)
15528+#endif
15529+
15530+ mov %cs,%rdi
15531+ cmp $__KERNEXEC_KERNEL_CS,%edi
15532+ jz 2f
15533+1:
15534+
15535+#ifdef CONFIG_PARAVIRT
15536+ PV_RESTORE_REGS(CLBR_RDI);
15537+#endif
15538+
15539+ popq %rdi
15540+ pax_force_retaddr
15541+ retq
15542+
15543+2: GET_CR0_INTO_RDI
15544+ btr $16,%rdi
15545+ ljmpq __KERNEL_CS,3f
15546+3: SET_RDI_INTO_CR0
15547+ jmp 1b
15548+#ifdef CONFIG_PARAVIRT
15549+ PV_RESTORE_REGS(CLBR_RDI);
15550+#endif
15551+
15552+ popq %rdi
15553+ pax_force_retaddr
15554+ retq
15555+ENDPROC(pax_exit_kernel)
15556+#endif
15557+
15558+ .macro pax_enter_kernel_user
15559+ pax_set_fptr_mask
15560+#ifdef CONFIG_PAX_MEMORY_UDEREF
15561+ call pax_enter_kernel_user
15562+#endif
15563+ .endm
15564+
15565+ .macro pax_exit_kernel_user
15566+#ifdef CONFIG_PAX_MEMORY_UDEREF
15567+ call pax_exit_kernel_user
15568+#endif
15569+#ifdef CONFIG_PAX_RANDKSTACK
15570+ pushq %rax
15571+ call pax_randomize_kstack
15572+ popq %rax
15573+#endif
15574+ .endm
15575+
15576+#ifdef CONFIG_PAX_MEMORY_UDEREF
15577+ENTRY(pax_enter_kernel_user)
15578+ pushq %rdi
15579+ pushq %rbx
15580+
15581+#ifdef CONFIG_PARAVIRT
15582+ PV_SAVE_REGS(CLBR_RDI)
15583+#endif
15584+
15585+ GET_CR3_INTO_RDI
15586+ mov %rdi,%rbx
15587+ add $__START_KERNEL_map,%rbx
15588+ sub phys_base(%rip),%rbx
15589+
15590+#ifdef CONFIG_PARAVIRT
15591+ pushq %rdi
15592+ cmpl $0, pv_info+PARAVIRT_enabled
15593+ jz 1f
15594+ i = 0
15595+ .rept USER_PGD_PTRS
15596+ mov i*8(%rbx),%rsi
15597+ mov $0,%sil
15598+ lea i*8(%rbx),%rdi
15599+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15600+ i = i + 1
15601+ .endr
15602+ jmp 2f
15603+1:
15604+#endif
15605+
15606+ i = 0
15607+ .rept USER_PGD_PTRS
15608+ movb $0,i*8(%rbx)
15609+ i = i + 1
15610+ .endr
15611+
15612+#ifdef CONFIG_PARAVIRT
15613+2: popq %rdi
15614+#endif
15615+ SET_RDI_INTO_CR3
15616+
15617+#ifdef CONFIG_PAX_KERNEXEC
15618+ GET_CR0_INTO_RDI
15619+ bts $16,%rdi
15620+ SET_RDI_INTO_CR0
15621+#endif
15622+
15623+#ifdef CONFIG_PARAVIRT
15624+ PV_RESTORE_REGS(CLBR_RDI)
15625+#endif
15626+
15627+ popq %rbx
15628+ popq %rdi
15629+ pax_force_retaddr
15630+ retq
15631+ENDPROC(pax_enter_kernel_user)
15632+
15633+ENTRY(pax_exit_kernel_user)
15634+ push %rdi
15635+
15636+#ifdef CONFIG_PARAVIRT
15637+ pushq %rbx
15638+ PV_SAVE_REGS(CLBR_RDI)
15639+#endif
15640+
15641+#ifdef CONFIG_PAX_KERNEXEC
15642+ GET_CR0_INTO_RDI
15643+ btr $16,%rdi
15644+ SET_RDI_INTO_CR0
15645+#endif
15646+
15647+ GET_CR3_INTO_RDI
15648+ add $__START_KERNEL_map,%rdi
15649+ sub phys_base(%rip),%rdi
15650+
15651+#ifdef CONFIG_PARAVIRT
15652+ cmpl $0, pv_info+PARAVIRT_enabled
15653+ jz 1f
15654+ mov %rdi,%rbx
15655+ i = 0
15656+ .rept USER_PGD_PTRS
15657+ mov i*8(%rbx),%rsi
15658+ mov $0x67,%sil
15659+ lea i*8(%rbx),%rdi
15660+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15661+ i = i + 1
15662+ .endr
15663+ jmp 2f
15664+1:
15665+#endif
15666+
15667+ i = 0
15668+ .rept USER_PGD_PTRS
15669+ movb $0x67,i*8(%rdi)
15670+ i = i + 1
15671+ .endr
15672+
15673+#ifdef CONFIG_PARAVIRT
15674+2: PV_RESTORE_REGS(CLBR_RDI)
15675+ popq %rbx
15676+#endif
15677+
15678+ popq %rdi
15679+ pax_force_retaddr
15680+ retq
15681+ENDPROC(pax_exit_kernel_user)
15682+#endif
15683+
15684+.macro pax_erase_kstack
15685+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15686+ call pax_erase_kstack
15687+#endif
15688+.endm
15689+
15690+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15691+/*
15692+ * r11: thread_info
15693+ * rcx, rdx: can be clobbered
15694+ */
15695+ENTRY(pax_erase_kstack)
15696+ pushq %rdi
15697+ pushq %rax
15698+ pushq %r11
15699+
15700+ GET_THREAD_INFO(%r11)
15701+ mov TI_lowest_stack(%r11), %rdi
15702+ mov $-0xBEEF, %rax
15703+ std
15704+
15705+1: mov %edi, %ecx
15706+ and $THREAD_SIZE_asm - 1, %ecx
15707+ shr $3, %ecx
15708+ repne scasq
15709+ jecxz 2f
15710+
15711+ cmp $2*8, %ecx
15712+ jc 2f
15713+
15714+ mov $2*8, %ecx
15715+ repe scasq
15716+ jecxz 2f
15717+ jne 1b
15718+
15719+2: cld
15720+ mov %esp, %ecx
15721+ sub %edi, %ecx
15722+
15723+ cmp $THREAD_SIZE_asm, %rcx
15724+ jb 3f
15725+ ud2
15726+3:
15727+
15728+ shr $3, %ecx
15729+ rep stosq
15730+
15731+ mov TI_task_thread_sp0(%r11), %rdi
15732+ sub $256, %rdi
15733+ mov %rdi, TI_lowest_stack(%r11)
15734+
15735+ popq %r11
15736+ popq %rax
15737+ popq %rdi
15738+ pax_force_retaddr
15739+ ret
15740+ENDPROC(pax_erase_kstack)
15741+#endif
15742
15743 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
15744 #ifdef CONFIG_TRACE_IRQFLAGS
15745@@ -232,8 +516,8 @@ ENDPROC(native_usergs_sysret64)
15746 .endm
15747
15748 .macro UNFAKE_STACK_FRAME
15749- addq $8*6, %rsp
15750- CFI_ADJUST_CFA_OFFSET -(6*8)
15751+ addq $8*6 + ARG_SKIP, %rsp
15752+ CFI_ADJUST_CFA_OFFSET -(6*8 + ARG_SKIP)
15753 .endm
15754
15755 /*
15756@@ -320,7 +604,7 @@ ENDPROC(native_usergs_sysret64)
15757 movq %rsp, %rsi
15758
15759 leaq -RBP(%rsp),%rdi /* arg1 for handler */
15760- testl $3, CS(%rdi)
15761+ testb $3, CS(%rdi)
15762 je 1f
15763 SWAPGS
15764 /*
15765@@ -356,9 +640,10 @@ ENTRY(save_rest)
15766 movq_cfi r15, R15+16
15767 movq %r11, 8(%rsp) /* return address */
15768 FIXUP_TOP_OF_STACK %r11, 16
15769+ pax_force_retaddr
15770 ret
15771 CFI_ENDPROC
15772-END(save_rest)
15773+ENDPROC(save_rest)
15774
15775 /* save complete stack frame */
15776 .pushsection .kprobes.text, "ax"
15777@@ -387,9 +672,10 @@ ENTRY(save_paranoid)
15778 js 1f /* negative -> in kernel */
15779 SWAPGS
15780 xorl %ebx,%ebx
15781-1: ret
15782+1: pax_force_retaddr_bts
15783+ ret
15784 CFI_ENDPROC
15785-END(save_paranoid)
15786+ENDPROC(save_paranoid)
15787 .popsection
15788
15789 /*
15790@@ -411,7 +697,7 @@ ENTRY(ret_from_fork)
15791
15792 RESTORE_REST
15793
15794- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
15795+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
15796 jz retint_restore_args
15797
15798 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
15799@@ -421,7 +707,7 @@ ENTRY(ret_from_fork)
15800 jmp ret_from_sys_call # go to the SYSRET fastpath
15801
15802 CFI_ENDPROC
15803-END(ret_from_fork)
15804+ENDPROC(ret_from_fork)
15805
15806 /*
15807 * System call entry. Up to 6 arguments in registers are supported.
15808@@ -457,7 +743,7 @@ END(ret_from_fork)
15809 ENTRY(system_call)
15810 CFI_STARTPROC simple
15811 CFI_SIGNAL_FRAME
15812- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
15813+ CFI_DEF_CFA rsp,0
15814 CFI_REGISTER rip,rcx
15815 /*CFI_REGISTER rflags,r11*/
15816 SWAPGS_UNSAFE_STACK
15817@@ -470,21 +756,23 @@ GLOBAL(system_call_after_swapgs)
15818
15819 movq %rsp,PER_CPU_VAR(old_rsp)
15820 movq PER_CPU_VAR(kernel_stack),%rsp
15821+ SAVE_ARGS 8*6,0
15822+ pax_enter_kernel_user
15823 /*
15824 * No need to follow this irqs off/on section - it's straight
15825 * and short:
15826 */
15827 ENABLE_INTERRUPTS(CLBR_NONE)
15828- SAVE_ARGS 8,0
15829 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
15830 movq %rcx,RIP-ARGOFFSET(%rsp)
15831 CFI_REL_OFFSET rip,RIP-ARGOFFSET
15832- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15833+ GET_THREAD_INFO(%rcx)
15834+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
15835 jnz tracesys
15836 system_call_fastpath:
15837 cmpq $__NR_syscall_max,%rax
15838 ja badsys
15839- movq %r10,%rcx
15840+ movq R10-ARGOFFSET(%rsp),%rcx
15841 call *sys_call_table(,%rax,8) # XXX: rip relative
15842 movq %rax,RAX-ARGOFFSET(%rsp)
15843 /*
15844@@ -498,10 +786,13 @@ sysret_check:
15845 LOCKDEP_SYS_EXIT
15846 DISABLE_INTERRUPTS(CLBR_NONE)
15847 TRACE_IRQS_OFF
15848- movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
15849+ GET_THREAD_INFO(%rcx)
15850+ movl TI_flags(%rcx),%edx
15851 andl %edi,%edx
15852 jnz sysret_careful
15853 CFI_REMEMBER_STATE
15854+ pax_exit_kernel_user
15855+ pax_erase_kstack
15856 /*
15857 * sysretq will re-enable interrupts:
15858 */
15859@@ -553,14 +844,18 @@ badsys:
15860 * jump back to the normal fast path.
15861 */
15862 auditsys:
15863- movq %r10,%r9 /* 6th arg: 4th syscall arg */
15864+ movq R10-ARGOFFSET(%rsp),%r9 /* 6th arg: 4th syscall arg */
15865 movq %rdx,%r8 /* 5th arg: 3rd syscall arg */
15866 movq %rsi,%rcx /* 4th arg: 2nd syscall arg */
15867 movq %rdi,%rdx /* 3rd arg: 1st syscall arg */
15868 movq %rax,%rsi /* 2nd arg: syscall number */
15869 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
15870 call __audit_syscall_entry
15871+
15872+ pax_erase_kstack
15873+
15874 LOAD_ARGS 0 /* reload call-clobbered registers */
15875+ pax_set_fptr_mask
15876 jmp system_call_fastpath
15877
15878 /*
15879@@ -581,7 +876,7 @@ sysret_audit:
15880 /* Do syscall tracing */
15881 tracesys:
15882 #ifdef CONFIG_AUDITSYSCALL
15883- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15884+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
15885 jz auditsys
15886 #endif
15887 SAVE_REST
15888@@ -589,16 +884,20 @@ tracesys:
15889 FIXUP_TOP_OF_STACK %rdi
15890 movq %rsp,%rdi
15891 call syscall_trace_enter
15892+
15893+ pax_erase_kstack
15894+
15895 /*
15896 * Reload arg registers from stack in case ptrace changed them.
15897 * We don't reload %rax because syscall_trace_enter() returned
15898 * the value it wants us to use in the table lookup.
15899 */
15900 LOAD_ARGS ARGOFFSET, 1
15901+ pax_set_fptr_mask
15902 RESTORE_REST
15903 cmpq $__NR_syscall_max,%rax
15904 ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
15905- movq %r10,%rcx /* fixup for C */
15906+ movq R10-ARGOFFSET(%rsp),%rcx /* fixup for C */
15907 call *sys_call_table(,%rax,8)
15908 movq %rax,RAX-ARGOFFSET(%rsp)
15909 /* Use IRET because user could have changed frame */
15910@@ -619,6 +918,7 @@ GLOBAL(int_with_check)
15911 andl %edi,%edx
15912 jnz int_careful
15913 andl $~TS_COMPAT,TI_status(%rcx)
15914+ pax_erase_kstack
15915 jmp retint_swapgs
15916
15917 /* Either reschedule or signal or syscall exit tracking needed. */
15918@@ -665,7 +965,7 @@ int_restore_rest:
15919 TRACE_IRQS_OFF
15920 jmp int_with_check
15921 CFI_ENDPROC
15922-END(system_call)
15923+ENDPROC(system_call)
15924
15925 /*
15926 * Certain special system calls that need to save a complete full stack frame.
15927@@ -681,7 +981,7 @@ ENTRY(\label)
15928 call \func
15929 jmp ptregscall_common
15930 CFI_ENDPROC
15931-END(\label)
15932+ENDPROC(\label)
15933 .endm
15934
15935 PTREGSCALL stub_clone, sys_clone, %r8
15936@@ -699,9 +999,10 @@ ENTRY(ptregscall_common)
15937 movq_cfi_restore R12+8, r12
15938 movq_cfi_restore RBP+8, rbp
15939 movq_cfi_restore RBX+8, rbx
15940+ pax_force_retaddr
15941 ret $REST_SKIP /* pop extended registers */
15942 CFI_ENDPROC
15943-END(ptregscall_common)
15944+ENDPROC(ptregscall_common)
15945
15946 ENTRY(stub_execve)
15947 CFI_STARTPROC
15948@@ -716,7 +1017,7 @@ ENTRY(stub_execve)
15949 RESTORE_REST
15950 jmp int_ret_from_sys_call
15951 CFI_ENDPROC
15952-END(stub_execve)
15953+ENDPROC(stub_execve)
15954
15955 /*
15956 * sigreturn is special because it needs to restore all registers on return.
15957@@ -734,7 +1035,7 @@ ENTRY(stub_rt_sigreturn)
15958 RESTORE_REST
15959 jmp int_ret_from_sys_call
15960 CFI_ENDPROC
15961-END(stub_rt_sigreturn)
15962+ENDPROC(stub_rt_sigreturn)
15963
15964 /*
15965 * Build the entry stubs and pointer table with some assembler magic.
15966@@ -769,7 +1070,7 @@ vector=vector+1
15967 2: jmp common_interrupt
15968 .endr
15969 CFI_ENDPROC
15970-END(irq_entries_start)
15971+ENDPROC(irq_entries_start)
15972
15973 .previous
15974 END(interrupt)
15975@@ -789,6 +1090,16 @@ END(interrupt)
15976 subq $ORIG_RAX-RBP, %rsp
15977 CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
15978 SAVE_ARGS_IRQ
15979+#ifdef CONFIG_PAX_MEMORY_UDEREF
15980+ testb $3, CS(%rdi)
15981+ jnz 1f
15982+ pax_enter_kernel
15983+ jmp 2f
15984+1: pax_enter_kernel_user
15985+2:
15986+#else
15987+ pax_enter_kernel
15988+#endif
15989 call \func
15990 .endm
15991
15992@@ -820,7 +1131,7 @@ ret_from_intr:
15993
15994 exit_intr:
15995 GET_THREAD_INFO(%rcx)
15996- testl $3,CS-ARGOFFSET(%rsp)
15997+ testb $3,CS-ARGOFFSET(%rsp)
15998 je retint_kernel
15999
16000 /* Interrupt came from user space */
16001@@ -842,12 +1153,15 @@ retint_swapgs: /* return to user-space */
16002 * The iretq could re-enable interrupts:
16003 */
16004 DISABLE_INTERRUPTS(CLBR_ANY)
16005+ pax_exit_kernel_user
16006 TRACE_IRQS_IRETQ
16007 SWAPGS
16008 jmp restore_args
16009
16010 retint_restore_args: /* return to kernel space */
16011 DISABLE_INTERRUPTS(CLBR_ANY)
16012+ pax_exit_kernel
16013+ pax_force_retaddr RIP-ARGOFFSET
16014 /*
16015 * The iretq could re-enable interrupts:
16016 */
16017@@ -936,7 +1250,7 @@ ENTRY(retint_kernel)
16018 #endif
16019
16020 CFI_ENDPROC
16021-END(common_interrupt)
16022+ENDPROC(common_interrupt)
16023 /*
16024 * End of kprobes section
16025 */
16026@@ -953,7 +1267,7 @@ ENTRY(\sym)
16027 interrupt \do_sym
16028 jmp ret_from_intr
16029 CFI_ENDPROC
16030-END(\sym)
16031+ENDPROC(\sym)
16032 .endm
16033
16034 #ifdef CONFIG_SMP
16035@@ -1026,12 +1340,22 @@ ENTRY(\sym)
16036 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16037 call error_entry
16038 DEFAULT_FRAME 0
16039+#ifdef CONFIG_PAX_MEMORY_UDEREF
16040+ testb $3, CS(%rsp)
16041+ jnz 1f
16042+ pax_enter_kernel
16043+ jmp 2f
16044+1: pax_enter_kernel_user
16045+2:
16046+#else
16047+ pax_enter_kernel
16048+#endif
16049 movq %rsp,%rdi /* pt_regs pointer */
16050 xorl %esi,%esi /* no error code */
16051 call \do_sym
16052 jmp error_exit /* %ebx: no swapgs flag */
16053 CFI_ENDPROC
16054-END(\sym)
16055+ENDPROC(\sym)
16056 .endm
16057
16058 .macro paranoidzeroentry sym do_sym
16059@@ -1043,15 +1367,25 @@ ENTRY(\sym)
16060 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16061 call save_paranoid
16062 TRACE_IRQS_OFF
16063+#ifdef CONFIG_PAX_MEMORY_UDEREF
16064+ testb $3, CS(%rsp)
16065+ jnz 1f
16066+ pax_enter_kernel
16067+ jmp 2f
16068+1: pax_enter_kernel_user
16069+2:
16070+#else
16071+ pax_enter_kernel
16072+#endif
16073 movq %rsp,%rdi /* pt_regs pointer */
16074 xorl %esi,%esi /* no error code */
16075 call \do_sym
16076 jmp paranoid_exit /* %ebx: no swapgs flag */
16077 CFI_ENDPROC
16078-END(\sym)
16079+ENDPROC(\sym)
16080 .endm
16081
16082-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
16083+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r12)
16084 .macro paranoidzeroentry_ist sym do_sym ist
16085 ENTRY(\sym)
16086 INTR_FRAME
16087@@ -1061,14 +1395,30 @@ ENTRY(\sym)
16088 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16089 call save_paranoid
16090 TRACE_IRQS_OFF
16091+#ifdef CONFIG_PAX_MEMORY_UDEREF
16092+ testb $3, CS(%rsp)
16093+ jnz 1f
16094+ pax_enter_kernel
16095+ jmp 2f
16096+1: pax_enter_kernel_user
16097+2:
16098+#else
16099+ pax_enter_kernel
16100+#endif
16101 movq %rsp,%rdi /* pt_regs pointer */
16102 xorl %esi,%esi /* no error code */
16103+#ifdef CONFIG_SMP
16104+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r12d
16105+ lea init_tss(%r12), %r12
16106+#else
16107+ lea init_tss(%rip), %r12
16108+#endif
16109 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
16110 call \do_sym
16111 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
16112 jmp paranoid_exit /* %ebx: no swapgs flag */
16113 CFI_ENDPROC
16114-END(\sym)
16115+ENDPROC(\sym)
16116 .endm
16117
16118 .macro errorentry sym do_sym
16119@@ -1079,13 +1429,23 @@ ENTRY(\sym)
16120 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16121 call error_entry
16122 DEFAULT_FRAME 0
16123+#ifdef CONFIG_PAX_MEMORY_UDEREF
16124+ testb $3, CS(%rsp)
16125+ jnz 1f
16126+ pax_enter_kernel
16127+ jmp 2f
16128+1: pax_enter_kernel_user
16129+2:
16130+#else
16131+ pax_enter_kernel
16132+#endif
16133 movq %rsp,%rdi /* pt_regs pointer */
16134 movq ORIG_RAX(%rsp),%rsi /* get error code */
16135 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
16136 call \do_sym
16137 jmp error_exit /* %ebx: no swapgs flag */
16138 CFI_ENDPROC
16139-END(\sym)
16140+ENDPROC(\sym)
16141 .endm
16142
16143 /* error code is on the stack already */
16144@@ -1098,13 +1458,23 @@ ENTRY(\sym)
16145 call save_paranoid
16146 DEFAULT_FRAME 0
16147 TRACE_IRQS_OFF
16148+#ifdef CONFIG_PAX_MEMORY_UDEREF
16149+ testb $3, CS(%rsp)
16150+ jnz 1f
16151+ pax_enter_kernel
16152+ jmp 2f
16153+1: pax_enter_kernel_user
16154+2:
16155+#else
16156+ pax_enter_kernel
16157+#endif
16158 movq %rsp,%rdi /* pt_regs pointer */
16159 movq ORIG_RAX(%rsp),%rsi /* get error code */
16160 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
16161 call \do_sym
16162 jmp paranoid_exit /* %ebx: no swapgs flag */
16163 CFI_ENDPROC
16164-END(\sym)
16165+ENDPROC(\sym)
16166 .endm
16167
16168 zeroentry divide_error do_divide_error
16169@@ -1134,9 +1504,10 @@ gs_change:
16170 2: mfence /* workaround */
16171 SWAPGS
16172 popfq_cfi
16173+ pax_force_retaddr
16174 ret
16175 CFI_ENDPROC
16176-END(native_load_gs_index)
16177+ENDPROC(native_load_gs_index)
16178
16179 .section __ex_table,"a"
16180 .align 8
16181@@ -1158,13 +1529,14 @@ ENTRY(kernel_thread_helper)
16182 * Here we are in the child and the registers are set as they were
16183 * at kernel_thread() invocation in the parent.
16184 */
16185+ pax_force_fptr %rsi
16186 call *%rsi
16187 # exit
16188 mov %eax, %edi
16189 call do_exit
16190 ud2 # padding for call trace
16191 CFI_ENDPROC
16192-END(kernel_thread_helper)
16193+ENDPROC(kernel_thread_helper)
16194
16195 /*
16196 * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
16197@@ -1191,11 +1563,11 @@ ENTRY(kernel_execve)
16198 RESTORE_REST
16199 testq %rax,%rax
16200 je int_ret_from_sys_call
16201- RESTORE_ARGS
16202 UNFAKE_STACK_FRAME
16203+ pax_force_retaddr
16204 ret
16205 CFI_ENDPROC
16206-END(kernel_execve)
16207+ENDPROC(kernel_execve)
16208
16209 /* Call softirq on interrupt stack. Interrupts are off. */
16210 ENTRY(call_softirq)
16211@@ -1213,9 +1585,10 @@ ENTRY(call_softirq)
16212 CFI_DEF_CFA_REGISTER rsp
16213 CFI_ADJUST_CFA_OFFSET -8
16214 decl PER_CPU_VAR(irq_count)
16215+ pax_force_retaddr
16216 ret
16217 CFI_ENDPROC
16218-END(call_softirq)
16219+ENDPROC(call_softirq)
16220
16221 #ifdef CONFIG_XEN
16222 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
16223@@ -1253,7 +1626,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
16224 decl PER_CPU_VAR(irq_count)
16225 jmp error_exit
16226 CFI_ENDPROC
16227-END(xen_do_hypervisor_callback)
16228+ENDPROC(xen_do_hypervisor_callback)
16229
16230 /*
16231 * Hypervisor uses this for application faults while it executes.
16232@@ -1312,7 +1685,7 @@ ENTRY(xen_failsafe_callback)
16233 SAVE_ALL
16234 jmp error_exit
16235 CFI_ENDPROC
16236-END(xen_failsafe_callback)
16237+ENDPROC(xen_failsafe_callback)
16238
16239 apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
16240 xen_hvm_callback_vector xen_evtchn_do_upcall
16241@@ -1361,16 +1734,31 @@ ENTRY(paranoid_exit)
16242 TRACE_IRQS_OFF
16243 testl %ebx,%ebx /* swapgs needed? */
16244 jnz paranoid_restore
16245- testl $3,CS(%rsp)
16246+ testb $3,CS(%rsp)
16247 jnz paranoid_userspace
16248+#ifdef CONFIG_PAX_MEMORY_UDEREF
16249+ pax_exit_kernel
16250+ TRACE_IRQS_IRETQ 0
16251+ SWAPGS_UNSAFE_STACK
16252+ RESTORE_ALL 8
16253+ pax_force_retaddr_bts
16254+ jmp irq_return
16255+#endif
16256 paranoid_swapgs:
16257+#ifdef CONFIG_PAX_MEMORY_UDEREF
16258+ pax_exit_kernel_user
16259+#else
16260+ pax_exit_kernel
16261+#endif
16262 TRACE_IRQS_IRETQ 0
16263 SWAPGS_UNSAFE_STACK
16264 RESTORE_ALL 8
16265 jmp irq_return
16266 paranoid_restore:
16267+ pax_exit_kernel
16268 TRACE_IRQS_IRETQ 0
16269 RESTORE_ALL 8
16270+ pax_force_retaddr_bts
16271 jmp irq_return
16272 paranoid_userspace:
16273 GET_THREAD_INFO(%rcx)
16274@@ -1399,7 +1787,7 @@ paranoid_schedule:
16275 TRACE_IRQS_OFF
16276 jmp paranoid_userspace
16277 CFI_ENDPROC
16278-END(paranoid_exit)
16279+ENDPROC(paranoid_exit)
16280
16281 /*
16282 * Exception entry point. This expects an error code/orig_rax on the stack.
16283@@ -1426,12 +1814,13 @@ ENTRY(error_entry)
16284 movq_cfi r14, R14+8
16285 movq_cfi r15, R15+8
16286 xorl %ebx,%ebx
16287- testl $3,CS+8(%rsp)
16288+ testb $3,CS+8(%rsp)
16289 je error_kernelspace
16290 error_swapgs:
16291 SWAPGS
16292 error_sti:
16293 TRACE_IRQS_OFF
16294+ pax_force_retaddr_bts
16295 ret
16296
16297 /*
16298@@ -1458,7 +1847,7 @@ bstep_iret:
16299 movq %rcx,RIP+8(%rsp)
16300 jmp error_swapgs
16301 CFI_ENDPROC
16302-END(error_entry)
16303+ENDPROC(error_entry)
16304
16305
16306 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
16307@@ -1478,7 +1867,7 @@ ENTRY(error_exit)
16308 jnz retint_careful
16309 jmp retint_swapgs
16310 CFI_ENDPROC
16311-END(error_exit)
16312+ENDPROC(error_exit)
16313
16314 /*
16315 * Test if a given stack is an NMI stack or not.
16316@@ -1535,9 +1924,11 @@ ENTRY(nmi)
16317 * If %cs was not the kernel segment, then the NMI triggered in user
16318 * space, which means it is definitely not nested.
16319 */
16320+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
16321+ je 1f
16322 cmpl $__KERNEL_CS, 16(%rsp)
16323 jne first_nmi
16324-
16325+1:
16326 /*
16327 * Check the special variable on the stack to see if NMIs are
16328 * executing.
16329@@ -1659,6 +2050,16 @@ restart_nmi:
16330 */
16331 call save_paranoid
16332 DEFAULT_FRAME 0
16333+#ifdef CONFIG_PAX_MEMORY_UDEREF
16334+ testb $3, CS(%rsp)
16335+ jnz 1f
16336+ pax_enter_kernel
16337+ jmp 2f
16338+1: pax_enter_kernel_user
16339+2:
16340+#else
16341+ pax_enter_kernel
16342+#endif
16343 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
16344 movq %rsp,%rdi
16345 movq $-1,%rsi
16346@@ -1666,14 +2067,25 @@ restart_nmi:
16347 testl %ebx,%ebx /* swapgs needed? */
16348 jnz nmi_restore
16349 nmi_swapgs:
16350+#ifdef CONFIG_PAX_MEMORY_UDEREF
16351+ pax_exit_kernel_user
16352+#else
16353+ pax_exit_kernel
16354+#endif
16355 SWAPGS_UNSAFE_STACK
16356+ RESTORE_ALL 8
16357+ /* Clear the NMI executing stack variable */
16358+ movq $0, 10*8(%rsp)
16359+ jmp irq_return
16360 nmi_restore:
16361+ pax_exit_kernel
16362 RESTORE_ALL 8
16363+ pax_force_retaddr_bts
16364 /* Clear the NMI executing stack variable */
16365 movq $0, 10*8(%rsp)
16366 jmp irq_return
16367 CFI_ENDPROC
16368-END(nmi)
16369+ENDPROC(nmi)
16370
16371 /*
16372 * If an NMI hit an iret because of an exception or breakpoint,
16373@@ -1700,7 +2112,7 @@ ENTRY(ignore_sysret)
16374 mov $-ENOSYS,%eax
16375 sysret
16376 CFI_ENDPROC
16377-END(ignore_sysret)
16378+ENDPROC(ignore_sysret)
16379
16380 /*
16381 * End of kprobes section
16382diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
16383index c9a281f..ce2f317 100644
16384--- a/arch/x86/kernel/ftrace.c
16385+++ b/arch/x86/kernel/ftrace.c
16386@@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the IP to write to */
16387 static const void *mod_code_newcode; /* holds the text to write to the IP */
16388
16389 static unsigned nmi_wait_count;
16390-static atomic_t nmi_update_count = ATOMIC_INIT(0);
16391+static atomic_unchecked_t nmi_update_count = ATOMIC_INIT(0);
16392
16393 int ftrace_arch_read_dyn_info(char *buf, int size)
16394 {
16395@@ -134,7 +134,7 @@ int ftrace_arch_read_dyn_info(char *buf, int size)
16396
16397 r = snprintf(buf, size, "%u %u",
16398 nmi_wait_count,
16399- atomic_read(&nmi_update_count));
16400+ atomic_read_unchecked(&nmi_update_count));
16401 return r;
16402 }
16403
16404@@ -177,8 +177,10 @@ void ftrace_nmi_enter(void)
16405
16406 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
16407 smp_rmb();
16408+ pax_open_kernel();
16409 ftrace_mod_code();
16410- atomic_inc(&nmi_update_count);
16411+ pax_close_kernel();
16412+ atomic_inc_unchecked(&nmi_update_count);
16413 }
16414 /* Must have previous changes seen before executions */
16415 smp_mb();
16416@@ -271,6 +273,8 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
16417 {
16418 unsigned char replaced[MCOUNT_INSN_SIZE];
16419
16420+ ip = ktla_ktva(ip);
16421+
16422 /*
16423 * Note: Due to modules and __init, code can
16424 * disappear and change, we need to protect against faulting
16425@@ -327,7 +331,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
16426 unsigned char old[MCOUNT_INSN_SIZE], *new;
16427 int ret;
16428
16429- memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
16430+ memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
16431 new = ftrace_call_replace(ip, (unsigned long)func);
16432 ret = ftrace_modify_code(ip, old, new);
16433
16434@@ -353,6 +357,8 @@ static int ftrace_mod_jmp(unsigned long ip,
16435 {
16436 unsigned char code[MCOUNT_INSN_SIZE];
16437
16438+ ip = ktla_ktva(ip);
16439+
16440 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
16441 return -EFAULT;
16442
16443diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
16444index 51ff186..9e77418 100644
16445--- a/arch/x86/kernel/head32.c
16446+++ b/arch/x86/kernel/head32.c
16447@@ -19,6 +19,7 @@
16448 #include <asm/io_apic.h>
16449 #include <asm/bios_ebda.h>
16450 #include <asm/tlbflush.h>
16451+#include <asm/boot.h>
16452
16453 static void __init i386_default_early_setup(void)
16454 {
16455@@ -31,8 +32,7 @@ static void __init i386_default_early_setup(void)
16456
16457 void __init i386_start_kernel(void)
16458 {
16459- memblock_reserve(__pa_symbol(&_text),
16460- __pa_symbol(&__bss_stop) - __pa_symbol(&_text));
16461+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop) - LOAD_PHYSICAL_ADDR);
16462
16463 #ifdef CONFIG_BLK_DEV_INITRD
16464 /* Reserve INITRD */
16465diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
16466index ce0be7c..c41476e 100644
16467--- a/arch/x86/kernel/head_32.S
16468+++ b/arch/x86/kernel/head_32.S
16469@@ -25,6 +25,12 @@
16470 /* Physical address */
16471 #define pa(X) ((X) - __PAGE_OFFSET)
16472
16473+#ifdef CONFIG_PAX_KERNEXEC
16474+#define ta(X) (X)
16475+#else
16476+#define ta(X) ((X) - __PAGE_OFFSET)
16477+#endif
16478+
16479 /*
16480 * References to members of the new_cpu_data structure.
16481 */
16482@@ -54,11 +60,7 @@
16483 * and small than max_low_pfn, otherwise will waste some page table entries
16484 */
16485
16486-#if PTRS_PER_PMD > 1
16487-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
16488-#else
16489-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
16490-#endif
16491+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
16492
16493 /* Number of possible pages in the lowmem region */
16494 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
16495@@ -77,6 +79,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
16496 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16497
16498 /*
16499+ * Real beginning of normal "text" segment
16500+ */
16501+ENTRY(stext)
16502+ENTRY(_stext)
16503+
16504+/*
16505 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
16506 * %esi points to the real-mode code as a 32-bit pointer.
16507 * CS and DS must be 4 GB flat segments, but we don't depend on
16508@@ -84,6 +92,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16509 * can.
16510 */
16511 __HEAD
16512+
16513+#ifdef CONFIG_PAX_KERNEXEC
16514+ jmp startup_32
16515+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
16516+.fill PAGE_SIZE-5,1,0xcc
16517+#endif
16518+
16519 ENTRY(startup_32)
16520 movl pa(stack_start),%ecx
16521
16522@@ -105,6 +120,57 @@ ENTRY(startup_32)
16523 2:
16524 leal -__PAGE_OFFSET(%ecx),%esp
16525
16526+#ifdef CONFIG_SMP
16527+ movl $pa(cpu_gdt_table),%edi
16528+ movl $__per_cpu_load,%eax
16529+ movw %ax,__KERNEL_PERCPU + 2(%edi)
16530+ rorl $16,%eax
16531+ movb %al,__KERNEL_PERCPU + 4(%edi)
16532+ movb %ah,__KERNEL_PERCPU + 7(%edi)
16533+ movl $__per_cpu_end - 1,%eax
16534+ subl $__per_cpu_start,%eax
16535+ movw %ax,__KERNEL_PERCPU + 0(%edi)
16536+#endif
16537+
16538+#ifdef CONFIG_PAX_MEMORY_UDEREF
16539+ movl $NR_CPUS,%ecx
16540+ movl $pa(cpu_gdt_table),%edi
16541+1:
16542+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
16543+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
16544+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
16545+ addl $PAGE_SIZE_asm,%edi
16546+ loop 1b
16547+#endif
16548+
16549+#ifdef CONFIG_PAX_KERNEXEC
16550+ movl $pa(boot_gdt),%edi
16551+ movl $__LOAD_PHYSICAL_ADDR,%eax
16552+ movw %ax,__BOOT_CS + 2(%edi)
16553+ rorl $16,%eax
16554+ movb %al,__BOOT_CS + 4(%edi)
16555+ movb %ah,__BOOT_CS + 7(%edi)
16556+ rorl $16,%eax
16557+
16558+ ljmp $(__BOOT_CS),$1f
16559+1:
16560+
16561+ movl $NR_CPUS,%ecx
16562+ movl $pa(cpu_gdt_table),%edi
16563+ addl $__PAGE_OFFSET,%eax
16564+1:
16565+ movw %ax,__KERNEL_CS + 2(%edi)
16566+ movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi)
16567+ rorl $16,%eax
16568+ movb %al,__KERNEL_CS + 4(%edi)
16569+ movb %al,__KERNEXEC_KERNEL_CS + 4(%edi)
16570+ movb %ah,__KERNEL_CS + 7(%edi)
16571+ movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi)
16572+ rorl $16,%eax
16573+ addl $PAGE_SIZE_asm,%edi
16574+ loop 1b
16575+#endif
16576+
16577 /*
16578 * Clear BSS first so that there are no surprises...
16579 */
16580@@ -195,8 +261,11 @@ ENTRY(startup_32)
16581 movl %eax, pa(max_pfn_mapped)
16582
16583 /* Do early initialization of the fixmap area */
16584- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
16585- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
16586+#ifdef CONFIG_COMPAT_VDSO
16587+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
16588+#else
16589+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
16590+#endif
16591 #else /* Not PAE */
16592
16593 page_pde_offset = (__PAGE_OFFSET >> 20);
16594@@ -226,8 +295,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
16595 movl %eax, pa(max_pfn_mapped)
16596
16597 /* Do early initialization of the fixmap area */
16598- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
16599- movl %eax,pa(initial_page_table+0xffc)
16600+#ifdef CONFIG_COMPAT_VDSO
16601+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
16602+#else
16603+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
16604+#endif
16605 #endif
16606
16607 #ifdef CONFIG_PARAVIRT
16608@@ -241,9 +313,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
16609 cmpl $num_subarch_entries, %eax
16610 jae bad_subarch
16611
16612- movl pa(subarch_entries)(,%eax,4), %eax
16613- subl $__PAGE_OFFSET, %eax
16614- jmp *%eax
16615+ jmp *pa(subarch_entries)(,%eax,4)
16616
16617 bad_subarch:
16618 WEAK(lguest_entry)
16619@@ -255,10 +325,10 @@ WEAK(xen_entry)
16620 __INITDATA
16621
16622 subarch_entries:
16623- .long default_entry /* normal x86/PC */
16624- .long lguest_entry /* lguest hypervisor */
16625- .long xen_entry /* Xen hypervisor */
16626- .long default_entry /* Moorestown MID */
16627+ .long ta(default_entry) /* normal x86/PC */
16628+ .long ta(lguest_entry) /* lguest hypervisor */
16629+ .long ta(xen_entry) /* Xen hypervisor */
16630+ .long ta(default_entry) /* Moorestown MID */
16631 num_subarch_entries = (. - subarch_entries) / 4
16632 .previous
16633 #else
16634@@ -312,6 +382,7 @@ default_entry:
16635 orl %edx,%eax
16636 movl %eax,%cr4
16637
16638+#ifdef CONFIG_X86_PAE
16639 testb $X86_CR4_PAE, %al # check if PAE is enabled
16640 jz 6f
16641
16642@@ -340,6 +411,9 @@ default_entry:
16643 /* Make changes effective */
16644 wrmsr
16645
16646+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
16647+#endif
16648+
16649 6:
16650
16651 /*
16652@@ -443,7 +517,7 @@ is386: movl $2,%ecx # set MP
16653 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
16654 movl %eax,%ss # after changing gdt.
16655
16656- movl $(__USER_DS),%eax # DS/ES contains default USER segment
16657+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
16658 movl %eax,%ds
16659 movl %eax,%es
16660
16661@@ -457,15 +531,22 @@ is386: movl $2,%ecx # set MP
16662 */
16663 cmpb $0,ready
16664 jne 1f
16665- movl $gdt_page,%eax
16666+ movl $cpu_gdt_table,%eax
16667 movl $stack_canary,%ecx
16668+#ifdef CONFIG_SMP
16669+ addl $__per_cpu_load,%ecx
16670+#endif
16671 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
16672 shrl $16, %ecx
16673 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
16674 movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax)
16675 1:
16676-#endif
16677 movl $(__KERNEL_STACK_CANARY),%eax
16678+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
16679+ movl $(__USER_DS),%eax
16680+#else
16681+ xorl %eax,%eax
16682+#endif
16683 movl %eax,%gs
16684
16685 xorl %eax,%eax # Clear LDT
16686@@ -558,22 +639,22 @@ early_page_fault:
16687 jmp early_fault
16688
16689 early_fault:
16690- cld
16691 #ifdef CONFIG_PRINTK
16692+ cmpl $1,%ss:early_recursion_flag
16693+ je hlt_loop
16694+ incl %ss:early_recursion_flag
16695+ cld
16696 pusha
16697 movl $(__KERNEL_DS),%eax
16698 movl %eax,%ds
16699 movl %eax,%es
16700- cmpl $2,early_recursion_flag
16701- je hlt_loop
16702- incl early_recursion_flag
16703 movl %cr2,%eax
16704 pushl %eax
16705 pushl %edx /* trapno */
16706 pushl $fault_msg
16707 call printk
16708+; call dump_stack
16709 #endif
16710- call dump_stack
16711 hlt_loop:
16712 hlt
16713 jmp hlt_loop
16714@@ -581,8 +662,11 @@ hlt_loop:
16715 /* This is the default interrupt "handler" :-) */
16716 ALIGN
16717 ignore_int:
16718- cld
16719 #ifdef CONFIG_PRINTK
16720+ cmpl $2,%ss:early_recursion_flag
16721+ je hlt_loop
16722+ incl %ss:early_recursion_flag
16723+ cld
16724 pushl %eax
16725 pushl %ecx
16726 pushl %edx
16727@@ -591,9 +675,6 @@ ignore_int:
16728 movl $(__KERNEL_DS),%eax
16729 movl %eax,%ds
16730 movl %eax,%es
16731- cmpl $2,early_recursion_flag
16732- je hlt_loop
16733- incl early_recursion_flag
16734 pushl 16(%esp)
16735 pushl 24(%esp)
16736 pushl 32(%esp)
16737@@ -622,29 +703,43 @@ ENTRY(initial_code)
16738 /*
16739 * BSS section
16740 */
16741-__PAGE_ALIGNED_BSS
16742- .align PAGE_SIZE
16743 #ifdef CONFIG_X86_PAE
16744+.section .initial_pg_pmd,"a",@progbits
16745 initial_pg_pmd:
16746 .fill 1024*KPMDS,4,0
16747 #else
16748+.section .initial_page_table,"a",@progbits
16749 ENTRY(initial_page_table)
16750 .fill 1024,4,0
16751 #endif
16752+.section .initial_pg_fixmap,"a",@progbits
16753 initial_pg_fixmap:
16754 .fill 1024,4,0
16755+.section .empty_zero_page,"a",@progbits
16756 ENTRY(empty_zero_page)
16757 .fill 4096,1,0
16758+.section .swapper_pg_dir,"a",@progbits
16759 ENTRY(swapper_pg_dir)
16760+#ifdef CONFIG_X86_PAE
16761+ .fill 4,8,0
16762+#else
16763 .fill 1024,4,0
16764+#endif
16765+
16766+/*
16767+ * The IDT has to be page-aligned to simplify the Pentium
16768+ * F0 0F bug workaround.. We have a special link segment
16769+ * for this.
16770+ */
16771+.section .idt,"a",@progbits
16772+ENTRY(idt_table)
16773+ .fill 256,8,0
16774
16775 /*
16776 * This starts the data section.
16777 */
16778 #ifdef CONFIG_X86_PAE
16779-__PAGE_ALIGNED_DATA
16780- /* Page-aligned for the benefit of paravirt? */
16781- .align PAGE_SIZE
16782+.section .initial_page_table,"a",@progbits
16783 ENTRY(initial_page_table)
16784 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
16785 # if KPMDS == 3
16786@@ -663,18 +758,27 @@ ENTRY(initial_page_table)
16787 # error "Kernel PMDs should be 1, 2 or 3"
16788 # endif
16789 .align PAGE_SIZE /* needs to be page-sized too */
16790+
16791+#ifdef CONFIG_PAX_PER_CPU_PGD
16792+ENTRY(cpu_pgd)
16793+ .rept NR_CPUS
16794+ .fill 4,8,0
16795+ .endr
16796+#endif
16797+
16798 #endif
16799
16800 .data
16801 .balign 4
16802 ENTRY(stack_start)
16803- .long init_thread_union+THREAD_SIZE
16804+ .long init_thread_union+THREAD_SIZE-8
16805
16806+ready: .byte 0
16807+
16808+.section .rodata,"a",@progbits
16809 early_recursion_flag:
16810 .long 0
16811
16812-ready: .byte 0
16813-
16814 int_msg:
16815 .asciz "Unknown interrupt or fault at: %p %p %p\n"
16816
16817@@ -707,7 +811,7 @@ fault_msg:
16818 .word 0 # 32 bit align gdt_desc.address
16819 boot_gdt_descr:
16820 .word __BOOT_DS+7
16821- .long boot_gdt - __PAGE_OFFSET
16822+ .long pa(boot_gdt)
16823
16824 .word 0 # 32-bit align idt_desc.address
16825 idt_descr:
16826@@ -718,7 +822,7 @@ idt_descr:
16827 .word 0 # 32 bit align gdt_desc.address
16828 ENTRY(early_gdt_descr)
16829 .word GDT_ENTRIES*8-1
16830- .long gdt_page /* Overwritten for secondary CPUs */
16831+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
16832
16833 /*
16834 * The boot_gdt must mirror the equivalent in setup.S and is
16835@@ -727,5 +831,65 @@ ENTRY(early_gdt_descr)
16836 .align L1_CACHE_BYTES
16837 ENTRY(boot_gdt)
16838 .fill GDT_ENTRY_BOOT_CS,8,0
16839- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
16840- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
16841+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
16842+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
16843+
16844+ .align PAGE_SIZE_asm
16845+ENTRY(cpu_gdt_table)
16846+ .rept NR_CPUS
16847+ .quad 0x0000000000000000 /* NULL descriptor */
16848+ .quad 0x0000000000000000 /* 0x0b reserved */
16849+ .quad 0x0000000000000000 /* 0x13 reserved */
16850+ .quad 0x0000000000000000 /* 0x1b reserved */
16851+
16852+#ifdef CONFIG_PAX_KERNEXEC
16853+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
16854+#else
16855+ .quad 0x0000000000000000 /* 0x20 unused */
16856+#endif
16857+
16858+ .quad 0x0000000000000000 /* 0x28 unused */
16859+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
16860+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
16861+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
16862+ .quad 0x0000000000000000 /* 0x4b reserved */
16863+ .quad 0x0000000000000000 /* 0x53 reserved */
16864+ .quad 0x0000000000000000 /* 0x5b reserved */
16865+
16866+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
16867+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
16868+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
16869+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
16870+
16871+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
16872+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
16873+
16874+ /*
16875+ * Segments used for calling PnP BIOS have byte granularity.
16876+ * The code segments and data segments have fixed 64k limits,
16877+ * the transfer segment sizes are set at run time.
16878+ */
16879+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
16880+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
16881+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
16882+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
16883+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
16884+
16885+ /*
16886+ * The APM segments have byte granularity and their bases
16887+ * are set at run time. All have 64k limits.
16888+ */
16889+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
16890+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
16891+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
16892+
16893+ .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
16894+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
16895+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
16896+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
16897+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
16898+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
16899+
16900+ /* Be sure this is zeroed to avoid false validations in Xen */
16901+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
16902+ .endr
16903diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
16904index 40f4eb3..6d24d9d 100644
16905--- a/arch/x86/kernel/head_64.S
16906+++ b/arch/x86/kernel/head_64.S
16907@@ -19,6 +19,8 @@
16908 #include <asm/cache.h>
16909 #include <asm/processor-flags.h>
16910 #include <asm/percpu.h>
16911+#include <asm/cpufeature.h>
16912+#include <asm/alternative-asm.h>
16913
16914 #ifdef CONFIG_PARAVIRT
16915 #include <asm/asm-offsets.h>
16916@@ -38,6 +40,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
16917 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
16918 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
16919 L3_START_KERNEL = pud_index(__START_KERNEL_map)
16920+L4_VMALLOC_START = pgd_index(VMALLOC_START)
16921+L3_VMALLOC_START = pud_index(VMALLOC_START)
16922+L4_VMALLOC_END = pgd_index(VMALLOC_END)
16923+L3_VMALLOC_END = pud_index(VMALLOC_END)
16924+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
16925+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
16926
16927 .text
16928 __HEAD
16929@@ -85,35 +93,23 @@ startup_64:
16930 */
16931 addq %rbp, init_level4_pgt + 0(%rip)
16932 addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
16933+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
16934+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
16935+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
16936 addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
16937
16938 addq %rbp, level3_ident_pgt + 0(%rip)
16939+#ifndef CONFIG_XEN
16940+ addq %rbp, level3_ident_pgt + 8(%rip)
16941+#endif
16942
16943- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
16944- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
16945+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
16946+
16947+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
16948+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
16949
16950 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
16951-
16952- /* Add an Identity mapping if I am above 1G */
16953- leaq _text(%rip), %rdi
16954- andq $PMD_PAGE_MASK, %rdi
16955-
16956- movq %rdi, %rax
16957- shrq $PUD_SHIFT, %rax
16958- andq $(PTRS_PER_PUD - 1), %rax
16959- jz ident_complete
16960-
16961- leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
16962- leaq level3_ident_pgt(%rip), %rbx
16963- movq %rdx, 0(%rbx, %rax, 8)
16964-
16965- movq %rdi, %rax
16966- shrq $PMD_SHIFT, %rax
16967- andq $(PTRS_PER_PMD - 1), %rax
16968- leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx
16969- leaq level2_spare_pgt(%rip), %rbx
16970- movq %rdx, 0(%rbx, %rax, 8)
16971-ident_complete:
16972+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
16973
16974 /*
16975 * Fixup the kernel text+data virtual addresses. Note that
16976@@ -160,8 +156,8 @@ ENTRY(secondary_startup_64)
16977 * after the boot processor executes this code.
16978 */
16979
16980- /* Enable PAE mode and PGE */
16981- movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
16982+ /* Enable PAE mode and PSE/PGE */
16983+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
16984 movq %rax, %cr4
16985
16986 /* Setup early boot stage 4 level pagetables. */
16987@@ -183,9 +179,17 @@ ENTRY(secondary_startup_64)
16988 movl $MSR_EFER, %ecx
16989 rdmsr
16990 btsl $_EFER_SCE, %eax /* Enable System Call */
16991- btl $20,%edi /* No Execute supported? */
16992+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
16993 jnc 1f
16994 btsl $_EFER_NX, %eax
16995+ leaq init_level4_pgt(%rip), %rdi
16996+#ifndef CONFIG_EFI
16997+ btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
16998+#endif
16999+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
17000+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
17001+ btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
17002+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
17003 1: wrmsr /* Make changes effective */
17004
17005 /* Setup cr0 */
17006@@ -247,6 +251,7 @@ ENTRY(secondary_startup_64)
17007 * jump. In addition we need to ensure %cs is set so we make this
17008 * a far return.
17009 */
17010+ pax_set_fptr_mask
17011 movq initial_code(%rip),%rax
17012 pushq $0 # fake return address to stop unwinder
17013 pushq $__KERNEL_CS # set correct cs
17014@@ -269,7 +274,7 @@ ENTRY(secondary_startup_64)
17015 bad_address:
17016 jmp bad_address
17017
17018- .section ".init.text","ax"
17019+ __INIT
17020 #ifdef CONFIG_EARLY_PRINTK
17021 .globl early_idt_handlers
17022 early_idt_handlers:
17023@@ -314,18 +319,23 @@ ENTRY(early_idt_handler)
17024 #endif /* EARLY_PRINTK */
17025 1: hlt
17026 jmp 1b
17027+ .previous
17028
17029 #ifdef CONFIG_EARLY_PRINTK
17030+ __INITDATA
17031 early_recursion_flag:
17032 .long 0
17033+ .previous
17034
17035+ .section .rodata,"a",@progbits
17036 early_idt_msg:
17037 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
17038 early_idt_ripmsg:
17039 .asciz "RIP %s\n"
17040+ .previous
17041 #endif /* CONFIG_EARLY_PRINTK */
17042- .previous
17043
17044+ .section .rodata,"a",@progbits
17045 #define NEXT_PAGE(name) \
17046 .balign PAGE_SIZE; \
17047 ENTRY(name)
17048@@ -338,7 +348,6 @@ ENTRY(name)
17049 i = i + 1 ; \
17050 .endr
17051
17052- .data
17053 /*
17054 * This default setting generates an ident mapping at address 0x100000
17055 * and a mapping for the kernel that precisely maps virtual address
17056@@ -349,13 +358,41 @@ NEXT_PAGE(init_level4_pgt)
17057 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17058 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
17059 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17060+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
17061+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
17062+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
17063+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
17064+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
17065+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
17066 .org init_level4_pgt + L4_START_KERNEL*8, 0
17067 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
17068 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
17069
17070+#ifdef CONFIG_PAX_PER_CPU_PGD
17071+NEXT_PAGE(cpu_pgd)
17072+ .rept NR_CPUS
17073+ .fill 512,8,0
17074+ .endr
17075+#endif
17076+
17077 NEXT_PAGE(level3_ident_pgt)
17078 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17079+#ifdef CONFIG_XEN
17080 .fill 511,8,0
17081+#else
17082+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
17083+ .fill 510,8,0
17084+#endif
17085+
17086+NEXT_PAGE(level3_vmalloc_start_pgt)
17087+ .fill 512,8,0
17088+
17089+NEXT_PAGE(level3_vmalloc_end_pgt)
17090+ .fill 512,8,0
17091+
17092+NEXT_PAGE(level3_vmemmap_pgt)
17093+ .fill L3_VMEMMAP_START,8,0
17094+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
17095
17096 NEXT_PAGE(level3_kernel_pgt)
17097 .fill L3_START_KERNEL,8,0
17098@@ -363,20 +400,23 @@ NEXT_PAGE(level3_kernel_pgt)
17099 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
17100 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
17101
17102+NEXT_PAGE(level2_vmemmap_pgt)
17103+ .fill 512,8,0
17104+
17105 NEXT_PAGE(level2_fixmap_pgt)
17106- .fill 506,8,0
17107- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
17108- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
17109- .fill 5,8,0
17110+ .fill 507,8,0
17111+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
17112+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
17113+ .fill 4,8,0
17114
17115-NEXT_PAGE(level1_fixmap_pgt)
17116+NEXT_PAGE(level1_vsyscall_pgt)
17117 .fill 512,8,0
17118
17119-NEXT_PAGE(level2_ident_pgt)
17120- /* Since I easily can, map the first 1G.
17121+ /* Since I easily can, map the first 2G.
17122 * Don't set NX because code runs from these pages.
17123 */
17124- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
17125+NEXT_PAGE(level2_ident_pgt)
17126+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
17127
17128 NEXT_PAGE(level2_kernel_pgt)
17129 /*
17130@@ -389,37 +429,59 @@ NEXT_PAGE(level2_kernel_pgt)
17131 * If you want to increase this then increase MODULES_VADDR
17132 * too.)
17133 */
17134- PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
17135- KERNEL_IMAGE_SIZE/PMD_SIZE)
17136-
17137-NEXT_PAGE(level2_spare_pgt)
17138- .fill 512, 8, 0
17139+ PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)
17140
17141 #undef PMDS
17142 #undef NEXT_PAGE
17143
17144- .data
17145+ .align PAGE_SIZE
17146+ENTRY(cpu_gdt_table)
17147+ .rept NR_CPUS
17148+ .quad 0x0000000000000000 /* NULL descriptor */
17149+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
17150+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
17151+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
17152+ .quad 0x00cffb000000ffff /* __USER32_CS */
17153+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
17154+ .quad 0x00affb000000ffff /* __USER_CS */
17155+
17156+#ifdef CONFIG_PAX_KERNEXEC
17157+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
17158+#else
17159+ .quad 0x0 /* unused */
17160+#endif
17161+
17162+ .quad 0,0 /* TSS */
17163+ .quad 0,0 /* LDT */
17164+ .quad 0,0,0 /* three TLS descriptors */
17165+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
17166+ /* asm/segment.h:GDT_ENTRIES must match this */
17167+
17168+ /* zero the remaining page */
17169+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
17170+ .endr
17171+
17172 .align 16
17173 .globl early_gdt_descr
17174 early_gdt_descr:
17175 .word GDT_ENTRIES*8-1
17176 early_gdt_descr_base:
17177- .quad INIT_PER_CPU_VAR(gdt_page)
17178+ .quad cpu_gdt_table
17179
17180 ENTRY(phys_base)
17181 /* This must match the first entry in level2_kernel_pgt */
17182 .quad 0x0000000000000000
17183
17184 #include "../../x86/xen/xen-head.S"
17185-
17186- .section .bss, "aw", @nobits
17187+
17188+ .section .rodata,"a",@progbits
17189 .align L1_CACHE_BYTES
17190 ENTRY(idt_table)
17191- .skip IDT_ENTRIES * 16
17192+ .fill 512,8,0
17193
17194 .align L1_CACHE_BYTES
17195 ENTRY(nmi_idt_table)
17196- .skip IDT_ENTRIES * 16
17197+ .fill 512,8,0
17198
17199 __PAGE_ALIGNED_BSS
17200 .align PAGE_SIZE
17201diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
17202index 9c3bd4a..e1d9b35 100644
17203--- a/arch/x86/kernel/i386_ksyms_32.c
17204+++ b/arch/x86/kernel/i386_ksyms_32.c
17205@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
17206 EXPORT_SYMBOL(cmpxchg8b_emu);
17207 #endif
17208
17209+EXPORT_SYMBOL_GPL(cpu_gdt_table);
17210+
17211 /* Networking helper routines. */
17212 EXPORT_SYMBOL(csum_partial_copy_generic);
17213+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
17214+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
17215
17216 EXPORT_SYMBOL(__get_user_1);
17217 EXPORT_SYMBOL(__get_user_2);
17218@@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr);
17219
17220 EXPORT_SYMBOL(csum_partial);
17221 EXPORT_SYMBOL(empty_zero_page);
17222+
17223+#ifdef CONFIG_PAX_KERNEXEC
17224+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
17225+#endif
17226diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
17227index f239f30..aab2a58 100644
17228--- a/arch/x86/kernel/i387.c
17229+++ b/arch/x86/kernel/i387.c
17230@@ -189,6 +189,9 @@ int xfpregs_active(struct task_struct *target, const struct user_regset *regset)
17231
17232 int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
17233 unsigned int pos, unsigned int count,
17234+ void *kbuf, void __user *ubuf) __size_overflow(4);
17235+int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
17236+ unsigned int pos, unsigned int count,
17237 void *kbuf, void __user *ubuf)
17238 {
17239 int ret;
17240@@ -208,6 +211,9 @@ int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
17241
17242 int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17243 unsigned int pos, unsigned int count,
17244+ const void *kbuf, const void __user *ubuf) __size_overflow(4);
17245+int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17246+ unsigned int pos, unsigned int count,
17247 const void *kbuf, const void __user *ubuf)
17248 {
17249 int ret;
17250@@ -241,6 +247,9 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17251
17252 int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17253 unsigned int pos, unsigned int count,
17254+ void *kbuf, void __user *ubuf) __size_overflow(4);
17255+int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17256+ unsigned int pos, unsigned int count,
17257 void *kbuf, void __user *ubuf)
17258 {
17259 int ret;
17260@@ -270,6 +279,9 @@ int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17261
17262 int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
17263 unsigned int pos, unsigned int count,
17264+ const void *kbuf, const void __user *ubuf) __size_overflow(4);
17265+int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
17266+ unsigned int pos, unsigned int count,
17267 const void *kbuf, const void __user *ubuf)
17268 {
17269 int ret;
17270@@ -440,6 +452,9 @@ static void convert_to_fxsr(struct task_struct *tsk,
17271
17272 int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17273 unsigned int pos, unsigned int count,
17274+ void *kbuf, void __user *ubuf) __size_overflow(3,4);
17275+int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17276+ unsigned int pos, unsigned int count,
17277 void *kbuf, void __user *ubuf)
17278 {
17279 struct user_i387_ia32_struct env;
17280@@ -472,6 +487,9 @@ int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17281
17282 int fpregs_set(struct task_struct *target, const struct user_regset *regset,
17283 unsigned int pos, unsigned int count,
17284+ const void *kbuf, const void __user *ubuf) __size_overflow(3,4);
17285+int fpregs_set(struct task_struct *target, const struct user_regset *regset,
17286+ unsigned int pos, unsigned int count,
17287 const void *kbuf, const void __user *ubuf)
17288 {
17289 struct user_i387_ia32_struct env;
17290@@ -620,6 +638,8 @@ static inline int restore_i387_fsave(struct _fpstate_ia32 __user *buf)
17291 }
17292
17293 static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf,
17294+ unsigned int size) __size_overflow(2);
17295+static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf,
17296 unsigned int size)
17297 {
17298 struct task_struct *tsk = current;
17299diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
17300index 6104852..6114160 100644
17301--- a/arch/x86/kernel/i8259.c
17302+++ b/arch/x86/kernel/i8259.c
17303@@ -210,7 +210,7 @@ spurious_8259A_irq:
17304 "spurious 8259A interrupt: IRQ%d.\n", irq);
17305 spurious_irq_mask |= irqmask;
17306 }
17307- atomic_inc(&irq_err_count);
17308+ atomic_inc_unchecked(&irq_err_count);
17309 /*
17310 * Theoretically we do not have to handle this IRQ,
17311 * but in Linux this does not cause problems and is
17312diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
17313index 43e9ccf..44ccf6f 100644
17314--- a/arch/x86/kernel/init_task.c
17315+++ b/arch/x86/kernel/init_task.c
17316@@ -20,8 +20,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
17317 * way process stacks are handled. This is done by having a special
17318 * "init_task" linker map entry..
17319 */
17320-union thread_union init_thread_union __init_task_data =
17321- { INIT_THREAD_INFO(init_task) };
17322+union thread_union init_thread_union __init_task_data;
17323
17324 /*
17325 * Initial task structure.
17326@@ -38,5 +37,5 @@ EXPORT_SYMBOL(init_task);
17327 * section. Since TSS's are completely CPU-local, we want them
17328 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
17329 */
17330-DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
17331-
17332+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
17333+EXPORT_SYMBOL(init_tss);
17334diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
17335index 8c96897..be66bfa 100644
17336--- a/arch/x86/kernel/ioport.c
17337+++ b/arch/x86/kernel/ioport.c
17338@@ -6,6 +6,7 @@
17339 #include <linux/sched.h>
17340 #include <linux/kernel.h>
17341 #include <linux/capability.h>
17342+#include <linux/security.h>
17343 #include <linux/errno.h>
17344 #include <linux/types.h>
17345 #include <linux/ioport.h>
17346@@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17347
17348 if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
17349 return -EINVAL;
17350+#ifdef CONFIG_GRKERNSEC_IO
17351+ if (turn_on && grsec_disable_privio) {
17352+ gr_handle_ioperm();
17353+ return -EPERM;
17354+ }
17355+#endif
17356 if (turn_on && !capable(CAP_SYS_RAWIO))
17357 return -EPERM;
17358
17359@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17360 * because the ->io_bitmap_max value must match the bitmap
17361 * contents:
17362 */
17363- tss = &per_cpu(init_tss, get_cpu());
17364+ tss = init_tss + get_cpu();
17365
17366 if (turn_on)
17367 bitmap_clear(t->io_bitmap_ptr, from, num);
17368@@ -102,6 +109,12 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
17369 return -EINVAL;
17370 /* Trying to gain more privileges? */
17371 if (level > old) {
17372+#ifdef CONFIG_GRKERNSEC_IO
17373+ if (grsec_disable_privio) {
17374+ gr_handle_iopl();
17375+ return -EPERM;
17376+ }
17377+#endif
17378 if (!capable(CAP_SYS_RAWIO))
17379 return -EPERM;
17380 }
17381diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
17382index 7943e0c..dd32c5c 100644
17383--- a/arch/x86/kernel/irq.c
17384+++ b/arch/x86/kernel/irq.c
17385@@ -18,7 +18,7 @@
17386 #include <asm/mce.h>
17387 #include <asm/hw_irq.h>
17388
17389-atomic_t irq_err_count;
17390+atomic_unchecked_t irq_err_count;
17391
17392 /* Function pointer for generic interrupt vector handling */
17393 void (*x86_platform_ipi_callback)(void) = NULL;
17394@@ -121,9 +121,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
17395 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
17396 seq_printf(p, " Machine check polls\n");
17397 #endif
17398- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
17399+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
17400 #if defined(CONFIG_X86_IO_APIC)
17401- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
17402+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
17403 #endif
17404 return 0;
17405 }
17406@@ -164,10 +164,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
17407
17408 u64 arch_irq_stat(void)
17409 {
17410- u64 sum = atomic_read(&irq_err_count);
17411+ u64 sum = atomic_read_unchecked(&irq_err_count);
17412
17413 #ifdef CONFIG_X86_IO_APIC
17414- sum += atomic_read(&irq_mis_count);
17415+ sum += atomic_read_unchecked(&irq_mis_count);
17416 #endif
17417 return sum;
17418 }
17419diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
17420index 40fc861..9b8739b 100644
17421--- a/arch/x86/kernel/irq_32.c
17422+++ b/arch/x86/kernel/irq_32.c
17423@@ -39,7 +39,7 @@ static int check_stack_overflow(void)
17424 __asm__ __volatile__("andl %%esp,%0" :
17425 "=r" (sp) : "0" (THREAD_SIZE - 1));
17426
17427- return sp < (sizeof(struct thread_info) + STACK_WARN);
17428+ return sp < STACK_WARN;
17429 }
17430
17431 static void print_stack_overflow(void)
17432@@ -59,8 +59,8 @@ static inline void print_stack_overflow(void) { }
17433 * per-CPU IRQ handling contexts (thread information and stack)
17434 */
17435 union irq_ctx {
17436- struct thread_info tinfo;
17437- u32 stack[THREAD_SIZE/sizeof(u32)];
17438+ unsigned long previous_esp;
17439+ u32 stack[THREAD_SIZE/sizeof(u32)];
17440 } __attribute__((aligned(THREAD_SIZE)));
17441
17442 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
17443@@ -80,10 +80,9 @@ static void call_on_stack(void *func, void *stack)
17444 static inline int
17445 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17446 {
17447- union irq_ctx *curctx, *irqctx;
17448+ union irq_ctx *irqctx;
17449 u32 *isp, arg1, arg2;
17450
17451- curctx = (union irq_ctx *) current_thread_info();
17452 irqctx = __this_cpu_read(hardirq_ctx);
17453
17454 /*
17455@@ -92,21 +91,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17456 * handler) we can't do that and just have to keep using the
17457 * current stack (which is the irq stack already after all)
17458 */
17459- if (unlikely(curctx == irqctx))
17460+ if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
17461 return 0;
17462
17463 /* build the stack frame on the IRQ stack */
17464- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17465- irqctx->tinfo.task = curctx->tinfo.task;
17466- irqctx->tinfo.previous_esp = current_stack_pointer;
17467+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17468+ irqctx->previous_esp = current_stack_pointer;
17469
17470- /*
17471- * Copy the softirq bits in preempt_count so that the
17472- * softirq checks work in the hardirq context.
17473- */
17474- irqctx->tinfo.preempt_count =
17475- (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
17476- (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
17477+#ifdef CONFIG_PAX_MEMORY_UDEREF
17478+ __set_fs(MAKE_MM_SEG(0));
17479+#endif
17480
17481 if (unlikely(overflow))
17482 call_on_stack(print_stack_overflow, isp);
17483@@ -118,6 +112,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17484 : "0" (irq), "1" (desc), "2" (isp),
17485 "D" (desc->handle_irq)
17486 : "memory", "cc", "ecx");
17487+
17488+#ifdef CONFIG_PAX_MEMORY_UDEREF
17489+ __set_fs(current_thread_info()->addr_limit);
17490+#endif
17491+
17492 return 1;
17493 }
17494
17495@@ -126,29 +125,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17496 */
17497 void __cpuinit irq_ctx_init(int cpu)
17498 {
17499- union irq_ctx *irqctx;
17500-
17501 if (per_cpu(hardirq_ctx, cpu))
17502 return;
17503
17504- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17505- THREAD_FLAGS,
17506- THREAD_ORDER));
17507- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17508- irqctx->tinfo.cpu = cpu;
17509- irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
17510- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17511-
17512- per_cpu(hardirq_ctx, cpu) = irqctx;
17513-
17514- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17515- THREAD_FLAGS,
17516- THREAD_ORDER));
17517- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17518- irqctx->tinfo.cpu = cpu;
17519- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17520-
17521- per_cpu(softirq_ctx, cpu) = irqctx;
17522+ per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
17523+ per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
17524
17525 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
17526 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
17527@@ -157,7 +138,6 @@ void __cpuinit irq_ctx_init(int cpu)
17528 asmlinkage void do_softirq(void)
17529 {
17530 unsigned long flags;
17531- struct thread_info *curctx;
17532 union irq_ctx *irqctx;
17533 u32 *isp;
17534
17535@@ -167,15 +147,22 @@ asmlinkage void do_softirq(void)
17536 local_irq_save(flags);
17537
17538 if (local_softirq_pending()) {
17539- curctx = current_thread_info();
17540 irqctx = __this_cpu_read(softirq_ctx);
17541- irqctx->tinfo.task = curctx->task;
17542- irqctx->tinfo.previous_esp = current_stack_pointer;
17543+ irqctx->previous_esp = current_stack_pointer;
17544
17545 /* build the stack frame on the softirq stack */
17546- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17547+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17548+
17549+#ifdef CONFIG_PAX_MEMORY_UDEREF
17550+ __set_fs(MAKE_MM_SEG(0));
17551+#endif
17552
17553 call_on_stack(__do_softirq, isp);
17554+
17555+#ifdef CONFIG_PAX_MEMORY_UDEREF
17556+ __set_fs(current_thread_info()->addr_limit);
17557+#endif
17558+
17559 /*
17560 * Shouldn't happen, we returned above if in_interrupt():
17561 */
17562diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
17563index d04d3ec..ea4b374 100644
17564--- a/arch/x86/kernel/irq_64.c
17565+++ b/arch/x86/kernel/irq_64.c
17566@@ -44,7 +44,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
17567 u64 estack_top, estack_bottom;
17568 u64 curbase = (u64)task_stack_page(current);
17569
17570- if (user_mode_vm(regs))
17571+ if (user_mode(regs))
17572 return;
17573
17574 if (regs->sp >= curbase + sizeof(struct thread_info) +
17575diff --git a/arch/x86/kernel/kdebugfs.c b/arch/x86/kernel/kdebugfs.c
17576index 90fcf62..e682cdd 100644
17577--- a/arch/x86/kernel/kdebugfs.c
17578+++ b/arch/x86/kernel/kdebugfs.c
17579@@ -28,6 +28,8 @@ struct setup_data_node {
17580 };
17581
17582 static ssize_t setup_data_read(struct file *file, char __user *user_buf,
17583+ size_t count, loff_t *ppos) __size_overflow(3);
17584+static ssize_t setup_data_read(struct file *file, char __user *user_buf,
17585 size_t count, loff_t *ppos)
17586 {
17587 struct setup_data_node *node = file->private_data;
17588diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
17589index 2f45c4c..d95504f 100644
17590--- a/arch/x86/kernel/kgdb.c
17591+++ b/arch/x86/kernel/kgdb.c
17592@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
17593 #ifdef CONFIG_X86_32
17594 switch (regno) {
17595 case GDB_SS:
17596- if (!user_mode_vm(regs))
17597+ if (!user_mode(regs))
17598 *(unsigned long *)mem = __KERNEL_DS;
17599 break;
17600 case GDB_SP:
17601- if (!user_mode_vm(regs))
17602+ if (!user_mode(regs))
17603 *(unsigned long *)mem = kernel_stack_pointer(regs);
17604 break;
17605 case GDB_GS:
17606@@ -475,12 +475,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
17607 case 'k':
17608 /* clear the trace bit */
17609 linux_regs->flags &= ~X86_EFLAGS_TF;
17610- atomic_set(&kgdb_cpu_doing_single_step, -1);
17611+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
17612
17613 /* set the trace bit if we're stepping */
17614 if (remcomInBuffer[0] == 's') {
17615 linux_regs->flags |= X86_EFLAGS_TF;
17616- atomic_set(&kgdb_cpu_doing_single_step,
17617+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
17618 raw_smp_processor_id());
17619 }
17620
17621@@ -545,7 +545,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
17622
17623 switch (cmd) {
17624 case DIE_DEBUG:
17625- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
17626+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
17627 if (user_mode(regs))
17628 return single_step_cont(regs, args);
17629 break;
17630diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
17631index 7da647d..56fe348 100644
17632--- a/arch/x86/kernel/kprobes.c
17633+++ b/arch/x86/kernel/kprobes.c
17634@@ -118,8 +118,11 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
17635 } __attribute__((packed)) *insn;
17636
17637 insn = (struct __arch_relative_insn *)from;
17638+
17639+ pax_open_kernel();
17640 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
17641 insn->op = op;
17642+ pax_close_kernel();
17643 }
17644
17645 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
17646@@ -156,7 +159,7 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes)
17647 kprobe_opcode_t opcode;
17648 kprobe_opcode_t *orig_opcodes = opcodes;
17649
17650- if (search_exception_tables((unsigned long)opcodes))
17651+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
17652 return 0; /* Page fault may occur on this address. */
17653
17654 retry:
17655@@ -317,7 +320,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
17656 }
17657 }
17658 insn_get_length(&insn);
17659+ pax_open_kernel();
17660 memcpy(dest, insn.kaddr, insn.length);
17661+ pax_close_kernel();
17662
17663 #ifdef CONFIG_X86_64
17664 if (insn_rip_relative(&insn)) {
17665@@ -341,7 +346,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
17666 (u8 *) dest;
17667 BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */
17668 disp = (u8 *) dest + insn_offset_displacement(&insn);
17669+ pax_open_kernel();
17670 *(s32 *) disp = (s32) newdisp;
17671+ pax_close_kernel();
17672 }
17673 #endif
17674 return insn.length;
17675@@ -355,12 +362,12 @@ static void __kprobes arch_copy_kprobe(struct kprobe *p)
17676 */
17677 __copy_instruction(p->ainsn.insn, p->addr, 0);
17678
17679- if (can_boost(p->addr))
17680+ if (can_boost(ktla_ktva(p->addr)))
17681 p->ainsn.boostable = 0;
17682 else
17683 p->ainsn.boostable = -1;
17684
17685- p->opcode = *p->addr;
17686+ p->opcode = *(ktla_ktva(p->addr));
17687 }
17688
17689 int __kprobes arch_prepare_kprobe(struct kprobe *p)
17690@@ -477,7 +484,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
17691 * nor set current_kprobe, because it doesn't use single
17692 * stepping.
17693 */
17694- regs->ip = (unsigned long)p->ainsn.insn;
17695+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17696 preempt_enable_no_resched();
17697 return;
17698 }
17699@@ -496,7 +503,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
17700 if (p->opcode == BREAKPOINT_INSTRUCTION)
17701 regs->ip = (unsigned long)p->addr;
17702 else
17703- regs->ip = (unsigned long)p->ainsn.insn;
17704+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17705 }
17706
17707 /*
17708@@ -575,7 +582,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
17709 setup_singlestep(p, regs, kcb, 0);
17710 return 1;
17711 }
17712- } else if (*addr != BREAKPOINT_INSTRUCTION) {
17713+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
17714 /*
17715 * The breakpoint instruction was removed right
17716 * after we hit it. Another cpu has removed
17717@@ -683,6 +690,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
17718 " movq %rax, 152(%rsp)\n"
17719 RESTORE_REGS_STRING
17720 " popfq\n"
17721+#ifdef KERNEXEC_PLUGIN
17722+ " btsq $63,(%rsp)\n"
17723+#endif
17724 #else
17725 " pushf\n"
17726 SAVE_REGS_STRING
17727@@ -820,7 +830,7 @@ static void __kprobes resume_execution(struct kprobe *p,
17728 struct pt_regs *regs, struct kprobe_ctlblk *kcb)
17729 {
17730 unsigned long *tos = stack_addr(regs);
17731- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
17732+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
17733 unsigned long orig_ip = (unsigned long)p->addr;
17734 kprobe_opcode_t *insn = p->ainsn.insn;
17735
17736@@ -1002,7 +1012,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
17737 struct die_args *args = data;
17738 int ret = NOTIFY_DONE;
17739
17740- if (args->regs && user_mode_vm(args->regs))
17741+ if (args->regs && user_mode(args->regs))
17742 return ret;
17743
17744 switch (val) {
17745@@ -1384,7 +1394,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17746 * Verify if the address gap is in 2GB range, because this uses
17747 * a relative jump.
17748 */
17749- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
17750+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
17751 if (abs(rel) > 0x7fffffff)
17752 return -ERANGE;
17753
17754@@ -1405,11 +1415,11 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17755 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
17756
17757 /* Set probe function call */
17758- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
17759+ synthesize_relcall(buf + TMPL_CALL_IDX, ktla_ktva(optimized_callback));
17760
17761 /* Set returning jmp instruction at the tail of out-of-line buffer */
17762 synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
17763- (u8 *)op->kp.addr + op->optinsn.size);
17764+ (u8 *)ktla_ktva(op->kp.addr) + op->optinsn.size);
17765
17766 flush_icache_range((unsigned long) buf,
17767 (unsigned long) buf + TMPL_END_IDX +
17768@@ -1431,7 +1441,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
17769 ((long)op->kp.addr + RELATIVEJUMP_SIZE));
17770
17771 /* Backup instructions which will be replaced by jump address */
17772- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
17773+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
17774 RELATIVE_ADDR_SIZE);
17775
17776 insn_buf[0] = RELATIVEJUMP_OPCODE;
17777diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
17778index ea69726..a305f16 100644
17779--- a/arch/x86/kernel/ldt.c
17780+++ b/arch/x86/kernel/ldt.c
17781@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
17782 if (reload) {
17783 #ifdef CONFIG_SMP
17784 preempt_disable();
17785- load_LDT(pc);
17786+ load_LDT_nolock(pc);
17787 if (!cpumask_equal(mm_cpumask(current->mm),
17788 cpumask_of(smp_processor_id())))
17789 smp_call_function(flush_ldt, current->mm, 1);
17790 preempt_enable();
17791 #else
17792- load_LDT(pc);
17793+ load_LDT_nolock(pc);
17794 #endif
17795 }
17796 if (oldsize) {
17797@@ -95,7 +95,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
17798 return err;
17799
17800 for (i = 0; i < old->size; i++)
17801- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
17802+ write_ldt_entry(new->ldt, i, old->ldt + i);
17803 return 0;
17804 }
17805
17806@@ -116,6 +116,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
17807 retval = copy_ldt(&mm->context, &old_mm->context);
17808 mutex_unlock(&old_mm->context.lock);
17809 }
17810+
17811+ if (tsk == current) {
17812+ mm->context.vdso = 0;
17813+
17814+#ifdef CONFIG_X86_32
17815+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17816+ mm->context.user_cs_base = 0UL;
17817+ mm->context.user_cs_limit = ~0UL;
17818+
17819+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17820+ cpus_clear(mm->context.cpu_user_cs_mask);
17821+#endif
17822+
17823+#endif
17824+#endif
17825+
17826+ }
17827+
17828 return retval;
17829 }
17830
17831@@ -141,6 +159,7 @@ void destroy_context(struct mm_struct *mm)
17832 }
17833 }
17834
17835+static int read_ldt(void __user *ptr, unsigned long bytecount) __size_overflow(2);
17836 static int read_ldt(void __user *ptr, unsigned long bytecount)
17837 {
17838 int err;
17839@@ -175,6 +194,7 @@ error_return:
17840 return err;
17841 }
17842
17843+static int read_default_ldt(void __user *ptr, unsigned long bytecount) __size_overflow(2);
17844 static int read_default_ldt(void __user *ptr, unsigned long bytecount)
17845 {
17846 /* CHECKME: Can we use _one_ random number ? */
17847@@ -230,6 +250,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
17848 }
17849 }
17850
17851+#ifdef CONFIG_PAX_SEGMEXEC
17852+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
17853+ error = -EINVAL;
17854+ goto out_unlock;
17855+ }
17856+#endif
17857+
17858 fill_ldt(&ldt, &ldt_info);
17859 if (oldmode)
17860 ldt.avl = 0;
17861diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
17862index a3fa43b..8966f4c 100644
17863--- a/arch/x86/kernel/machine_kexec_32.c
17864+++ b/arch/x86/kernel/machine_kexec_32.c
17865@@ -27,7 +27,7 @@
17866 #include <asm/cacheflush.h>
17867 #include <asm/debugreg.h>
17868
17869-static void set_idt(void *newidt, __u16 limit)
17870+static void set_idt(struct desc_struct *newidt, __u16 limit)
17871 {
17872 struct desc_ptr curidt;
17873
17874@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit)
17875 }
17876
17877
17878-static void set_gdt(void *newgdt, __u16 limit)
17879+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
17880 {
17881 struct desc_ptr curgdt;
17882
17883@@ -217,7 +217,7 @@ void machine_kexec(struct kimage *image)
17884 }
17885
17886 control_page = page_address(image->control_code_page);
17887- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
17888+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
17889
17890 relocate_kernel_ptr = control_page;
17891 page_list[PA_CONTROL_PAGE] = __pa(control_page);
17892diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
17893index 3ca42d0..79d24cd 100644
17894--- a/arch/x86/kernel/microcode_intel.c
17895+++ b/arch/x86/kernel/microcode_intel.c
17896@@ -434,15 +434,16 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
17897 return ret;
17898 }
17899
17900+static int get_ucode_user(void *to, const void *from, size_t n) __size_overflow(3);
17901 static int get_ucode_user(void *to, const void *from, size_t n)
17902 {
17903- return copy_from_user(to, from, n);
17904+ return copy_from_user(to, (const void __force_user *)from, n);
17905 }
17906
17907 static enum ucode_state
17908 request_microcode_user(int cpu, const void __user *buf, size_t size)
17909 {
17910- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
17911+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
17912 }
17913
17914 static void microcode_fini_cpu(int cpu)
17915diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
17916index 925179f..1f0d561 100644
17917--- a/arch/x86/kernel/module.c
17918+++ b/arch/x86/kernel/module.c
17919@@ -36,15 +36,61 @@
17920 #define DEBUGP(fmt...)
17921 #endif
17922
17923-void *module_alloc(unsigned long size)
17924+static inline void *__module_alloc(unsigned long size, pgprot_t prot) __size_overflow(1);
17925+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
17926 {
17927- if (PAGE_ALIGN(size) > MODULES_LEN)
17928+ if (size == 0 || PAGE_ALIGN(size) > MODULES_LEN)
17929 return NULL;
17930 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
17931- GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
17932+ GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
17933 -1, __builtin_return_address(0));
17934 }
17935
17936+void *module_alloc(unsigned long size)
17937+{
17938+
17939+#ifdef CONFIG_PAX_KERNEXEC
17940+ return __module_alloc(size, PAGE_KERNEL);
17941+#else
17942+ return __module_alloc(size, PAGE_KERNEL_EXEC);
17943+#endif
17944+
17945+}
17946+
17947+#ifdef CONFIG_PAX_KERNEXEC
17948+#ifdef CONFIG_X86_32
17949+void *module_alloc_exec(unsigned long size)
17950+{
17951+ struct vm_struct *area;
17952+
17953+ if (size == 0)
17954+ return NULL;
17955+
17956+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
17957+ return area ? area->addr : NULL;
17958+}
17959+EXPORT_SYMBOL(module_alloc_exec);
17960+
17961+void module_free_exec(struct module *mod, void *module_region)
17962+{
17963+ vunmap(module_region);
17964+}
17965+EXPORT_SYMBOL(module_free_exec);
17966+#else
17967+void module_free_exec(struct module *mod, void *module_region)
17968+{
17969+ module_free(mod, module_region);
17970+}
17971+EXPORT_SYMBOL(module_free_exec);
17972+
17973+void *module_alloc_exec(unsigned long size)
17974+{
17975+ return __module_alloc(size, PAGE_KERNEL_RX);
17976+}
17977+EXPORT_SYMBOL(module_alloc_exec);
17978+#endif
17979+#endif
17980+
17981 #ifdef CONFIG_X86_32
17982 int apply_relocate(Elf32_Shdr *sechdrs,
17983 const char *strtab,
17984@@ -55,14 +101,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
17985 unsigned int i;
17986 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
17987 Elf32_Sym *sym;
17988- uint32_t *location;
17989+ uint32_t *plocation, location;
17990
17991 DEBUGP("Applying relocate section %u to %u\n", relsec,
17992 sechdrs[relsec].sh_info);
17993 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
17994 /* This is where to make the change */
17995- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
17996- + rel[i].r_offset;
17997+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
17998+ location = (uint32_t)plocation;
17999+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
18000+ plocation = ktla_ktva((void *)plocation);
18001 /* This is the symbol it is referring to. Note that all
18002 undefined symbols have been resolved. */
18003 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
18004@@ -71,11 +119,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
18005 switch (ELF32_R_TYPE(rel[i].r_info)) {
18006 case R_386_32:
18007 /* We add the value into the location given */
18008- *location += sym->st_value;
18009+ pax_open_kernel();
18010+ *plocation += sym->st_value;
18011+ pax_close_kernel();
18012 break;
18013 case R_386_PC32:
18014 /* Add the value, subtract its postition */
18015- *location += sym->st_value - (uint32_t)location;
18016+ pax_open_kernel();
18017+ *plocation += sym->st_value - location;
18018+ pax_close_kernel();
18019 break;
18020 default:
18021 printk(KERN_ERR "module %s: Unknown relocation: %u\n",
18022@@ -120,21 +172,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
18023 case R_X86_64_NONE:
18024 break;
18025 case R_X86_64_64:
18026+ pax_open_kernel();
18027 *(u64 *)loc = val;
18028+ pax_close_kernel();
18029 break;
18030 case R_X86_64_32:
18031+ pax_open_kernel();
18032 *(u32 *)loc = val;
18033+ pax_close_kernel();
18034 if (val != *(u32 *)loc)
18035 goto overflow;
18036 break;
18037 case R_X86_64_32S:
18038+ pax_open_kernel();
18039 *(s32 *)loc = val;
18040+ pax_close_kernel();
18041 if ((s64)val != *(s32 *)loc)
18042 goto overflow;
18043 break;
18044 case R_X86_64_PC32:
18045 val -= (u64)loc;
18046+ pax_open_kernel();
18047 *(u32 *)loc = val;
18048+ pax_close_kernel();
18049+
18050 #if 0
18051 if ((s64)val != *(s32 *)loc)
18052 goto overflow;
18053diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
18054index 47acaf3..ec48ab6 100644
18055--- a/arch/x86/kernel/nmi.c
18056+++ b/arch/x86/kernel/nmi.c
18057@@ -505,6 +505,17 @@ static inline void nmi_nesting_postprocess(void)
18058 dotraplinkage notrace __kprobes void
18059 do_nmi(struct pt_regs *regs, long error_code)
18060 {
18061+
18062+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18063+ if (!user_mode(regs)) {
18064+ unsigned long cs = regs->cs & 0xFFFF;
18065+ unsigned long ip = ktva_ktla(regs->ip);
18066+
18067+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
18068+ regs->ip = ip;
18069+ }
18070+#endif
18071+
18072 nmi_nesting_preprocess(regs);
18073
18074 nmi_enter();
18075diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
18076index 676b8c7..870ba04 100644
18077--- a/arch/x86/kernel/paravirt-spinlocks.c
18078+++ b/arch/x86/kernel/paravirt-spinlocks.c
18079@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
18080 arch_spin_lock(lock);
18081 }
18082
18083-struct pv_lock_ops pv_lock_ops = {
18084+struct pv_lock_ops pv_lock_ops __read_only = {
18085 #ifdef CONFIG_SMP
18086 .spin_is_locked = __ticket_spin_is_locked,
18087 .spin_is_contended = __ticket_spin_is_contended,
18088diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
18089index d90272e..6bb013b 100644
18090--- a/arch/x86/kernel/paravirt.c
18091+++ b/arch/x86/kernel/paravirt.c
18092@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
18093 {
18094 return x;
18095 }
18096+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
18097+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
18098+#endif
18099
18100 void __init default_banner(void)
18101 {
18102@@ -145,15 +148,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
18103 if (opfunc == NULL)
18104 /* If there's no function, patch it with a ud2a (BUG) */
18105 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
18106- else if (opfunc == _paravirt_nop)
18107+ else if (opfunc == (void *)_paravirt_nop)
18108 /* If the operation is a nop, then nop the callsite */
18109 ret = paravirt_patch_nop();
18110
18111 /* identity functions just return their single argument */
18112- else if (opfunc == _paravirt_ident_32)
18113+ else if (opfunc == (void *)_paravirt_ident_32)
18114 ret = paravirt_patch_ident_32(insnbuf, len);
18115- else if (opfunc == _paravirt_ident_64)
18116+ else if (opfunc == (void *)_paravirt_ident_64)
18117 ret = paravirt_patch_ident_64(insnbuf, len);
18118+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
18119+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
18120+ ret = paravirt_patch_ident_64(insnbuf, len);
18121+#endif
18122
18123 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
18124 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
18125@@ -178,7 +185,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
18126 if (insn_len > len || start == NULL)
18127 insn_len = len;
18128 else
18129- memcpy(insnbuf, start, insn_len);
18130+ memcpy(insnbuf, ktla_ktva(start), insn_len);
18131
18132 return insn_len;
18133 }
18134@@ -302,7 +309,7 @@ void arch_flush_lazy_mmu_mode(void)
18135 preempt_enable();
18136 }
18137
18138-struct pv_info pv_info = {
18139+struct pv_info pv_info __read_only = {
18140 .name = "bare hardware",
18141 .paravirt_enabled = 0,
18142 .kernel_rpl = 0,
18143@@ -313,16 +320,16 @@ struct pv_info pv_info = {
18144 #endif
18145 };
18146
18147-struct pv_init_ops pv_init_ops = {
18148+struct pv_init_ops pv_init_ops __read_only = {
18149 .patch = native_patch,
18150 };
18151
18152-struct pv_time_ops pv_time_ops = {
18153+struct pv_time_ops pv_time_ops __read_only = {
18154 .sched_clock = native_sched_clock,
18155 .steal_clock = native_steal_clock,
18156 };
18157
18158-struct pv_irq_ops pv_irq_ops = {
18159+struct pv_irq_ops pv_irq_ops __read_only = {
18160 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
18161 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
18162 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
18163@@ -334,7 +341,7 @@ struct pv_irq_ops pv_irq_ops = {
18164 #endif
18165 };
18166
18167-struct pv_cpu_ops pv_cpu_ops = {
18168+struct pv_cpu_ops pv_cpu_ops __read_only = {
18169 .cpuid = native_cpuid,
18170 .get_debugreg = native_get_debugreg,
18171 .set_debugreg = native_set_debugreg,
18172@@ -395,21 +402,26 @@ struct pv_cpu_ops pv_cpu_ops = {
18173 .end_context_switch = paravirt_nop,
18174 };
18175
18176-struct pv_apic_ops pv_apic_ops = {
18177+struct pv_apic_ops pv_apic_ops __read_only = {
18178 #ifdef CONFIG_X86_LOCAL_APIC
18179 .startup_ipi_hook = paravirt_nop,
18180 #endif
18181 };
18182
18183-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
18184+#ifdef CONFIG_X86_32
18185+#ifdef CONFIG_X86_PAE
18186+/* 64-bit pagetable entries */
18187+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
18188+#else
18189 /* 32-bit pagetable entries */
18190 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
18191+#endif
18192 #else
18193 /* 64-bit pagetable entries */
18194 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
18195 #endif
18196
18197-struct pv_mmu_ops pv_mmu_ops = {
18198+struct pv_mmu_ops pv_mmu_ops __read_only = {
18199
18200 .read_cr2 = native_read_cr2,
18201 .write_cr2 = native_write_cr2,
18202@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
18203 .make_pud = PTE_IDENT,
18204
18205 .set_pgd = native_set_pgd,
18206+ .set_pgd_batched = native_set_pgd_batched,
18207 #endif
18208 #endif /* PAGETABLE_LEVELS >= 3 */
18209
18210@@ -478,6 +491,12 @@ struct pv_mmu_ops pv_mmu_ops = {
18211 },
18212
18213 .set_fixmap = native_set_fixmap,
18214+
18215+#ifdef CONFIG_PAX_KERNEXEC
18216+ .pax_open_kernel = native_pax_open_kernel,
18217+ .pax_close_kernel = native_pax_close_kernel,
18218+#endif
18219+
18220 };
18221
18222 EXPORT_SYMBOL_GPL(pv_time_ops);
18223diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
18224index 35ccf75..7a15747 100644
18225--- a/arch/x86/kernel/pci-iommu_table.c
18226+++ b/arch/x86/kernel/pci-iommu_table.c
18227@@ -2,7 +2,7 @@
18228 #include <asm/iommu_table.h>
18229 #include <linux/string.h>
18230 #include <linux/kallsyms.h>
18231-
18232+#include <linux/sched.h>
18233
18234 #define DEBUG 1
18235
18236diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
18237index 15763af..da59ada 100644
18238--- a/arch/x86/kernel/process.c
18239+++ b/arch/x86/kernel/process.c
18240@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_struct *tsk)
18241
18242 void free_thread_info(struct thread_info *ti)
18243 {
18244- free_thread_xstate(ti->task);
18245 free_pages((unsigned long)ti, THREAD_ORDER);
18246 }
18247
18248+static struct kmem_cache *task_struct_cachep;
18249+
18250 void arch_task_cache_init(void)
18251 {
18252- task_xstate_cachep =
18253- kmem_cache_create("task_xstate", xstate_size,
18254+ /* create a slab on which task_structs can be allocated */
18255+ task_struct_cachep =
18256+ kmem_cache_create("task_struct", sizeof(struct task_struct),
18257+ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);
18258+
18259+ task_xstate_cachep =
18260+ kmem_cache_create("task_xstate", xstate_size,
18261 __alignof__(union thread_xstate),
18262- SLAB_PANIC | SLAB_NOTRACK, NULL);
18263+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
18264+}
18265+
18266+struct task_struct *alloc_task_struct_node(int node)
18267+{
18268+ return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node);
18269+}
18270+
18271+void free_task_struct(struct task_struct *task)
18272+{
18273+ free_thread_xstate(task);
18274+ kmem_cache_free(task_struct_cachep, task);
18275 }
18276
18277 /*
18278@@ -70,7 +87,7 @@ void exit_thread(void)
18279 unsigned long *bp = t->io_bitmap_ptr;
18280
18281 if (bp) {
18282- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
18283+ struct tss_struct *tss = init_tss + get_cpu();
18284
18285 t->io_bitmap_ptr = NULL;
18286 clear_thread_flag(TIF_IO_BITMAP);
18287@@ -106,7 +123,7 @@ void show_regs_common(void)
18288
18289 printk(KERN_CONT "\n");
18290 printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
18291- current->pid, current->comm, print_tainted(),
18292+ task_pid_nr(current), current->comm, print_tainted(),
18293 init_utsname()->release,
18294 (int)strcspn(init_utsname()->version, " "),
18295 init_utsname()->version);
18296@@ -120,6 +137,9 @@ void flush_thread(void)
18297 {
18298 struct task_struct *tsk = current;
18299
18300+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
18301+ loadsegment(gs, 0);
18302+#endif
18303 flush_ptrace_hw_breakpoint(tsk);
18304 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
18305 /*
18306@@ -282,10 +302,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
18307 regs.di = (unsigned long) arg;
18308
18309 #ifdef CONFIG_X86_32
18310- regs.ds = __USER_DS;
18311- regs.es = __USER_DS;
18312+ regs.ds = __KERNEL_DS;
18313+ regs.es = __KERNEL_DS;
18314 regs.fs = __KERNEL_PERCPU;
18315- regs.gs = __KERNEL_STACK_CANARY;
18316+ savesegment(gs, regs.gs);
18317 #else
18318 regs.ss = __KERNEL_DS;
18319 #endif
18320@@ -411,7 +431,7 @@ bool set_pm_idle_to_default(void)
18321
18322 return ret;
18323 }
18324-void stop_this_cpu(void *dummy)
18325+__noreturn void stop_this_cpu(void *dummy)
18326 {
18327 local_irq_disable();
18328 /*
18329@@ -653,16 +673,37 @@ static int __init idle_setup(char *str)
18330 }
18331 early_param("idle", idle_setup);
18332
18333-unsigned long arch_align_stack(unsigned long sp)
18334+#ifdef CONFIG_PAX_RANDKSTACK
18335+void pax_randomize_kstack(struct pt_regs *regs)
18336 {
18337- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
18338- sp -= get_random_int() % 8192;
18339- return sp & ~0xf;
18340-}
18341+ struct thread_struct *thread = &current->thread;
18342+ unsigned long time;
18343
18344-unsigned long arch_randomize_brk(struct mm_struct *mm)
18345-{
18346- unsigned long range_end = mm->brk + 0x02000000;
18347- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
18348-}
18349+ if (!randomize_va_space)
18350+ return;
18351+
18352+ if (v8086_mode(regs))
18353+ return;
18354
18355+ rdtscl(time);
18356+
18357+ /* P4 seems to return a 0 LSB, ignore it */
18358+#ifdef CONFIG_MPENTIUM4
18359+ time &= 0x3EUL;
18360+ time <<= 2;
18361+#elif defined(CONFIG_X86_64)
18362+ time &= 0xFUL;
18363+ time <<= 4;
18364+#else
18365+ time &= 0x1FUL;
18366+ time <<= 3;
18367+#endif
18368+
18369+ thread->sp0 ^= time;
18370+ load_sp0(init_tss + smp_processor_id(), thread);
18371+
18372+#ifdef CONFIG_X86_64
18373+ percpu_write(kernel_stack, thread->sp0);
18374+#endif
18375+}
18376+#endif
18377diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
18378index c08d1ff..6ae1c81 100644
18379--- a/arch/x86/kernel/process_32.c
18380+++ b/arch/x86/kernel/process_32.c
18381@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
18382 unsigned long thread_saved_pc(struct task_struct *tsk)
18383 {
18384 return ((unsigned long *)tsk->thread.sp)[3];
18385+//XXX return tsk->thread.eip;
18386 }
18387
18388 #ifndef CONFIG_SMP
18389@@ -132,15 +133,14 @@ void __show_regs(struct pt_regs *regs, int all)
18390 unsigned long sp;
18391 unsigned short ss, gs;
18392
18393- if (user_mode_vm(regs)) {
18394+ if (user_mode(regs)) {
18395 sp = regs->sp;
18396 ss = regs->ss & 0xffff;
18397- gs = get_user_gs(regs);
18398 } else {
18399 sp = kernel_stack_pointer(regs);
18400 savesegment(ss, ss);
18401- savesegment(gs, gs);
18402 }
18403+ gs = get_user_gs(regs);
18404
18405 show_regs_common();
18406
18407@@ -202,13 +202,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18408 struct task_struct *tsk;
18409 int err;
18410
18411- childregs = task_pt_regs(p);
18412+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
18413 *childregs = *regs;
18414 childregs->ax = 0;
18415 childregs->sp = sp;
18416
18417 p->thread.sp = (unsigned long) childregs;
18418 p->thread.sp0 = (unsigned long) (childregs+1);
18419+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18420
18421 p->thread.ip = (unsigned long) ret_from_fork;
18422
18423@@ -299,7 +300,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18424 struct thread_struct *prev = &prev_p->thread,
18425 *next = &next_p->thread;
18426 int cpu = smp_processor_id();
18427- struct tss_struct *tss = &per_cpu(init_tss, cpu);
18428+ struct tss_struct *tss = init_tss + cpu;
18429 fpu_switch_t fpu;
18430
18431 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
18432@@ -323,6 +324,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18433 */
18434 lazy_save_gs(prev->gs);
18435
18436+#ifdef CONFIG_PAX_MEMORY_UDEREF
18437+ __set_fs(task_thread_info(next_p)->addr_limit);
18438+#endif
18439+
18440 /*
18441 * Load the per-thread Thread-Local Storage descriptor.
18442 */
18443@@ -353,6 +358,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18444 */
18445 arch_end_context_switch(next_p);
18446
18447+ percpu_write(current_task, next_p);
18448+ percpu_write(current_tinfo, &next_p->tinfo);
18449+
18450 /*
18451 * Restore %gs if needed (which is common)
18452 */
18453@@ -361,8 +369,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18454
18455 switch_fpu_finish(next_p, fpu);
18456
18457- percpu_write(current_task, next_p);
18458-
18459 return prev_p;
18460 }
18461
18462@@ -392,4 +398,3 @@ unsigned long get_wchan(struct task_struct *p)
18463 } while (count++ < 16);
18464 return 0;
18465 }
18466-
18467diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
18468index cfa5c90..4facd28 100644
18469--- a/arch/x86/kernel/process_64.c
18470+++ b/arch/x86/kernel/process_64.c
18471@@ -89,7 +89,7 @@ static void __exit_idle(void)
18472 void exit_idle(void)
18473 {
18474 /* idle loop has pid 0 */
18475- if (current->pid)
18476+ if (task_pid_nr(current))
18477 return;
18478 __exit_idle();
18479 }
18480@@ -270,8 +270,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18481 struct pt_regs *childregs;
18482 struct task_struct *me = current;
18483
18484- childregs = ((struct pt_regs *)
18485- (THREAD_SIZE + task_stack_page(p))) - 1;
18486+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
18487 *childregs = *regs;
18488
18489 childregs->ax = 0;
18490@@ -283,6 +282,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18491 p->thread.sp = (unsigned long) childregs;
18492 p->thread.sp0 = (unsigned long) (childregs+1);
18493 p->thread.usersp = me->thread.usersp;
18494+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18495
18496 set_tsk_thread_flag(p, TIF_FORK);
18497
18498@@ -385,7 +385,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18499 struct thread_struct *prev = &prev_p->thread;
18500 struct thread_struct *next = &next_p->thread;
18501 int cpu = smp_processor_id();
18502- struct tss_struct *tss = &per_cpu(init_tss, cpu);
18503+ struct tss_struct *tss = init_tss + cpu;
18504 unsigned fsindex, gsindex;
18505 fpu_switch_t fpu;
18506
18507@@ -467,10 +467,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18508 prev->usersp = percpu_read(old_rsp);
18509 percpu_write(old_rsp, next->usersp);
18510 percpu_write(current_task, next_p);
18511+ percpu_write(current_tinfo, &next_p->tinfo);
18512
18513- percpu_write(kernel_stack,
18514- (unsigned long)task_stack_page(next_p) +
18515- THREAD_SIZE - KERNEL_STACK_OFFSET);
18516+ percpu_write(kernel_stack, next->sp0);
18517
18518 /*
18519 * Now maybe reload the debug registers and handle I/O bitmaps
18520@@ -525,12 +524,11 @@ unsigned long get_wchan(struct task_struct *p)
18521 if (!p || p == current || p->state == TASK_RUNNING)
18522 return 0;
18523 stack = (unsigned long)task_stack_page(p);
18524- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
18525+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
18526 return 0;
18527 fp = *(u64 *)(p->thread.sp);
18528 do {
18529- if (fp < (unsigned long)stack ||
18530- fp >= (unsigned long)stack+THREAD_SIZE)
18531+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
18532 return 0;
18533 ip = *(u64 *)(fp+8);
18534 if (!in_sched_functions(ip))
18535diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
18536index 5026738..e1b5aa8 100644
18537--- a/arch/x86/kernel/ptrace.c
18538+++ b/arch/x86/kernel/ptrace.c
18539@@ -792,6 +792,10 @@ static int ioperm_active(struct task_struct *target,
18540 static int ioperm_get(struct task_struct *target,
18541 const struct user_regset *regset,
18542 unsigned int pos, unsigned int count,
18543+ void *kbuf, void __user *ubuf) __size_overflow(3,4);
18544+static int ioperm_get(struct task_struct *target,
18545+ const struct user_regset *regset,
18546+ unsigned int pos, unsigned int count,
18547 void *kbuf, void __user *ubuf)
18548 {
18549 if (!target->thread.io_bitmap_ptr)
18550@@ -823,7 +827,7 @@ long arch_ptrace(struct task_struct *child, long request,
18551 unsigned long addr, unsigned long data)
18552 {
18553 int ret;
18554- unsigned long __user *datap = (unsigned long __user *)data;
18555+ unsigned long __user *datap = (__force unsigned long __user *)data;
18556
18557 switch (request) {
18558 /* read the word at location addr in the USER area. */
18559@@ -908,14 +912,14 @@ long arch_ptrace(struct task_struct *child, long request,
18560 if ((int) addr < 0)
18561 return -EIO;
18562 ret = do_get_thread_area(child, addr,
18563- (struct user_desc __user *)data);
18564+ (__force struct user_desc __user *) data);
18565 break;
18566
18567 case PTRACE_SET_THREAD_AREA:
18568 if ((int) addr < 0)
18569 return -EIO;
18570 ret = do_set_thread_area(child, addr,
18571- (struct user_desc __user *)data, 0);
18572+ (__force struct user_desc __user *) data, 0);
18573 break;
18574 #endif
18575
18576@@ -1332,7 +1336,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
18577 memset(info, 0, sizeof(*info));
18578 info->si_signo = SIGTRAP;
18579 info->si_code = si_code;
18580- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
18581+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
18582 }
18583
18584 void user_single_step_siginfo(struct task_struct *tsk,
18585diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
18586index 42eb330..139955c 100644
18587--- a/arch/x86/kernel/pvclock.c
18588+++ b/arch/x86/kernel/pvclock.c
18589@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
18590 return pv_tsc_khz;
18591 }
18592
18593-static atomic64_t last_value = ATOMIC64_INIT(0);
18594+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
18595
18596 void pvclock_resume(void)
18597 {
18598- atomic64_set(&last_value, 0);
18599+ atomic64_set_unchecked(&last_value, 0);
18600 }
18601
18602 cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18603@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18604 * updating at the same time, and one of them could be slightly behind,
18605 * making the assumption that last_value always go forward fail to hold.
18606 */
18607- last = atomic64_read(&last_value);
18608+ last = atomic64_read_unchecked(&last_value);
18609 do {
18610 if (ret < last)
18611 return last;
18612- last = atomic64_cmpxchg(&last_value, last, ret);
18613+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
18614 } while (unlikely(last != ret));
18615
18616 return ret;
18617diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
18618index d840e69..98e9581 100644
18619--- a/arch/x86/kernel/reboot.c
18620+++ b/arch/x86/kernel/reboot.c
18621@@ -35,7 +35,7 @@ void (*pm_power_off)(void);
18622 EXPORT_SYMBOL(pm_power_off);
18623
18624 static const struct desc_ptr no_idt = {};
18625-static int reboot_mode;
18626+static unsigned short reboot_mode;
18627 enum reboot_type reboot_type = BOOT_ACPI;
18628 int reboot_force;
18629
18630@@ -335,13 +335,17 @@ core_initcall(reboot_init);
18631 extern const unsigned char machine_real_restart_asm[];
18632 extern const u64 machine_real_restart_gdt[3];
18633
18634-void machine_real_restart(unsigned int type)
18635+__noreturn void machine_real_restart(unsigned int type)
18636 {
18637 void *restart_va;
18638 unsigned long restart_pa;
18639- void (*restart_lowmem)(unsigned int);
18640+ void (* __noreturn restart_lowmem)(unsigned int);
18641 u64 *lowmem_gdt;
18642
18643+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18644+ struct desc_struct *gdt;
18645+#endif
18646+
18647 local_irq_disable();
18648
18649 /* Write zero to CMOS register number 0x0f, which the BIOS POST
18650@@ -367,14 +371,14 @@ void machine_real_restart(unsigned int type)
18651 boot)". This seems like a fairly standard thing that gets set by
18652 REBOOT.COM programs, and the previous reset routine did this
18653 too. */
18654- *((unsigned short *)0x472) = reboot_mode;
18655+ *(unsigned short *)(__va(0x472)) = reboot_mode;
18656
18657 /* Patch the GDT in the low memory trampoline */
18658 lowmem_gdt = TRAMPOLINE_SYM(machine_real_restart_gdt);
18659
18660 restart_va = TRAMPOLINE_SYM(machine_real_restart_asm);
18661 restart_pa = virt_to_phys(restart_va);
18662- restart_lowmem = (void (*)(unsigned int))restart_pa;
18663+ restart_lowmem = (void *)restart_pa;
18664
18665 /* GDT[0]: GDT self-pointer */
18666 lowmem_gdt[0] =
18667@@ -385,7 +389,33 @@ void machine_real_restart(unsigned int type)
18668 GDT_ENTRY(0x009b, restart_pa, 0xffff);
18669
18670 /* Jump to the identity-mapped low memory code */
18671+
18672+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18673+ gdt = get_cpu_gdt_table(smp_processor_id());
18674+ pax_open_kernel();
18675+#ifdef CONFIG_PAX_MEMORY_UDEREF
18676+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
18677+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
18678+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
18679+#endif
18680+#ifdef CONFIG_PAX_KERNEXEC
18681+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
18682+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
18683+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
18684+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
18685+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
18686+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
18687+#endif
18688+ pax_close_kernel();
18689+#endif
18690+
18691+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18692+ asm volatile("push %0; push %1; lret\n" : : "i" (__KERNEL_CS), "rm" (restart_lowmem), "a" (type));
18693+ unreachable();
18694+#else
18695 restart_lowmem(type);
18696+#endif
18697+
18698 }
18699 #ifdef CONFIG_APM_MODULE
18700 EXPORT_SYMBOL(machine_real_restart);
18701@@ -556,7 +586,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
18702 * try to force a triple fault and then cycle between hitting the keyboard
18703 * controller and doing that
18704 */
18705-static void native_machine_emergency_restart(void)
18706+__noreturn static void native_machine_emergency_restart(void)
18707 {
18708 int i;
18709 int attempt = 0;
18710@@ -680,13 +710,13 @@ void native_machine_shutdown(void)
18711 #endif
18712 }
18713
18714-static void __machine_emergency_restart(int emergency)
18715+static __noreturn void __machine_emergency_restart(int emergency)
18716 {
18717 reboot_emergency = emergency;
18718 machine_ops.emergency_restart();
18719 }
18720
18721-static void native_machine_restart(char *__unused)
18722+static __noreturn void native_machine_restart(char *__unused)
18723 {
18724 printk("machine restart\n");
18725
18726@@ -695,7 +725,7 @@ static void native_machine_restart(char *__unused)
18727 __machine_emergency_restart(0);
18728 }
18729
18730-static void native_machine_halt(void)
18731+static __noreturn void native_machine_halt(void)
18732 {
18733 /* stop other cpus and apics */
18734 machine_shutdown();
18735@@ -706,7 +736,7 @@ static void native_machine_halt(void)
18736 stop_this_cpu(NULL);
18737 }
18738
18739-static void native_machine_power_off(void)
18740+__noreturn static void native_machine_power_off(void)
18741 {
18742 if (pm_power_off) {
18743 if (!reboot_force)
18744@@ -715,6 +745,7 @@ static void native_machine_power_off(void)
18745 }
18746 /* a fallback in case there is no PM info available */
18747 tboot_shutdown(TB_SHUTDOWN_HALT);
18748+ unreachable();
18749 }
18750
18751 struct machine_ops machine_ops = {
18752diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
18753index 7a6f3b3..bed145d7 100644
18754--- a/arch/x86/kernel/relocate_kernel_64.S
18755+++ b/arch/x86/kernel/relocate_kernel_64.S
18756@@ -11,6 +11,7 @@
18757 #include <asm/kexec.h>
18758 #include <asm/processor-flags.h>
18759 #include <asm/pgtable_types.h>
18760+#include <asm/alternative-asm.h>
18761
18762 /*
18763 * Must be relocatable PIC code callable as a C function
18764@@ -160,13 +161,14 @@ identity_mapped:
18765 xorq %rbp, %rbp
18766 xorq %r8, %r8
18767 xorq %r9, %r9
18768- xorq %r10, %r9
18769+ xorq %r10, %r10
18770 xorq %r11, %r11
18771 xorq %r12, %r12
18772 xorq %r13, %r13
18773 xorq %r14, %r14
18774 xorq %r15, %r15
18775
18776+ pax_force_retaddr 0, 1
18777 ret
18778
18779 1:
18780diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
18781index d7d5099..28555d0 100644
18782--- a/arch/x86/kernel/setup.c
18783+++ b/arch/x86/kernel/setup.c
18784@@ -448,7 +448,7 @@ static void __init parse_setup_data(void)
18785
18786 switch (data->type) {
18787 case SETUP_E820_EXT:
18788- parse_e820_ext(data);
18789+ parse_e820_ext((struct setup_data __force_kernel *)data);
18790 break;
18791 case SETUP_DTB:
18792 add_dtb(pa_data);
18793@@ -649,7 +649,7 @@ static void __init trim_bios_range(void)
18794 * area (640->1Mb) as ram even though it is not.
18795 * take them out.
18796 */
18797- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
18798+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
18799 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
18800 }
18801
18802@@ -767,14 +767,14 @@ void __init setup_arch(char **cmdline_p)
18803
18804 if (!boot_params.hdr.root_flags)
18805 root_mountflags &= ~MS_RDONLY;
18806- init_mm.start_code = (unsigned long) _text;
18807- init_mm.end_code = (unsigned long) _etext;
18808+ init_mm.start_code = ktla_ktva((unsigned long) _text);
18809+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
18810 init_mm.end_data = (unsigned long) _edata;
18811 init_mm.brk = _brk_end;
18812
18813- code_resource.start = virt_to_phys(_text);
18814- code_resource.end = virt_to_phys(_etext)-1;
18815- data_resource.start = virt_to_phys(_etext);
18816+ code_resource.start = virt_to_phys(ktla_ktva(_text));
18817+ code_resource.end = virt_to_phys(ktla_ktva(_etext))-1;
18818+ data_resource.start = virt_to_phys(_sdata);
18819 data_resource.end = virt_to_phys(_edata)-1;
18820 bss_resource.start = virt_to_phys(&__bss_start);
18821 bss_resource.end = virt_to_phys(&__bss_stop)-1;
18822diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
18823index 71f4727..217419b 100644
18824--- a/arch/x86/kernel/setup_percpu.c
18825+++ b/arch/x86/kernel/setup_percpu.c
18826@@ -21,19 +21,17 @@
18827 #include <asm/cpu.h>
18828 #include <asm/stackprotector.h>
18829
18830-DEFINE_PER_CPU(int, cpu_number);
18831+#ifdef CONFIG_SMP
18832+DEFINE_PER_CPU(unsigned int, cpu_number);
18833 EXPORT_PER_CPU_SYMBOL(cpu_number);
18834+#endif
18835
18836-#ifdef CONFIG_X86_64
18837 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
18838-#else
18839-#define BOOT_PERCPU_OFFSET 0
18840-#endif
18841
18842 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
18843 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
18844
18845-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
18846+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
18847 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
18848 };
18849 EXPORT_SYMBOL(__per_cpu_offset);
18850@@ -96,6 +94,8 @@ static bool __init pcpu_need_numa(void)
18851 * Pointer to the allocated area on success, NULL on failure.
18852 */
18853 static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18854+ unsigned long align) __size_overflow(2);
18855+static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18856 unsigned long align)
18857 {
18858 const unsigned long goal = __pa(MAX_DMA_ADDRESS);
18859@@ -124,6 +124,8 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18860 /*
18861 * Helpers for first chunk memory allocation
18862 */
18863+static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align) __size_overflow(2);
18864+
18865 static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align)
18866 {
18867 return pcpu_alloc_bootmem(cpu, size, align);
18868@@ -155,10 +157,10 @@ static inline void setup_percpu_segment(int cpu)
18869 {
18870 #ifdef CONFIG_X86_32
18871 struct desc_struct gdt;
18872+ unsigned long base = per_cpu_offset(cpu);
18873
18874- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
18875- 0x2 | DESCTYPE_S, 0x8);
18876- gdt.s = 1;
18877+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
18878+ 0x83 | DESCTYPE_S, 0xC);
18879 write_gdt_entry(get_cpu_gdt_table(cpu),
18880 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
18881 #endif
18882@@ -207,6 +209,11 @@ void __init setup_per_cpu_areas(void)
18883 /* alrighty, percpu areas up and running */
18884 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
18885 for_each_possible_cpu(cpu) {
18886+#ifdef CONFIG_CC_STACKPROTECTOR
18887+#ifdef CONFIG_X86_32
18888+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
18889+#endif
18890+#endif
18891 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
18892 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
18893 per_cpu(cpu_number, cpu) = cpu;
18894@@ -247,6 +254,12 @@ void __init setup_per_cpu_areas(void)
18895 */
18896 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
18897 #endif
18898+#ifdef CONFIG_CC_STACKPROTECTOR
18899+#ifdef CONFIG_X86_32
18900+ if (!cpu)
18901+ per_cpu(stack_canary.canary, cpu) = canary;
18902+#endif
18903+#endif
18904 /*
18905 * Up to this point, the boot CPU has been using .init.data
18906 * area. Reload any changed state for the boot CPU.
18907diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
18908index 46a01bd..2e88e6d 100644
18909--- a/arch/x86/kernel/signal.c
18910+++ b/arch/x86/kernel/signal.c
18911@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsigned long sp)
18912 * Align the stack pointer according to the i386 ABI,
18913 * i.e. so that on function entry ((sp + 4) & 15) == 0.
18914 */
18915- sp = ((sp + 4) & -16ul) - 4;
18916+ sp = ((sp - 12) & -16ul) - 4;
18917 #else /* !CONFIG_X86_32 */
18918 sp = round_down(sp, 16) - 8;
18919 #endif
18920@@ -249,11 +249,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
18921 * Return an always-bogus address instead so we will die with SIGSEGV.
18922 */
18923 if (onsigstack && !likely(on_sig_stack(sp)))
18924- return (void __user *)-1L;
18925+ return (__force void __user *)-1L;
18926
18927 /* save i387 state */
18928 if (used_math() && save_i387_xstate(*fpstate) < 0)
18929- return (void __user *)-1L;
18930+ return (__force void __user *)-1L;
18931
18932 return (void __user *)sp;
18933 }
18934@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
18935 }
18936
18937 if (current->mm->context.vdso)
18938- restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
18939+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
18940 else
18941- restorer = &frame->retcode;
18942+ restorer = (void __user *)&frame->retcode;
18943 if (ka->sa.sa_flags & SA_RESTORER)
18944 restorer = ka->sa.sa_restorer;
18945
18946@@ -324,7 +324,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
18947 * reasons and because gdb uses it as a signature to notice
18948 * signal handler stack frames.
18949 */
18950- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
18951+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
18952
18953 if (err)
18954 return -EFAULT;
18955@@ -378,7 +378,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
18956 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
18957
18958 /* Set up to return from userspace. */
18959- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
18960+ if (current->mm->context.vdso)
18961+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
18962+ else
18963+ restorer = (void __user *)&frame->retcode;
18964 if (ka->sa.sa_flags & SA_RESTORER)
18965 restorer = ka->sa.sa_restorer;
18966 put_user_ex(restorer, &frame->pretcode);
18967@@ -390,7 +393,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
18968 * reasons and because gdb uses it as a signature to notice
18969 * signal handler stack frames.
18970 */
18971- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
18972+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
18973 } put_user_catch(err);
18974
18975 if (err)
18976@@ -765,7 +768,7 @@ static void do_signal(struct pt_regs *regs)
18977 * X86_32: vm86 regs switched out by assembly code before reaching
18978 * here, so testing against kernel CS suffices.
18979 */
18980- if (!user_mode(regs))
18981+ if (!user_mode_novm(regs))
18982 return;
18983
18984 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
18985diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
18986index 66d250c..f1b10bd 100644
18987--- a/arch/x86/kernel/smpboot.c
18988+++ b/arch/x86/kernel/smpboot.c
18989@@ -715,17 +715,20 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
18990 set_idle_for_cpu(cpu, c_idle.idle);
18991 do_rest:
18992 per_cpu(current_task, cpu) = c_idle.idle;
18993+ per_cpu(current_tinfo, cpu) = &c_idle.idle->tinfo;
18994 #ifdef CONFIG_X86_32
18995 /* Stack for startup_32 can be just as for start_secondary onwards */
18996 irq_ctx_init(cpu);
18997 #else
18998 clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
18999 initial_gs = per_cpu_offset(cpu);
19000- per_cpu(kernel_stack, cpu) =
19001- (unsigned long)task_stack_page(c_idle.idle) -
19002- KERNEL_STACK_OFFSET + THREAD_SIZE;
19003+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
19004 #endif
19005+
19006+ pax_open_kernel();
19007 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
19008+ pax_close_kernel();
19009+
19010 initial_code = (unsigned long)start_secondary;
19011 stack_start = c_idle.idle->thread.sp;
19012
19013@@ -868,6 +871,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
19014
19015 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
19016
19017+#ifdef CONFIG_PAX_PER_CPU_PGD
19018+ clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
19019+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
19020+ KERNEL_PGD_PTRS);
19021+#endif
19022+
19023 err = do_boot_cpu(apicid, cpu);
19024 if (err) {
19025 pr_debug("do_boot_cpu failed %d\n", err);
19026diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
19027index c346d11..d43b163 100644
19028--- a/arch/x86/kernel/step.c
19029+++ b/arch/x86/kernel/step.c
19030@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
19031 struct desc_struct *desc;
19032 unsigned long base;
19033
19034- seg &= ~7UL;
19035+ seg >>= 3;
19036
19037 mutex_lock(&child->mm->context.lock);
19038- if (unlikely((seg >> 3) >= child->mm->context.size))
19039+ if (unlikely(seg >= child->mm->context.size))
19040 addr = -1L; /* bogus selector, access would fault */
19041 else {
19042 desc = child->mm->context.ldt + seg;
19043@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
19044 addr += base;
19045 }
19046 mutex_unlock(&child->mm->context.lock);
19047- }
19048+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
19049+ addr = ktla_ktva(addr);
19050
19051 return addr;
19052 }
19053@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
19054 unsigned char opcode[15];
19055 unsigned long addr = convert_ip_to_linear(child, regs);
19056
19057+ if (addr == -EINVAL)
19058+ return 0;
19059+
19060 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
19061 for (i = 0; i < copied; i++) {
19062 switch (opcode[i]) {
19063diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
19064index 0b0cb5f..db6b9ed 100644
19065--- a/arch/x86/kernel/sys_i386_32.c
19066+++ b/arch/x86/kernel/sys_i386_32.c
19067@@ -24,17 +24,224 @@
19068
19069 #include <asm/syscalls.h>
19070
19071-/*
19072- * Do a system call from kernel instead of calling sys_execve so we
19073- * end up with proper pt_regs.
19074- */
19075-int kernel_execve(const char *filename,
19076- const char *const argv[],
19077- const char *const envp[])
19078+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
19079 {
19080- long __res;
19081- asm volatile ("int $0x80"
19082- : "=a" (__res)
19083- : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
19084- return __res;
19085+ unsigned long pax_task_size = TASK_SIZE;
19086+
19087+#ifdef CONFIG_PAX_SEGMEXEC
19088+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
19089+ pax_task_size = SEGMEXEC_TASK_SIZE;
19090+#endif
19091+
19092+ if (len > pax_task_size || addr > pax_task_size - len)
19093+ return -EINVAL;
19094+
19095+ return 0;
19096+}
19097+
19098+unsigned long
19099+arch_get_unmapped_area(struct file *filp, unsigned long addr,
19100+ unsigned long len, unsigned long pgoff, unsigned long flags)
19101+{
19102+ struct mm_struct *mm = current->mm;
19103+ struct vm_area_struct *vma;
19104+ unsigned long start_addr, pax_task_size = TASK_SIZE;
19105+
19106+#ifdef CONFIG_PAX_SEGMEXEC
19107+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
19108+ pax_task_size = SEGMEXEC_TASK_SIZE;
19109+#endif
19110+
19111+ pax_task_size -= PAGE_SIZE;
19112+
19113+ if (len > pax_task_size)
19114+ return -ENOMEM;
19115+
19116+ if (flags & MAP_FIXED)
19117+ return addr;
19118+
19119+#ifdef CONFIG_PAX_RANDMMAP
19120+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19121+#endif
19122+
19123+ if (addr) {
19124+ addr = PAGE_ALIGN(addr);
19125+ if (pax_task_size - len >= addr) {
19126+ vma = find_vma(mm, addr);
19127+ if (check_heap_stack_gap(vma, addr, len))
19128+ return addr;
19129+ }
19130+ }
19131+ if (len > mm->cached_hole_size) {
19132+ start_addr = addr = mm->free_area_cache;
19133+ } else {
19134+ start_addr = addr = mm->mmap_base;
19135+ mm->cached_hole_size = 0;
19136+ }
19137+
19138+#ifdef CONFIG_PAX_PAGEEXEC
19139+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
19140+ start_addr = 0x00110000UL;
19141+
19142+#ifdef CONFIG_PAX_RANDMMAP
19143+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19144+ start_addr += mm->delta_mmap & 0x03FFF000UL;
19145+#endif
19146+
19147+ if (mm->start_brk <= start_addr && start_addr < mm->mmap_base)
19148+ start_addr = addr = mm->mmap_base;
19149+ else
19150+ addr = start_addr;
19151+ }
19152+#endif
19153+
19154+full_search:
19155+ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
19156+ /* At this point: (!vma || addr < vma->vm_end). */
19157+ if (pax_task_size - len < addr) {
19158+ /*
19159+ * Start a new search - just in case we missed
19160+ * some holes.
19161+ */
19162+ if (start_addr != mm->mmap_base) {
19163+ start_addr = addr = mm->mmap_base;
19164+ mm->cached_hole_size = 0;
19165+ goto full_search;
19166+ }
19167+ return -ENOMEM;
19168+ }
19169+ if (check_heap_stack_gap(vma, addr, len))
19170+ break;
19171+ if (addr + mm->cached_hole_size < vma->vm_start)
19172+ mm->cached_hole_size = vma->vm_start - addr;
19173+ addr = vma->vm_end;
19174+ if (mm->start_brk <= addr && addr < mm->mmap_base) {
19175+ start_addr = addr = mm->mmap_base;
19176+ mm->cached_hole_size = 0;
19177+ goto full_search;
19178+ }
19179+ }
19180+
19181+ /*
19182+ * Remember the place where we stopped the search:
19183+ */
19184+ mm->free_area_cache = addr + len;
19185+ return addr;
19186+}
19187+
19188+unsigned long
19189+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19190+ const unsigned long len, const unsigned long pgoff,
19191+ const unsigned long flags)
19192+{
19193+ struct vm_area_struct *vma;
19194+ struct mm_struct *mm = current->mm;
19195+ unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
19196+
19197+#ifdef CONFIG_PAX_SEGMEXEC
19198+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
19199+ pax_task_size = SEGMEXEC_TASK_SIZE;
19200+#endif
19201+
19202+ pax_task_size -= PAGE_SIZE;
19203+
19204+ /* requested length too big for entire address space */
19205+ if (len > pax_task_size)
19206+ return -ENOMEM;
19207+
19208+ if (flags & MAP_FIXED)
19209+ return addr;
19210+
19211+#ifdef CONFIG_PAX_PAGEEXEC
19212+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
19213+ goto bottomup;
19214+#endif
19215+
19216+#ifdef CONFIG_PAX_RANDMMAP
19217+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19218+#endif
19219+
19220+ /* requesting a specific address */
19221+ if (addr) {
19222+ addr = PAGE_ALIGN(addr);
19223+ if (pax_task_size - len >= addr) {
19224+ vma = find_vma(mm, addr);
19225+ if (check_heap_stack_gap(vma, addr, len))
19226+ return addr;
19227+ }
19228+ }
19229+
19230+ /* check if free_area_cache is useful for us */
19231+ if (len <= mm->cached_hole_size) {
19232+ mm->cached_hole_size = 0;
19233+ mm->free_area_cache = mm->mmap_base;
19234+ }
19235+
19236+ /* either no address requested or can't fit in requested address hole */
19237+ addr = mm->free_area_cache;
19238+
19239+ /* make sure it can fit in the remaining address space */
19240+ if (addr > len) {
19241+ vma = find_vma(mm, addr-len);
19242+ if (check_heap_stack_gap(vma, addr - len, len))
19243+ /* remember the address as a hint for next time */
19244+ return (mm->free_area_cache = addr-len);
19245+ }
19246+
19247+ if (mm->mmap_base < len)
19248+ goto bottomup;
19249+
19250+ addr = mm->mmap_base-len;
19251+
19252+ do {
19253+ /*
19254+ * Lookup failure means no vma is above this address,
19255+ * else if new region fits below vma->vm_start,
19256+ * return with success:
19257+ */
19258+ vma = find_vma(mm, addr);
19259+ if (check_heap_stack_gap(vma, addr, len))
19260+ /* remember the address as a hint for next time */
19261+ return (mm->free_area_cache = addr);
19262+
19263+ /* remember the largest hole we saw so far */
19264+ if (addr + mm->cached_hole_size < vma->vm_start)
19265+ mm->cached_hole_size = vma->vm_start - addr;
19266+
19267+ /* try just below the current vma->vm_start */
19268+ addr = skip_heap_stack_gap(vma, len);
19269+ } while (!IS_ERR_VALUE(addr));
19270+
19271+bottomup:
19272+ /*
19273+ * A failed mmap() very likely causes application failure,
19274+ * so fall back to the bottom-up function here. This scenario
19275+ * can happen with large stack limits and large mmap()
19276+ * allocations.
19277+ */
19278+
19279+#ifdef CONFIG_PAX_SEGMEXEC
19280+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
19281+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
19282+ else
19283+#endif
19284+
19285+ mm->mmap_base = TASK_UNMAPPED_BASE;
19286+
19287+#ifdef CONFIG_PAX_RANDMMAP
19288+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19289+ mm->mmap_base += mm->delta_mmap;
19290+#endif
19291+
19292+ mm->free_area_cache = mm->mmap_base;
19293+ mm->cached_hole_size = ~0UL;
19294+ addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19295+ /*
19296+ * Restore the topdown base:
19297+ */
19298+ mm->mmap_base = base;
19299+ mm->free_area_cache = base;
19300+ mm->cached_hole_size = ~0UL;
19301+
19302+ return addr;
19303 }
19304diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
19305index 0514890..3dbebce 100644
19306--- a/arch/x86/kernel/sys_x86_64.c
19307+++ b/arch/x86/kernel/sys_x86_64.c
19308@@ -95,8 +95,8 @@ out:
19309 return error;
19310 }
19311
19312-static void find_start_end(unsigned long flags, unsigned long *begin,
19313- unsigned long *end)
19314+static void find_start_end(struct mm_struct *mm, unsigned long flags,
19315+ unsigned long *begin, unsigned long *end)
19316 {
19317 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
19318 unsigned long new_begin;
19319@@ -115,7 +115,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
19320 *begin = new_begin;
19321 }
19322 } else {
19323- *begin = TASK_UNMAPPED_BASE;
19324+ *begin = mm->mmap_base;
19325 *end = TASK_SIZE;
19326 }
19327 }
19328@@ -132,16 +132,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
19329 if (flags & MAP_FIXED)
19330 return addr;
19331
19332- find_start_end(flags, &begin, &end);
19333+ find_start_end(mm, flags, &begin, &end);
19334
19335 if (len > end)
19336 return -ENOMEM;
19337
19338+#ifdef CONFIG_PAX_RANDMMAP
19339+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19340+#endif
19341+
19342 if (addr) {
19343 addr = PAGE_ALIGN(addr);
19344 vma = find_vma(mm, addr);
19345- if (end - len >= addr &&
19346- (!vma || addr + len <= vma->vm_start))
19347+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
19348 return addr;
19349 }
19350 if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
19351@@ -172,7 +175,7 @@ full_search:
19352 }
19353 return -ENOMEM;
19354 }
19355- if (!vma || addr + len <= vma->vm_start) {
19356+ if (check_heap_stack_gap(vma, addr, len)) {
19357 /*
19358 * Remember the place where we stopped the search:
19359 */
19360@@ -195,7 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19361 {
19362 struct vm_area_struct *vma;
19363 struct mm_struct *mm = current->mm;
19364- unsigned long addr = addr0;
19365+ unsigned long base = mm->mmap_base, addr = addr0;
19366
19367 /* requested length too big for entire address space */
19368 if (len > TASK_SIZE)
19369@@ -208,13 +211,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19370 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
19371 goto bottomup;
19372
19373+#ifdef CONFIG_PAX_RANDMMAP
19374+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19375+#endif
19376+
19377 /* requesting a specific address */
19378 if (addr) {
19379 addr = PAGE_ALIGN(addr);
19380- vma = find_vma(mm, addr);
19381- if (TASK_SIZE - len >= addr &&
19382- (!vma || addr + len <= vma->vm_start))
19383- return addr;
19384+ if (TASK_SIZE - len >= addr) {
19385+ vma = find_vma(mm, addr);
19386+ if (check_heap_stack_gap(vma, addr, len))
19387+ return addr;
19388+ }
19389 }
19390
19391 /* check if free_area_cache is useful for us */
19392@@ -232,7 +240,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19393 ALIGN_TOPDOWN);
19394
19395 vma = find_vma(mm, tmp_addr);
19396- if (!vma || tmp_addr + len <= vma->vm_start)
19397+ if (check_heap_stack_gap(vma, tmp_addr, len))
19398 /* remember the address as a hint for next time */
19399 return mm->free_area_cache = tmp_addr;
19400 }
19401@@ -251,7 +259,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19402 * return with success:
19403 */
19404 vma = find_vma(mm, addr);
19405- if (!vma || addr+len <= vma->vm_start)
19406+ if (check_heap_stack_gap(vma, addr, len))
19407 /* remember the address as a hint for next time */
19408 return mm->free_area_cache = addr;
19409
19410@@ -260,8 +268,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19411 mm->cached_hole_size = vma->vm_start - addr;
19412
19413 /* try just below the current vma->vm_start */
19414- addr = vma->vm_start-len;
19415- } while (len < vma->vm_start);
19416+ addr = skip_heap_stack_gap(vma, len);
19417+ } while (!IS_ERR_VALUE(addr));
19418
19419 bottomup:
19420 /*
19421@@ -270,13 +278,21 @@ bottomup:
19422 * can happen with large stack limits and large mmap()
19423 * allocations.
19424 */
19425+ mm->mmap_base = TASK_UNMAPPED_BASE;
19426+
19427+#ifdef CONFIG_PAX_RANDMMAP
19428+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19429+ mm->mmap_base += mm->delta_mmap;
19430+#endif
19431+
19432+ mm->free_area_cache = mm->mmap_base;
19433 mm->cached_hole_size = ~0UL;
19434- mm->free_area_cache = TASK_UNMAPPED_BASE;
19435 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19436 /*
19437 * Restore the topdown base:
19438 */
19439- mm->free_area_cache = mm->mmap_base;
19440+ mm->mmap_base = base;
19441+ mm->free_area_cache = base;
19442 mm->cached_hole_size = ~0UL;
19443
19444 return addr;
19445diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
19446index e2410e2..4fe3fbc 100644
19447--- a/arch/x86/kernel/tboot.c
19448+++ b/arch/x86/kernel/tboot.c
19449@@ -219,7 +219,7 @@ static int tboot_setup_sleep(void)
19450
19451 void tboot_shutdown(u32 shutdown_type)
19452 {
19453- void (*shutdown)(void);
19454+ void (* __noreturn shutdown)(void);
19455
19456 if (!tboot_enabled())
19457 return;
19458@@ -241,7 +241,7 @@ void tboot_shutdown(u32 shutdown_type)
19459
19460 switch_to_tboot_pt();
19461
19462- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
19463+ shutdown = (void *)tboot->shutdown_entry;
19464 shutdown();
19465
19466 /* should not reach here */
19467@@ -298,7 +298,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
19468 tboot_shutdown(acpi_shutdown_map[sleep_state]);
19469 }
19470
19471-static atomic_t ap_wfs_count;
19472+static atomic_unchecked_t ap_wfs_count;
19473
19474 static int tboot_wait_for_aps(int num_aps)
19475 {
19476@@ -322,9 +322,9 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
19477 {
19478 switch (action) {
19479 case CPU_DYING:
19480- atomic_inc(&ap_wfs_count);
19481+ atomic_inc_unchecked(&ap_wfs_count);
19482 if (num_online_cpus() == 1)
19483- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
19484+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
19485 return NOTIFY_BAD;
19486 break;
19487 }
19488@@ -343,7 +343,7 @@ static __init int tboot_late_init(void)
19489
19490 tboot_create_trampoline();
19491
19492- atomic_set(&ap_wfs_count, 0);
19493+ atomic_set_unchecked(&ap_wfs_count, 0);
19494 register_hotcpu_notifier(&tboot_cpu_notifier);
19495 return 0;
19496 }
19497diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
19498index dd5fbf4..b7f2232 100644
19499--- a/arch/x86/kernel/time.c
19500+++ b/arch/x86/kernel/time.c
19501@@ -31,9 +31,9 @@ unsigned long profile_pc(struct pt_regs *regs)
19502 {
19503 unsigned long pc = instruction_pointer(regs);
19504
19505- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
19506+ if (!user_mode(regs) && in_lock_functions(pc)) {
19507 #ifdef CONFIG_FRAME_POINTER
19508- return *(unsigned long *)(regs->bp + sizeof(long));
19509+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
19510 #else
19511 unsigned long *sp =
19512 (unsigned long *)kernel_stack_pointer(regs);
19513@@ -42,11 +42,17 @@ unsigned long profile_pc(struct pt_regs *regs)
19514 * or above a saved flags. Eflags has bits 22-31 zero,
19515 * kernel addresses don't.
19516 */
19517+
19518+#ifdef CONFIG_PAX_KERNEXEC
19519+ return ktla_ktva(sp[0]);
19520+#else
19521 if (sp[0] >> 22)
19522 return sp[0];
19523 if (sp[1] >> 22)
19524 return sp[1];
19525 #endif
19526+
19527+#endif
19528 }
19529 return pc;
19530 }
19531diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
19532index bcfec2d..8f88b4a 100644
19533--- a/arch/x86/kernel/tls.c
19534+++ b/arch/x86/kernel/tls.c
19535@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
19536 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
19537 return -EINVAL;
19538
19539+#ifdef CONFIG_PAX_SEGMEXEC
19540+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
19541+ return -EINVAL;
19542+#endif
19543+
19544 set_tls_desc(p, idx, &info, 1);
19545
19546 return 0;
19547diff --git a/arch/x86/kernel/tls.h b/arch/x86/kernel/tls.h
19548index 2f083a2..7d3fecc 100644
19549--- a/arch/x86/kernel/tls.h
19550+++ b/arch/x86/kernel/tls.h
19551@@ -16,6 +16,6 @@
19552
19553 extern user_regset_active_fn regset_tls_active;
19554 extern user_regset_get_fn regset_tls_get;
19555-extern user_regset_set_fn regset_tls_set;
19556+extern user_regset_set_fn regset_tls_set __size_overflow(4);
19557
19558 #endif /* _ARCH_X86_KERNEL_TLS_H */
19559diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S
19560index 451c0a7..e57f551 100644
19561--- a/arch/x86/kernel/trampoline_32.S
19562+++ b/arch/x86/kernel/trampoline_32.S
19563@@ -32,6 +32,12 @@
19564 #include <asm/segment.h>
19565 #include <asm/page_types.h>
19566
19567+#ifdef CONFIG_PAX_KERNEXEC
19568+#define ta(X) (X)
19569+#else
19570+#define ta(X) ((X) - __PAGE_OFFSET)
19571+#endif
19572+
19573 #ifdef CONFIG_SMP
19574
19575 .section ".x86_trampoline","a"
19576@@ -62,7 +68,7 @@ r_base = .
19577 inc %ax # protected mode (PE) bit
19578 lmsw %ax # into protected mode
19579 # flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S
19580- ljmpl $__BOOT_CS, $(startup_32_smp-__PAGE_OFFSET)
19581+ ljmpl $__BOOT_CS, $ta(startup_32_smp)
19582
19583 # These need to be in the same 64K segment as the above;
19584 # hence we don't use the boot_gdt_descr defined in head.S
19585diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
19586index 09ff517..df19fbff 100644
19587--- a/arch/x86/kernel/trampoline_64.S
19588+++ b/arch/x86/kernel/trampoline_64.S
19589@@ -90,7 +90,7 @@ startup_32:
19590 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
19591 movl %eax, %ds
19592
19593- movl $X86_CR4_PAE, %eax
19594+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
19595 movl %eax, %cr4 # Enable PAE mode
19596
19597 # Setup trampoline 4 level pagetables
19598@@ -138,7 +138,7 @@ tidt:
19599 # so the kernel can live anywhere
19600 .balign 4
19601 tgdt:
19602- .short tgdt_end - tgdt # gdt limit
19603+ .short tgdt_end - tgdt - 1 # gdt limit
19604 .long tgdt - r_base
19605 .short 0
19606 .quad 0x00cf9b000000ffff # __KERNEL32_CS
19607diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
19608index 4bbe04d..41d0943 100644
19609--- a/arch/x86/kernel/traps.c
19610+++ b/arch/x86/kernel/traps.c
19611@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
19612
19613 /* Do we ignore FPU interrupts ? */
19614 char ignore_fpu_irq;
19615-
19616-/*
19617- * The IDT has to be page-aligned to simplify the Pentium
19618- * F0 0F bug workaround.
19619- */
19620-gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
19621 #endif
19622
19623 DECLARE_BITMAP(used_vectors, NR_VECTORS);
19624@@ -108,13 +102,13 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
19625 }
19626
19627 static void __kprobes
19628-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
19629+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
19630 long error_code, siginfo_t *info)
19631 {
19632 struct task_struct *tsk = current;
19633
19634 #ifdef CONFIG_X86_32
19635- if (regs->flags & X86_VM_MASK) {
19636+ if (v8086_mode(regs)) {
19637 /*
19638 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
19639 * On nmi (interrupt 2), do_trap should not be called.
19640@@ -125,7 +119,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
19641 }
19642 #endif
19643
19644- if (!user_mode(regs))
19645+ if (!user_mode_novm(regs))
19646 goto kernel_trap;
19647
19648 #ifdef CONFIG_X86_32
19649@@ -148,7 +142,7 @@ trap_signal:
19650 printk_ratelimit()) {
19651 printk(KERN_INFO
19652 "%s[%d] trap %s ip:%lx sp:%lx error:%lx",
19653- tsk->comm, tsk->pid, str,
19654+ tsk->comm, task_pid_nr(tsk), str,
19655 regs->ip, regs->sp, error_code);
19656 print_vma_addr(" in ", regs->ip);
19657 printk("\n");
19658@@ -165,8 +159,20 @@ kernel_trap:
19659 if (!fixup_exception(regs)) {
19660 tsk->thread.error_code = error_code;
19661 tsk->thread.trap_no = trapnr;
19662+
19663+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19664+ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
19665+ str = "PAX: suspicious stack segment fault";
19666+#endif
19667+
19668 die(str, regs, error_code);
19669 }
19670+
19671+#ifdef CONFIG_PAX_REFCOUNT
19672+ if (trapnr == 4)
19673+ pax_report_refcount_overflow(regs);
19674+#endif
19675+
19676 return;
19677
19678 #ifdef CONFIG_X86_32
19679@@ -255,14 +261,30 @@ do_general_protection(struct pt_regs *regs, long error_code)
19680 conditional_sti(regs);
19681
19682 #ifdef CONFIG_X86_32
19683- if (regs->flags & X86_VM_MASK)
19684+ if (v8086_mode(regs))
19685 goto gp_in_vm86;
19686 #endif
19687
19688 tsk = current;
19689- if (!user_mode(regs))
19690+ if (!user_mode_novm(regs))
19691 goto gp_in_kernel;
19692
19693+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
19694+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
19695+ struct mm_struct *mm = tsk->mm;
19696+ unsigned long limit;
19697+
19698+ down_write(&mm->mmap_sem);
19699+ limit = mm->context.user_cs_limit;
19700+ if (limit < TASK_SIZE) {
19701+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
19702+ up_write(&mm->mmap_sem);
19703+ return;
19704+ }
19705+ up_write(&mm->mmap_sem);
19706+ }
19707+#endif
19708+
19709 tsk->thread.error_code = error_code;
19710 tsk->thread.trap_no = 13;
19711
19712@@ -295,6 +317,13 @@ gp_in_kernel:
19713 if (notify_die(DIE_GPF, "general protection fault", regs,
19714 error_code, 13, SIGSEGV) == NOTIFY_STOP)
19715 return;
19716+
19717+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19718+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
19719+ die("PAX: suspicious general protection fault", regs, error_code);
19720+ else
19721+#endif
19722+
19723 die("general protection fault", regs, error_code);
19724 }
19725
19726@@ -421,7 +450,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
19727 /* It's safe to allow irq's after DR6 has been saved */
19728 preempt_conditional_sti(regs);
19729
19730- if (regs->flags & X86_VM_MASK) {
19731+ if (v8086_mode(regs)) {
19732 handle_vm86_trap((struct kernel_vm86_regs *) regs,
19733 error_code, 1);
19734 preempt_conditional_cli(regs);
19735@@ -436,7 +465,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
19736 * We already checked v86 mode above, so we can check for kernel mode
19737 * by just checking the CPL of CS.
19738 */
19739- if ((dr6 & DR_STEP) && !user_mode(regs)) {
19740+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
19741 tsk->thread.debugreg6 &= ~DR_STEP;
19742 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
19743 regs->flags &= ~X86_EFLAGS_TF;
19744@@ -466,7 +495,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
19745 return;
19746 conditional_sti(regs);
19747
19748- if (!user_mode_vm(regs))
19749+ if (!user_mode(regs))
19750 {
19751 if (!fixup_exception(regs)) {
19752 task->thread.error_code = error_code;
19753diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
19754index b9242ba..50c5edd 100644
19755--- a/arch/x86/kernel/verify_cpu.S
19756+++ b/arch/x86/kernel/verify_cpu.S
19757@@ -20,6 +20,7 @@
19758 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
19759 * arch/x86/kernel/trampoline_64.S: secondary processor verification
19760 * arch/x86/kernel/head_32.S: processor startup
19761+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
19762 *
19763 * verify_cpu, returns the status of longmode and SSE in register %eax.
19764 * 0: Success 1: Failure
19765diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
19766index 328cb37..f37fee1 100644
19767--- a/arch/x86/kernel/vm86_32.c
19768+++ b/arch/x86/kernel/vm86_32.c
19769@@ -41,6 +41,7 @@
19770 #include <linux/ptrace.h>
19771 #include <linux/audit.h>
19772 #include <linux/stddef.h>
19773+#include <linux/grsecurity.h>
19774
19775 #include <asm/uaccess.h>
19776 #include <asm/io.h>
19777@@ -109,6 +110,9 @@ static int copy_vm86_regs_to_user(struct vm86_regs __user *user,
19778 /* convert vm86_regs to kernel_vm86_regs */
19779 static int copy_vm86_regs_from_user(struct kernel_vm86_regs *regs,
19780 const struct vm86_regs __user *user,
19781+ unsigned extra) __size_overflow(3);
19782+static int copy_vm86_regs_from_user(struct kernel_vm86_regs *regs,
19783+ const struct vm86_regs __user *user,
19784 unsigned extra)
19785 {
19786 int ret = 0;
19787@@ -148,7 +152,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
19788 do_exit(SIGSEGV);
19789 }
19790
19791- tss = &per_cpu(init_tss, get_cpu());
19792+ tss = init_tss + get_cpu();
19793 current->thread.sp0 = current->thread.saved_sp0;
19794 current->thread.sysenter_cs = __KERNEL_CS;
19795 load_sp0(tss, &current->thread);
19796@@ -210,6 +214,13 @@ int sys_vm86old(struct vm86_struct __user *v86, struct pt_regs *regs)
19797 struct task_struct *tsk;
19798 int tmp, ret = -EPERM;
19799
19800+#ifdef CONFIG_GRKERNSEC_VM86
19801+ if (!capable(CAP_SYS_RAWIO)) {
19802+ gr_handle_vm86();
19803+ goto out;
19804+ }
19805+#endif
19806+
19807 tsk = current;
19808 if (tsk->thread.saved_sp0)
19809 goto out;
19810@@ -240,6 +251,14 @@ int sys_vm86(unsigned long cmd, unsigned long arg, struct pt_regs *regs)
19811 int tmp, ret;
19812 struct vm86plus_struct __user *v86;
19813
19814+#ifdef CONFIG_GRKERNSEC_VM86
19815+ if (!capable(CAP_SYS_RAWIO)) {
19816+ gr_handle_vm86();
19817+ ret = -EPERM;
19818+ goto out;
19819+ }
19820+#endif
19821+
19822 tsk = current;
19823 switch (cmd) {
19824 case VM86_REQUEST_IRQ:
19825@@ -326,7 +345,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
19826 tsk->thread.saved_fs = info->regs32->fs;
19827 tsk->thread.saved_gs = get_user_gs(info->regs32);
19828
19829- tss = &per_cpu(init_tss, get_cpu());
19830+ tss = init_tss + get_cpu();
19831 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
19832 if (cpu_has_sep)
19833 tsk->thread.sysenter_cs = 0;
19834@@ -533,7 +552,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
19835 goto cannot_handle;
19836 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
19837 goto cannot_handle;
19838- intr_ptr = (unsigned long __user *) (i << 2);
19839+ intr_ptr = (__force unsigned long __user *) (i << 2);
19840 if (get_user(segoffs, intr_ptr))
19841 goto cannot_handle;
19842 if ((segoffs >> 16) == BIOSSEG)
19843diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
19844index 0f703f1..9e15f64 100644
19845--- a/arch/x86/kernel/vmlinux.lds.S
19846+++ b/arch/x86/kernel/vmlinux.lds.S
19847@@ -26,6 +26,13 @@
19848 #include <asm/page_types.h>
19849 #include <asm/cache.h>
19850 #include <asm/boot.h>
19851+#include <asm/segment.h>
19852+
19853+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19854+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
19855+#else
19856+#define __KERNEL_TEXT_OFFSET 0
19857+#endif
19858
19859 #undef i386 /* in case the preprocessor is a 32bit one */
19860
19861@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
19862
19863 PHDRS {
19864 text PT_LOAD FLAGS(5); /* R_E */
19865+#ifdef CONFIG_X86_32
19866+ module PT_LOAD FLAGS(5); /* R_E */
19867+#endif
19868+#ifdef CONFIG_XEN
19869+ rodata PT_LOAD FLAGS(5); /* R_E */
19870+#else
19871+ rodata PT_LOAD FLAGS(4); /* R__ */
19872+#endif
19873 data PT_LOAD FLAGS(6); /* RW_ */
19874-#ifdef CONFIG_X86_64
19875+ init.begin PT_LOAD FLAGS(6); /* RW_ */
19876 #ifdef CONFIG_SMP
19877 percpu PT_LOAD FLAGS(6); /* RW_ */
19878 #endif
19879+ text.init PT_LOAD FLAGS(5); /* R_E */
19880+ text.exit PT_LOAD FLAGS(5); /* R_E */
19881 init PT_LOAD FLAGS(7); /* RWE */
19882-#endif
19883 note PT_NOTE FLAGS(0); /* ___ */
19884 }
19885
19886 SECTIONS
19887 {
19888 #ifdef CONFIG_X86_32
19889- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
19890- phys_startup_32 = startup_32 - LOAD_OFFSET;
19891+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
19892 #else
19893- . = __START_KERNEL;
19894- phys_startup_64 = startup_64 - LOAD_OFFSET;
19895+ . = __START_KERNEL;
19896 #endif
19897
19898 /* Text and read-only data */
19899- .text : AT(ADDR(.text) - LOAD_OFFSET) {
19900- _text = .;
19901+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
19902 /* bootstrapping code */
19903+#ifdef CONFIG_X86_32
19904+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19905+#else
19906+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19907+#endif
19908+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19909+ _text = .;
19910 HEAD_TEXT
19911 #ifdef CONFIG_X86_32
19912 . = ALIGN(PAGE_SIZE);
19913@@ -108,13 +128,47 @@ SECTIONS
19914 IRQENTRY_TEXT
19915 *(.fixup)
19916 *(.gnu.warning)
19917- /* End of text section */
19918- _etext = .;
19919 } :text = 0x9090
19920
19921- NOTES :text :note
19922+ . += __KERNEL_TEXT_OFFSET;
19923
19924- EXCEPTION_TABLE(16) :text = 0x9090
19925+#ifdef CONFIG_X86_32
19926+ . = ALIGN(PAGE_SIZE);
19927+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
19928+
19929+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
19930+ MODULES_EXEC_VADDR = .;
19931+ BYTE(0)
19932+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
19933+ . = ALIGN(HPAGE_SIZE);
19934+ MODULES_EXEC_END = . - 1;
19935+#endif
19936+
19937+ } :module
19938+#endif
19939+
19940+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
19941+ /* End of text section */
19942+ _etext = . - __KERNEL_TEXT_OFFSET;
19943+ }
19944+
19945+#ifdef CONFIG_X86_32
19946+ . = ALIGN(PAGE_SIZE);
19947+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
19948+ *(.idt)
19949+ . = ALIGN(PAGE_SIZE);
19950+ *(.empty_zero_page)
19951+ *(.initial_pg_fixmap)
19952+ *(.initial_pg_pmd)
19953+ *(.initial_page_table)
19954+ *(.swapper_pg_dir)
19955+ } :rodata
19956+#endif
19957+
19958+ . = ALIGN(PAGE_SIZE);
19959+ NOTES :rodata :note
19960+
19961+ EXCEPTION_TABLE(16) :rodata
19962
19963 #if defined(CONFIG_DEBUG_RODATA)
19964 /* .text should occupy whole number of pages */
19965@@ -126,16 +180,20 @@ SECTIONS
19966
19967 /* Data */
19968 .data : AT(ADDR(.data) - LOAD_OFFSET) {
19969+
19970+#ifdef CONFIG_PAX_KERNEXEC
19971+ . = ALIGN(HPAGE_SIZE);
19972+#else
19973+ . = ALIGN(PAGE_SIZE);
19974+#endif
19975+
19976 /* Start of data section */
19977 _sdata = .;
19978
19979 /* init_task */
19980 INIT_TASK_DATA(THREAD_SIZE)
19981
19982-#ifdef CONFIG_X86_32
19983- /* 32 bit has nosave before _edata */
19984 NOSAVE_DATA
19985-#endif
19986
19987 PAGE_ALIGNED_DATA(PAGE_SIZE)
19988
19989@@ -176,12 +234,19 @@ SECTIONS
19990 #endif /* CONFIG_X86_64 */
19991
19992 /* Init code and data - will be freed after init */
19993- . = ALIGN(PAGE_SIZE);
19994 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
19995+ BYTE(0)
19996+
19997+#ifdef CONFIG_PAX_KERNEXEC
19998+ . = ALIGN(HPAGE_SIZE);
19999+#else
20000+ . = ALIGN(PAGE_SIZE);
20001+#endif
20002+
20003 __init_begin = .; /* paired with __init_end */
20004- }
20005+ } :init.begin
20006
20007-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
20008+#ifdef CONFIG_SMP
20009 /*
20010 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
20011 * output PHDR, so the next output section - .init.text - should
20012@@ -190,12 +255,27 @@ SECTIONS
20013 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
20014 #endif
20015
20016- INIT_TEXT_SECTION(PAGE_SIZE)
20017-#ifdef CONFIG_X86_64
20018- :init
20019-#endif
20020+ . = ALIGN(PAGE_SIZE);
20021+ init_begin = .;
20022+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
20023+ VMLINUX_SYMBOL(_sinittext) = .;
20024+ INIT_TEXT
20025+ VMLINUX_SYMBOL(_einittext) = .;
20026+ . = ALIGN(PAGE_SIZE);
20027+ } :text.init
20028
20029- INIT_DATA_SECTION(16)
20030+ /*
20031+ * .exit.text is discard at runtime, not link time, to deal with
20032+ * references from .altinstructions and .eh_frame
20033+ */
20034+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
20035+ EXIT_TEXT
20036+ . = ALIGN(16);
20037+ } :text.exit
20038+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
20039+
20040+ . = ALIGN(PAGE_SIZE);
20041+ INIT_DATA_SECTION(16) :init
20042
20043 /*
20044 * Code and data for a variety of lowlevel trampolines, to be
20045@@ -269,19 +349,12 @@ SECTIONS
20046 }
20047
20048 . = ALIGN(8);
20049- /*
20050- * .exit.text is discard at runtime, not link time, to deal with
20051- * references from .altinstructions and .eh_frame
20052- */
20053- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
20054- EXIT_TEXT
20055- }
20056
20057 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
20058 EXIT_DATA
20059 }
20060
20061-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
20062+#ifndef CONFIG_SMP
20063 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
20064 #endif
20065
20066@@ -300,16 +373,10 @@ SECTIONS
20067 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
20068 __smp_locks = .;
20069 *(.smp_locks)
20070- . = ALIGN(PAGE_SIZE);
20071 __smp_locks_end = .;
20072+ . = ALIGN(PAGE_SIZE);
20073 }
20074
20075-#ifdef CONFIG_X86_64
20076- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
20077- NOSAVE_DATA
20078- }
20079-#endif
20080-
20081 /* BSS */
20082 . = ALIGN(PAGE_SIZE);
20083 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
20084@@ -325,6 +392,7 @@ SECTIONS
20085 __brk_base = .;
20086 . += 64 * 1024; /* 64k alignment slop space */
20087 *(.brk_reservation) /* areas brk users have reserved */
20088+ . = ALIGN(HPAGE_SIZE);
20089 __brk_limit = .;
20090 }
20091
20092@@ -351,13 +419,12 @@ SECTIONS
20093 * for the boot processor.
20094 */
20095 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
20096-INIT_PER_CPU(gdt_page);
20097 INIT_PER_CPU(irq_stack_union);
20098
20099 /*
20100 * Build-time check on the image size:
20101 */
20102-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
20103+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
20104 "kernel image bigger than KERNEL_IMAGE_SIZE");
20105
20106 #ifdef CONFIG_SMP
20107diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
20108index b07ba93..a212969 100644
20109--- a/arch/x86/kernel/vsyscall_64.c
20110+++ b/arch/x86/kernel/vsyscall_64.c
20111@@ -57,15 +57,13 @@ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
20112 .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
20113 };
20114
20115-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
20116+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
20117
20118 static int __init vsyscall_setup(char *str)
20119 {
20120 if (str) {
20121 if (!strcmp("emulate", str))
20122 vsyscall_mode = EMULATE;
20123- else if (!strcmp("native", str))
20124- vsyscall_mode = NATIVE;
20125 else if (!strcmp("none", str))
20126 vsyscall_mode = NONE;
20127 else
20128@@ -207,7 +205,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
20129
20130 tsk = current;
20131 if (seccomp_mode(&tsk->seccomp))
20132- do_exit(SIGKILL);
20133+ do_group_exit(SIGKILL);
20134
20135 /*
20136 * With a real vsyscall, page faults cause SIGSEGV. We want to
20137@@ -279,8 +277,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
20138 return true;
20139
20140 sigsegv:
20141- force_sig(SIGSEGV, current);
20142- return true;
20143+ do_group_exit(SIGKILL);
20144 }
20145
20146 /*
20147@@ -333,10 +330,7 @@ void __init map_vsyscall(void)
20148 extern char __vvar_page;
20149 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
20150
20151- __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
20152- vsyscall_mode == NATIVE
20153- ? PAGE_KERNEL_VSYSCALL
20154- : PAGE_KERNEL_VVAR);
20155+ __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
20156 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
20157 (unsigned long)VSYSCALL_START);
20158
20159diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
20160index 9796c2f..f686fbf 100644
20161--- a/arch/x86/kernel/x8664_ksyms_64.c
20162+++ b/arch/x86/kernel/x8664_ksyms_64.c
20163@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
20164 EXPORT_SYMBOL(copy_user_generic_string);
20165 EXPORT_SYMBOL(copy_user_generic_unrolled);
20166 EXPORT_SYMBOL(__copy_user_nocache);
20167-EXPORT_SYMBOL(_copy_from_user);
20168-EXPORT_SYMBOL(_copy_to_user);
20169
20170 EXPORT_SYMBOL(copy_page);
20171 EXPORT_SYMBOL(clear_page);
20172diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
20173index 7110911..e8cdee5 100644
20174--- a/arch/x86/kernel/xsave.c
20175+++ b/arch/x86/kernel/xsave.c
20176@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
20177 fx_sw_user->xstate_size > fx_sw_user->extended_size)
20178 return -EINVAL;
20179
20180- err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
20181+ err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
20182 fx_sw_user->extended_size -
20183 FP_XSTATE_MAGIC2_SIZE));
20184 if (err)
20185@@ -266,7 +266,7 @@ fx_only:
20186 * the other extended state.
20187 */
20188 xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
20189- return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
20190+ return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
20191 }
20192
20193 /*
20194@@ -295,7 +295,7 @@ int restore_i387_xstate(void __user *buf)
20195 if (use_xsave())
20196 err = restore_user_xstate(buf);
20197 else
20198- err = fxrstor_checking((__force struct i387_fxsave_struct *)
20199+ err = fxrstor_checking((struct i387_fxsave_struct __force_kernel *)
20200 buf);
20201 if (unlikely(err)) {
20202 /*
20203diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
20204index 89b02bf..0f6511d 100644
20205--- a/arch/x86/kvm/cpuid.c
20206+++ b/arch/x86/kvm/cpuid.c
20207@@ -124,15 +124,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
20208 struct kvm_cpuid2 *cpuid,
20209 struct kvm_cpuid_entry2 __user *entries)
20210 {
20211- int r;
20212+ int r, i;
20213
20214 r = -E2BIG;
20215 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
20216 goto out;
20217 r = -EFAULT;
20218- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
20219- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20220+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20221 goto out;
20222+ for (i = 0; i < cpuid->nent; ++i) {
20223+ struct kvm_cpuid_entry2 cpuid_entry;
20224+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
20225+ goto out;
20226+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
20227+ }
20228 vcpu->arch.cpuid_nent = cpuid->nent;
20229 kvm_apic_set_version(vcpu);
20230 kvm_x86_ops->cpuid_update(vcpu);
20231@@ -147,15 +152,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
20232 struct kvm_cpuid2 *cpuid,
20233 struct kvm_cpuid_entry2 __user *entries)
20234 {
20235- int r;
20236+ int r, i;
20237
20238 r = -E2BIG;
20239 if (cpuid->nent < vcpu->arch.cpuid_nent)
20240 goto out;
20241 r = -EFAULT;
20242- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
20243- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20244+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20245 goto out;
20246+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
20247+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
20248+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
20249+ goto out;
20250+ }
20251 return 0;
20252
20253 out:
20254diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
20255index 0982507..7f6d72f 100644
20256--- a/arch/x86/kvm/emulate.c
20257+++ b/arch/x86/kvm/emulate.c
20258@@ -250,6 +250,7 @@ struct gprefix {
20259
20260 #define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype) \
20261 do { \
20262+ unsigned long _tmp; \
20263 __asm__ __volatile__ ( \
20264 _PRE_EFLAGS("0", "4", "2") \
20265 _op _suffix " %"_x"3,%1; " \
20266@@ -264,8 +265,6 @@ struct gprefix {
20267 /* Raw emulation: instruction has two explicit operands. */
20268 #define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy) \
20269 do { \
20270- unsigned long _tmp; \
20271- \
20272 switch ((ctxt)->dst.bytes) { \
20273 case 2: \
20274 ____emulate_2op(ctxt,_op,_wx,_wy,"w",u16); \
20275@@ -281,7 +280,6 @@ struct gprefix {
20276
20277 #define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
20278 do { \
20279- unsigned long _tmp; \
20280 switch ((ctxt)->dst.bytes) { \
20281 case 1: \
20282 ____emulate_2op(ctxt,_op,_bx,_by,"b",u8); \
20283diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
20284index cfdc6e0..ab92e84 100644
20285--- a/arch/x86/kvm/lapic.c
20286+++ b/arch/x86/kvm/lapic.c
20287@@ -54,7 +54,7 @@
20288 #define APIC_BUS_CYCLE_NS 1
20289
20290 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
20291-#define apic_debug(fmt, arg...)
20292+#define apic_debug(fmt, arg...) do {} while (0)
20293
20294 #define APIC_LVT_NUM 6
20295 /* 14 is the version for Xeon and Pentium 8.4.8*/
20296diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
20297index 1561028..0ed7f14 100644
20298--- a/arch/x86/kvm/paging_tmpl.h
20299+++ b/arch/x86/kvm/paging_tmpl.h
20300@@ -197,7 +197,7 @@ retry_walk:
20301 if (unlikely(kvm_is_error_hva(host_addr)))
20302 goto error;
20303
20304- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
20305+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
20306 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
20307 goto error;
20308
20309diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
20310index e385214..f8df033 100644
20311--- a/arch/x86/kvm/svm.c
20312+++ b/arch/x86/kvm/svm.c
20313@@ -3420,7 +3420,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
20314 int cpu = raw_smp_processor_id();
20315
20316 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
20317+
20318+ pax_open_kernel();
20319 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
20320+ pax_close_kernel();
20321+
20322 load_TR_desc();
20323 }
20324
20325@@ -3798,6 +3802,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
20326 #endif
20327 #endif
20328
20329+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20330+ __set_fs(current_thread_info()->addr_limit);
20331+#endif
20332+
20333 reload_tss(vcpu);
20334
20335 local_irq_disable();
20336diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
20337index 3b4c8d8..f457b63 100644
20338--- a/arch/x86/kvm/vmx.c
20339+++ b/arch/x86/kvm/vmx.c
20340@@ -1306,7 +1306,11 @@ static void reload_tss(void)
20341 struct desc_struct *descs;
20342
20343 descs = (void *)gdt->address;
20344+
20345+ pax_open_kernel();
20346 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
20347+ pax_close_kernel();
20348+
20349 load_TR_desc();
20350 }
20351
20352@@ -2631,8 +2635,11 @@ static __init int hardware_setup(void)
20353 if (!cpu_has_vmx_flexpriority())
20354 flexpriority_enabled = 0;
20355
20356- if (!cpu_has_vmx_tpr_shadow())
20357- kvm_x86_ops->update_cr8_intercept = NULL;
20358+ if (!cpu_has_vmx_tpr_shadow()) {
20359+ pax_open_kernel();
20360+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
20361+ pax_close_kernel();
20362+ }
20363
20364 if (enable_ept && !cpu_has_vmx_ept_2m_page())
20365 kvm_disable_largepages();
20366@@ -3648,7 +3655,7 @@ static void vmx_set_constant_host_state(void)
20367 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
20368
20369 asm("mov $.Lkvm_vmx_return, %0" : "=r"(tmpl));
20370- vmcs_writel(HOST_RIP, tmpl); /* 22.2.5 */
20371+ vmcs_writel(HOST_RIP, ktla_ktva(tmpl)); /* 22.2.5 */
20372
20373 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
20374 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
20375@@ -6184,6 +6191,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20376 "jmp .Lkvm_vmx_return \n\t"
20377 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
20378 ".Lkvm_vmx_return: "
20379+
20380+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20381+ "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
20382+ ".Lkvm_vmx_return2: "
20383+#endif
20384+
20385 /* Save guest registers, load host registers, keep flags */
20386 "mov %0, %c[wordsize](%%"R"sp) \n\t"
20387 "pop %0 \n\t"
20388@@ -6232,6 +6245,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20389 #endif
20390 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
20391 [wordsize]"i"(sizeof(ulong))
20392+
20393+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20394+ ,[cs]"i"(__KERNEL_CS)
20395+#endif
20396+
20397 : "cc", "memory"
20398 , R"ax", R"bx", R"di", R"si"
20399 #ifdef CONFIG_X86_64
20400@@ -6260,7 +6278,16 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20401 }
20402 }
20403
20404- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
20405+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
20406+
20407+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20408+ loadsegment(fs, __KERNEL_PERCPU);
20409+#endif
20410+
20411+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20412+ __set_fs(current_thread_info()->addr_limit);
20413+#endif
20414+
20415 vmx->loaded_vmcs->launched = 1;
20416
20417 vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
20418diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
20419index 9cbfc06..943ffa6 100644
20420--- a/arch/x86/kvm/x86.c
20421+++ b/arch/x86/kvm/x86.c
20422@@ -873,6 +873,7 @@ static int do_set_msr(struct kvm_vcpu *vcpu, unsigned index, u64 *data)
20423 return kvm_set_msr(vcpu, index, *data);
20424 }
20425
20426+static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) __size_overflow(2);
20427 static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock)
20428 {
20429 int version;
20430@@ -1307,12 +1308,13 @@ static int set_msr_mce(struct kvm_vcpu *vcpu, u32 msr, u64 data)
20431 return 0;
20432 }
20433
20434+static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data) __size_overflow(2);
20435 static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
20436 {
20437 struct kvm *kvm = vcpu->kvm;
20438 int lm = is_long_mode(vcpu);
20439- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20440- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20441+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20442+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20443 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
20444 : kvm->arch.xen_hvm_config.blob_size_32;
20445 u32 page_num = data & ~PAGE_MASK;
20446@@ -2145,6 +2147,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
20447 if (n < msr_list.nmsrs)
20448 goto out;
20449 r = -EFAULT;
20450+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
20451+ goto out;
20452 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
20453 num_msrs_to_save * sizeof(u32)))
20454 goto out;
20455@@ -2266,7 +2270,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
20456 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
20457 struct kvm_interrupt *irq)
20458 {
20459- if (irq->irq < 0 || irq->irq >= 256)
20460+ if (irq->irq >= 256)
20461 return -EINVAL;
20462 if (irqchip_in_kernel(vcpu->kvm))
20463 return -ENXIO;
20464@@ -3497,6 +3501,9 @@ gpa_t kvm_mmu_gva_to_gpa_system(struct kvm_vcpu *vcpu, gva_t gva,
20465
20466 static int kvm_read_guest_virt_helper(gva_t addr, void *val, unsigned int bytes,
20467 struct kvm_vcpu *vcpu, u32 access,
20468+ struct x86_exception *exception) __size_overflow(1,3);
20469+static int kvm_read_guest_virt_helper(gva_t addr, void *val, unsigned int bytes,
20470+ struct kvm_vcpu *vcpu, u32 access,
20471 struct x86_exception *exception)
20472 {
20473 void *data = val;
20474@@ -3528,6 +3535,9 @@ out:
20475 /* used for instruction fetching */
20476 static int kvm_fetch_guest_virt(struct x86_emulate_ctxt *ctxt,
20477 gva_t addr, void *val, unsigned int bytes,
20478+ struct x86_exception *exception) __size_overflow(2,4);
20479+static int kvm_fetch_guest_virt(struct x86_emulate_ctxt *ctxt,
20480+ gva_t addr, void *val, unsigned int bytes,
20481 struct x86_exception *exception)
20482 {
20483 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20484@@ -3552,6 +3562,9 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_virt);
20485
20486 static int kvm_read_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20487 gva_t addr, void *val, unsigned int bytes,
20488+ struct x86_exception *exception) __size_overflow(2,4);
20489+static int kvm_read_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20490+ gva_t addr, void *val, unsigned int bytes,
20491 struct x86_exception *exception)
20492 {
20493 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20494@@ -3665,12 +3678,16 @@ static int read_prepare(struct kvm_vcpu *vcpu, void *val, int bytes)
20495 }
20496
20497 static int read_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20498+ void *val, int bytes) __size_overflow(2);
20499+static int read_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20500 void *val, int bytes)
20501 {
20502 return !kvm_read_guest(vcpu->kvm, gpa, val, bytes);
20503 }
20504
20505 static int write_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20506+ void *val, int bytes) __size_overflow(2);
20507+static int write_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20508 void *val, int bytes)
20509 {
20510 return emulator_write_phys(vcpu, gpa, val, bytes);
20511@@ -3821,6 +3838,12 @@ static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
20512 const void *old,
20513 const void *new,
20514 unsigned int bytes,
20515+ struct x86_exception *exception) __size_overflow(5);
20516+static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
20517+ unsigned long addr,
20518+ const void *old,
20519+ const void *new,
20520+ unsigned int bytes,
20521 struct x86_exception *exception)
20522 {
20523 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20524@@ -4780,7 +4803,7 @@ static void kvm_set_mmio_spte_mask(void)
20525 kvm_mmu_set_mmio_spte_mask(mask);
20526 }
20527
20528-int kvm_arch_init(void *opaque)
20529+int kvm_arch_init(const void *opaque)
20530 {
20531 int r;
20532 struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
20533diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
20534index cb80c29..aeee86c 100644
20535--- a/arch/x86/kvm/x86.h
20536+++ b/arch/x86/kvm/x86.h
20537@@ -116,11 +116,11 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, u64 data);
20538
20539 int kvm_read_guest_virt(struct x86_emulate_ctxt *ctxt,
20540 gva_t addr, void *val, unsigned int bytes,
20541- struct x86_exception *exception);
20542+ struct x86_exception *exception) __size_overflow(2,4);
20543
20544 int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20545 gva_t addr, void *val, unsigned int bytes,
20546- struct x86_exception *exception);
20547+ struct x86_exception *exception) __size_overflow(2,4);
20548
20549 extern u64 host_xcr0;
20550
20551diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
20552index 642d880..44e0f3f 100644
20553--- a/arch/x86/lguest/boot.c
20554+++ b/arch/x86/lguest/boot.c
20555@@ -1200,9 +1200,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
20556 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
20557 * Launcher to reboot us.
20558 */
20559-static void lguest_restart(char *reason)
20560+static __noreturn void lguest_restart(char *reason)
20561 {
20562 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
20563+ BUG();
20564 }
20565
20566 /*G:050
20567diff --git a/arch/x86/lib/atomic64_32.c b/arch/x86/lib/atomic64_32.c
20568index 042f682..c92afb6 100644
20569--- a/arch/x86/lib/atomic64_32.c
20570+++ b/arch/x86/lib/atomic64_32.c
20571@@ -8,18 +8,30 @@
20572
20573 long long atomic64_read_cx8(long long, const atomic64_t *v);
20574 EXPORT_SYMBOL(atomic64_read_cx8);
20575+long long atomic64_read_unchecked_cx8(long long, const atomic64_unchecked_t *v);
20576+EXPORT_SYMBOL(atomic64_read_unchecked_cx8);
20577 long long atomic64_set_cx8(long long, const atomic64_t *v);
20578 EXPORT_SYMBOL(atomic64_set_cx8);
20579+long long atomic64_set_unchecked_cx8(long long, const atomic64_unchecked_t *v);
20580+EXPORT_SYMBOL(atomic64_set_unchecked_cx8);
20581 long long atomic64_xchg_cx8(long long, unsigned high);
20582 EXPORT_SYMBOL(atomic64_xchg_cx8);
20583 long long atomic64_add_return_cx8(long long a, atomic64_t *v);
20584 EXPORT_SYMBOL(atomic64_add_return_cx8);
20585+long long atomic64_add_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20586+EXPORT_SYMBOL(atomic64_add_return_unchecked_cx8);
20587 long long atomic64_sub_return_cx8(long long a, atomic64_t *v);
20588 EXPORT_SYMBOL(atomic64_sub_return_cx8);
20589+long long atomic64_sub_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20590+EXPORT_SYMBOL(atomic64_sub_return_unchecked_cx8);
20591 long long atomic64_inc_return_cx8(long long a, atomic64_t *v);
20592 EXPORT_SYMBOL(atomic64_inc_return_cx8);
20593+long long atomic64_inc_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20594+EXPORT_SYMBOL(atomic64_inc_return_unchecked_cx8);
20595 long long atomic64_dec_return_cx8(long long a, atomic64_t *v);
20596 EXPORT_SYMBOL(atomic64_dec_return_cx8);
20597+long long atomic64_dec_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20598+EXPORT_SYMBOL(atomic64_dec_return_unchecked_cx8);
20599 long long atomic64_dec_if_positive_cx8(atomic64_t *v);
20600 EXPORT_SYMBOL(atomic64_dec_if_positive_cx8);
20601 int atomic64_inc_not_zero_cx8(atomic64_t *v);
20602@@ -30,26 +42,46 @@ EXPORT_SYMBOL(atomic64_add_unless_cx8);
20603 #ifndef CONFIG_X86_CMPXCHG64
20604 long long atomic64_read_386(long long, const atomic64_t *v);
20605 EXPORT_SYMBOL(atomic64_read_386);
20606+long long atomic64_read_unchecked_386(long long, const atomic64_unchecked_t *v);
20607+EXPORT_SYMBOL(atomic64_read_unchecked_386);
20608 long long atomic64_set_386(long long, const atomic64_t *v);
20609 EXPORT_SYMBOL(atomic64_set_386);
20610+long long atomic64_set_unchecked_386(long long, const atomic64_unchecked_t *v);
20611+EXPORT_SYMBOL(atomic64_set_unchecked_386);
20612 long long atomic64_xchg_386(long long, unsigned high);
20613 EXPORT_SYMBOL(atomic64_xchg_386);
20614 long long atomic64_add_return_386(long long a, atomic64_t *v);
20615 EXPORT_SYMBOL(atomic64_add_return_386);
20616+long long atomic64_add_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20617+EXPORT_SYMBOL(atomic64_add_return_unchecked_386);
20618 long long atomic64_sub_return_386(long long a, atomic64_t *v);
20619 EXPORT_SYMBOL(atomic64_sub_return_386);
20620+long long atomic64_sub_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20621+EXPORT_SYMBOL(atomic64_sub_return_unchecked_386);
20622 long long atomic64_inc_return_386(long long a, atomic64_t *v);
20623 EXPORT_SYMBOL(atomic64_inc_return_386);
20624+long long atomic64_inc_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20625+EXPORT_SYMBOL(atomic64_inc_return_unchecked_386);
20626 long long atomic64_dec_return_386(long long a, atomic64_t *v);
20627 EXPORT_SYMBOL(atomic64_dec_return_386);
20628+long long atomic64_dec_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20629+EXPORT_SYMBOL(atomic64_dec_return_unchecked_386);
20630 long long atomic64_add_386(long long a, atomic64_t *v);
20631 EXPORT_SYMBOL(atomic64_add_386);
20632+long long atomic64_add_unchecked_386(long long a, atomic64_unchecked_t *v);
20633+EXPORT_SYMBOL(atomic64_add_unchecked_386);
20634 long long atomic64_sub_386(long long a, atomic64_t *v);
20635 EXPORT_SYMBOL(atomic64_sub_386);
20636+long long atomic64_sub_unchecked_386(long long a, atomic64_unchecked_t *v);
20637+EXPORT_SYMBOL(atomic64_sub_unchecked_386);
20638 long long atomic64_inc_386(long long a, atomic64_t *v);
20639 EXPORT_SYMBOL(atomic64_inc_386);
20640+long long atomic64_inc_unchecked_386(long long a, atomic64_unchecked_t *v);
20641+EXPORT_SYMBOL(atomic64_inc_unchecked_386);
20642 long long atomic64_dec_386(long long a, atomic64_t *v);
20643 EXPORT_SYMBOL(atomic64_dec_386);
20644+long long atomic64_dec_unchecked_386(long long a, atomic64_unchecked_t *v);
20645+EXPORT_SYMBOL(atomic64_dec_unchecked_386);
20646 long long atomic64_dec_if_positive_386(atomic64_t *v);
20647 EXPORT_SYMBOL(atomic64_dec_if_positive_386);
20648 int atomic64_inc_not_zero_386(atomic64_t *v);
20649diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
20650index e8e7e0d..56fd1b0 100644
20651--- a/arch/x86/lib/atomic64_386_32.S
20652+++ b/arch/x86/lib/atomic64_386_32.S
20653@@ -48,6 +48,10 @@ BEGIN(read)
20654 movl (v), %eax
20655 movl 4(v), %edx
20656 RET_ENDP
20657+BEGIN(read_unchecked)
20658+ movl (v), %eax
20659+ movl 4(v), %edx
20660+RET_ENDP
20661 #undef v
20662
20663 #define v %esi
20664@@ -55,6 +59,10 @@ BEGIN(set)
20665 movl %ebx, (v)
20666 movl %ecx, 4(v)
20667 RET_ENDP
20668+BEGIN(set_unchecked)
20669+ movl %ebx, (v)
20670+ movl %ecx, 4(v)
20671+RET_ENDP
20672 #undef v
20673
20674 #define v %esi
20675@@ -70,6 +78,20 @@ RET_ENDP
20676 BEGIN(add)
20677 addl %eax, (v)
20678 adcl %edx, 4(v)
20679+
20680+#ifdef CONFIG_PAX_REFCOUNT
20681+ jno 0f
20682+ subl %eax, (v)
20683+ sbbl %edx, 4(v)
20684+ int $4
20685+0:
20686+ _ASM_EXTABLE(0b, 0b)
20687+#endif
20688+
20689+RET_ENDP
20690+BEGIN(add_unchecked)
20691+ addl %eax, (v)
20692+ adcl %edx, 4(v)
20693 RET_ENDP
20694 #undef v
20695
20696@@ -77,6 +99,24 @@ RET_ENDP
20697 BEGIN(add_return)
20698 addl (v), %eax
20699 adcl 4(v), %edx
20700+
20701+#ifdef CONFIG_PAX_REFCOUNT
20702+ into
20703+1234:
20704+ _ASM_EXTABLE(1234b, 2f)
20705+#endif
20706+
20707+ movl %eax, (v)
20708+ movl %edx, 4(v)
20709+
20710+#ifdef CONFIG_PAX_REFCOUNT
20711+2:
20712+#endif
20713+
20714+RET_ENDP
20715+BEGIN(add_return_unchecked)
20716+ addl (v), %eax
20717+ adcl 4(v), %edx
20718 movl %eax, (v)
20719 movl %edx, 4(v)
20720 RET_ENDP
20721@@ -86,6 +126,20 @@ RET_ENDP
20722 BEGIN(sub)
20723 subl %eax, (v)
20724 sbbl %edx, 4(v)
20725+
20726+#ifdef CONFIG_PAX_REFCOUNT
20727+ jno 0f
20728+ addl %eax, (v)
20729+ adcl %edx, 4(v)
20730+ int $4
20731+0:
20732+ _ASM_EXTABLE(0b, 0b)
20733+#endif
20734+
20735+RET_ENDP
20736+BEGIN(sub_unchecked)
20737+ subl %eax, (v)
20738+ sbbl %edx, 4(v)
20739 RET_ENDP
20740 #undef v
20741
20742@@ -96,6 +150,27 @@ BEGIN(sub_return)
20743 sbbl $0, %edx
20744 addl (v), %eax
20745 adcl 4(v), %edx
20746+
20747+#ifdef CONFIG_PAX_REFCOUNT
20748+ into
20749+1234:
20750+ _ASM_EXTABLE(1234b, 2f)
20751+#endif
20752+
20753+ movl %eax, (v)
20754+ movl %edx, 4(v)
20755+
20756+#ifdef CONFIG_PAX_REFCOUNT
20757+2:
20758+#endif
20759+
20760+RET_ENDP
20761+BEGIN(sub_return_unchecked)
20762+ negl %edx
20763+ negl %eax
20764+ sbbl $0, %edx
20765+ addl (v), %eax
20766+ adcl 4(v), %edx
20767 movl %eax, (v)
20768 movl %edx, 4(v)
20769 RET_ENDP
20770@@ -105,6 +180,20 @@ RET_ENDP
20771 BEGIN(inc)
20772 addl $1, (v)
20773 adcl $0, 4(v)
20774+
20775+#ifdef CONFIG_PAX_REFCOUNT
20776+ jno 0f
20777+ subl $1, (v)
20778+ sbbl $0, 4(v)
20779+ int $4
20780+0:
20781+ _ASM_EXTABLE(0b, 0b)
20782+#endif
20783+
20784+RET_ENDP
20785+BEGIN(inc_unchecked)
20786+ addl $1, (v)
20787+ adcl $0, 4(v)
20788 RET_ENDP
20789 #undef v
20790
20791@@ -114,6 +203,26 @@ BEGIN(inc_return)
20792 movl 4(v), %edx
20793 addl $1, %eax
20794 adcl $0, %edx
20795+
20796+#ifdef CONFIG_PAX_REFCOUNT
20797+ into
20798+1234:
20799+ _ASM_EXTABLE(1234b, 2f)
20800+#endif
20801+
20802+ movl %eax, (v)
20803+ movl %edx, 4(v)
20804+
20805+#ifdef CONFIG_PAX_REFCOUNT
20806+2:
20807+#endif
20808+
20809+RET_ENDP
20810+BEGIN(inc_return_unchecked)
20811+ movl (v), %eax
20812+ movl 4(v), %edx
20813+ addl $1, %eax
20814+ adcl $0, %edx
20815 movl %eax, (v)
20816 movl %edx, 4(v)
20817 RET_ENDP
20818@@ -123,6 +232,20 @@ RET_ENDP
20819 BEGIN(dec)
20820 subl $1, (v)
20821 sbbl $0, 4(v)
20822+
20823+#ifdef CONFIG_PAX_REFCOUNT
20824+ jno 0f
20825+ addl $1, (v)
20826+ adcl $0, 4(v)
20827+ int $4
20828+0:
20829+ _ASM_EXTABLE(0b, 0b)
20830+#endif
20831+
20832+RET_ENDP
20833+BEGIN(dec_unchecked)
20834+ subl $1, (v)
20835+ sbbl $0, 4(v)
20836 RET_ENDP
20837 #undef v
20838
20839@@ -132,6 +255,26 @@ BEGIN(dec_return)
20840 movl 4(v), %edx
20841 subl $1, %eax
20842 sbbl $0, %edx
20843+
20844+#ifdef CONFIG_PAX_REFCOUNT
20845+ into
20846+1234:
20847+ _ASM_EXTABLE(1234b, 2f)
20848+#endif
20849+
20850+ movl %eax, (v)
20851+ movl %edx, 4(v)
20852+
20853+#ifdef CONFIG_PAX_REFCOUNT
20854+2:
20855+#endif
20856+
20857+RET_ENDP
20858+BEGIN(dec_return_unchecked)
20859+ movl (v), %eax
20860+ movl 4(v), %edx
20861+ subl $1, %eax
20862+ sbbl $0, %edx
20863 movl %eax, (v)
20864 movl %edx, 4(v)
20865 RET_ENDP
20866@@ -143,6 +286,13 @@ BEGIN(add_unless)
20867 adcl %edx, %edi
20868 addl (v), %eax
20869 adcl 4(v), %edx
20870+
20871+#ifdef CONFIG_PAX_REFCOUNT
20872+ into
20873+1234:
20874+ _ASM_EXTABLE(1234b, 2f)
20875+#endif
20876+
20877 cmpl %eax, %esi
20878 je 3f
20879 1:
20880@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
20881 1:
20882 addl $1, %eax
20883 adcl $0, %edx
20884+
20885+#ifdef CONFIG_PAX_REFCOUNT
20886+ into
20887+1234:
20888+ _ASM_EXTABLE(1234b, 2f)
20889+#endif
20890+
20891 movl %eax, (v)
20892 movl %edx, 4(v)
20893 movl $1, %eax
20894@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
20895 movl 4(v), %edx
20896 subl $1, %eax
20897 sbbl $0, %edx
20898+
20899+#ifdef CONFIG_PAX_REFCOUNT
20900+ into
20901+1234:
20902+ _ASM_EXTABLE(1234b, 1f)
20903+#endif
20904+
20905 js 1f
20906 movl %eax, (v)
20907 movl %edx, 4(v)
20908diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
20909index 391a083..d658e9f 100644
20910--- a/arch/x86/lib/atomic64_cx8_32.S
20911+++ b/arch/x86/lib/atomic64_cx8_32.S
20912@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
20913 CFI_STARTPROC
20914
20915 read64 %ecx
20916+ pax_force_retaddr
20917 ret
20918 CFI_ENDPROC
20919 ENDPROC(atomic64_read_cx8)
20920
20921+ENTRY(atomic64_read_unchecked_cx8)
20922+ CFI_STARTPROC
20923+
20924+ read64 %ecx
20925+ pax_force_retaddr
20926+ ret
20927+ CFI_ENDPROC
20928+ENDPROC(atomic64_read_unchecked_cx8)
20929+
20930 ENTRY(atomic64_set_cx8)
20931 CFI_STARTPROC
20932
20933@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
20934 cmpxchg8b (%esi)
20935 jne 1b
20936
20937+ pax_force_retaddr
20938 ret
20939 CFI_ENDPROC
20940 ENDPROC(atomic64_set_cx8)
20941
20942+ENTRY(atomic64_set_unchecked_cx8)
20943+ CFI_STARTPROC
20944+
20945+1:
20946+/* we don't need LOCK_PREFIX since aligned 64-bit writes
20947+ * are atomic on 586 and newer */
20948+ cmpxchg8b (%esi)
20949+ jne 1b
20950+
20951+ pax_force_retaddr
20952+ ret
20953+ CFI_ENDPROC
20954+ENDPROC(atomic64_set_unchecked_cx8)
20955+
20956 ENTRY(atomic64_xchg_cx8)
20957 CFI_STARTPROC
20958
20959@@ -62,12 +87,13 @@ ENTRY(atomic64_xchg_cx8)
20960 cmpxchg8b (%esi)
20961 jne 1b
20962
20963+ pax_force_retaddr
20964 ret
20965 CFI_ENDPROC
20966 ENDPROC(atomic64_xchg_cx8)
20967
20968-.macro addsub_return func ins insc
20969-ENTRY(atomic64_\func\()_return_cx8)
20970+.macro addsub_return func ins insc unchecked=""
20971+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
20972 CFI_STARTPROC
20973 SAVE ebp
20974 SAVE ebx
20975@@ -84,27 +110,44 @@ ENTRY(atomic64_\func\()_return_cx8)
20976 movl %edx, %ecx
20977 \ins\()l %esi, %ebx
20978 \insc\()l %edi, %ecx
20979+
20980+.ifb \unchecked
20981+#ifdef CONFIG_PAX_REFCOUNT
20982+ into
20983+2:
20984+ _ASM_EXTABLE(2b, 3f)
20985+#endif
20986+.endif
20987+
20988 LOCK_PREFIX
20989 cmpxchg8b (%ebp)
20990 jne 1b
20991-
20992-10:
20993 movl %ebx, %eax
20994 movl %ecx, %edx
20995+
20996+.ifb \unchecked
20997+#ifdef CONFIG_PAX_REFCOUNT
20998+3:
20999+#endif
21000+.endif
21001+
21002 RESTORE edi
21003 RESTORE esi
21004 RESTORE ebx
21005 RESTORE ebp
21006+ pax_force_retaddr
21007 ret
21008 CFI_ENDPROC
21009-ENDPROC(atomic64_\func\()_return_cx8)
21010+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
21011 .endm
21012
21013 addsub_return add add adc
21014 addsub_return sub sub sbb
21015+addsub_return add add adc _unchecked
21016+addsub_return sub sub sbb _unchecked
21017
21018-.macro incdec_return func ins insc
21019-ENTRY(atomic64_\func\()_return_cx8)
21020+.macro incdec_return func ins insc unchecked
21021+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
21022 CFI_STARTPROC
21023 SAVE ebx
21024
21025@@ -114,21 +157,39 @@ ENTRY(atomic64_\func\()_return_cx8)
21026 movl %edx, %ecx
21027 \ins\()l $1, %ebx
21028 \insc\()l $0, %ecx
21029+
21030+.ifb \unchecked
21031+#ifdef CONFIG_PAX_REFCOUNT
21032+ into
21033+2:
21034+ _ASM_EXTABLE(2b, 3f)
21035+#endif
21036+.endif
21037+
21038 LOCK_PREFIX
21039 cmpxchg8b (%esi)
21040 jne 1b
21041
21042-10:
21043 movl %ebx, %eax
21044 movl %ecx, %edx
21045+
21046+.ifb \unchecked
21047+#ifdef CONFIG_PAX_REFCOUNT
21048+3:
21049+#endif
21050+.endif
21051+
21052 RESTORE ebx
21053+ pax_force_retaddr
21054 ret
21055 CFI_ENDPROC
21056-ENDPROC(atomic64_\func\()_return_cx8)
21057+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
21058 .endm
21059
21060 incdec_return inc add adc
21061 incdec_return dec sub sbb
21062+incdec_return inc add adc _unchecked
21063+incdec_return dec sub sbb _unchecked
21064
21065 ENTRY(atomic64_dec_if_positive_cx8)
21066 CFI_STARTPROC
21067@@ -140,6 +201,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
21068 movl %edx, %ecx
21069 subl $1, %ebx
21070 sbb $0, %ecx
21071+
21072+#ifdef CONFIG_PAX_REFCOUNT
21073+ into
21074+1234:
21075+ _ASM_EXTABLE(1234b, 2f)
21076+#endif
21077+
21078 js 2f
21079 LOCK_PREFIX
21080 cmpxchg8b (%esi)
21081@@ -149,6 +217,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
21082 movl %ebx, %eax
21083 movl %ecx, %edx
21084 RESTORE ebx
21085+ pax_force_retaddr
21086 ret
21087 CFI_ENDPROC
21088 ENDPROC(atomic64_dec_if_positive_cx8)
21089@@ -174,6 +243,13 @@ ENTRY(atomic64_add_unless_cx8)
21090 movl %edx, %ecx
21091 addl %esi, %ebx
21092 adcl %edi, %ecx
21093+
21094+#ifdef CONFIG_PAX_REFCOUNT
21095+ into
21096+1234:
21097+ _ASM_EXTABLE(1234b, 3f)
21098+#endif
21099+
21100 LOCK_PREFIX
21101 cmpxchg8b (%ebp)
21102 jne 1b
21103@@ -184,6 +260,7 @@ ENTRY(atomic64_add_unless_cx8)
21104 CFI_ADJUST_CFA_OFFSET -8
21105 RESTORE ebx
21106 RESTORE ebp
21107+ pax_force_retaddr
21108 ret
21109 4:
21110 cmpl %edx, 4(%esp)
21111@@ -206,6 +283,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
21112 movl %edx, %ecx
21113 addl $1, %ebx
21114 adcl $0, %ecx
21115+
21116+#ifdef CONFIG_PAX_REFCOUNT
21117+ into
21118+1234:
21119+ _ASM_EXTABLE(1234b, 3f)
21120+#endif
21121+
21122 LOCK_PREFIX
21123 cmpxchg8b (%esi)
21124 jne 1b
21125@@ -213,6 +297,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
21126 movl $1, %eax
21127 3:
21128 RESTORE ebx
21129+ pax_force_retaddr
21130 ret
21131 4:
21132 testl %edx, %edx
21133diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
21134index 78d16a5..fbcf666 100644
21135--- a/arch/x86/lib/checksum_32.S
21136+++ b/arch/x86/lib/checksum_32.S
21137@@ -28,7 +28,8 @@
21138 #include <linux/linkage.h>
21139 #include <asm/dwarf2.h>
21140 #include <asm/errno.h>
21141-
21142+#include <asm/segment.h>
21143+
21144 /*
21145 * computes a partial checksum, e.g. for TCP/UDP fragments
21146 */
21147@@ -296,9 +297,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
21148
21149 #define ARGBASE 16
21150 #define FP 12
21151-
21152-ENTRY(csum_partial_copy_generic)
21153+
21154+ENTRY(csum_partial_copy_generic_to_user)
21155 CFI_STARTPROC
21156+
21157+#ifdef CONFIG_PAX_MEMORY_UDEREF
21158+ pushl_cfi %gs
21159+ popl_cfi %es
21160+ jmp csum_partial_copy_generic
21161+#endif
21162+
21163+ENTRY(csum_partial_copy_generic_from_user)
21164+
21165+#ifdef CONFIG_PAX_MEMORY_UDEREF
21166+ pushl_cfi %gs
21167+ popl_cfi %ds
21168+#endif
21169+
21170+ENTRY(csum_partial_copy_generic)
21171 subl $4,%esp
21172 CFI_ADJUST_CFA_OFFSET 4
21173 pushl_cfi %edi
21174@@ -320,7 +336,7 @@ ENTRY(csum_partial_copy_generic)
21175 jmp 4f
21176 SRC(1: movw (%esi), %bx )
21177 addl $2, %esi
21178-DST( movw %bx, (%edi) )
21179+DST( movw %bx, %es:(%edi) )
21180 addl $2, %edi
21181 addw %bx, %ax
21182 adcl $0, %eax
21183@@ -332,30 +348,30 @@ DST( movw %bx, (%edi) )
21184 SRC(1: movl (%esi), %ebx )
21185 SRC( movl 4(%esi), %edx )
21186 adcl %ebx, %eax
21187-DST( movl %ebx, (%edi) )
21188+DST( movl %ebx, %es:(%edi) )
21189 adcl %edx, %eax
21190-DST( movl %edx, 4(%edi) )
21191+DST( movl %edx, %es:4(%edi) )
21192
21193 SRC( movl 8(%esi), %ebx )
21194 SRC( movl 12(%esi), %edx )
21195 adcl %ebx, %eax
21196-DST( movl %ebx, 8(%edi) )
21197+DST( movl %ebx, %es:8(%edi) )
21198 adcl %edx, %eax
21199-DST( movl %edx, 12(%edi) )
21200+DST( movl %edx, %es:12(%edi) )
21201
21202 SRC( movl 16(%esi), %ebx )
21203 SRC( movl 20(%esi), %edx )
21204 adcl %ebx, %eax
21205-DST( movl %ebx, 16(%edi) )
21206+DST( movl %ebx, %es:16(%edi) )
21207 adcl %edx, %eax
21208-DST( movl %edx, 20(%edi) )
21209+DST( movl %edx, %es:20(%edi) )
21210
21211 SRC( movl 24(%esi), %ebx )
21212 SRC( movl 28(%esi), %edx )
21213 adcl %ebx, %eax
21214-DST( movl %ebx, 24(%edi) )
21215+DST( movl %ebx, %es:24(%edi) )
21216 adcl %edx, %eax
21217-DST( movl %edx, 28(%edi) )
21218+DST( movl %edx, %es:28(%edi) )
21219
21220 lea 32(%esi), %esi
21221 lea 32(%edi), %edi
21222@@ -369,7 +385,7 @@ DST( movl %edx, 28(%edi) )
21223 shrl $2, %edx # This clears CF
21224 SRC(3: movl (%esi), %ebx )
21225 adcl %ebx, %eax
21226-DST( movl %ebx, (%edi) )
21227+DST( movl %ebx, %es:(%edi) )
21228 lea 4(%esi), %esi
21229 lea 4(%edi), %edi
21230 dec %edx
21231@@ -381,12 +397,12 @@ DST( movl %ebx, (%edi) )
21232 jb 5f
21233 SRC( movw (%esi), %cx )
21234 leal 2(%esi), %esi
21235-DST( movw %cx, (%edi) )
21236+DST( movw %cx, %es:(%edi) )
21237 leal 2(%edi), %edi
21238 je 6f
21239 shll $16,%ecx
21240 SRC(5: movb (%esi), %cl )
21241-DST( movb %cl, (%edi) )
21242+DST( movb %cl, %es:(%edi) )
21243 6: addl %ecx, %eax
21244 adcl $0, %eax
21245 7:
21246@@ -397,7 +413,7 @@ DST( movb %cl, (%edi) )
21247
21248 6001:
21249 movl ARGBASE+20(%esp), %ebx # src_err_ptr
21250- movl $-EFAULT, (%ebx)
21251+ movl $-EFAULT, %ss:(%ebx)
21252
21253 # zero the complete destination - computing the rest
21254 # is too much work
21255@@ -410,11 +426,15 @@ DST( movb %cl, (%edi) )
21256
21257 6002:
21258 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21259- movl $-EFAULT,(%ebx)
21260+ movl $-EFAULT,%ss:(%ebx)
21261 jmp 5000b
21262
21263 .previous
21264
21265+ pushl_cfi %ss
21266+ popl_cfi %ds
21267+ pushl_cfi %ss
21268+ popl_cfi %es
21269 popl_cfi %ebx
21270 CFI_RESTORE ebx
21271 popl_cfi %esi
21272@@ -424,26 +444,43 @@ DST( movb %cl, (%edi) )
21273 popl_cfi %ecx # equivalent to addl $4,%esp
21274 ret
21275 CFI_ENDPROC
21276-ENDPROC(csum_partial_copy_generic)
21277+ENDPROC(csum_partial_copy_generic_to_user)
21278
21279 #else
21280
21281 /* Version for PentiumII/PPro */
21282
21283 #define ROUND1(x) \
21284+ nop; nop; nop; \
21285 SRC(movl x(%esi), %ebx ) ; \
21286 addl %ebx, %eax ; \
21287- DST(movl %ebx, x(%edi) ) ;
21288+ DST(movl %ebx, %es:x(%edi)) ;
21289
21290 #define ROUND(x) \
21291+ nop; nop; nop; \
21292 SRC(movl x(%esi), %ebx ) ; \
21293 adcl %ebx, %eax ; \
21294- DST(movl %ebx, x(%edi) ) ;
21295+ DST(movl %ebx, %es:x(%edi)) ;
21296
21297 #define ARGBASE 12
21298-
21299-ENTRY(csum_partial_copy_generic)
21300+
21301+ENTRY(csum_partial_copy_generic_to_user)
21302 CFI_STARTPROC
21303+
21304+#ifdef CONFIG_PAX_MEMORY_UDEREF
21305+ pushl_cfi %gs
21306+ popl_cfi %es
21307+ jmp csum_partial_copy_generic
21308+#endif
21309+
21310+ENTRY(csum_partial_copy_generic_from_user)
21311+
21312+#ifdef CONFIG_PAX_MEMORY_UDEREF
21313+ pushl_cfi %gs
21314+ popl_cfi %ds
21315+#endif
21316+
21317+ENTRY(csum_partial_copy_generic)
21318 pushl_cfi %ebx
21319 CFI_REL_OFFSET ebx, 0
21320 pushl_cfi %edi
21321@@ -464,7 +501,7 @@ ENTRY(csum_partial_copy_generic)
21322 subl %ebx, %edi
21323 lea -1(%esi),%edx
21324 andl $-32,%edx
21325- lea 3f(%ebx,%ebx), %ebx
21326+ lea 3f(%ebx,%ebx,2), %ebx
21327 testl %esi, %esi
21328 jmp *%ebx
21329 1: addl $64,%esi
21330@@ -485,19 +522,19 @@ ENTRY(csum_partial_copy_generic)
21331 jb 5f
21332 SRC( movw (%esi), %dx )
21333 leal 2(%esi), %esi
21334-DST( movw %dx, (%edi) )
21335+DST( movw %dx, %es:(%edi) )
21336 leal 2(%edi), %edi
21337 je 6f
21338 shll $16,%edx
21339 5:
21340 SRC( movb (%esi), %dl )
21341-DST( movb %dl, (%edi) )
21342+DST( movb %dl, %es:(%edi) )
21343 6: addl %edx, %eax
21344 adcl $0, %eax
21345 7:
21346 .section .fixup, "ax"
21347 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
21348- movl $-EFAULT, (%ebx)
21349+ movl $-EFAULT, %ss:(%ebx)
21350 # zero the complete destination (computing the rest is too much work)
21351 movl ARGBASE+8(%esp),%edi # dst
21352 movl ARGBASE+12(%esp),%ecx # len
21353@@ -505,10 +542,17 @@ DST( movb %dl, (%edi) )
21354 rep; stosb
21355 jmp 7b
21356 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21357- movl $-EFAULT, (%ebx)
21358+ movl $-EFAULT, %ss:(%ebx)
21359 jmp 7b
21360 .previous
21361
21362+#ifdef CONFIG_PAX_MEMORY_UDEREF
21363+ pushl_cfi %ss
21364+ popl_cfi %ds
21365+ pushl_cfi %ss
21366+ popl_cfi %es
21367+#endif
21368+
21369 popl_cfi %esi
21370 CFI_RESTORE esi
21371 popl_cfi %edi
21372@@ -517,7 +561,7 @@ DST( movb %dl, (%edi) )
21373 CFI_RESTORE ebx
21374 ret
21375 CFI_ENDPROC
21376-ENDPROC(csum_partial_copy_generic)
21377+ENDPROC(csum_partial_copy_generic_to_user)
21378
21379 #undef ROUND
21380 #undef ROUND1
21381diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
21382index f2145cf..cea889d 100644
21383--- a/arch/x86/lib/clear_page_64.S
21384+++ b/arch/x86/lib/clear_page_64.S
21385@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
21386 movl $4096/8,%ecx
21387 xorl %eax,%eax
21388 rep stosq
21389+ pax_force_retaddr
21390 ret
21391 CFI_ENDPROC
21392 ENDPROC(clear_page_c)
21393@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
21394 movl $4096,%ecx
21395 xorl %eax,%eax
21396 rep stosb
21397+ pax_force_retaddr
21398 ret
21399 CFI_ENDPROC
21400 ENDPROC(clear_page_c_e)
21401@@ -43,6 +45,7 @@ ENTRY(clear_page)
21402 leaq 64(%rdi),%rdi
21403 jnz .Lloop
21404 nop
21405+ pax_force_retaddr
21406 ret
21407 CFI_ENDPROC
21408 .Lclear_page_end:
21409@@ -58,7 +61,7 @@ ENDPROC(clear_page)
21410
21411 #include <asm/cpufeature.h>
21412
21413- .section .altinstr_replacement,"ax"
21414+ .section .altinstr_replacement,"a"
21415 1: .byte 0xeb /* jmp <disp8> */
21416 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
21417 2: .byte 0xeb /* jmp <disp8> */
21418diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
21419index 1e572c5..2a162cd 100644
21420--- a/arch/x86/lib/cmpxchg16b_emu.S
21421+++ b/arch/x86/lib/cmpxchg16b_emu.S
21422@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
21423
21424 popf
21425 mov $1, %al
21426+ pax_force_retaddr
21427 ret
21428
21429 not_same:
21430 popf
21431 xor %al,%al
21432+ pax_force_retaddr
21433 ret
21434
21435 CFI_ENDPROC
21436diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
21437index 01c805b..dccb07f 100644
21438--- a/arch/x86/lib/copy_page_64.S
21439+++ b/arch/x86/lib/copy_page_64.S
21440@@ -9,6 +9,7 @@ copy_page_c:
21441 CFI_STARTPROC
21442 movl $4096/8,%ecx
21443 rep movsq
21444+ pax_force_retaddr
21445 ret
21446 CFI_ENDPROC
21447 ENDPROC(copy_page_c)
21448@@ -39,7 +40,7 @@ ENTRY(copy_page)
21449 movq 16 (%rsi), %rdx
21450 movq 24 (%rsi), %r8
21451 movq 32 (%rsi), %r9
21452- movq 40 (%rsi), %r10
21453+ movq 40 (%rsi), %r13
21454 movq 48 (%rsi), %r11
21455 movq 56 (%rsi), %r12
21456
21457@@ -50,7 +51,7 @@ ENTRY(copy_page)
21458 movq %rdx, 16 (%rdi)
21459 movq %r8, 24 (%rdi)
21460 movq %r9, 32 (%rdi)
21461- movq %r10, 40 (%rdi)
21462+ movq %r13, 40 (%rdi)
21463 movq %r11, 48 (%rdi)
21464 movq %r12, 56 (%rdi)
21465
21466@@ -69,7 +70,7 @@ ENTRY(copy_page)
21467 movq 16 (%rsi), %rdx
21468 movq 24 (%rsi), %r8
21469 movq 32 (%rsi), %r9
21470- movq 40 (%rsi), %r10
21471+ movq 40 (%rsi), %r13
21472 movq 48 (%rsi), %r11
21473 movq 56 (%rsi), %r12
21474
21475@@ -78,7 +79,7 @@ ENTRY(copy_page)
21476 movq %rdx, 16 (%rdi)
21477 movq %r8, 24 (%rdi)
21478 movq %r9, 32 (%rdi)
21479- movq %r10, 40 (%rdi)
21480+ movq %r13, 40 (%rdi)
21481 movq %r11, 48 (%rdi)
21482 movq %r12, 56 (%rdi)
21483
21484@@ -95,6 +96,7 @@ ENTRY(copy_page)
21485 CFI_RESTORE r13
21486 addq $3*8,%rsp
21487 CFI_ADJUST_CFA_OFFSET -3*8
21488+ pax_force_retaddr
21489 ret
21490 .Lcopy_page_end:
21491 CFI_ENDPROC
21492@@ -105,7 +107,7 @@ ENDPROC(copy_page)
21493
21494 #include <asm/cpufeature.h>
21495
21496- .section .altinstr_replacement,"ax"
21497+ .section .altinstr_replacement,"a"
21498 1: .byte 0xeb /* jmp <disp8> */
21499 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
21500 2:
21501diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
21502index 0248402..821c786 100644
21503--- a/arch/x86/lib/copy_user_64.S
21504+++ b/arch/x86/lib/copy_user_64.S
21505@@ -16,6 +16,7 @@
21506 #include <asm/thread_info.h>
21507 #include <asm/cpufeature.h>
21508 #include <asm/alternative-asm.h>
21509+#include <asm/pgtable.h>
21510
21511 /*
21512 * By placing feature2 after feature1 in altinstructions section, we logically
21513@@ -29,7 +30,7 @@
21514 .byte 0xe9 /* 32bit jump */
21515 .long \orig-1f /* by default jump to orig */
21516 1:
21517- .section .altinstr_replacement,"ax"
21518+ .section .altinstr_replacement,"a"
21519 2: .byte 0xe9 /* near jump with 32bit immediate */
21520 .long \alt1-1b /* offset */ /* or alternatively to alt1 */
21521 3: .byte 0xe9 /* near jump with 32bit immediate */
21522@@ -71,47 +72,20 @@
21523 #endif
21524 .endm
21525
21526-/* Standard copy_to_user with segment limit checking */
21527-ENTRY(_copy_to_user)
21528- CFI_STARTPROC
21529- GET_THREAD_INFO(%rax)
21530- movq %rdi,%rcx
21531- addq %rdx,%rcx
21532- jc bad_to_user
21533- cmpq TI_addr_limit(%rax),%rcx
21534- ja bad_to_user
21535- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21536- copy_user_generic_unrolled,copy_user_generic_string, \
21537- copy_user_enhanced_fast_string
21538- CFI_ENDPROC
21539-ENDPROC(_copy_to_user)
21540-
21541-/* Standard copy_from_user with segment limit checking */
21542-ENTRY(_copy_from_user)
21543- CFI_STARTPROC
21544- GET_THREAD_INFO(%rax)
21545- movq %rsi,%rcx
21546- addq %rdx,%rcx
21547- jc bad_from_user
21548- cmpq TI_addr_limit(%rax),%rcx
21549- ja bad_from_user
21550- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21551- copy_user_generic_unrolled,copy_user_generic_string, \
21552- copy_user_enhanced_fast_string
21553- CFI_ENDPROC
21554-ENDPROC(_copy_from_user)
21555-
21556 .section .fixup,"ax"
21557 /* must zero dest */
21558 ENTRY(bad_from_user)
21559 bad_from_user:
21560 CFI_STARTPROC
21561+ testl %edx,%edx
21562+ js bad_to_user
21563 movl %edx,%ecx
21564 xorl %eax,%eax
21565 rep
21566 stosb
21567 bad_to_user:
21568 movl %edx,%eax
21569+ pax_force_retaddr
21570 ret
21571 CFI_ENDPROC
21572 ENDPROC(bad_from_user)
21573@@ -141,19 +115,19 @@ ENTRY(copy_user_generic_unrolled)
21574 jz 17f
21575 1: movq (%rsi),%r8
21576 2: movq 1*8(%rsi),%r9
21577-3: movq 2*8(%rsi),%r10
21578+3: movq 2*8(%rsi),%rax
21579 4: movq 3*8(%rsi),%r11
21580 5: movq %r8,(%rdi)
21581 6: movq %r9,1*8(%rdi)
21582-7: movq %r10,2*8(%rdi)
21583+7: movq %rax,2*8(%rdi)
21584 8: movq %r11,3*8(%rdi)
21585 9: movq 4*8(%rsi),%r8
21586 10: movq 5*8(%rsi),%r9
21587-11: movq 6*8(%rsi),%r10
21588+11: movq 6*8(%rsi),%rax
21589 12: movq 7*8(%rsi),%r11
21590 13: movq %r8,4*8(%rdi)
21591 14: movq %r9,5*8(%rdi)
21592-15: movq %r10,6*8(%rdi)
21593+15: movq %rax,6*8(%rdi)
21594 16: movq %r11,7*8(%rdi)
21595 leaq 64(%rsi),%rsi
21596 leaq 64(%rdi),%rdi
21597@@ -179,6 +153,7 @@ ENTRY(copy_user_generic_unrolled)
21598 decl %ecx
21599 jnz 21b
21600 23: xor %eax,%eax
21601+ pax_force_retaddr
21602 ret
21603
21604 .section .fixup,"ax"
21605@@ -251,6 +226,7 @@ ENTRY(copy_user_generic_string)
21606 3: rep
21607 movsb
21608 4: xorl %eax,%eax
21609+ pax_force_retaddr
21610 ret
21611
21612 .section .fixup,"ax"
21613@@ -287,6 +263,7 @@ ENTRY(copy_user_enhanced_fast_string)
21614 1: rep
21615 movsb
21616 2: xorl %eax,%eax
21617+ pax_force_retaddr
21618 ret
21619
21620 .section .fixup,"ax"
21621diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
21622index cb0c112..e3a6895 100644
21623--- a/arch/x86/lib/copy_user_nocache_64.S
21624+++ b/arch/x86/lib/copy_user_nocache_64.S
21625@@ -8,12 +8,14 @@
21626
21627 #include <linux/linkage.h>
21628 #include <asm/dwarf2.h>
21629+#include <asm/alternative-asm.h>
21630
21631 #define FIX_ALIGNMENT 1
21632
21633 #include <asm/current.h>
21634 #include <asm/asm-offsets.h>
21635 #include <asm/thread_info.h>
21636+#include <asm/pgtable.h>
21637
21638 .macro ALIGN_DESTINATION
21639 #ifdef FIX_ALIGNMENT
21640@@ -50,6 +52,15 @@
21641 */
21642 ENTRY(__copy_user_nocache)
21643 CFI_STARTPROC
21644+
21645+#ifdef CONFIG_PAX_MEMORY_UDEREF
21646+ mov $PAX_USER_SHADOW_BASE,%rcx
21647+ cmp %rcx,%rsi
21648+ jae 1f
21649+ add %rcx,%rsi
21650+1:
21651+#endif
21652+
21653 cmpl $8,%edx
21654 jb 20f /* less then 8 bytes, go to byte copy loop */
21655 ALIGN_DESTINATION
21656@@ -59,19 +70,19 @@ ENTRY(__copy_user_nocache)
21657 jz 17f
21658 1: movq (%rsi),%r8
21659 2: movq 1*8(%rsi),%r9
21660-3: movq 2*8(%rsi),%r10
21661+3: movq 2*8(%rsi),%rax
21662 4: movq 3*8(%rsi),%r11
21663 5: movnti %r8,(%rdi)
21664 6: movnti %r9,1*8(%rdi)
21665-7: movnti %r10,2*8(%rdi)
21666+7: movnti %rax,2*8(%rdi)
21667 8: movnti %r11,3*8(%rdi)
21668 9: movq 4*8(%rsi),%r8
21669 10: movq 5*8(%rsi),%r9
21670-11: movq 6*8(%rsi),%r10
21671+11: movq 6*8(%rsi),%rax
21672 12: movq 7*8(%rsi),%r11
21673 13: movnti %r8,4*8(%rdi)
21674 14: movnti %r9,5*8(%rdi)
21675-15: movnti %r10,6*8(%rdi)
21676+15: movnti %rax,6*8(%rdi)
21677 16: movnti %r11,7*8(%rdi)
21678 leaq 64(%rsi),%rsi
21679 leaq 64(%rdi),%rdi
21680@@ -98,6 +109,7 @@ ENTRY(__copy_user_nocache)
21681 jnz 21b
21682 23: xorl %eax,%eax
21683 sfence
21684+ pax_force_retaddr
21685 ret
21686
21687 .section .fixup,"ax"
21688diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
21689index fb903b7..c92b7f7 100644
21690--- a/arch/x86/lib/csum-copy_64.S
21691+++ b/arch/x86/lib/csum-copy_64.S
21692@@ -8,6 +8,7 @@
21693 #include <linux/linkage.h>
21694 #include <asm/dwarf2.h>
21695 #include <asm/errno.h>
21696+#include <asm/alternative-asm.h>
21697
21698 /*
21699 * Checksum copy with exception handling.
21700@@ -228,6 +229,7 @@ ENTRY(csum_partial_copy_generic)
21701 CFI_RESTORE rbp
21702 addq $7*8, %rsp
21703 CFI_ADJUST_CFA_OFFSET -7*8
21704+ pax_force_retaddr 0, 1
21705 ret
21706 CFI_RESTORE_STATE
21707
21708diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
21709index 459b58a..9570bc7 100644
21710--- a/arch/x86/lib/csum-wrappers_64.c
21711+++ b/arch/x86/lib/csum-wrappers_64.c
21712@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
21713 len -= 2;
21714 }
21715 }
21716- isum = csum_partial_copy_generic((__force const void *)src,
21717+
21718+#ifdef CONFIG_PAX_MEMORY_UDEREF
21719+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
21720+ src += PAX_USER_SHADOW_BASE;
21721+#endif
21722+
21723+ isum = csum_partial_copy_generic((const void __force_kernel *)src,
21724 dst, len, isum, errp, NULL);
21725 if (unlikely(*errp))
21726 goto out_err;
21727@@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
21728 }
21729
21730 *errp = 0;
21731- return csum_partial_copy_generic(src, (void __force *)dst,
21732+
21733+#ifdef CONFIG_PAX_MEMORY_UDEREF
21734+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
21735+ dst += PAX_USER_SHADOW_BASE;
21736+#endif
21737+
21738+ return csum_partial_copy_generic(src, (void __force_kernel *)dst,
21739 len, isum, NULL, errp);
21740 }
21741 EXPORT_SYMBOL(csum_partial_copy_to_user);
21742diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
21743index 51f1504..ddac4c1 100644
21744--- a/arch/x86/lib/getuser.S
21745+++ b/arch/x86/lib/getuser.S
21746@@ -33,15 +33,38 @@
21747 #include <asm/asm-offsets.h>
21748 #include <asm/thread_info.h>
21749 #include <asm/asm.h>
21750+#include <asm/segment.h>
21751+#include <asm/pgtable.h>
21752+#include <asm/alternative-asm.h>
21753+
21754+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
21755+#define __copyuser_seg gs;
21756+#else
21757+#define __copyuser_seg
21758+#endif
21759
21760 .text
21761 ENTRY(__get_user_1)
21762 CFI_STARTPROC
21763+
21764+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21765 GET_THREAD_INFO(%_ASM_DX)
21766 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21767 jae bad_get_user
21768-1: movzb (%_ASM_AX),%edx
21769+
21770+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21771+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21772+ cmp %_ASM_DX,%_ASM_AX
21773+ jae 1234f
21774+ add %_ASM_DX,%_ASM_AX
21775+1234:
21776+#endif
21777+
21778+#endif
21779+
21780+1: __copyuser_seg movzb (%_ASM_AX),%edx
21781 xor %eax,%eax
21782+ pax_force_retaddr
21783 ret
21784 CFI_ENDPROC
21785 ENDPROC(__get_user_1)
21786@@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
21787 ENTRY(__get_user_2)
21788 CFI_STARTPROC
21789 add $1,%_ASM_AX
21790+
21791+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21792 jc bad_get_user
21793 GET_THREAD_INFO(%_ASM_DX)
21794 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21795 jae bad_get_user
21796-2: movzwl -1(%_ASM_AX),%edx
21797+
21798+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21799+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21800+ cmp %_ASM_DX,%_ASM_AX
21801+ jae 1234f
21802+ add %_ASM_DX,%_ASM_AX
21803+1234:
21804+#endif
21805+
21806+#endif
21807+
21808+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
21809 xor %eax,%eax
21810+ pax_force_retaddr
21811 ret
21812 CFI_ENDPROC
21813 ENDPROC(__get_user_2)
21814@@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
21815 ENTRY(__get_user_4)
21816 CFI_STARTPROC
21817 add $3,%_ASM_AX
21818+
21819+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21820 jc bad_get_user
21821 GET_THREAD_INFO(%_ASM_DX)
21822 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21823 jae bad_get_user
21824-3: mov -3(%_ASM_AX),%edx
21825+
21826+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21827+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21828+ cmp %_ASM_DX,%_ASM_AX
21829+ jae 1234f
21830+ add %_ASM_DX,%_ASM_AX
21831+1234:
21832+#endif
21833+
21834+#endif
21835+
21836+3: __copyuser_seg mov -3(%_ASM_AX),%edx
21837 xor %eax,%eax
21838+ pax_force_retaddr
21839 ret
21840 CFI_ENDPROC
21841 ENDPROC(__get_user_4)
21842@@ -80,8 +131,18 @@ ENTRY(__get_user_8)
21843 GET_THREAD_INFO(%_ASM_DX)
21844 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21845 jae bad_get_user
21846+
21847+#ifdef CONFIG_PAX_MEMORY_UDEREF
21848+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21849+ cmp %_ASM_DX,%_ASM_AX
21850+ jae 1234f
21851+ add %_ASM_DX,%_ASM_AX
21852+1234:
21853+#endif
21854+
21855 4: movq -7(%_ASM_AX),%_ASM_DX
21856 xor %eax,%eax
21857+ pax_force_retaddr
21858 ret
21859 CFI_ENDPROC
21860 ENDPROC(__get_user_8)
21861@@ -91,6 +152,7 @@ bad_get_user:
21862 CFI_STARTPROC
21863 xor %edx,%edx
21864 mov $(-EFAULT),%_ASM_AX
21865+ pax_force_retaddr
21866 ret
21867 CFI_ENDPROC
21868 END(bad_get_user)
21869diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
21870index 5a1f9f3..ba9f577 100644
21871--- a/arch/x86/lib/insn.c
21872+++ b/arch/x86/lib/insn.c
21873@@ -21,6 +21,11 @@
21874 #include <linux/string.h>
21875 #include <asm/inat.h>
21876 #include <asm/insn.h>
21877+#ifdef __KERNEL__
21878+#include <asm/pgtable_types.h>
21879+#else
21880+#define ktla_ktva(addr) addr
21881+#endif
21882
21883 /* Verify next sizeof(t) bytes can be on the same instruction */
21884 #define validate_next(t, insn, n) \
21885@@ -49,8 +54,8 @@
21886 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
21887 {
21888 memset(insn, 0, sizeof(*insn));
21889- insn->kaddr = kaddr;
21890- insn->next_byte = kaddr;
21891+ insn->kaddr = ktla_ktva(kaddr);
21892+ insn->next_byte = ktla_ktva(kaddr);
21893 insn->x86_64 = x86_64 ? 1 : 0;
21894 insn->opnd_bytes = 4;
21895 if (x86_64)
21896diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
21897index 05a95e7..326f2fa 100644
21898--- a/arch/x86/lib/iomap_copy_64.S
21899+++ b/arch/x86/lib/iomap_copy_64.S
21900@@ -17,6 +17,7 @@
21901
21902 #include <linux/linkage.h>
21903 #include <asm/dwarf2.h>
21904+#include <asm/alternative-asm.h>
21905
21906 /*
21907 * override generic version in lib/iomap_copy.c
21908@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
21909 CFI_STARTPROC
21910 movl %edx,%ecx
21911 rep movsd
21912+ pax_force_retaddr
21913 ret
21914 CFI_ENDPROC
21915 ENDPROC(__iowrite32_copy)
21916diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
21917index efbf2a0..8893637 100644
21918--- a/arch/x86/lib/memcpy_64.S
21919+++ b/arch/x86/lib/memcpy_64.S
21920@@ -34,6 +34,7 @@
21921 rep movsq
21922 movl %edx, %ecx
21923 rep movsb
21924+ pax_force_retaddr
21925 ret
21926 .Lmemcpy_e:
21927 .previous
21928@@ -51,6 +52,7 @@
21929
21930 movl %edx, %ecx
21931 rep movsb
21932+ pax_force_retaddr
21933 ret
21934 .Lmemcpy_e_e:
21935 .previous
21936@@ -81,13 +83,13 @@ ENTRY(memcpy)
21937 */
21938 movq 0*8(%rsi), %r8
21939 movq 1*8(%rsi), %r9
21940- movq 2*8(%rsi), %r10
21941+ movq 2*8(%rsi), %rcx
21942 movq 3*8(%rsi), %r11
21943 leaq 4*8(%rsi), %rsi
21944
21945 movq %r8, 0*8(%rdi)
21946 movq %r9, 1*8(%rdi)
21947- movq %r10, 2*8(%rdi)
21948+ movq %rcx, 2*8(%rdi)
21949 movq %r11, 3*8(%rdi)
21950 leaq 4*8(%rdi), %rdi
21951 jae .Lcopy_forward_loop
21952@@ -110,12 +112,12 @@ ENTRY(memcpy)
21953 subq $0x20, %rdx
21954 movq -1*8(%rsi), %r8
21955 movq -2*8(%rsi), %r9
21956- movq -3*8(%rsi), %r10
21957+ movq -3*8(%rsi), %rcx
21958 movq -4*8(%rsi), %r11
21959 leaq -4*8(%rsi), %rsi
21960 movq %r8, -1*8(%rdi)
21961 movq %r9, -2*8(%rdi)
21962- movq %r10, -3*8(%rdi)
21963+ movq %rcx, -3*8(%rdi)
21964 movq %r11, -4*8(%rdi)
21965 leaq -4*8(%rdi), %rdi
21966 jae .Lcopy_backward_loop
21967@@ -135,12 +137,13 @@ ENTRY(memcpy)
21968 */
21969 movq 0*8(%rsi), %r8
21970 movq 1*8(%rsi), %r9
21971- movq -2*8(%rsi, %rdx), %r10
21972+ movq -2*8(%rsi, %rdx), %rcx
21973 movq -1*8(%rsi, %rdx), %r11
21974 movq %r8, 0*8(%rdi)
21975 movq %r9, 1*8(%rdi)
21976- movq %r10, -2*8(%rdi, %rdx)
21977+ movq %rcx, -2*8(%rdi, %rdx)
21978 movq %r11, -1*8(%rdi, %rdx)
21979+ pax_force_retaddr
21980 retq
21981 .p2align 4
21982 .Lless_16bytes:
21983@@ -153,6 +156,7 @@ ENTRY(memcpy)
21984 movq -1*8(%rsi, %rdx), %r9
21985 movq %r8, 0*8(%rdi)
21986 movq %r9, -1*8(%rdi, %rdx)
21987+ pax_force_retaddr
21988 retq
21989 .p2align 4
21990 .Lless_8bytes:
21991@@ -166,6 +170,7 @@ ENTRY(memcpy)
21992 movl -4(%rsi, %rdx), %r8d
21993 movl %ecx, (%rdi)
21994 movl %r8d, -4(%rdi, %rdx)
21995+ pax_force_retaddr
21996 retq
21997 .p2align 4
21998 .Lless_3bytes:
21999@@ -183,6 +188,7 @@ ENTRY(memcpy)
22000 jnz .Lloop_1
22001
22002 .Lend:
22003+ pax_force_retaddr
22004 retq
22005 CFI_ENDPROC
22006 ENDPROC(memcpy)
22007diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
22008index ee16461..c39c199 100644
22009--- a/arch/x86/lib/memmove_64.S
22010+++ b/arch/x86/lib/memmove_64.S
22011@@ -61,13 +61,13 @@ ENTRY(memmove)
22012 5:
22013 sub $0x20, %rdx
22014 movq 0*8(%rsi), %r11
22015- movq 1*8(%rsi), %r10
22016+ movq 1*8(%rsi), %rcx
22017 movq 2*8(%rsi), %r9
22018 movq 3*8(%rsi), %r8
22019 leaq 4*8(%rsi), %rsi
22020
22021 movq %r11, 0*8(%rdi)
22022- movq %r10, 1*8(%rdi)
22023+ movq %rcx, 1*8(%rdi)
22024 movq %r9, 2*8(%rdi)
22025 movq %r8, 3*8(%rdi)
22026 leaq 4*8(%rdi), %rdi
22027@@ -81,10 +81,10 @@ ENTRY(memmove)
22028 4:
22029 movq %rdx, %rcx
22030 movq -8(%rsi, %rdx), %r11
22031- lea -8(%rdi, %rdx), %r10
22032+ lea -8(%rdi, %rdx), %r9
22033 shrq $3, %rcx
22034 rep movsq
22035- movq %r11, (%r10)
22036+ movq %r11, (%r9)
22037 jmp 13f
22038 .Lmemmove_end_forward:
22039
22040@@ -95,14 +95,14 @@ ENTRY(memmove)
22041 7:
22042 movq %rdx, %rcx
22043 movq (%rsi), %r11
22044- movq %rdi, %r10
22045+ movq %rdi, %r9
22046 leaq -8(%rsi, %rdx), %rsi
22047 leaq -8(%rdi, %rdx), %rdi
22048 shrq $3, %rcx
22049 std
22050 rep movsq
22051 cld
22052- movq %r11, (%r10)
22053+ movq %r11, (%r9)
22054 jmp 13f
22055
22056 /*
22057@@ -127,13 +127,13 @@ ENTRY(memmove)
22058 8:
22059 subq $0x20, %rdx
22060 movq -1*8(%rsi), %r11
22061- movq -2*8(%rsi), %r10
22062+ movq -2*8(%rsi), %rcx
22063 movq -3*8(%rsi), %r9
22064 movq -4*8(%rsi), %r8
22065 leaq -4*8(%rsi), %rsi
22066
22067 movq %r11, -1*8(%rdi)
22068- movq %r10, -2*8(%rdi)
22069+ movq %rcx, -2*8(%rdi)
22070 movq %r9, -3*8(%rdi)
22071 movq %r8, -4*8(%rdi)
22072 leaq -4*8(%rdi), %rdi
22073@@ -151,11 +151,11 @@ ENTRY(memmove)
22074 * Move data from 16 bytes to 31 bytes.
22075 */
22076 movq 0*8(%rsi), %r11
22077- movq 1*8(%rsi), %r10
22078+ movq 1*8(%rsi), %rcx
22079 movq -2*8(%rsi, %rdx), %r9
22080 movq -1*8(%rsi, %rdx), %r8
22081 movq %r11, 0*8(%rdi)
22082- movq %r10, 1*8(%rdi)
22083+ movq %rcx, 1*8(%rdi)
22084 movq %r9, -2*8(%rdi, %rdx)
22085 movq %r8, -1*8(%rdi, %rdx)
22086 jmp 13f
22087@@ -167,9 +167,9 @@ ENTRY(memmove)
22088 * Move data from 8 bytes to 15 bytes.
22089 */
22090 movq 0*8(%rsi), %r11
22091- movq -1*8(%rsi, %rdx), %r10
22092+ movq -1*8(%rsi, %rdx), %r9
22093 movq %r11, 0*8(%rdi)
22094- movq %r10, -1*8(%rdi, %rdx)
22095+ movq %r9, -1*8(%rdi, %rdx)
22096 jmp 13f
22097 10:
22098 cmpq $4, %rdx
22099@@ -178,9 +178,9 @@ ENTRY(memmove)
22100 * Move data from 4 bytes to 7 bytes.
22101 */
22102 movl (%rsi), %r11d
22103- movl -4(%rsi, %rdx), %r10d
22104+ movl -4(%rsi, %rdx), %r9d
22105 movl %r11d, (%rdi)
22106- movl %r10d, -4(%rdi, %rdx)
22107+ movl %r9d, -4(%rdi, %rdx)
22108 jmp 13f
22109 11:
22110 cmp $2, %rdx
22111@@ -189,9 +189,9 @@ ENTRY(memmove)
22112 * Move data from 2 bytes to 3 bytes.
22113 */
22114 movw (%rsi), %r11w
22115- movw -2(%rsi, %rdx), %r10w
22116+ movw -2(%rsi, %rdx), %r9w
22117 movw %r11w, (%rdi)
22118- movw %r10w, -2(%rdi, %rdx)
22119+ movw %r9w, -2(%rdi, %rdx)
22120 jmp 13f
22121 12:
22122 cmp $1, %rdx
22123@@ -202,6 +202,7 @@ ENTRY(memmove)
22124 movb (%rsi), %r11b
22125 movb %r11b, (%rdi)
22126 13:
22127+ pax_force_retaddr
22128 retq
22129 CFI_ENDPROC
22130
22131@@ -210,6 +211,7 @@ ENTRY(memmove)
22132 /* Forward moving data. */
22133 movq %rdx, %rcx
22134 rep movsb
22135+ pax_force_retaddr
22136 retq
22137 .Lmemmove_end_forward_efs:
22138 .previous
22139diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
22140index 79bd454..dff325a 100644
22141--- a/arch/x86/lib/memset_64.S
22142+++ b/arch/x86/lib/memset_64.S
22143@@ -31,6 +31,7 @@
22144 movl %r8d,%ecx
22145 rep stosb
22146 movq %r9,%rax
22147+ pax_force_retaddr
22148 ret
22149 .Lmemset_e:
22150 .previous
22151@@ -53,6 +54,7 @@
22152 movl %edx,%ecx
22153 rep stosb
22154 movq %r9,%rax
22155+ pax_force_retaddr
22156 ret
22157 .Lmemset_e_e:
22158 .previous
22159@@ -60,13 +62,13 @@
22160 ENTRY(memset)
22161 ENTRY(__memset)
22162 CFI_STARTPROC
22163- movq %rdi,%r10
22164 movq %rdx,%r11
22165
22166 /* expand byte value */
22167 movzbl %sil,%ecx
22168 movabs $0x0101010101010101,%rax
22169 mul %rcx /* with rax, clobbers rdx */
22170+ movq %rdi,%rdx
22171
22172 /* align dst */
22173 movl %edi,%r9d
22174@@ -120,7 +122,8 @@ ENTRY(__memset)
22175 jnz .Lloop_1
22176
22177 .Lende:
22178- movq %r10,%rax
22179+ movq %rdx,%rax
22180+ pax_force_retaddr
22181 ret
22182
22183 CFI_RESTORE_STATE
22184diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
22185index c9f2d9b..e7fd2c0 100644
22186--- a/arch/x86/lib/mmx_32.c
22187+++ b/arch/x86/lib/mmx_32.c
22188@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22189 {
22190 void *p;
22191 int i;
22192+ unsigned long cr0;
22193
22194 if (unlikely(in_interrupt()))
22195 return __memcpy(to, from, len);
22196@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22197 kernel_fpu_begin();
22198
22199 __asm__ __volatile__ (
22200- "1: prefetch (%0)\n" /* This set is 28 bytes */
22201- " prefetch 64(%0)\n"
22202- " prefetch 128(%0)\n"
22203- " prefetch 192(%0)\n"
22204- " prefetch 256(%0)\n"
22205+ "1: prefetch (%1)\n" /* This set is 28 bytes */
22206+ " prefetch 64(%1)\n"
22207+ " prefetch 128(%1)\n"
22208+ " prefetch 192(%1)\n"
22209+ " prefetch 256(%1)\n"
22210 "2: \n"
22211 ".section .fixup, \"ax\"\n"
22212- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22213+ "3: \n"
22214+
22215+#ifdef CONFIG_PAX_KERNEXEC
22216+ " movl %%cr0, %0\n"
22217+ " movl %0, %%eax\n"
22218+ " andl $0xFFFEFFFF, %%eax\n"
22219+ " movl %%eax, %%cr0\n"
22220+#endif
22221+
22222+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22223+
22224+#ifdef CONFIG_PAX_KERNEXEC
22225+ " movl %0, %%cr0\n"
22226+#endif
22227+
22228 " jmp 2b\n"
22229 ".previous\n"
22230 _ASM_EXTABLE(1b, 3b)
22231- : : "r" (from));
22232+ : "=&r" (cr0) : "r" (from) : "ax");
22233
22234 for ( ; i > 5; i--) {
22235 __asm__ __volatile__ (
22236- "1: prefetch 320(%0)\n"
22237- "2: movq (%0), %%mm0\n"
22238- " movq 8(%0), %%mm1\n"
22239- " movq 16(%0), %%mm2\n"
22240- " movq 24(%0), %%mm3\n"
22241- " movq %%mm0, (%1)\n"
22242- " movq %%mm1, 8(%1)\n"
22243- " movq %%mm2, 16(%1)\n"
22244- " movq %%mm3, 24(%1)\n"
22245- " movq 32(%0), %%mm0\n"
22246- " movq 40(%0), %%mm1\n"
22247- " movq 48(%0), %%mm2\n"
22248- " movq 56(%0), %%mm3\n"
22249- " movq %%mm0, 32(%1)\n"
22250- " movq %%mm1, 40(%1)\n"
22251- " movq %%mm2, 48(%1)\n"
22252- " movq %%mm3, 56(%1)\n"
22253+ "1: prefetch 320(%1)\n"
22254+ "2: movq (%1), %%mm0\n"
22255+ " movq 8(%1), %%mm1\n"
22256+ " movq 16(%1), %%mm2\n"
22257+ " movq 24(%1), %%mm3\n"
22258+ " movq %%mm0, (%2)\n"
22259+ " movq %%mm1, 8(%2)\n"
22260+ " movq %%mm2, 16(%2)\n"
22261+ " movq %%mm3, 24(%2)\n"
22262+ " movq 32(%1), %%mm0\n"
22263+ " movq 40(%1), %%mm1\n"
22264+ " movq 48(%1), %%mm2\n"
22265+ " movq 56(%1), %%mm3\n"
22266+ " movq %%mm0, 32(%2)\n"
22267+ " movq %%mm1, 40(%2)\n"
22268+ " movq %%mm2, 48(%2)\n"
22269+ " movq %%mm3, 56(%2)\n"
22270 ".section .fixup, \"ax\"\n"
22271- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22272+ "3:\n"
22273+
22274+#ifdef CONFIG_PAX_KERNEXEC
22275+ " movl %%cr0, %0\n"
22276+ " movl %0, %%eax\n"
22277+ " andl $0xFFFEFFFF, %%eax\n"
22278+ " movl %%eax, %%cr0\n"
22279+#endif
22280+
22281+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22282+
22283+#ifdef CONFIG_PAX_KERNEXEC
22284+ " movl %0, %%cr0\n"
22285+#endif
22286+
22287 " jmp 2b\n"
22288 ".previous\n"
22289 _ASM_EXTABLE(1b, 3b)
22290- : : "r" (from), "r" (to) : "memory");
22291+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22292
22293 from += 64;
22294 to += 64;
22295@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
22296 static void fast_copy_page(void *to, void *from)
22297 {
22298 int i;
22299+ unsigned long cr0;
22300
22301 kernel_fpu_begin();
22302
22303@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
22304 * but that is for later. -AV
22305 */
22306 __asm__ __volatile__(
22307- "1: prefetch (%0)\n"
22308- " prefetch 64(%0)\n"
22309- " prefetch 128(%0)\n"
22310- " prefetch 192(%0)\n"
22311- " prefetch 256(%0)\n"
22312+ "1: prefetch (%1)\n"
22313+ " prefetch 64(%1)\n"
22314+ " prefetch 128(%1)\n"
22315+ " prefetch 192(%1)\n"
22316+ " prefetch 256(%1)\n"
22317 "2: \n"
22318 ".section .fixup, \"ax\"\n"
22319- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22320+ "3: \n"
22321+
22322+#ifdef CONFIG_PAX_KERNEXEC
22323+ " movl %%cr0, %0\n"
22324+ " movl %0, %%eax\n"
22325+ " andl $0xFFFEFFFF, %%eax\n"
22326+ " movl %%eax, %%cr0\n"
22327+#endif
22328+
22329+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22330+
22331+#ifdef CONFIG_PAX_KERNEXEC
22332+ " movl %0, %%cr0\n"
22333+#endif
22334+
22335 " jmp 2b\n"
22336 ".previous\n"
22337- _ASM_EXTABLE(1b, 3b) : : "r" (from));
22338+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22339
22340 for (i = 0; i < (4096-320)/64; i++) {
22341 __asm__ __volatile__ (
22342- "1: prefetch 320(%0)\n"
22343- "2: movq (%0), %%mm0\n"
22344- " movntq %%mm0, (%1)\n"
22345- " movq 8(%0), %%mm1\n"
22346- " movntq %%mm1, 8(%1)\n"
22347- " movq 16(%0), %%mm2\n"
22348- " movntq %%mm2, 16(%1)\n"
22349- " movq 24(%0), %%mm3\n"
22350- " movntq %%mm3, 24(%1)\n"
22351- " movq 32(%0), %%mm4\n"
22352- " movntq %%mm4, 32(%1)\n"
22353- " movq 40(%0), %%mm5\n"
22354- " movntq %%mm5, 40(%1)\n"
22355- " movq 48(%0), %%mm6\n"
22356- " movntq %%mm6, 48(%1)\n"
22357- " movq 56(%0), %%mm7\n"
22358- " movntq %%mm7, 56(%1)\n"
22359+ "1: prefetch 320(%1)\n"
22360+ "2: movq (%1), %%mm0\n"
22361+ " movntq %%mm0, (%2)\n"
22362+ " movq 8(%1), %%mm1\n"
22363+ " movntq %%mm1, 8(%2)\n"
22364+ " movq 16(%1), %%mm2\n"
22365+ " movntq %%mm2, 16(%2)\n"
22366+ " movq 24(%1), %%mm3\n"
22367+ " movntq %%mm3, 24(%2)\n"
22368+ " movq 32(%1), %%mm4\n"
22369+ " movntq %%mm4, 32(%2)\n"
22370+ " movq 40(%1), %%mm5\n"
22371+ " movntq %%mm5, 40(%2)\n"
22372+ " movq 48(%1), %%mm6\n"
22373+ " movntq %%mm6, 48(%2)\n"
22374+ " movq 56(%1), %%mm7\n"
22375+ " movntq %%mm7, 56(%2)\n"
22376 ".section .fixup, \"ax\"\n"
22377- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22378+ "3:\n"
22379+
22380+#ifdef CONFIG_PAX_KERNEXEC
22381+ " movl %%cr0, %0\n"
22382+ " movl %0, %%eax\n"
22383+ " andl $0xFFFEFFFF, %%eax\n"
22384+ " movl %%eax, %%cr0\n"
22385+#endif
22386+
22387+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22388+
22389+#ifdef CONFIG_PAX_KERNEXEC
22390+ " movl %0, %%cr0\n"
22391+#endif
22392+
22393 " jmp 2b\n"
22394 ".previous\n"
22395- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
22396+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22397
22398 from += 64;
22399 to += 64;
22400@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
22401 static void fast_copy_page(void *to, void *from)
22402 {
22403 int i;
22404+ unsigned long cr0;
22405
22406 kernel_fpu_begin();
22407
22408 __asm__ __volatile__ (
22409- "1: prefetch (%0)\n"
22410- " prefetch 64(%0)\n"
22411- " prefetch 128(%0)\n"
22412- " prefetch 192(%0)\n"
22413- " prefetch 256(%0)\n"
22414+ "1: prefetch (%1)\n"
22415+ " prefetch 64(%1)\n"
22416+ " prefetch 128(%1)\n"
22417+ " prefetch 192(%1)\n"
22418+ " prefetch 256(%1)\n"
22419 "2: \n"
22420 ".section .fixup, \"ax\"\n"
22421- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22422+ "3: \n"
22423+
22424+#ifdef CONFIG_PAX_KERNEXEC
22425+ " movl %%cr0, %0\n"
22426+ " movl %0, %%eax\n"
22427+ " andl $0xFFFEFFFF, %%eax\n"
22428+ " movl %%eax, %%cr0\n"
22429+#endif
22430+
22431+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22432+
22433+#ifdef CONFIG_PAX_KERNEXEC
22434+ " movl %0, %%cr0\n"
22435+#endif
22436+
22437 " jmp 2b\n"
22438 ".previous\n"
22439- _ASM_EXTABLE(1b, 3b) : : "r" (from));
22440+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22441
22442 for (i = 0; i < 4096/64; i++) {
22443 __asm__ __volatile__ (
22444- "1: prefetch 320(%0)\n"
22445- "2: movq (%0), %%mm0\n"
22446- " movq 8(%0), %%mm1\n"
22447- " movq 16(%0), %%mm2\n"
22448- " movq 24(%0), %%mm3\n"
22449- " movq %%mm0, (%1)\n"
22450- " movq %%mm1, 8(%1)\n"
22451- " movq %%mm2, 16(%1)\n"
22452- " movq %%mm3, 24(%1)\n"
22453- " movq 32(%0), %%mm0\n"
22454- " movq 40(%0), %%mm1\n"
22455- " movq 48(%0), %%mm2\n"
22456- " movq 56(%0), %%mm3\n"
22457- " movq %%mm0, 32(%1)\n"
22458- " movq %%mm1, 40(%1)\n"
22459- " movq %%mm2, 48(%1)\n"
22460- " movq %%mm3, 56(%1)\n"
22461+ "1: prefetch 320(%1)\n"
22462+ "2: movq (%1), %%mm0\n"
22463+ " movq 8(%1), %%mm1\n"
22464+ " movq 16(%1), %%mm2\n"
22465+ " movq 24(%1), %%mm3\n"
22466+ " movq %%mm0, (%2)\n"
22467+ " movq %%mm1, 8(%2)\n"
22468+ " movq %%mm2, 16(%2)\n"
22469+ " movq %%mm3, 24(%2)\n"
22470+ " movq 32(%1), %%mm0\n"
22471+ " movq 40(%1), %%mm1\n"
22472+ " movq 48(%1), %%mm2\n"
22473+ " movq 56(%1), %%mm3\n"
22474+ " movq %%mm0, 32(%2)\n"
22475+ " movq %%mm1, 40(%2)\n"
22476+ " movq %%mm2, 48(%2)\n"
22477+ " movq %%mm3, 56(%2)\n"
22478 ".section .fixup, \"ax\"\n"
22479- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22480+ "3:\n"
22481+
22482+#ifdef CONFIG_PAX_KERNEXEC
22483+ " movl %%cr0, %0\n"
22484+ " movl %0, %%eax\n"
22485+ " andl $0xFFFEFFFF, %%eax\n"
22486+ " movl %%eax, %%cr0\n"
22487+#endif
22488+
22489+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22490+
22491+#ifdef CONFIG_PAX_KERNEXEC
22492+ " movl %0, %%cr0\n"
22493+#endif
22494+
22495 " jmp 2b\n"
22496 ".previous\n"
22497 _ASM_EXTABLE(1b, 3b)
22498- : : "r" (from), "r" (to) : "memory");
22499+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22500
22501 from += 64;
22502 to += 64;
22503diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
22504index 69fa106..adda88b 100644
22505--- a/arch/x86/lib/msr-reg.S
22506+++ b/arch/x86/lib/msr-reg.S
22507@@ -3,6 +3,7 @@
22508 #include <asm/dwarf2.h>
22509 #include <asm/asm.h>
22510 #include <asm/msr.h>
22511+#include <asm/alternative-asm.h>
22512
22513 #ifdef CONFIG_X86_64
22514 /*
22515@@ -16,7 +17,7 @@ ENTRY(native_\op\()_safe_regs)
22516 CFI_STARTPROC
22517 pushq_cfi %rbx
22518 pushq_cfi %rbp
22519- movq %rdi, %r10 /* Save pointer */
22520+ movq %rdi, %r9 /* Save pointer */
22521 xorl %r11d, %r11d /* Return value */
22522 movl (%rdi), %eax
22523 movl 4(%rdi), %ecx
22524@@ -27,16 +28,17 @@ ENTRY(native_\op\()_safe_regs)
22525 movl 28(%rdi), %edi
22526 CFI_REMEMBER_STATE
22527 1: \op
22528-2: movl %eax, (%r10)
22529+2: movl %eax, (%r9)
22530 movl %r11d, %eax /* Return value */
22531- movl %ecx, 4(%r10)
22532- movl %edx, 8(%r10)
22533- movl %ebx, 12(%r10)
22534- movl %ebp, 20(%r10)
22535- movl %esi, 24(%r10)
22536- movl %edi, 28(%r10)
22537+ movl %ecx, 4(%r9)
22538+ movl %edx, 8(%r9)
22539+ movl %ebx, 12(%r9)
22540+ movl %ebp, 20(%r9)
22541+ movl %esi, 24(%r9)
22542+ movl %edi, 28(%r9)
22543 popq_cfi %rbp
22544 popq_cfi %rbx
22545+ pax_force_retaddr
22546 ret
22547 3:
22548 CFI_RESTORE_STATE
22549diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
22550index 36b0d15..d381858 100644
22551--- a/arch/x86/lib/putuser.S
22552+++ b/arch/x86/lib/putuser.S
22553@@ -15,7 +15,9 @@
22554 #include <asm/thread_info.h>
22555 #include <asm/errno.h>
22556 #include <asm/asm.h>
22557-
22558+#include <asm/segment.h>
22559+#include <asm/pgtable.h>
22560+#include <asm/alternative-asm.h>
22561
22562 /*
22563 * __put_user_X
22564@@ -29,52 +31,119 @@
22565 * as they get called from within inline assembly.
22566 */
22567
22568-#define ENTER CFI_STARTPROC ; \
22569- GET_THREAD_INFO(%_ASM_BX)
22570-#define EXIT ret ; \
22571+#define ENTER CFI_STARTPROC
22572+#define EXIT pax_force_retaddr; ret ; \
22573 CFI_ENDPROC
22574
22575+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22576+#define _DEST %_ASM_CX,%_ASM_BX
22577+#else
22578+#define _DEST %_ASM_CX
22579+#endif
22580+
22581+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
22582+#define __copyuser_seg gs;
22583+#else
22584+#define __copyuser_seg
22585+#endif
22586+
22587 .text
22588 ENTRY(__put_user_1)
22589 ENTER
22590+
22591+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22592+ GET_THREAD_INFO(%_ASM_BX)
22593 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
22594 jae bad_put_user
22595-1: movb %al,(%_ASM_CX)
22596+
22597+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22598+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22599+ cmp %_ASM_BX,%_ASM_CX
22600+ jb 1234f
22601+ xor %ebx,%ebx
22602+1234:
22603+#endif
22604+
22605+#endif
22606+
22607+1: __copyuser_seg movb %al,(_DEST)
22608 xor %eax,%eax
22609 EXIT
22610 ENDPROC(__put_user_1)
22611
22612 ENTRY(__put_user_2)
22613 ENTER
22614+
22615+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22616+ GET_THREAD_INFO(%_ASM_BX)
22617 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22618 sub $1,%_ASM_BX
22619 cmp %_ASM_BX,%_ASM_CX
22620 jae bad_put_user
22621-2: movw %ax,(%_ASM_CX)
22622+
22623+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22624+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22625+ cmp %_ASM_BX,%_ASM_CX
22626+ jb 1234f
22627+ xor %ebx,%ebx
22628+1234:
22629+#endif
22630+
22631+#endif
22632+
22633+2: __copyuser_seg movw %ax,(_DEST)
22634 xor %eax,%eax
22635 EXIT
22636 ENDPROC(__put_user_2)
22637
22638 ENTRY(__put_user_4)
22639 ENTER
22640+
22641+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22642+ GET_THREAD_INFO(%_ASM_BX)
22643 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22644 sub $3,%_ASM_BX
22645 cmp %_ASM_BX,%_ASM_CX
22646 jae bad_put_user
22647-3: movl %eax,(%_ASM_CX)
22648+
22649+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22650+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22651+ cmp %_ASM_BX,%_ASM_CX
22652+ jb 1234f
22653+ xor %ebx,%ebx
22654+1234:
22655+#endif
22656+
22657+#endif
22658+
22659+3: __copyuser_seg movl %eax,(_DEST)
22660 xor %eax,%eax
22661 EXIT
22662 ENDPROC(__put_user_4)
22663
22664 ENTRY(__put_user_8)
22665 ENTER
22666+
22667+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22668+ GET_THREAD_INFO(%_ASM_BX)
22669 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22670 sub $7,%_ASM_BX
22671 cmp %_ASM_BX,%_ASM_CX
22672 jae bad_put_user
22673-4: mov %_ASM_AX,(%_ASM_CX)
22674+
22675+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22676+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22677+ cmp %_ASM_BX,%_ASM_CX
22678+ jb 1234f
22679+ xor %ebx,%ebx
22680+1234:
22681+#endif
22682+
22683+#endif
22684+
22685+4: __copyuser_seg mov %_ASM_AX,(_DEST)
22686 #ifdef CONFIG_X86_32
22687-5: movl %edx,4(%_ASM_CX)
22688+5: __copyuser_seg movl %edx,4(_DEST)
22689 #endif
22690 xor %eax,%eax
22691 EXIT
22692diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
22693index 1cad221..de671ee 100644
22694--- a/arch/x86/lib/rwlock.S
22695+++ b/arch/x86/lib/rwlock.S
22696@@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
22697 FRAME
22698 0: LOCK_PREFIX
22699 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22700+
22701+#ifdef CONFIG_PAX_REFCOUNT
22702+ jno 1234f
22703+ LOCK_PREFIX
22704+ WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22705+ int $4
22706+1234:
22707+ _ASM_EXTABLE(1234b, 1234b)
22708+#endif
22709+
22710 1: rep; nop
22711 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
22712 jne 1b
22713 LOCK_PREFIX
22714 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22715+
22716+#ifdef CONFIG_PAX_REFCOUNT
22717+ jno 1234f
22718+ LOCK_PREFIX
22719+ WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22720+ int $4
22721+1234:
22722+ _ASM_EXTABLE(1234b, 1234b)
22723+#endif
22724+
22725 jnz 0b
22726 ENDFRAME
22727+ pax_force_retaddr
22728 ret
22729 CFI_ENDPROC
22730 END(__write_lock_failed)
22731@@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
22732 FRAME
22733 0: LOCK_PREFIX
22734 READ_LOCK_SIZE(inc) (%__lock_ptr)
22735+
22736+#ifdef CONFIG_PAX_REFCOUNT
22737+ jno 1234f
22738+ LOCK_PREFIX
22739+ READ_LOCK_SIZE(dec) (%__lock_ptr)
22740+ int $4
22741+1234:
22742+ _ASM_EXTABLE(1234b, 1234b)
22743+#endif
22744+
22745 1: rep; nop
22746 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
22747 js 1b
22748 LOCK_PREFIX
22749 READ_LOCK_SIZE(dec) (%__lock_ptr)
22750+
22751+#ifdef CONFIG_PAX_REFCOUNT
22752+ jno 1234f
22753+ LOCK_PREFIX
22754+ READ_LOCK_SIZE(inc) (%__lock_ptr)
22755+ int $4
22756+1234:
22757+ _ASM_EXTABLE(1234b, 1234b)
22758+#endif
22759+
22760 js 0b
22761 ENDFRAME
22762+ pax_force_retaddr
22763 ret
22764 CFI_ENDPROC
22765 END(__read_lock_failed)
22766diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
22767index 5dff5f0..cadebf4 100644
22768--- a/arch/x86/lib/rwsem.S
22769+++ b/arch/x86/lib/rwsem.S
22770@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
22771 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22772 CFI_RESTORE __ASM_REG(dx)
22773 restore_common_regs
22774+ pax_force_retaddr
22775 ret
22776 CFI_ENDPROC
22777 ENDPROC(call_rwsem_down_read_failed)
22778@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
22779 movq %rax,%rdi
22780 call rwsem_down_write_failed
22781 restore_common_regs
22782+ pax_force_retaddr
22783 ret
22784 CFI_ENDPROC
22785 ENDPROC(call_rwsem_down_write_failed)
22786@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
22787 movq %rax,%rdi
22788 call rwsem_wake
22789 restore_common_regs
22790-1: ret
22791+1: pax_force_retaddr
22792+ ret
22793 CFI_ENDPROC
22794 ENDPROC(call_rwsem_wake)
22795
22796@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
22797 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22798 CFI_RESTORE __ASM_REG(dx)
22799 restore_common_regs
22800+ pax_force_retaddr
22801 ret
22802 CFI_ENDPROC
22803 ENDPROC(call_rwsem_downgrade_wake)
22804diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
22805index a63efd6..ccecad8 100644
22806--- a/arch/x86/lib/thunk_64.S
22807+++ b/arch/x86/lib/thunk_64.S
22808@@ -8,6 +8,7 @@
22809 #include <linux/linkage.h>
22810 #include <asm/dwarf2.h>
22811 #include <asm/calling.h>
22812+#include <asm/alternative-asm.h>
22813
22814 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
22815 .macro THUNK name, func, put_ret_addr_in_rdi=0
22816@@ -41,5 +42,6 @@
22817 SAVE_ARGS
22818 restore:
22819 RESTORE_ARGS
22820+ pax_force_retaddr
22821 ret
22822 CFI_ENDPROC
22823diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
22824index e218d5d..a99a1eb 100644
22825--- a/arch/x86/lib/usercopy_32.c
22826+++ b/arch/x86/lib/usercopy_32.c
22827@@ -43,7 +43,7 @@ do { \
22828 __asm__ __volatile__( \
22829 " testl %1,%1\n" \
22830 " jz 2f\n" \
22831- "0: lodsb\n" \
22832+ "0: "__copyuser_seg"lodsb\n" \
22833 " stosb\n" \
22834 " testb %%al,%%al\n" \
22835 " jz 1f\n" \
22836@@ -128,10 +128,12 @@ do { \
22837 int __d0; \
22838 might_fault(); \
22839 __asm__ __volatile__( \
22840+ __COPYUSER_SET_ES \
22841 "0: rep; stosl\n" \
22842 " movl %2,%0\n" \
22843 "1: rep; stosb\n" \
22844 "2:\n" \
22845+ __COPYUSER_RESTORE_ES \
22846 ".section .fixup,\"ax\"\n" \
22847 "3: lea 0(%2,%0,4),%0\n" \
22848 " jmp 2b\n" \
22849@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, long n)
22850 might_fault();
22851
22852 __asm__ __volatile__(
22853+ __COPYUSER_SET_ES
22854 " testl %0, %0\n"
22855 " jz 3f\n"
22856 " andl %0,%%ecx\n"
22857@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, long n)
22858 " subl %%ecx,%0\n"
22859 " addl %0,%%eax\n"
22860 "1:\n"
22861+ __COPYUSER_RESTORE_ES
22862 ".section .fixup,\"ax\"\n"
22863 "2: xorl %%eax,%%eax\n"
22864 " jmp 1b\n"
22865@@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user);
22866
22867 #ifdef CONFIG_X86_INTEL_USERCOPY
22868 static unsigned long
22869-__copy_user_intel(void __user *to, const void *from, unsigned long size)
22870+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
22871 {
22872 int d0, d1;
22873 __asm__ __volatile__(
22874@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22875 " .align 2,0x90\n"
22876 "3: movl 0(%4), %%eax\n"
22877 "4: movl 4(%4), %%edx\n"
22878- "5: movl %%eax, 0(%3)\n"
22879- "6: movl %%edx, 4(%3)\n"
22880+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
22881+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
22882 "7: movl 8(%4), %%eax\n"
22883 "8: movl 12(%4),%%edx\n"
22884- "9: movl %%eax, 8(%3)\n"
22885- "10: movl %%edx, 12(%3)\n"
22886+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
22887+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
22888 "11: movl 16(%4), %%eax\n"
22889 "12: movl 20(%4), %%edx\n"
22890- "13: movl %%eax, 16(%3)\n"
22891- "14: movl %%edx, 20(%3)\n"
22892+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
22893+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
22894 "15: movl 24(%4), %%eax\n"
22895 "16: movl 28(%4), %%edx\n"
22896- "17: movl %%eax, 24(%3)\n"
22897- "18: movl %%edx, 28(%3)\n"
22898+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
22899+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
22900 "19: movl 32(%4), %%eax\n"
22901 "20: movl 36(%4), %%edx\n"
22902- "21: movl %%eax, 32(%3)\n"
22903- "22: movl %%edx, 36(%3)\n"
22904+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
22905+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
22906 "23: movl 40(%4), %%eax\n"
22907 "24: movl 44(%4), %%edx\n"
22908- "25: movl %%eax, 40(%3)\n"
22909- "26: movl %%edx, 44(%3)\n"
22910+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
22911+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
22912 "27: movl 48(%4), %%eax\n"
22913 "28: movl 52(%4), %%edx\n"
22914- "29: movl %%eax, 48(%3)\n"
22915- "30: movl %%edx, 52(%3)\n"
22916+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
22917+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
22918 "31: movl 56(%4), %%eax\n"
22919 "32: movl 60(%4), %%edx\n"
22920- "33: movl %%eax, 56(%3)\n"
22921- "34: movl %%edx, 60(%3)\n"
22922+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
22923+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
22924 " addl $-64, %0\n"
22925 " addl $64, %4\n"
22926 " addl $64, %3\n"
22927@@ -278,10 +282,12 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22928 " shrl $2, %0\n"
22929 " andl $3, %%eax\n"
22930 " cld\n"
22931+ __COPYUSER_SET_ES
22932 "99: rep; movsl\n"
22933 "36: movl %%eax, %0\n"
22934 "37: rep; movsb\n"
22935 "100:\n"
22936+ __COPYUSER_RESTORE_ES
22937 ".section .fixup,\"ax\"\n"
22938 "101: lea 0(%%eax,%0,4),%0\n"
22939 " jmp 100b\n"
22940@@ -334,46 +340,155 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22941 }
22942
22943 static unsigned long
22944+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
22945+{
22946+ int d0, d1;
22947+ __asm__ __volatile__(
22948+ " .align 2,0x90\n"
22949+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
22950+ " cmpl $67, %0\n"
22951+ " jbe 3f\n"
22952+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
22953+ " .align 2,0x90\n"
22954+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
22955+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
22956+ "5: movl %%eax, 0(%3)\n"
22957+ "6: movl %%edx, 4(%3)\n"
22958+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
22959+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
22960+ "9: movl %%eax, 8(%3)\n"
22961+ "10: movl %%edx, 12(%3)\n"
22962+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
22963+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
22964+ "13: movl %%eax, 16(%3)\n"
22965+ "14: movl %%edx, 20(%3)\n"
22966+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
22967+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
22968+ "17: movl %%eax, 24(%3)\n"
22969+ "18: movl %%edx, 28(%3)\n"
22970+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
22971+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
22972+ "21: movl %%eax, 32(%3)\n"
22973+ "22: movl %%edx, 36(%3)\n"
22974+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
22975+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
22976+ "25: movl %%eax, 40(%3)\n"
22977+ "26: movl %%edx, 44(%3)\n"
22978+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
22979+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
22980+ "29: movl %%eax, 48(%3)\n"
22981+ "30: movl %%edx, 52(%3)\n"
22982+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
22983+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
22984+ "33: movl %%eax, 56(%3)\n"
22985+ "34: movl %%edx, 60(%3)\n"
22986+ " addl $-64, %0\n"
22987+ " addl $64, %4\n"
22988+ " addl $64, %3\n"
22989+ " cmpl $63, %0\n"
22990+ " ja 1b\n"
22991+ "35: movl %0, %%eax\n"
22992+ " shrl $2, %0\n"
22993+ " andl $3, %%eax\n"
22994+ " cld\n"
22995+ "99: rep; "__copyuser_seg" movsl\n"
22996+ "36: movl %%eax, %0\n"
22997+ "37: rep; "__copyuser_seg" movsb\n"
22998+ "100:\n"
22999+ ".section .fixup,\"ax\"\n"
23000+ "101: lea 0(%%eax,%0,4),%0\n"
23001+ " jmp 100b\n"
23002+ ".previous\n"
23003+ ".section __ex_table,\"a\"\n"
23004+ " .align 4\n"
23005+ " .long 1b,100b\n"
23006+ " .long 2b,100b\n"
23007+ " .long 3b,100b\n"
23008+ " .long 4b,100b\n"
23009+ " .long 5b,100b\n"
23010+ " .long 6b,100b\n"
23011+ " .long 7b,100b\n"
23012+ " .long 8b,100b\n"
23013+ " .long 9b,100b\n"
23014+ " .long 10b,100b\n"
23015+ " .long 11b,100b\n"
23016+ " .long 12b,100b\n"
23017+ " .long 13b,100b\n"
23018+ " .long 14b,100b\n"
23019+ " .long 15b,100b\n"
23020+ " .long 16b,100b\n"
23021+ " .long 17b,100b\n"
23022+ " .long 18b,100b\n"
23023+ " .long 19b,100b\n"
23024+ " .long 20b,100b\n"
23025+ " .long 21b,100b\n"
23026+ " .long 22b,100b\n"
23027+ " .long 23b,100b\n"
23028+ " .long 24b,100b\n"
23029+ " .long 25b,100b\n"
23030+ " .long 26b,100b\n"
23031+ " .long 27b,100b\n"
23032+ " .long 28b,100b\n"
23033+ " .long 29b,100b\n"
23034+ " .long 30b,100b\n"
23035+ " .long 31b,100b\n"
23036+ " .long 32b,100b\n"
23037+ " .long 33b,100b\n"
23038+ " .long 34b,100b\n"
23039+ " .long 35b,100b\n"
23040+ " .long 36b,100b\n"
23041+ " .long 37b,100b\n"
23042+ " .long 99b,101b\n"
23043+ ".previous"
23044+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
23045+ : "1"(to), "2"(from), "0"(size)
23046+ : "eax", "edx", "memory");
23047+ return size;
23048+}
23049+
23050+static unsigned long
23051+__copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size) __size_overflow(3);
23052+static unsigned long
23053 __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
23054 {
23055 int d0, d1;
23056 __asm__ __volatile__(
23057 " .align 2,0x90\n"
23058- "0: movl 32(%4), %%eax\n"
23059+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23060 " cmpl $67, %0\n"
23061 " jbe 2f\n"
23062- "1: movl 64(%4), %%eax\n"
23063+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23064 " .align 2,0x90\n"
23065- "2: movl 0(%4), %%eax\n"
23066- "21: movl 4(%4), %%edx\n"
23067+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23068+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23069 " movl %%eax, 0(%3)\n"
23070 " movl %%edx, 4(%3)\n"
23071- "3: movl 8(%4), %%eax\n"
23072- "31: movl 12(%4),%%edx\n"
23073+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23074+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23075 " movl %%eax, 8(%3)\n"
23076 " movl %%edx, 12(%3)\n"
23077- "4: movl 16(%4), %%eax\n"
23078- "41: movl 20(%4), %%edx\n"
23079+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23080+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23081 " movl %%eax, 16(%3)\n"
23082 " movl %%edx, 20(%3)\n"
23083- "10: movl 24(%4), %%eax\n"
23084- "51: movl 28(%4), %%edx\n"
23085+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23086+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23087 " movl %%eax, 24(%3)\n"
23088 " movl %%edx, 28(%3)\n"
23089- "11: movl 32(%4), %%eax\n"
23090- "61: movl 36(%4), %%edx\n"
23091+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23092+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23093 " movl %%eax, 32(%3)\n"
23094 " movl %%edx, 36(%3)\n"
23095- "12: movl 40(%4), %%eax\n"
23096- "71: movl 44(%4), %%edx\n"
23097+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23098+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23099 " movl %%eax, 40(%3)\n"
23100 " movl %%edx, 44(%3)\n"
23101- "13: movl 48(%4), %%eax\n"
23102- "81: movl 52(%4), %%edx\n"
23103+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23104+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23105 " movl %%eax, 48(%3)\n"
23106 " movl %%edx, 52(%3)\n"
23107- "14: movl 56(%4), %%eax\n"
23108- "91: movl 60(%4), %%edx\n"
23109+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23110+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23111 " movl %%eax, 56(%3)\n"
23112 " movl %%edx, 60(%3)\n"
23113 " addl $-64, %0\n"
23114@@ -385,9 +500,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
23115 " shrl $2, %0\n"
23116 " andl $3, %%eax\n"
23117 " cld\n"
23118- "6: rep; movsl\n"
23119+ "6: rep; "__copyuser_seg" movsl\n"
23120 " movl %%eax,%0\n"
23121- "7: rep; movsb\n"
23122+ "7: rep; "__copyuser_seg" movsb\n"
23123 "8:\n"
23124 ".section .fixup,\"ax\"\n"
23125 "9: lea 0(%%eax,%0,4),%0\n"
23126@@ -434,47 +549,49 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
23127 */
23128
23129 static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23130+ const void __user *from, unsigned long size) __size_overflow(3);
23131+static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23132 const void __user *from, unsigned long size)
23133 {
23134 int d0, d1;
23135
23136 __asm__ __volatile__(
23137 " .align 2,0x90\n"
23138- "0: movl 32(%4), %%eax\n"
23139+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23140 " cmpl $67, %0\n"
23141 " jbe 2f\n"
23142- "1: movl 64(%4), %%eax\n"
23143+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23144 " .align 2,0x90\n"
23145- "2: movl 0(%4), %%eax\n"
23146- "21: movl 4(%4), %%edx\n"
23147+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23148+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23149 " movnti %%eax, 0(%3)\n"
23150 " movnti %%edx, 4(%3)\n"
23151- "3: movl 8(%4), %%eax\n"
23152- "31: movl 12(%4),%%edx\n"
23153+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23154+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23155 " movnti %%eax, 8(%3)\n"
23156 " movnti %%edx, 12(%3)\n"
23157- "4: movl 16(%4), %%eax\n"
23158- "41: movl 20(%4), %%edx\n"
23159+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23160+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23161 " movnti %%eax, 16(%3)\n"
23162 " movnti %%edx, 20(%3)\n"
23163- "10: movl 24(%4), %%eax\n"
23164- "51: movl 28(%4), %%edx\n"
23165+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23166+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23167 " movnti %%eax, 24(%3)\n"
23168 " movnti %%edx, 28(%3)\n"
23169- "11: movl 32(%4), %%eax\n"
23170- "61: movl 36(%4), %%edx\n"
23171+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23172+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23173 " movnti %%eax, 32(%3)\n"
23174 " movnti %%edx, 36(%3)\n"
23175- "12: movl 40(%4), %%eax\n"
23176- "71: movl 44(%4), %%edx\n"
23177+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23178+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23179 " movnti %%eax, 40(%3)\n"
23180 " movnti %%edx, 44(%3)\n"
23181- "13: movl 48(%4), %%eax\n"
23182- "81: movl 52(%4), %%edx\n"
23183+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23184+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23185 " movnti %%eax, 48(%3)\n"
23186 " movnti %%edx, 52(%3)\n"
23187- "14: movl 56(%4), %%eax\n"
23188- "91: movl 60(%4), %%edx\n"
23189+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23190+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23191 " movnti %%eax, 56(%3)\n"
23192 " movnti %%edx, 60(%3)\n"
23193 " addl $-64, %0\n"
23194@@ -487,9 +604,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23195 " shrl $2, %0\n"
23196 " andl $3, %%eax\n"
23197 " cld\n"
23198- "6: rep; movsl\n"
23199+ "6: rep; "__copyuser_seg" movsl\n"
23200 " movl %%eax,%0\n"
23201- "7: rep; movsb\n"
23202+ "7: rep; "__copyuser_seg" movsb\n"
23203 "8:\n"
23204 ".section .fixup,\"ax\"\n"
23205 "9: lea 0(%%eax,%0,4),%0\n"
23206@@ -531,47 +648,49 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23207 }
23208
23209 static unsigned long __copy_user_intel_nocache(void *to,
23210+ const void __user *from, unsigned long size) __size_overflow(3);
23211+static unsigned long __copy_user_intel_nocache(void *to,
23212 const void __user *from, unsigned long size)
23213 {
23214 int d0, d1;
23215
23216 __asm__ __volatile__(
23217 " .align 2,0x90\n"
23218- "0: movl 32(%4), %%eax\n"
23219+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23220 " cmpl $67, %0\n"
23221 " jbe 2f\n"
23222- "1: movl 64(%4), %%eax\n"
23223+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23224 " .align 2,0x90\n"
23225- "2: movl 0(%4), %%eax\n"
23226- "21: movl 4(%4), %%edx\n"
23227+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23228+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23229 " movnti %%eax, 0(%3)\n"
23230 " movnti %%edx, 4(%3)\n"
23231- "3: movl 8(%4), %%eax\n"
23232- "31: movl 12(%4),%%edx\n"
23233+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23234+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23235 " movnti %%eax, 8(%3)\n"
23236 " movnti %%edx, 12(%3)\n"
23237- "4: movl 16(%4), %%eax\n"
23238- "41: movl 20(%4), %%edx\n"
23239+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23240+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23241 " movnti %%eax, 16(%3)\n"
23242 " movnti %%edx, 20(%3)\n"
23243- "10: movl 24(%4), %%eax\n"
23244- "51: movl 28(%4), %%edx\n"
23245+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23246+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23247 " movnti %%eax, 24(%3)\n"
23248 " movnti %%edx, 28(%3)\n"
23249- "11: movl 32(%4), %%eax\n"
23250- "61: movl 36(%4), %%edx\n"
23251+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23252+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23253 " movnti %%eax, 32(%3)\n"
23254 " movnti %%edx, 36(%3)\n"
23255- "12: movl 40(%4), %%eax\n"
23256- "71: movl 44(%4), %%edx\n"
23257+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23258+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23259 " movnti %%eax, 40(%3)\n"
23260 " movnti %%edx, 44(%3)\n"
23261- "13: movl 48(%4), %%eax\n"
23262- "81: movl 52(%4), %%edx\n"
23263+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23264+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23265 " movnti %%eax, 48(%3)\n"
23266 " movnti %%edx, 52(%3)\n"
23267- "14: movl 56(%4), %%eax\n"
23268- "91: movl 60(%4), %%edx\n"
23269+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23270+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23271 " movnti %%eax, 56(%3)\n"
23272 " movnti %%edx, 60(%3)\n"
23273 " addl $-64, %0\n"
23274@@ -584,9 +703,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
23275 " shrl $2, %0\n"
23276 " andl $3, %%eax\n"
23277 " cld\n"
23278- "6: rep; movsl\n"
23279+ "6: rep; "__copyuser_seg" movsl\n"
23280 " movl %%eax,%0\n"
23281- "7: rep; movsb\n"
23282+ "7: rep; "__copyuser_seg" movsb\n"
23283 "8:\n"
23284 ".section .fixup,\"ax\"\n"
23285 "9: lea 0(%%eax,%0,4),%0\n"
23286@@ -629,32 +748,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
23287 */
23288 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
23289 unsigned long size);
23290-unsigned long __copy_user_intel(void __user *to, const void *from,
23291+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
23292+ unsigned long size);
23293+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
23294 unsigned long size);
23295 unsigned long __copy_user_zeroing_intel_nocache(void *to,
23296 const void __user *from, unsigned long size);
23297 #endif /* CONFIG_X86_INTEL_USERCOPY */
23298
23299 /* Generic arbitrary sized copy. */
23300-#define __copy_user(to, from, size) \
23301+#define __copy_user(to, from, size, prefix, set, restore) \
23302 do { \
23303 int __d0, __d1, __d2; \
23304 __asm__ __volatile__( \
23305+ set \
23306 " cmp $7,%0\n" \
23307 " jbe 1f\n" \
23308 " movl %1,%0\n" \
23309 " negl %0\n" \
23310 " andl $7,%0\n" \
23311 " subl %0,%3\n" \
23312- "4: rep; movsb\n" \
23313+ "4: rep; "prefix"movsb\n" \
23314 " movl %3,%0\n" \
23315 " shrl $2,%0\n" \
23316 " andl $3,%3\n" \
23317 " .align 2,0x90\n" \
23318- "0: rep; movsl\n" \
23319+ "0: rep; "prefix"movsl\n" \
23320 " movl %3,%0\n" \
23321- "1: rep; movsb\n" \
23322+ "1: rep; "prefix"movsb\n" \
23323 "2:\n" \
23324+ restore \
23325 ".section .fixup,\"ax\"\n" \
23326 "5: addl %3,%0\n" \
23327 " jmp 2b\n" \
23328@@ -682,14 +805,14 @@ do { \
23329 " negl %0\n" \
23330 " andl $7,%0\n" \
23331 " subl %0,%3\n" \
23332- "4: rep; movsb\n" \
23333+ "4: rep; "__copyuser_seg"movsb\n" \
23334 " movl %3,%0\n" \
23335 " shrl $2,%0\n" \
23336 " andl $3,%3\n" \
23337 " .align 2,0x90\n" \
23338- "0: rep; movsl\n" \
23339+ "0: rep; "__copyuser_seg"movsl\n" \
23340 " movl %3,%0\n" \
23341- "1: rep; movsb\n" \
23342+ "1: rep; "__copyuser_seg"movsb\n" \
23343 "2:\n" \
23344 ".section .fixup,\"ax\"\n" \
23345 "5: addl %3,%0\n" \
23346@@ -775,9 +898,9 @@ survive:
23347 }
23348 #endif
23349 if (movsl_is_ok(to, from, n))
23350- __copy_user(to, from, n);
23351+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
23352 else
23353- n = __copy_user_intel(to, from, n);
23354+ n = __generic_copy_to_user_intel(to, from, n);
23355 return n;
23356 }
23357 EXPORT_SYMBOL(__copy_to_user_ll);
23358@@ -797,10 +920,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
23359 unsigned long n)
23360 {
23361 if (movsl_is_ok(to, from, n))
23362- __copy_user(to, from, n);
23363+ __copy_user(to, from, n, __copyuser_seg, "", "");
23364 else
23365- n = __copy_user_intel((void __user *)to,
23366- (const void *)from, n);
23367+ n = __generic_copy_from_user_intel(to, from, n);
23368 return n;
23369 }
23370 EXPORT_SYMBOL(__copy_from_user_ll_nozero);
23371@@ -827,65 +949,50 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
23372 if (n > 64 && cpu_has_xmm2)
23373 n = __copy_user_intel_nocache(to, from, n);
23374 else
23375- __copy_user(to, from, n);
23376+ __copy_user(to, from, n, __copyuser_seg, "", "");
23377 #else
23378- __copy_user(to, from, n);
23379+ __copy_user(to, from, n, __copyuser_seg, "", "");
23380 #endif
23381 return n;
23382 }
23383 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
23384
23385-/**
23386- * copy_to_user: - Copy a block of data into user space.
23387- * @to: Destination address, in user space.
23388- * @from: Source address, in kernel space.
23389- * @n: Number of bytes to copy.
23390- *
23391- * Context: User context only. This function may sleep.
23392- *
23393- * Copy data from kernel space to user space.
23394- *
23395- * Returns number of bytes that could not be copied.
23396- * On success, this will be zero.
23397- */
23398-unsigned long
23399-copy_to_user(void __user *to, const void *from, unsigned long n)
23400-{
23401- if (access_ok(VERIFY_WRITE, to, n))
23402- n = __copy_to_user(to, from, n);
23403- return n;
23404-}
23405-EXPORT_SYMBOL(copy_to_user);
23406-
23407-/**
23408- * copy_from_user: - Copy a block of data from user space.
23409- * @to: Destination address, in kernel space.
23410- * @from: Source address, in user space.
23411- * @n: Number of bytes to copy.
23412- *
23413- * Context: User context only. This function may sleep.
23414- *
23415- * Copy data from user space to kernel space.
23416- *
23417- * Returns number of bytes that could not be copied.
23418- * On success, this will be zero.
23419- *
23420- * If some data could not be copied, this function will pad the copied
23421- * data to the requested size using zero bytes.
23422- */
23423-unsigned long
23424-_copy_from_user(void *to, const void __user *from, unsigned long n)
23425-{
23426- if (access_ok(VERIFY_READ, from, n))
23427- n = __copy_from_user(to, from, n);
23428- else
23429- memset(to, 0, n);
23430- return n;
23431-}
23432-EXPORT_SYMBOL(_copy_from_user);
23433-
23434 void copy_from_user_overflow(void)
23435 {
23436 WARN(1, "Buffer overflow detected!\n");
23437 }
23438 EXPORT_SYMBOL(copy_from_user_overflow);
23439+
23440+void copy_to_user_overflow(void)
23441+{
23442+ WARN(1, "Buffer overflow detected!\n");
23443+}
23444+EXPORT_SYMBOL(copy_to_user_overflow);
23445+
23446+#ifdef CONFIG_PAX_MEMORY_UDEREF
23447+void __set_fs(mm_segment_t x)
23448+{
23449+ switch (x.seg) {
23450+ case 0:
23451+ loadsegment(gs, 0);
23452+ break;
23453+ case TASK_SIZE_MAX:
23454+ loadsegment(gs, __USER_DS);
23455+ break;
23456+ case -1UL:
23457+ loadsegment(gs, __KERNEL_DS);
23458+ break;
23459+ default:
23460+ BUG();
23461+ }
23462+ return;
23463+}
23464+EXPORT_SYMBOL(__set_fs);
23465+
23466+void set_fs(mm_segment_t x)
23467+{
23468+ current_thread_info()->addr_limit = x;
23469+ __set_fs(x);
23470+}
23471+EXPORT_SYMBOL(set_fs);
23472+#endif
23473diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
23474index b7c2849..8633ad8 100644
23475--- a/arch/x86/lib/usercopy_64.c
23476+++ b/arch/x86/lib/usercopy_64.c
23477@@ -42,6 +42,12 @@ long
23478 __strncpy_from_user(char *dst, const char __user *src, long count)
23479 {
23480 long res;
23481+
23482+#ifdef CONFIG_PAX_MEMORY_UDEREF
23483+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
23484+ src += PAX_USER_SHADOW_BASE;
23485+#endif
23486+
23487 __do_strncpy_from_user(dst, src, count, res);
23488 return res;
23489 }
23490@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
23491 {
23492 long __d0;
23493 might_fault();
23494+
23495+#ifdef CONFIG_PAX_MEMORY_UDEREF
23496+ if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
23497+ addr += PAX_USER_SHADOW_BASE;
23498+#endif
23499+
23500 /* no memory constraint because it doesn't change any memory gcc knows
23501 about */
23502 asm volatile(
23503@@ -149,12 +161,20 @@ long strlen_user(const char __user *s)
23504 }
23505 EXPORT_SYMBOL(strlen_user);
23506
23507-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
23508+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
23509 {
23510- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23511- return copy_user_generic((__force void *)to, (__force void *)from, len);
23512- }
23513- return len;
23514+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23515+
23516+#ifdef CONFIG_PAX_MEMORY_UDEREF
23517+ if ((unsigned long)to < PAX_USER_SHADOW_BASE)
23518+ to += PAX_USER_SHADOW_BASE;
23519+ if ((unsigned long)from < PAX_USER_SHADOW_BASE)
23520+ from += PAX_USER_SHADOW_BASE;
23521+#endif
23522+
23523+ return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
23524+ }
23525+ return len;
23526 }
23527 EXPORT_SYMBOL(copy_in_user);
23528
23529@@ -164,7 +184,7 @@ EXPORT_SYMBOL(copy_in_user);
23530 * it is not necessary to optimize tail handling.
23531 */
23532 unsigned long
23533-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
23534+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
23535 {
23536 char c;
23537 unsigned zero_len;
23538diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
23539index 1fb85db..8b3540b 100644
23540--- a/arch/x86/mm/extable.c
23541+++ b/arch/x86/mm/extable.c
23542@@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs)
23543 const struct exception_table_entry *fixup;
23544
23545 #ifdef CONFIG_PNPBIOS
23546- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
23547+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
23548 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
23549 extern u32 pnp_bios_is_utter_crap;
23550 pnp_bios_is_utter_crap = 1;
23551diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
23552index f0b4caf..d92fd42 100644
23553--- a/arch/x86/mm/fault.c
23554+++ b/arch/x86/mm/fault.c
23555@@ -13,11 +13,18 @@
23556 #include <linux/perf_event.h> /* perf_sw_event */
23557 #include <linux/hugetlb.h> /* hstate_index_to_shift */
23558 #include <linux/prefetch.h> /* prefetchw */
23559+#include <linux/unistd.h>
23560+#include <linux/compiler.h>
23561
23562 #include <asm/traps.h> /* dotraplinkage, ... */
23563 #include <asm/pgalloc.h> /* pgd_*(), ... */
23564 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
23565 #include <asm/fixmap.h> /* VSYSCALL_START */
23566+#include <asm/tlbflush.h>
23567+
23568+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23569+#include <asm/stacktrace.h>
23570+#endif
23571
23572 /*
23573 * Page fault error code bits:
23574@@ -55,7 +62,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
23575 int ret = 0;
23576
23577 /* kprobe_running() needs smp_processor_id() */
23578- if (kprobes_built_in() && !user_mode_vm(regs)) {
23579+ if (kprobes_built_in() && !user_mode(regs)) {
23580 preempt_disable();
23581 if (kprobe_running() && kprobe_fault_handler(regs, 14))
23582 ret = 1;
23583@@ -116,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
23584 return !instr_lo || (instr_lo>>1) == 1;
23585 case 0x00:
23586 /* Prefetch instruction is 0x0F0D or 0x0F18 */
23587- if (probe_kernel_address(instr, opcode))
23588+ if (user_mode(regs)) {
23589+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23590+ return 0;
23591+ } else if (probe_kernel_address(instr, opcode))
23592 return 0;
23593
23594 *prefetch = (instr_lo == 0xF) &&
23595@@ -150,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
23596 while (instr < max_instr) {
23597 unsigned char opcode;
23598
23599- if (probe_kernel_address(instr, opcode))
23600+ if (user_mode(regs)) {
23601+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23602+ break;
23603+ } else if (probe_kernel_address(instr, opcode))
23604 break;
23605
23606 instr++;
23607@@ -181,6 +194,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
23608 force_sig_info(si_signo, &info, tsk);
23609 }
23610
23611+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23612+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
23613+#endif
23614+
23615+#ifdef CONFIG_PAX_EMUTRAMP
23616+static int pax_handle_fetch_fault(struct pt_regs *regs);
23617+#endif
23618+
23619+#ifdef CONFIG_PAX_PAGEEXEC
23620+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
23621+{
23622+ pgd_t *pgd;
23623+ pud_t *pud;
23624+ pmd_t *pmd;
23625+
23626+ pgd = pgd_offset(mm, address);
23627+ if (!pgd_present(*pgd))
23628+ return NULL;
23629+ pud = pud_offset(pgd, address);
23630+ if (!pud_present(*pud))
23631+ return NULL;
23632+ pmd = pmd_offset(pud, address);
23633+ if (!pmd_present(*pmd))
23634+ return NULL;
23635+ return pmd;
23636+}
23637+#endif
23638+
23639 DEFINE_SPINLOCK(pgd_lock);
23640 LIST_HEAD(pgd_list);
23641
23642@@ -231,10 +272,22 @@ void vmalloc_sync_all(void)
23643 for (address = VMALLOC_START & PMD_MASK;
23644 address >= TASK_SIZE && address < FIXADDR_TOP;
23645 address += PMD_SIZE) {
23646+
23647+#ifdef CONFIG_PAX_PER_CPU_PGD
23648+ unsigned long cpu;
23649+#else
23650 struct page *page;
23651+#endif
23652
23653 spin_lock(&pgd_lock);
23654+
23655+#ifdef CONFIG_PAX_PER_CPU_PGD
23656+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
23657+ pgd_t *pgd = get_cpu_pgd(cpu);
23658+ pmd_t *ret;
23659+#else
23660 list_for_each_entry(page, &pgd_list, lru) {
23661+ pgd_t *pgd = page_address(page);
23662 spinlock_t *pgt_lock;
23663 pmd_t *ret;
23664
23665@@ -242,8 +295,13 @@ void vmalloc_sync_all(void)
23666 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
23667
23668 spin_lock(pgt_lock);
23669- ret = vmalloc_sync_one(page_address(page), address);
23670+#endif
23671+
23672+ ret = vmalloc_sync_one(pgd, address);
23673+
23674+#ifndef CONFIG_PAX_PER_CPU_PGD
23675 spin_unlock(pgt_lock);
23676+#endif
23677
23678 if (!ret)
23679 break;
23680@@ -277,6 +335,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23681 * an interrupt in the middle of a task switch..
23682 */
23683 pgd_paddr = read_cr3();
23684+
23685+#ifdef CONFIG_PAX_PER_CPU_PGD
23686+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
23687+#endif
23688+
23689 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
23690 if (!pmd_k)
23691 return -1;
23692@@ -372,7 +435,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23693 * happen within a race in page table update. In the later
23694 * case just flush:
23695 */
23696+
23697+#ifdef CONFIG_PAX_PER_CPU_PGD
23698+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
23699+ pgd = pgd_offset_cpu(smp_processor_id(), address);
23700+#else
23701 pgd = pgd_offset(current->active_mm, address);
23702+#endif
23703+
23704 pgd_ref = pgd_offset_k(address);
23705 if (pgd_none(*pgd_ref))
23706 return -1;
23707@@ -540,7 +610,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
23708 static int is_errata100(struct pt_regs *regs, unsigned long address)
23709 {
23710 #ifdef CONFIG_X86_64
23711- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
23712+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
23713 return 1;
23714 #endif
23715 return 0;
23716@@ -567,7 +637,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
23717 }
23718
23719 static const char nx_warning[] = KERN_CRIT
23720-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
23721+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
23722
23723 static void
23724 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23725@@ -576,15 +646,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23726 if (!oops_may_print())
23727 return;
23728
23729- if (error_code & PF_INSTR) {
23730+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
23731 unsigned int level;
23732
23733 pte_t *pte = lookup_address(address, &level);
23734
23735 if (pte && pte_present(*pte) && !pte_exec(*pte))
23736- printk(nx_warning, current_uid());
23737+ printk(nx_warning, current_uid(), current->comm, task_pid_nr(current));
23738 }
23739
23740+#ifdef CONFIG_PAX_KERNEXEC
23741+ if (init_mm.start_code <= address && address < init_mm.end_code) {
23742+ if (current->signal->curr_ip)
23743+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23744+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
23745+ else
23746+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23747+ current->comm, task_pid_nr(current), current_uid(), current_euid());
23748+ }
23749+#endif
23750+
23751 printk(KERN_ALERT "BUG: unable to handle kernel ");
23752 if (address < PAGE_SIZE)
23753 printk(KERN_CONT "NULL pointer dereference");
23754@@ -748,6 +829,21 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
23755 }
23756 #endif
23757
23758+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23759+ if (pax_is_fetch_fault(regs, error_code, address)) {
23760+
23761+#ifdef CONFIG_PAX_EMUTRAMP
23762+ switch (pax_handle_fetch_fault(regs)) {
23763+ case 2:
23764+ return;
23765+ }
23766+#endif
23767+
23768+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23769+ do_group_exit(SIGKILL);
23770+ }
23771+#endif
23772+
23773 if (unlikely(show_unhandled_signals))
23774 show_signal_msg(regs, error_code, address, tsk);
23775
23776@@ -844,7 +940,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
23777 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
23778 printk(KERN_ERR
23779 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
23780- tsk->comm, tsk->pid, address);
23781+ tsk->comm, task_pid_nr(tsk), address);
23782 code = BUS_MCEERR_AR;
23783 }
23784 #endif
23785@@ -900,6 +996,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
23786 return 1;
23787 }
23788
23789+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
23790+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
23791+{
23792+ pte_t *pte;
23793+ pmd_t *pmd;
23794+ spinlock_t *ptl;
23795+ unsigned char pte_mask;
23796+
23797+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
23798+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
23799+ return 0;
23800+
23801+ /* PaX: it's our fault, let's handle it if we can */
23802+
23803+ /* PaX: take a look at read faults before acquiring any locks */
23804+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
23805+ /* instruction fetch attempt from a protected page in user mode */
23806+ up_read(&mm->mmap_sem);
23807+
23808+#ifdef CONFIG_PAX_EMUTRAMP
23809+ switch (pax_handle_fetch_fault(regs)) {
23810+ case 2:
23811+ return 1;
23812+ }
23813+#endif
23814+
23815+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23816+ do_group_exit(SIGKILL);
23817+ }
23818+
23819+ pmd = pax_get_pmd(mm, address);
23820+ if (unlikely(!pmd))
23821+ return 0;
23822+
23823+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
23824+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
23825+ pte_unmap_unlock(pte, ptl);
23826+ return 0;
23827+ }
23828+
23829+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
23830+ /* write attempt to a protected page in user mode */
23831+ pte_unmap_unlock(pte, ptl);
23832+ return 0;
23833+ }
23834+
23835+#ifdef CONFIG_SMP
23836+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
23837+#else
23838+ if (likely(address > get_limit(regs->cs)))
23839+#endif
23840+ {
23841+ set_pte(pte, pte_mkread(*pte));
23842+ __flush_tlb_one(address);
23843+ pte_unmap_unlock(pte, ptl);
23844+ up_read(&mm->mmap_sem);
23845+ return 1;
23846+ }
23847+
23848+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
23849+
23850+ /*
23851+ * PaX: fill DTLB with user rights and retry
23852+ */
23853+ __asm__ __volatile__ (
23854+ "orb %2,(%1)\n"
23855+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
23856+/*
23857+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
23858+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
23859+ * page fault when examined during a TLB load attempt. this is true not only
23860+ * for PTEs holding a non-present entry but also present entries that will
23861+ * raise a page fault (such as those set up by PaX, or the copy-on-write
23862+ * mechanism). in effect it means that we do *not* need to flush the TLBs
23863+ * for our target pages since their PTEs are simply not in the TLBs at all.
23864+
23865+ * the best thing in omitting it is that we gain around 15-20% speed in the
23866+ * fast path of the page fault handler and can get rid of tracing since we
23867+ * can no longer flush unintended entries.
23868+ */
23869+ "invlpg (%0)\n"
23870+#endif
23871+ __copyuser_seg"testb $0,(%0)\n"
23872+ "xorb %3,(%1)\n"
23873+ :
23874+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
23875+ : "memory", "cc");
23876+ pte_unmap_unlock(pte, ptl);
23877+ up_read(&mm->mmap_sem);
23878+ return 1;
23879+}
23880+#endif
23881+
23882 /*
23883 * Handle a spurious fault caused by a stale TLB entry.
23884 *
23885@@ -972,6 +1161,9 @@ int show_unhandled_signals = 1;
23886 static inline int
23887 access_error(unsigned long error_code, struct vm_area_struct *vma)
23888 {
23889+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
23890+ return 1;
23891+
23892 if (error_code & PF_WRITE) {
23893 /* write, present and write, not present: */
23894 if (unlikely(!(vma->vm_flags & VM_WRITE)))
23895@@ -1005,18 +1197,32 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
23896 {
23897 struct vm_area_struct *vma;
23898 struct task_struct *tsk;
23899- unsigned long address;
23900 struct mm_struct *mm;
23901 int fault;
23902 int write = error_code & PF_WRITE;
23903 unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
23904 (write ? FAULT_FLAG_WRITE : 0);
23905
23906- tsk = current;
23907- mm = tsk->mm;
23908-
23909 /* Get the faulting address: */
23910- address = read_cr2();
23911+ unsigned long address = read_cr2();
23912+
23913+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23914+ if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
23915+ if (!search_exception_tables(regs->ip)) {
23916+ bad_area_nosemaphore(regs, error_code, address);
23917+ return;
23918+ }
23919+ if (address < PAX_USER_SHADOW_BASE) {
23920+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
23921+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
23922+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
23923+ } else
23924+ address -= PAX_USER_SHADOW_BASE;
23925+ }
23926+#endif
23927+
23928+ tsk = current;
23929+ mm = tsk->mm;
23930
23931 /*
23932 * Detect and handle instructions that would cause a page fault for
23933@@ -1077,7 +1283,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
23934 * User-mode registers count as a user access even for any
23935 * potential system fault or CPU buglet:
23936 */
23937- if (user_mode_vm(regs)) {
23938+ if (user_mode(regs)) {
23939 local_irq_enable();
23940 error_code |= PF_USER;
23941 } else {
23942@@ -1132,6 +1338,11 @@ retry:
23943 might_sleep();
23944 }
23945
23946+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
23947+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
23948+ return;
23949+#endif
23950+
23951 vma = find_vma(mm, address);
23952 if (unlikely(!vma)) {
23953 bad_area(regs, error_code, address);
23954@@ -1143,18 +1354,24 @@ retry:
23955 bad_area(regs, error_code, address);
23956 return;
23957 }
23958- if (error_code & PF_USER) {
23959- /*
23960- * Accessing the stack below %sp is always a bug.
23961- * The large cushion allows instructions like enter
23962- * and pusha to work. ("enter $65535, $31" pushes
23963- * 32 pointers and then decrements %sp by 65535.)
23964- */
23965- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
23966- bad_area(regs, error_code, address);
23967- return;
23968- }
23969+ /*
23970+ * Accessing the stack below %sp is always a bug.
23971+ * The large cushion allows instructions like enter
23972+ * and pusha to work. ("enter $65535, $31" pushes
23973+ * 32 pointers and then decrements %sp by 65535.)
23974+ */
23975+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
23976+ bad_area(regs, error_code, address);
23977+ return;
23978 }
23979+
23980+#ifdef CONFIG_PAX_SEGMEXEC
23981+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
23982+ bad_area(regs, error_code, address);
23983+ return;
23984+ }
23985+#endif
23986+
23987 if (unlikely(expand_stack(vma, address))) {
23988 bad_area(regs, error_code, address);
23989 return;
23990@@ -1209,3 +1426,292 @@ good_area:
23991
23992 up_read(&mm->mmap_sem);
23993 }
23994+
23995+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23996+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
23997+{
23998+ struct mm_struct *mm = current->mm;
23999+ unsigned long ip = regs->ip;
24000+
24001+ if (v8086_mode(regs))
24002+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
24003+
24004+#ifdef CONFIG_PAX_PAGEEXEC
24005+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
24006+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
24007+ return true;
24008+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
24009+ return true;
24010+ return false;
24011+ }
24012+#endif
24013+
24014+#ifdef CONFIG_PAX_SEGMEXEC
24015+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
24016+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
24017+ return true;
24018+ return false;
24019+ }
24020+#endif
24021+
24022+ return false;
24023+}
24024+#endif
24025+
24026+#ifdef CONFIG_PAX_EMUTRAMP
24027+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
24028+{
24029+ int err;
24030+
24031+ do { /* PaX: libffi trampoline emulation */
24032+ unsigned char mov, jmp;
24033+ unsigned int addr1, addr2;
24034+
24035+#ifdef CONFIG_X86_64
24036+ if ((regs->ip + 9) >> 32)
24037+ break;
24038+#endif
24039+
24040+ err = get_user(mov, (unsigned char __user *)regs->ip);
24041+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
24042+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
24043+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
24044+
24045+ if (err)
24046+ break;
24047+
24048+ if (mov == 0xB8 && jmp == 0xE9) {
24049+ regs->ax = addr1;
24050+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
24051+ return 2;
24052+ }
24053+ } while (0);
24054+
24055+ do { /* PaX: gcc trampoline emulation #1 */
24056+ unsigned char mov1, mov2;
24057+ unsigned short jmp;
24058+ unsigned int addr1, addr2;
24059+
24060+#ifdef CONFIG_X86_64
24061+ if ((regs->ip + 11) >> 32)
24062+ break;
24063+#endif
24064+
24065+ err = get_user(mov1, (unsigned char __user *)regs->ip);
24066+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
24067+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
24068+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
24069+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
24070+
24071+ if (err)
24072+ break;
24073+
24074+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
24075+ regs->cx = addr1;
24076+ regs->ax = addr2;
24077+ regs->ip = addr2;
24078+ return 2;
24079+ }
24080+ } while (0);
24081+
24082+ do { /* PaX: gcc trampoline emulation #2 */
24083+ unsigned char mov, jmp;
24084+ unsigned int addr1, addr2;
24085+
24086+#ifdef CONFIG_X86_64
24087+ if ((regs->ip + 9) >> 32)
24088+ break;
24089+#endif
24090+
24091+ err = get_user(mov, (unsigned char __user *)regs->ip);
24092+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
24093+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
24094+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
24095+
24096+ if (err)
24097+ break;
24098+
24099+ if (mov == 0xB9 && jmp == 0xE9) {
24100+ regs->cx = addr1;
24101+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
24102+ return 2;
24103+ }
24104+ } while (0);
24105+
24106+ return 1; /* PaX in action */
24107+}
24108+
24109+#ifdef CONFIG_X86_64
24110+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
24111+{
24112+ int err;
24113+
24114+ do { /* PaX: libffi trampoline emulation */
24115+ unsigned short mov1, mov2, jmp1;
24116+ unsigned char stcclc, jmp2;
24117+ unsigned long addr1, addr2;
24118+
24119+ err = get_user(mov1, (unsigned short __user *)regs->ip);
24120+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
24121+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
24122+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
24123+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
24124+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
24125+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
24126+
24127+ if (err)
24128+ break;
24129+
24130+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24131+ regs->r11 = addr1;
24132+ regs->r10 = addr2;
24133+ if (stcclc == 0xF8)
24134+ regs->flags &= ~X86_EFLAGS_CF;
24135+ else
24136+ regs->flags |= X86_EFLAGS_CF;
24137+ regs->ip = addr1;
24138+ return 2;
24139+ }
24140+ } while (0);
24141+
24142+ do { /* PaX: gcc trampoline emulation #1 */
24143+ unsigned short mov1, mov2, jmp1;
24144+ unsigned char jmp2;
24145+ unsigned int addr1;
24146+ unsigned long addr2;
24147+
24148+ err = get_user(mov1, (unsigned short __user *)regs->ip);
24149+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
24150+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
24151+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
24152+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
24153+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
24154+
24155+ if (err)
24156+ break;
24157+
24158+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24159+ regs->r11 = addr1;
24160+ regs->r10 = addr2;
24161+ regs->ip = addr1;
24162+ return 2;
24163+ }
24164+ } while (0);
24165+
24166+ do { /* PaX: gcc trampoline emulation #2 */
24167+ unsigned short mov1, mov2, jmp1;
24168+ unsigned char jmp2;
24169+ unsigned long addr1, addr2;
24170+
24171+ err = get_user(mov1, (unsigned short __user *)regs->ip);
24172+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
24173+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
24174+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
24175+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
24176+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
24177+
24178+ if (err)
24179+ break;
24180+
24181+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24182+ regs->r11 = addr1;
24183+ regs->r10 = addr2;
24184+ regs->ip = addr1;
24185+ return 2;
24186+ }
24187+ } while (0);
24188+
24189+ return 1; /* PaX in action */
24190+}
24191+#endif
24192+
24193+/*
24194+ * PaX: decide what to do with offenders (regs->ip = fault address)
24195+ *
24196+ * returns 1 when task should be killed
24197+ * 2 when gcc trampoline was detected
24198+ */
24199+static int pax_handle_fetch_fault(struct pt_regs *regs)
24200+{
24201+ if (v8086_mode(regs))
24202+ return 1;
24203+
24204+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
24205+ return 1;
24206+
24207+#ifdef CONFIG_X86_32
24208+ return pax_handle_fetch_fault_32(regs);
24209+#else
24210+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
24211+ return pax_handle_fetch_fault_32(regs);
24212+ else
24213+ return pax_handle_fetch_fault_64(regs);
24214+#endif
24215+}
24216+#endif
24217+
24218+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24219+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
24220+{
24221+ long i;
24222+
24223+ printk(KERN_ERR "PAX: bytes at PC: ");
24224+ for (i = 0; i < 20; i++) {
24225+ unsigned char c;
24226+ if (get_user(c, (unsigned char __force_user *)pc+i))
24227+ printk(KERN_CONT "?? ");
24228+ else
24229+ printk(KERN_CONT "%02x ", c);
24230+ }
24231+ printk("\n");
24232+
24233+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
24234+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
24235+ unsigned long c;
24236+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
24237+#ifdef CONFIG_X86_32
24238+ printk(KERN_CONT "???????? ");
24239+#else
24240+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
24241+ printk(KERN_CONT "???????? ???????? ");
24242+ else
24243+ printk(KERN_CONT "???????????????? ");
24244+#endif
24245+ } else {
24246+#ifdef CONFIG_X86_64
24247+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
24248+ printk(KERN_CONT "%08x ", (unsigned int)c);
24249+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
24250+ } else
24251+#endif
24252+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
24253+ }
24254+ }
24255+ printk("\n");
24256+}
24257+#endif
24258+
24259+/**
24260+ * probe_kernel_write(): safely attempt to write to a location
24261+ * @dst: address to write to
24262+ * @src: pointer to the data that shall be written
24263+ * @size: size of the data chunk
24264+ *
24265+ * Safely write to address @dst from the buffer at @src. If a kernel fault
24266+ * happens, handle that and return -EFAULT.
24267+ */
24268+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
24269+{
24270+ long ret;
24271+ mm_segment_t old_fs = get_fs();
24272+
24273+ set_fs(KERNEL_DS);
24274+ pagefault_disable();
24275+ pax_open_kernel();
24276+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
24277+ pax_close_kernel();
24278+ pagefault_enable();
24279+ set_fs(old_fs);
24280+
24281+ return ret ? -EFAULT : 0;
24282+}
24283diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
24284index dd74e46..7d26398 100644
24285--- a/arch/x86/mm/gup.c
24286+++ b/arch/x86/mm/gup.c
24287@@ -255,7 +255,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
24288 addr = start;
24289 len = (unsigned long) nr_pages << PAGE_SHIFT;
24290 end = start + len;
24291- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24292+ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24293 (void __user *)start, len)))
24294 return 0;
24295
24296diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
24297index f4f29b1..5cac4fb 100644
24298--- a/arch/x86/mm/highmem_32.c
24299+++ b/arch/x86/mm/highmem_32.c
24300@@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
24301 idx = type + KM_TYPE_NR*smp_processor_id();
24302 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
24303 BUG_ON(!pte_none(*(kmap_pte-idx)));
24304+
24305+ pax_open_kernel();
24306 set_pte(kmap_pte-idx, mk_pte(page, prot));
24307+ pax_close_kernel();
24308+
24309 arch_flush_lazy_mmu_mode();
24310
24311 return (void *)vaddr;
24312diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
24313index 8ecbb4b..29efd37 100644
24314--- a/arch/x86/mm/hugetlbpage.c
24315+++ b/arch/x86/mm/hugetlbpage.c
24316@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
24317 struct hstate *h = hstate_file(file);
24318 struct mm_struct *mm = current->mm;
24319 struct vm_area_struct *vma;
24320- unsigned long start_addr;
24321+ unsigned long start_addr, pax_task_size = TASK_SIZE;
24322+
24323+#ifdef CONFIG_PAX_SEGMEXEC
24324+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24325+ pax_task_size = SEGMEXEC_TASK_SIZE;
24326+#endif
24327+
24328+ pax_task_size -= PAGE_SIZE;
24329
24330 if (len > mm->cached_hole_size) {
24331- start_addr = mm->free_area_cache;
24332+ start_addr = mm->free_area_cache;
24333 } else {
24334- start_addr = TASK_UNMAPPED_BASE;
24335- mm->cached_hole_size = 0;
24336+ start_addr = mm->mmap_base;
24337+ mm->cached_hole_size = 0;
24338 }
24339
24340 full_search:
24341@@ -280,26 +287,27 @@ full_search:
24342
24343 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
24344 /* At this point: (!vma || addr < vma->vm_end). */
24345- if (TASK_SIZE - len < addr) {
24346+ if (pax_task_size - len < addr) {
24347 /*
24348 * Start a new search - just in case we missed
24349 * some holes.
24350 */
24351- if (start_addr != TASK_UNMAPPED_BASE) {
24352- start_addr = TASK_UNMAPPED_BASE;
24353+ if (start_addr != mm->mmap_base) {
24354+ start_addr = mm->mmap_base;
24355 mm->cached_hole_size = 0;
24356 goto full_search;
24357 }
24358 return -ENOMEM;
24359 }
24360- if (!vma || addr + len <= vma->vm_start) {
24361- mm->free_area_cache = addr + len;
24362- return addr;
24363- }
24364+ if (check_heap_stack_gap(vma, addr, len))
24365+ break;
24366 if (addr + mm->cached_hole_size < vma->vm_start)
24367 mm->cached_hole_size = vma->vm_start - addr;
24368 addr = ALIGN(vma->vm_end, huge_page_size(h));
24369 }
24370+
24371+ mm->free_area_cache = addr + len;
24372+ return addr;
24373 }
24374
24375 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24376@@ -308,10 +316,9 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24377 {
24378 struct hstate *h = hstate_file(file);
24379 struct mm_struct *mm = current->mm;
24380- struct vm_area_struct *vma, *prev_vma;
24381- unsigned long base = mm->mmap_base, addr = addr0;
24382+ struct vm_area_struct *vma;
24383+ unsigned long base = mm->mmap_base, addr;
24384 unsigned long largest_hole = mm->cached_hole_size;
24385- int first_time = 1;
24386
24387 /* don't allow allocations above current base */
24388 if (mm->free_area_cache > base)
24389@@ -321,66 +328,63 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24390 largest_hole = 0;
24391 mm->free_area_cache = base;
24392 }
24393-try_again:
24394+
24395 /* make sure it can fit in the remaining address space */
24396 if (mm->free_area_cache < len)
24397 goto fail;
24398
24399 /* either no address requested or can't fit in requested address hole */
24400- addr = (mm->free_area_cache - len) & huge_page_mask(h);
24401+ addr = (mm->free_area_cache - len);
24402 do {
24403+ addr &= huge_page_mask(h);
24404+ vma = find_vma(mm, addr);
24405 /*
24406 * Lookup failure means no vma is above this address,
24407 * i.e. return with success:
24408- */
24409- vma = find_vma(mm, addr);
24410- if (!vma)
24411- return addr;
24412-
24413- /*
24414 * new region fits between prev_vma->vm_end and
24415 * vma->vm_start, use it:
24416 */
24417- prev_vma = vma->vm_prev;
24418- if (addr + len <= vma->vm_start &&
24419- (!prev_vma || (addr >= prev_vma->vm_end))) {
24420+ if (check_heap_stack_gap(vma, addr, len)) {
24421 /* remember the address as a hint for next time */
24422- mm->cached_hole_size = largest_hole;
24423- return (mm->free_area_cache = addr);
24424- } else {
24425- /* pull free_area_cache down to the first hole */
24426- if (mm->free_area_cache == vma->vm_end) {
24427- mm->free_area_cache = vma->vm_start;
24428- mm->cached_hole_size = largest_hole;
24429- }
24430+ mm->cached_hole_size = largest_hole;
24431+ return (mm->free_area_cache = addr);
24432+ }
24433+ /* pull free_area_cache down to the first hole */
24434+ if (mm->free_area_cache == vma->vm_end) {
24435+ mm->free_area_cache = vma->vm_start;
24436+ mm->cached_hole_size = largest_hole;
24437 }
24438
24439 /* remember the largest hole we saw so far */
24440 if (addr + largest_hole < vma->vm_start)
24441- largest_hole = vma->vm_start - addr;
24442+ largest_hole = vma->vm_start - addr;
24443
24444 /* try just below the current vma->vm_start */
24445- addr = (vma->vm_start - len) & huge_page_mask(h);
24446- } while (len <= vma->vm_start);
24447+ addr = skip_heap_stack_gap(vma, len);
24448+ } while (!IS_ERR_VALUE(addr));
24449
24450 fail:
24451 /*
24452- * if hint left us with no space for the requested
24453- * mapping then try again:
24454- */
24455- if (first_time) {
24456- mm->free_area_cache = base;
24457- largest_hole = 0;
24458- first_time = 0;
24459- goto try_again;
24460- }
24461- /*
24462 * A failed mmap() very likely causes application failure,
24463 * so fall back to the bottom-up function here. This scenario
24464 * can happen with large stack limits and large mmap()
24465 * allocations.
24466 */
24467- mm->free_area_cache = TASK_UNMAPPED_BASE;
24468+
24469+#ifdef CONFIG_PAX_SEGMEXEC
24470+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24471+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
24472+ else
24473+#endif
24474+
24475+ mm->mmap_base = TASK_UNMAPPED_BASE;
24476+
24477+#ifdef CONFIG_PAX_RANDMMAP
24478+ if (mm->pax_flags & MF_PAX_RANDMMAP)
24479+ mm->mmap_base += mm->delta_mmap;
24480+#endif
24481+
24482+ mm->free_area_cache = mm->mmap_base;
24483 mm->cached_hole_size = ~0UL;
24484 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
24485 len, pgoff, flags);
24486@@ -388,6 +392,7 @@ fail:
24487 /*
24488 * Restore the topdown base:
24489 */
24490+ mm->mmap_base = base;
24491 mm->free_area_cache = base;
24492 mm->cached_hole_size = ~0UL;
24493
24494@@ -401,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24495 struct hstate *h = hstate_file(file);
24496 struct mm_struct *mm = current->mm;
24497 struct vm_area_struct *vma;
24498+ unsigned long pax_task_size = TASK_SIZE;
24499
24500 if (len & ~huge_page_mask(h))
24501 return -EINVAL;
24502- if (len > TASK_SIZE)
24503+
24504+#ifdef CONFIG_PAX_SEGMEXEC
24505+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24506+ pax_task_size = SEGMEXEC_TASK_SIZE;
24507+#endif
24508+
24509+ pax_task_size -= PAGE_SIZE;
24510+
24511+ if (len > pax_task_size)
24512 return -ENOMEM;
24513
24514 if (flags & MAP_FIXED) {
24515@@ -416,8 +430,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24516 if (addr) {
24517 addr = ALIGN(addr, huge_page_size(h));
24518 vma = find_vma(mm, addr);
24519- if (TASK_SIZE - len >= addr &&
24520- (!vma || addr + len <= vma->vm_start))
24521+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
24522 return addr;
24523 }
24524 if (mm->get_unmapped_area == arch_get_unmapped_area)
24525diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
24526index 6cabf65..77e9c1c 100644
24527--- a/arch/x86/mm/init.c
24528+++ b/arch/x86/mm/init.c
24529@@ -17,6 +17,7 @@
24530 #include <asm/tlb.h>
24531 #include <asm/proto.h>
24532 #include <asm/dma.h> /* for MAX_DMA_PFN */
24533+#include <asm/desc.h>
24534
24535 unsigned long __initdata pgt_buf_start;
24536 unsigned long __meminitdata pgt_buf_end;
24537@@ -33,7 +34,7 @@ int direct_gbpages
24538 static void __init find_early_table_space(unsigned long end, int use_pse,
24539 int use_gbpages)
24540 {
24541- unsigned long puds, pmds, ptes, tables, start = 0, good_end = end;
24542+ unsigned long puds, pmds, ptes, tables, start = 0x100000, good_end = end;
24543 phys_addr_t base;
24544
24545 puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
24546@@ -314,8 +315,29 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
24547 */
24548 int devmem_is_allowed(unsigned long pagenr)
24549 {
24550+#ifdef CONFIG_GRKERNSEC_KMEM
24551+ /* allow BDA */
24552+ if (!pagenr)
24553+ return 1;
24554+ /* allow EBDA */
24555+ if ((0x9f000 >> PAGE_SHIFT) == pagenr)
24556+ return 1;
24557+#else
24558+ if (!pagenr)
24559+ return 1;
24560+#ifdef CONFIG_VM86
24561+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
24562+ return 1;
24563+#endif
24564+#endif
24565+
24566+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
24567+ return 1;
24568+#ifdef CONFIG_GRKERNSEC_KMEM
24569+ /* throw out everything else below 1MB */
24570 if (pagenr <= 256)
24571- return 1;
24572+ return 0;
24573+#endif
24574 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
24575 return 0;
24576 if (!page_is_ram(pagenr))
24577@@ -374,6 +396,86 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
24578
24579 void free_initmem(void)
24580 {
24581+
24582+#ifdef CONFIG_PAX_KERNEXEC
24583+#ifdef CONFIG_X86_32
24584+ /* PaX: limit KERNEL_CS to actual size */
24585+ unsigned long addr, limit;
24586+ struct desc_struct d;
24587+ int cpu;
24588+
24589+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
24590+ limit = (limit - 1UL) >> PAGE_SHIFT;
24591+
24592+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
24593+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
24594+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
24595+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
24596+ }
24597+
24598+ /* PaX: make KERNEL_CS read-only */
24599+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
24600+ if (!paravirt_enabled())
24601+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
24602+/*
24603+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
24604+ pgd = pgd_offset_k(addr);
24605+ pud = pud_offset(pgd, addr);
24606+ pmd = pmd_offset(pud, addr);
24607+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24608+ }
24609+*/
24610+#ifdef CONFIG_X86_PAE
24611+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
24612+/*
24613+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
24614+ pgd = pgd_offset_k(addr);
24615+ pud = pud_offset(pgd, addr);
24616+ pmd = pmd_offset(pud, addr);
24617+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24618+ }
24619+*/
24620+#endif
24621+
24622+#ifdef CONFIG_MODULES
24623+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
24624+#endif
24625+
24626+#else
24627+ pgd_t *pgd;
24628+ pud_t *pud;
24629+ pmd_t *pmd;
24630+ unsigned long addr, end;
24631+
24632+ /* PaX: make kernel code/rodata read-only, rest non-executable */
24633+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
24634+ pgd = pgd_offset_k(addr);
24635+ pud = pud_offset(pgd, addr);
24636+ pmd = pmd_offset(pud, addr);
24637+ if (!pmd_present(*pmd))
24638+ continue;
24639+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
24640+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24641+ else
24642+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24643+ }
24644+
24645+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
24646+ end = addr + KERNEL_IMAGE_SIZE;
24647+ for (; addr < end; addr += PMD_SIZE) {
24648+ pgd = pgd_offset_k(addr);
24649+ pud = pud_offset(pgd, addr);
24650+ pmd = pmd_offset(pud, addr);
24651+ if (!pmd_present(*pmd))
24652+ continue;
24653+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
24654+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24655+ }
24656+#endif
24657+
24658+ flush_tlb_all();
24659+#endif
24660+
24661 free_init_pages("unused kernel memory",
24662 (unsigned long)(&__init_begin),
24663 (unsigned long)(&__init_end));
24664diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
24665index 8663f6c..829ae76 100644
24666--- a/arch/x86/mm/init_32.c
24667+++ b/arch/x86/mm/init_32.c
24668@@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
24669 }
24670
24671 /*
24672- * Creates a middle page table and puts a pointer to it in the
24673- * given global directory entry. This only returns the gd entry
24674- * in non-PAE compilation mode, since the middle layer is folded.
24675- */
24676-static pmd_t * __init one_md_table_init(pgd_t *pgd)
24677-{
24678- pud_t *pud;
24679- pmd_t *pmd_table;
24680-
24681-#ifdef CONFIG_X86_PAE
24682- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
24683- if (after_bootmem)
24684- pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
24685- else
24686- pmd_table = (pmd_t *)alloc_low_page();
24687- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
24688- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
24689- pud = pud_offset(pgd, 0);
24690- BUG_ON(pmd_table != pmd_offset(pud, 0));
24691-
24692- return pmd_table;
24693- }
24694-#endif
24695- pud = pud_offset(pgd, 0);
24696- pmd_table = pmd_offset(pud, 0);
24697-
24698- return pmd_table;
24699-}
24700-
24701-/*
24702 * Create a page table and place a pointer to it in a middle page
24703 * directory entry:
24704 */
24705@@ -123,13 +93,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
24706 page_table = (pte_t *)alloc_low_page();
24707
24708 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
24709+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24710+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
24711+#else
24712 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
24713+#endif
24714 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
24715 }
24716
24717 return pte_offset_kernel(pmd, 0);
24718 }
24719
24720+static pmd_t * __init one_md_table_init(pgd_t *pgd)
24721+{
24722+ pud_t *pud;
24723+ pmd_t *pmd_table;
24724+
24725+ pud = pud_offset(pgd, 0);
24726+ pmd_table = pmd_offset(pud, 0);
24727+
24728+ return pmd_table;
24729+}
24730+
24731 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
24732 {
24733 int pgd_idx = pgd_index(vaddr);
24734@@ -203,6 +188,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24735 int pgd_idx, pmd_idx;
24736 unsigned long vaddr;
24737 pgd_t *pgd;
24738+ pud_t *pud;
24739 pmd_t *pmd;
24740 pte_t *pte = NULL;
24741
24742@@ -212,8 +198,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24743 pgd = pgd_base + pgd_idx;
24744
24745 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
24746- pmd = one_md_table_init(pgd);
24747- pmd = pmd + pmd_index(vaddr);
24748+ pud = pud_offset(pgd, vaddr);
24749+ pmd = pmd_offset(pud, vaddr);
24750+
24751+#ifdef CONFIG_X86_PAE
24752+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24753+#endif
24754+
24755 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
24756 pmd++, pmd_idx++) {
24757 pte = page_table_kmap_check(one_page_table_init(pmd),
24758@@ -225,11 +216,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24759 }
24760 }
24761
24762-static inline int is_kernel_text(unsigned long addr)
24763+static inline int is_kernel_text(unsigned long start, unsigned long end)
24764 {
24765- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
24766- return 1;
24767- return 0;
24768+ if ((start > ktla_ktva((unsigned long)_etext) ||
24769+ end <= ktla_ktva((unsigned long)_stext)) &&
24770+ (start > ktla_ktva((unsigned long)_einittext) ||
24771+ end <= ktla_ktva((unsigned long)_sinittext)) &&
24772+
24773+#ifdef CONFIG_ACPI_SLEEP
24774+ (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
24775+#endif
24776+
24777+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
24778+ return 0;
24779+ return 1;
24780 }
24781
24782 /*
24783@@ -246,9 +246,10 @@ kernel_physical_mapping_init(unsigned long start,
24784 unsigned long last_map_addr = end;
24785 unsigned long start_pfn, end_pfn;
24786 pgd_t *pgd_base = swapper_pg_dir;
24787- int pgd_idx, pmd_idx, pte_ofs;
24788+ unsigned int pgd_idx, pmd_idx, pte_ofs;
24789 unsigned long pfn;
24790 pgd_t *pgd;
24791+ pud_t *pud;
24792 pmd_t *pmd;
24793 pte_t *pte;
24794 unsigned pages_2m, pages_4k;
24795@@ -281,8 +282,13 @@ repeat:
24796 pfn = start_pfn;
24797 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
24798 pgd = pgd_base + pgd_idx;
24799- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
24800- pmd = one_md_table_init(pgd);
24801+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
24802+ pud = pud_offset(pgd, 0);
24803+ pmd = pmd_offset(pud, 0);
24804+
24805+#ifdef CONFIG_X86_PAE
24806+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24807+#endif
24808
24809 if (pfn >= end_pfn)
24810 continue;
24811@@ -294,14 +300,13 @@ repeat:
24812 #endif
24813 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
24814 pmd++, pmd_idx++) {
24815- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
24816+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
24817
24818 /*
24819 * Map with big pages if possible, otherwise
24820 * create normal page tables:
24821 */
24822 if (use_pse) {
24823- unsigned int addr2;
24824 pgprot_t prot = PAGE_KERNEL_LARGE;
24825 /*
24826 * first pass will use the same initial
24827@@ -311,11 +316,7 @@ repeat:
24828 __pgprot(PTE_IDENT_ATTR |
24829 _PAGE_PSE);
24830
24831- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
24832- PAGE_OFFSET + PAGE_SIZE-1;
24833-
24834- if (is_kernel_text(addr) ||
24835- is_kernel_text(addr2))
24836+ if (is_kernel_text(address, address + PMD_SIZE))
24837 prot = PAGE_KERNEL_LARGE_EXEC;
24838
24839 pages_2m++;
24840@@ -332,7 +333,7 @@ repeat:
24841 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
24842 pte += pte_ofs;
24843 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
24844- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
24845+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
24846 pgprot_t prot = PAGE_KERNEL;
24847 /*
24848 * first pass will use the same initial
24849@@ -340,7 +341,7 @@ repeat:
24850 */
24851 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
24852
24853- if (is_kernel_text(addr))
24854+ if (is_kernel_text(address, address + PAGE_SIZE))
24855 prot = PAGE_KERNEL_EXEC;
24856
24857 pages_4k++;
24858@@ -466,7 +467,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
24859
24860 pud = pud_offset(pgd, va);
24861 pmd = pmd_offset(pud, va);
24862- if (!pmd_present(*pmd))
24863+ if (!pmd_present(*pmd) || pmd_huge(*pmd))
24864 break;
24865
24866 pte = pte_offset_kernel(pmd, va);
24867@@ -518,12 +519,10 @@ void __init early_ioremap_page_table_range_init(void)
24868
24869 static void __init pagetable_init(void)
24870 {
24871- pgd_t *pgd_base = swapper_pg_dir;
24872-
24873- permanent_kmaps_init(pgd_base);
24874+ permanent_kmaps_init(swapper_pg_dir);
24875 }
24876
24877-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
24878+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
24879 EXPORT_SYMBOL_GPL(__supported_pte_mask);
24880
24881 /* user-defined highmem size */
24882@@ -735,6 +734,12 @@ void __init mem_init(void)
24883
24884 pci_iommu_alloc();
24885
24886+#ifdef CONFIG_PAX_PER_CPU_PGD
24887+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
24888+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
24889+ KERNEL_PGD_PTRS);
24890+#endif
24891+
24892 #ifdef CONFIG_FLATMEM
24893 BUG_ON(!mem_map);
24894 #endif
24895@@ -761,7 +766,7 @@ void __init mem_init(void)
24896 reservedpages++;
24897
24898 codesize = (unsigned long) &_etext - (unsigned long) &_text;
24899- datasize = (unsigned long) &_edata - (unsigned long) &_etext;
24900+ datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
24901 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
24902
24903 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
24904@@ -802,10 +807,10 @@ void __init mem_init(void)
24905 ((unsigned long)&__init_end -
24906 (unsigned long)&__init_begin) >> 10,
24907
24908- (unsigned long)&_etext, (unsigned long)&_edata,
24909- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
24910+ (unsigned long)&_sdata, (unsigned long)&_edata,
24911+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
24912
24913- (unsigned long)&_text, (unsigned long)&_etext,
24914+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
24915 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
24916
24917 /*
24918@@ -883,6 +888,7 @@ void set_kernel_text_rw(void)
24919 if (!kernel_set_to_readonly)
24920 return;
24921
24922+ start = ktla_ktva(start);
24923 pr_debug("Set kernel text: %lx - %lx for read write\n",
24924 start, start+size);
24925
24926@@ -897,6 +903,7 @@ void set_kernel_text_ro(void)
24927 if (!kernel_set_to_readonly)
24928 return;
24929
24930+ start = ktla_ktva(start);
24931 pr_debug("Set kernel text: %lx - %lx for read only\n",
24932 start, start+size);
24933
24934@@ -925,6 +932,7 @@ void mark_rodata_ro(void)
24935 unsigned long start = PFN_ALIGN(_text);
24936 unsigned long size = PFN_ALIGN(_etext) - start;
24937
24938+ start = ktla_ktva(start);
24939 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
24940 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
24941 size >> 10);
24942diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
24943index 436a030..2b60088 100644
24944--- a/arch/x86/mm/init_64.c
24945+++ b/arch/x86/mm/init_64.c
24946@@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpages_on);
24947 * around without checking the pgd every time.
24948 */
24949
24950-pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
24951+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
24952 EXPORT_SYMBOL_GPL(__supported_pte_mask);
24953
24954 int force_personality32;
24955@@ -108,12 +108,22 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24956
24957 for (address = start; address <= end; address += PGDIR_SIZE) {
24958 const pgd_t *pgd_ref = pgd_offset_k(address);
24959+
24960+#ifdef CONFIG_PAX_PER_CPU_PGD
24961+ unsigned long cpu;
24962+#else
24963 struct page *page;
24964+#endif
24965
24966 if (pgd_none(*pgd_ref))
24967 continue;
24968
24969 spin_lock(&pgd_lock);
24970+
24971+#ifdef CONFIG_PAX_PER_CPU_PGD
24972+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
24973+ pgd_t *pgd = pgd_offset_cpu(cpu, address);
24974+#else
24975 list_for_each_entry(page, &pgd_list, lru) {
24976 pgd_t *pgd;
24977 spinlock_t *pgt_lock;
24978@@ -122,6 +132,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24979 /* the pgt_lock only for Xen */
24980 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
24981 spin_lock(pgt_lock);
24982+#endif
24983
24984 if (pgd_none(*pgd))
24985 set_pgd(pgd, *pgd_ref);
24986@@ -129,7 +140,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24987 BUG_ON(pgd_page_vaddr(*pgd)
24988 != pgd_page_vaddr(*pgd_ref));
24989
24990+#ifndef CONFIG_PAX_PER_CPU_PGD
24991 spin_unlock(pgt_lock);
24992+#endif
24993+
24994 }
24995 spin_unlock(&pgd_lock);
24996 }
24997@@ -162,7 +176,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
24998 {
24999 if (pgd_none(*pgd)) {
25000 pud_t *pud = (pud_t *)spp_getpage();
25001- pgd_populate(&init_mm, pgd, pud);
25002+ pgd_populate_kernel(&init_mm, pgd, pud);
25003 if (pud != pud_offset(pgd, 0))
25004 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
25005 pud, pud_offset(pgd, 0));
25006@@ -174,7 +188,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
25007 {
25008 if (pud_none(*pud)) {
25009 pmd_t *pmd = (pmd_t *) spp_getpage();
25010- pud_populate(&init_mm, pud, pmd);
25011+ pud_populate_kernel(&init_mm, pud, pmd);
25012 if (pmd != pmd_offset(pud, 0))
25013 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
25014 pmd, pmd_offset(pud, 0));
25015@@ -203,7 +217,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
25016 pmd = fill_pmd(pud, vaddr);
25017 pte = fill_pte(pmd, vaddr);
25018
25019+ pax_open_kernel();
25020 set_pte(pte, new_pte);
25021+ pax_close_kernel();
25022
25023 /*
25024 * It's enough to flush this one mapping.
25025@@ -262,14 +278,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
25026 pgd = pgd_offset_k((unsigned long)__va(phys));
25027 if (pgd_none(*pgd)) {
25028 pud = (pud_t *) spp_getpage();
25029- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
25030- _PAGE_USER));
25031+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
25032 }
25033 pud = pud_offset(pgd, (unsigned long)__va(phys));
25034 if (pud_none(*pud)) {
25035 pmd = (pmd_t *) spp_getpage();
25036- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
25037- _PAGE_USER));
25038+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
25039 }
25040 pmd = pmd_offset(pud, phys);
25041 BUG_ON(!pmd_none(*pmd));
25042@@ -330,7 +344,7 @@ static __ref void *alloc_low_page(unsigned long *phys)
25043 if (pfn >= pgt_buf_top)
25044 panic("alloc_low_page: ran out of memory");
25045
25046- adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
25047+ adr = (void __force_kernel *)early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
25048 clear_page(adr);
25049 *phys = pfn * PAGE_SIZE;
25050 return adr;
25051@@ -346,7 +360,7 @@ static __ref void *map_low_page(void *virt)
25052
25053 phys = __pa(virt);
25054 left = phys & (PAGE_SIZE - 1);
25055- adr = early_memremap(phys & PAGE_MASK, PAGE_SIZE);
25056+ adr = (void __force_kernel *)early_memremap(phys & PAGE_MASK, PAGE_SIZE);
25057 adr = (void *)(((unsigned long)adr) | left);
25058
25059 return adr;
25060@@ -592,7 +606,7 @@ kernel_physical_mapping_init(unsigned long start,
25061 unmap_low_page(pud);
25062
25063 spin_lock(&init_mm.page_table_lock);
25064- pgd_populate(&init_mm, pgd, __va(pud_phys));
25065+ pgd_populate_kernel(&init_mm, pgd, __va(pud_phys));
25066 spin_unlock(&init_mm.page_table_lock);
25067 pgd_changed = true;
25068 }
25069@@ -684,6 +698,12 @@ void __init mem_init(void)
25070
25071 pci_iommu_alloc();
25072
25073+#ifdef CONFIG_PAX_PER_CPU_PGD
25074+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
25075+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
25076+ KERNEL_PGD_PTRS);
25077+#endif
25078+
25079 /* clear_bss() already clear the empty_zero_page */
25080
25081 reservedpages = 0;
25082@@ -844,8 +864,8 @@ int kern_addr_valid(unsigned long addr)
25083 static struct vm_area_struct gate_vma = {
25084 .vm_start = VSYSCALL_START,
25085 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
25086- .vm_page_prot = PAGE_READONLY_EXEC,
25087- .vm_flags = VM_READ | VM_EXEC
25088+ .vm_page_prot = PAGE_READONLY,
25089+ .vm_flags = VM_READ
25090 };
25091
25092 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
25093@@ -879,7 +899,7 @@ int in_gate_area_no_mm(unsigned long addr)
25094
25095 const char *arch_vma_name(struct vm_area_struct *vma)
25096 {
25097- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
25098+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
25099 return "[vdso]";
25100 if (vma == &gate_vma)
25101 return "[vsyscall]";
25102diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
25103index 7b179b4..6bd1777 100644
25104--- a/arch/x86/mm/iomap_32.c
25105+++ b/arch/x86/mm/iomap_32.c
25106@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
25107 type = kmap_atomic_idx_push();
25108 idx = type + KM_TYPE_NR * smp_processor_id();
25109 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
25110+
25111+ pax_open_kernel();
25112 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
25113+ pax_close_kernel();
25114+
25115 arch_flush_lazy_mmu_mode();
25116
25117 return (void *)vaddr;
25118diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
25119index be1ef57..55f0160 100644
25120--- a/arch/x86/mm/ioremap.c
25121+++ b/arch/x86/mm/ioremap.c
25122@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
25123 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
25124 int is_ram = page_is_ram(pfn);
25125
25126- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
25127+ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
25128 return NULL;
25129 WARN_ON_ONCE(is_ram);
25130 }
25131@@ -315,6 +315,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
25132
25133 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
25134 if (page_is_ram(start >> PAGE_SHIFT))
25135+#ifdef CONFIG_HIGHMEM
25136+ if ((start >> PAGE_SHIFT) < max_low_pfn)
25137+#endif
25138 return __va(phys);
25139
25140 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
25141@@ -344,7 +347,7 @@ static int __init early_ioremap_debug_setup(char *str)
25142 early_param("early_ioremap_debug", early_ioremap_debug_setup);
25143
25144 static __initdata int after_paging_init;
25145-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
25146+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
25147
25148 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
25149 {
25150@@ -381,8 +384,7 @@ void __init early_ioremap_init(void)
25151 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
25152
25153 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
25154- memset(bm_pte, 0, sizeof(bm_pte));
25155- pmd_populate_kernel(&init_mm, pmd, bm_pte);
25156+ pmd_populate_user(&init_mm, pmd, bm_pte);
25157
25158 /*
25159 * The boot-ioremap range spans multiple pmds, for which
25160diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
25161index d87dd6d..bf3fa66 100644
25162--- a/arch/x86/mm/kmemcheck/kmemcheck.c
25163+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
25164@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
25165 * memory (e.g. tracked pages)? For now, we need this to avoid
25166 * invoking kmemcheck for PnP BIOS calls.
25167 */
25168- if (regs->flags & X86_VM_MASK)
25169+ if (v8086_mode(regs))
25170 return false;
25171- if (regs->cs != __KERNEL_CS)
25172+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
25173 return false;
25174
25175 pte = kmemcheck_pte_lookup(address);
25176diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
25177index 845df68..1d8d29f 100644
25178--- a/arch/x86/mm/mmap.c
25179+++ b/arch/x86/mm/mmap.c
25180@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
25181 * Leave an at least ~128 MB hole with possible stack randomization.
25182 */
25183 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
25184-#define MAX_GAP (TASK_SIZE/6*5)
25185+#define MAX_GAP (pax_task_size/6*5)
25186
25187 static int mmap_is_legacy(void)
25188 {
25189@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
25190 return rnd << PAGE_SHIFT;
25191 }
25192
25193-static unsigned long mmap_base(void)
25194+static unsigned long mmap_base(struct mm_struct *mm)
25195 {
25196 unsigned long gap = rlimit(RLIMIT_STACK);
25197+ unsigned long pax_task_size = TASK_SIZE;
25198+
25199+#ifdef CONFIG_PAX_SEGMEXEC
25200+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
25201+ pax_task_size = SEGMEXEC_TASK_SIZE;
25202+#endif
25203
25204 if (gap < MIN_GAP)
25205 gap = MIN_GAP;
25206 else if (gap > MAX_GAP)
25207 gap = MAX_GAP;
25208
25209- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
25210+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
25211 }
25212
25213 /*
25214 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
25215 * does, but not when emulating X86_32
25216 */
25217-static unsigned long mmap_legacy_base(void)
25218+static unsigned long mmap_legacy_base(struct mm_struct *mm)
25219 {
25220- if (mmap_is_ia32())
25221+ if (mmap_is_ia32()) {
25222+
25223+#ifdef CONFIG_PAX_SEGMEXEC
25224+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
25225+ return SEGMEXEC_TASK_UNMAPPED_BASE;
25226+ else
25227+#endif
25228+
25229 return TASK_UNMAPPED_BASE;
25230- else
25231+ } else
25232 return TASK_UNMAPPED_BASE + mmap_rnd();
25233 }
25234
25235@@ -113,11 +126,23 @@ static unsigned long mmap_legacy_base(void)
25236 void arch_pick_mmap_layout(struct mm_struct *mm)
25237 {
25238 if (mmap_is_legacy()) {
25239- mm->mmap_base = mmap_legacy_base();
25240+ mm->mmap_base = mmap_legacy_base(mm);
25241+
25242+#ifdef CONFIG_PAX_RANDMMAP
25243+ if (mm->pax_flags & MF_PAX_RANDMMAP)
25244+ mm->mmap_base += mm->delta_mmap;
25245+#endif
25246+
25247 mm->get_unmapped_area = arch_get_unmapped_area;
25248 mm->unmap_area = arch_unmap_area;
25249 } else {
25250- mm->mmap_base = mmap_base();
25251+ mm->mmap_base = mmap_base(mm);
25252+
25253+#ifdef CONFIG_PAX_RANDMMAP
25254+ if (mm->pax_flags & MF_PAX_RANDMMAP)
25255+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
25256+#endif
25257+
25258 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
25259 mm->unmap_area = arch_unmap_area_topdown;
25260 }
25261diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
25262index dc0b727..dc9d71a 100644
25263--- a/arch/x86/mm/mmio-mod.c
25264+++ b/arch/x86/mm/mmio-mod.c
25265@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
25266 break;
25267 default:
25268 {
25269- unsigned char *ip = (unsigned char *)instptr;
25270+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
25271 my_trace->opcode = MMIO_UNKNOWN_OP;
25272 my_trace->width = 0;
25273 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
25274@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
25275 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25276 void __iomem *addr)
25277 {
25278- static atomic_t next_id;
25279+ static atomic_unchecked_t next_id;
25280 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
25281 /* These are page-unaligned. */
25282 struct mmiotrace_map map = {
25283@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25284 .private = trace
25285 },
25286 .phys = offset,
25287- .id = atomic_inc_return(&next_id)
25288+ .id = atomic_inc_return_unchecked(&next_id)
25289 };
25290 map.map_id = trace->id;
25291
25292diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
25293index b008656..773eac2 100644
25294--- a/arch/x86/mm/pageattr-test.c
25295+++ b/arch/x86/mm/pageattr-test.c
25296@@ -36,7 +36,7 @@ enum {
25297
25298 static int pte_testbit(pte_t pte)
25299 {
25300- return pte_flags(pte) & _PAGE_UNUSED1;
25301+ return pte_flags(pte) & _PAGE_CPA_TEST;
25302 }
25303
25304 struct split_state {
25305diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
25306index e1ebde3..b1e1db38 100644
25307--- a/arch/x86/mm/pageattr.c
25308+++ b/arch/x86/mm/pageattr.c
25309@@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25310 */
25311 #ifdef CONFIG_PCI_BIOS
25312 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
25313- pgprot_val(forbidden) |= _PAGE_NX;
25314+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25315 #endif
25316
25317 /*
25318@@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25319 * Does not cover __inittext since that is gone later on. On
25320 * 64bit we do not enforce !NX on the low mapping
25321 */
25322- if (within(address, (unsigned long)_text, (unsigned long)_etext))
25323- pgprot_val(forbidden) |= _PAGE_NX;
25324+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
25325+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25326
25327+#ifdef CONFIG_DEBUG_RODATA
25328 /*
25329 * The .rodata section needs to be read-only. Using the pfn
25330 * catches all aliases.
25331@@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25332 if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
25333 __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
25334 pgprot_val(forbidden) |= _PAGE_RW;
25335+#endif
25336
25337 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
25338 /*
25339@@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25340 }
25341 #endif
25342
25343+#ifdef CONFIG_PAX_KERNEXEC
25344+ if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
25345+ pgprot_val(forbidden) |= _PAGE_RW;
25346+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25347+ }
25348+#endif
25349+
25350 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
25351
25352 return prot;
25353@@ -369,23 +378,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
25354 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
25355 {
25356 /* change init_mm */
25357+ pax_open_kernel();
25358 set_pte_atomic(kpte, pte);
25359+
25360 #ifdef CONFIG_X86_32
25361 if (!SHARED_KERNEL_PMD) {
25362+
25363+#ifdef CONFIG_PAX_PER_CPU_PGD
25364+ unsigned long cpu;
25365+#else
25366 struct page *page;
25367+#endif
25368
25369+#ifdef CONFIG_PAX_PER_CPU_PGD
25370+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
25371+ pgd_t *pgd = get_cpu_pgd(cpu);
25372+#else
25373 list_for_each_entry(page, &pgd_list, lru) {
25374- pgd_t *pgd;
25375+ pgd_t *pgd = (pgd_t *)page_address(page);
25376+#endif
25377+
25378 pud_t *pud;
25379 pmd_t *pmd;
25380
25381- pgd = (pgd_t *)page_address(page) + pgd_index(address);
25382+ pgd += pgd_index(address);
25383 pud = pud_offset(pgd, address);
25384 pmd = pmd_offset(pud, address);
25385 set_pte_atomic((pte_t *)pmd, pte);
25386 }
25387 }
25388 #endif
25389+ pax_close_kernel();
25390 }
25391
25392 static int
25393diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
25394index f6ff57b..481690f 100644
25395--- a/arch/x86/mm/pat.c
25396+++ b/arch/x86/mm/pat.c
25397@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
25398
25399 if (!entry) {
25400 printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
25401- current->comm, current->pid, start, end);
25402+ current->comm, task_pid_nr(current), start, end);
25403 return -EINVAL;
25404 }
25405
25406@@ -492,8 +492,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
25407 while (cursor < to) {
25408 if (!devmem_is_allowed(pfn)) {
25409 printk(KERN_INFO
25410- "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
25411- current->comm, from, to);
25412+ "Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n",
25413+ current->comm, from, to, cursor);
25414 return 0;
25415 }
25416 cursor += PAGE_SIZE;
25417@@ -557,7 +557,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
25418 printk(KERN_INFO
25419 "%s:%d ioremap_change_attr failed %s "
25420 "for %Lx-%Lx\n",
25421- current->comm, current->pid,
25422+ current->comm, task_pid_nr(current),
25423 cattr_name(flags),
25424 base, (unsigned long long)(base + size));
25425 return -EINVAL;
25426@@ -593,7 +593,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25427 if (want_flags != flags) {
25428 printk(KERN_WARNING
25429 "%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n",
25430- current->comm, current->pid,
25431+ current->comm, task_pid_nr(current),
25432 cattr_name(want_flags),
25433 (unsigned long long)paddr,
25434 (unsigned long long)(paddr + size),
25435@@ -615,7 +615,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25436 free_memtype(paddr, paddr + size);
25437 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
25438 " for %Lx-%Lx, got %s\n",
25439- current->comm, current->pid,
25440+ current->comm, task_pid_nr(current),
25441 cattr_name(want_flags),
25442 (unsigned long long)paddr,
25443 (unsigned long long)(paddr + size),
25444diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
25445index 9f0614d..92ae64a 100644
25446--- a/arch/x86/mm/pf_in.c
25447+++ b/arch/x86/mm/pf_in.c
25448@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
25449 int i;
25450 enum reason_type rv = OTHERS;
25451
25452- p = (unsigned char *)ins_addr;
25453+ p = (unsigned char *)ktla_ktva(ins_addr);
25454 p += skip_prefix(p, &prf);
25455 p += get_opcode(p, &opcode);
25456
25457@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
25458 struct prefix_bits prf;
25459 int i;
25460
25461- p = (unsigned char *)ins_addr;
25462+ p = (unsigned char *)ktla_ktva(ins_addr);
25463 p += skip_prefix(p, &prf);
25464 p += get_opcode(p, &opcode);
25465
25466@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
25467 struct prefix_bits prf;
25468 int i;
25469
25470- p = (unsigned char *)ins_addr;
25471+ p = (unsigned char *)ktla_ktva(ins_addr);
25472 p += skip_prefix(p, &prf);
25473 p += get_opcode(p, &opcode);
25474
25475@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
25476 struct prefix_bits prf;
25477 int i;
25478
25479- p = (unsigned char *)ins_addr;
25480+ p = (unsigned char *)ktla_ktva(ins_addr);
25481 p += skip_prefix(p, &prf);
25482 p += get_opcode(p, &opcode);
25483 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
25484@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
25485 struct prefix_bits prf;
25486 int i;
25487
25488- p = (unsigned char *)ins_addr;
25489+ p = (unsigned char *)ktla_ktva(ins_addr);
25490 p += skip_prefix(p, &prf);
25491 p += get_opcode(p, &opcode);
25492 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
25493diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
25494index 8573b83..7d9628f 100644
25495--- a/arch/x86/mm/pgtable.c
25496+++ b/arch/x86/mm/pgtable.c
25497@@ -84,10 +84,60 @@ static inline void pgd_list_del(pgd_t *pgd)
25498 list_del(&page->lru);
25499 }
25500
25501-#define UNSHARED_PTRS_PER_PGD \
25502- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25503+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25504+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
25505
25506+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25507+{
25508+ while (count--)
25509+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
25510+}
25511+#endif
25512
25513+#ifdef CONFIG_PAX_PER_CPU_PGD
25514+void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25515+{
25516+ while (count--) {
25517+ pgd_t pgd;
25518+
25519+#ifdef CONFIG_X86_64
25520+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
25521+#else
25522+ pgd = *src++;
25523+#endif
25524+
25525+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25526+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
25527+#endif
25528+
25529+ *dst++ = pgd;
25530+ }
25531+
25532+}
25533+#endif
25534+
25535+#ifdef CONFIG_X86_64
25536+#define pxd_t pud_t
25537+#define pyd_t pgd_t
25538+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
25539+#define pxd_free(mm, pud) pud_free((mm), (pud))
25540+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
25541+#define pyd_offset(mm, address) pgd_offset((mm), (address))
25542+#define PYD_SIZE PGDIR_SIZE
25543+#else
25544+#define pxd_t pmd_t
25545+#define pyd_t pud_t
25546+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
25547+#define pxd_free(mm, pud) pmd_free((mm), (pud))
25548+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
25549+#define pyd_offset(mm, address) pud_offset((mm), (address))
25550+#define PYD_SIZE PUD_SIZE
25551+#endif
25552+
25553+#ifdef CONFIG_PAX_PER_CPU_PGD
25554+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
25555+static inline void pgd_dtor(pgd_t *pgd) {}
25556+#else
25557 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
25558 {
25559 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
25560@@ -128,6 +178,7 @@ static void pgd_dtor(pgd_t *pgd)
25561 pgd_list_del(pgd);
25562 spin_unlock(&pgd_lock);
25563 }
25564+#endif
25565
25566 /*
25567 * List of all pgd's needed for non-PAE so it can invalidate entries
25568@@ -140,7 +191,7 @@ static void pgd_dtor(pgd_t *pgd)
25569 * -- wli
25570 */
25571
25572-#ifdef CONFIG_X86_PAE
25573+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25574 /*
25575 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
25576 * updating the top-level pagetable entries to guarantee the
25577@@ -152,7 +203,7 @@ static void pgd_dtor(pgd_t *pgd)
25578 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
25579 * and initialize the kernel pmds here.
25580 */
25581-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
25582+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25583
25584 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25585 {
25586@@ -170,36 +221,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25587 */
25588 flush_tlb_mm(mm);
25589 }
25590+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
25591+#define PREALLOCATED_PXDS USER_PGD_PTRS
25592 #else /* !CONFIG_X86_PAE */
25593
25594 /* No need to prepopulate any pagetable entries in non-PAE modes. */
25595-#define PREALLOCATED_PMDS 0
25596+#define PREALLOCATED_PXDS 0
25597
25598 #endif /* CONFIG_X86_PAE */
25599
25600-static void free_pmds(pmd_t *pmds[])
25601+static void free_pxds(pxd_t *pxds[])
25602 {
25603 int i;
25604
25605- for(i = 0; i < PREALLOCATED_PMDS; i++)
25606- if (pmds[i])
25607- free_page((unsigned long)pmds[i]);
25608+ for(i = 0; i < PREALLOCATED_PXDS; i++)
25609+ if (pxds[i])
25610+ free_page((unsigned long)pxds[i]);
25611 }
25612
25613-static int preallocate_pmds(pmd_t *pmds[])
25614+static int preallocate_pxds(pxd_t *pxds[])
25615 {
25616 int i;
25617 bool failed = false;
25618
25619- for(i = 0; i < PREALLOCATED_PMDS; i++) {
25620- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
25621- if (pmd == NULL)
25622+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
25623+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
25624+ if (pxd == NULL)
25625 failed = true;
25626- pmds[i] = pmd;
25627+ pxds[i] = pxd;
25628 }
25629
25630 if (failed) {
25631- free_pmds(pmds);
25632+ free_pxds(pxds);
25633 return -ENOMEM;
25634 }
25635
25636@@ -212,51 +265,55 @@ static int preallocate_pmds(pmd_t *pmds[])
25637 * preallocate which never got a corresponding vma will need to be
25638 * freed manually.
25639 */
25640-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
25641+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
25642 {
25643 int i;
25644
25645- for(i = 0; i < PREALLOCATED_PMDS; i++) {
25646+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
25647 pgd_t pgd = pgdp[i];
25648
25649 if (pgd_val(pgd) != 0) {
25650- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
25651+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
25652
25653- pgdp[i] = native_make_pgd(0);
25654+ set_pgd(pgdp + i, native_make_pgd(0));
25655
25656- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
25657- pmd_free(mm, pmd);
25658+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
25659+ pxd_free(mm, pxd);
25660 }
25661 }
25662 }
25663
25664-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
25665+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
25666 {
25667- pud_t *pud;
25668+ pyd_t *pyd;
25669 unsigned long addr;
25670 int i;
25671
25672- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
25673+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
25674 return;
25675
25676- pud = pud_offset(pgd, 0);
25677+#ifdef CONFIG_X86_64
25678+ pyd = pyd_offset(mm, 0L);
25679+#else
25680+ pyd = pyd_offset(pgd, 0L);
25681+#endif
25682
25683- for (addr = i = 0; i < PREALLOCATED_PMDS;
25684- i++, pud++, addr += PUD_SIZE) {
25685- pmd_t *pmd = pmds[i];
25686+ for (addr = i = 0; i < PREALLOCATED_PXDS;
25687+ i++, pyd++, addr += PYD_SIZE) {
25688+ pxd_t *pxd = pxds[i];
25689
25690 if (i >= KERNEL_PGD_BOUNDARY)
25691- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25692- sizeof(pmd_t) * PTRS_PER_PMD);
25693+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25694+ sizeof(pxd_t) * PTRS_PER_PMD);
25695
25696- pud_populate(mm, pud, pmd);
25697+ pyd_populate(mm, pyd, pxd);
25698 }
25699 }
25700
25701 pgd_t *pgd_alloc(struct mm_struct *mm)
25702 {
25703 pgd_t *pgd;
25704- pmd_t *pmds[PREALLOCATED_PMDS];
25705+ pxd_t *pxds[PREALLOCATED_PXDS];
25706
25707 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
25708
25709@@ -265,11 +322,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25710
25711 mm->pgd = pgd;
25712
25713- if (preallocate_pmds(pmds) != 0)
25714+ if (preallocate_pxds(pxds) != 0)
25715 goto out_free_pgd;
25716
25717 if (paravirt_pgd_alloc(mm) != 0)
25718- goto out_free_pmds;
25719+ goto out_free_pxds;
25720
25721 /*
25722 * Make sure that pre-populating the pmds is atomic with
25723@@ -279,14 +336,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25724 spin_lock(&pgd_lock);
25725
25726 pgd_ctor(mm, pgd);
25727- pgd_prepopulate_pmd(mm, pgd, pmds);
25728+ pgd_prepopulate_pxd(mm, pgd, pxds);
25729
25730 spin_unlock(&pgd_lock);
25731
25732 return pgd;
25733
25734-out_free_pmds:
25735- free_pmds(pmds);
25736+out_free_pxds:
25737+ free_pxds(pxds);
25738 out_free_pgd:
25739 free_page((unsigned long)pgd);
25740 out:
25741@@ -295,7 +352,7 @@ out:
25742
25743 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
25744 {
25745- pgd_mop_up_pmds(mm, pgd);
25746+ pgd_mop_up_pxds(mm, pgd);
25747 pgd_dtor(pgd);
25748 paravirt_pgd_free(mm, pgd);
25749 free_page((unsigned long)pgd);
25750diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
25751index cac7184..09a39fa 100644
25752--- a/arch/x86/mm/pgtable_32.c
25753+++ b/arch/x86/mm/pgtable_32.c
25754@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
25755 return;
25756 }
25757 pte = pte_offset_kernel(pmd, vaddr);
25758+
25759+ pax_open_kernel();
25760 if (pte_val(pteval))
25761 set_pte_at(&init_mm, vaddr, pte, pteval);
25762 else
25763 pte_clear(&init_mm, vaddr, pte);
25764+ pax_close_kernel();
25765
25766 /*
25767 * It's enough to flush this one mapping.
25768diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
25769index 410531d..0f16030 100644
25770--- a/arch/x86/mm/setup_nx.c
25771+++ b/arch/x86/mm/setup_nx.c
25772@@ -5,8 +5,10 @@
25773 #include <asm/pgtable.h>
25774 #include <asm/proto.h>
25775
25776+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25777 static int disable_nx __cpuinitdata;
25778
25779+#ifndef CONFIG_PAX_PAGEEXEC
25780 /*
25781 * noexec = on|off
25782 *
25783@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
25784 return 0;
25785 }
25786 early_param("noexec", noexec_setup);
25787+#endif
25788+
25789+#endif
25790
25791 void __cpuinit x86_configure_nx(void)
25792 {
25793+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25794 if (cpu_has_nx && !disable_nx)
25795 __supported_pte_mask |= _PAGE_NX;
25796 else
25797+#endif
25798 __supported_pte_mask &= ~_PAGE_NX;
25799 }
25800
25801diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
25802index d6c0418..06a0ad5 100644
25803--- a/arch/x86/mm/tlb.c
25804+++ b/arch/x86/mm/tlb.c
25805@@ -65,7 +65,11 @@ void leave_mm(int cpu)
25806 BUG();
25807 cpumask_clear_cpu(cpu,
25808 mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
25809+
25810+#ifndef CONFIG_PAX_PER_CPU_PGD
25811 load_cr3(swapper_pg_dir);
25812+#endif
25813+
25814 }
25815 EXPORT_SYMBOL_GPL(leave_mm);
25816
25817diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
25818index 6687022..ceabcfa 100644
25819--- a/arch/x86/net/bpf_jit.S
25820+++ b/arch/x86/net/bpf_jit.S
25821@@ -9,6 +9,7 @@
25822 */
25823 #include <linux/linkage.h>
25824 #include <asm/dwarf2.h>
25825+#include <asm/alternative-asm.h>
25826
25827 /*
25828 * Calling convention :
25829@@ -35,6 +36,7 @@ sk_load_word:
25830 jle bpf_slow_path_word
25831 mov (SKBDATA,%rsi),%eax
25832 bswap %eax /* ntohl() */
25833+ pax_force_retaddr
25834 ret
25835
25836
25837@@ -53,6 +55,7 @@ sk_load_half:
25838 jle bpf_slow_path_half
25839 movzwl (SKBDATA,%rsi),%eax
25840 rol $8,%ax # ntohs()
25841+ pax_force_retaddr
25842 ret
25843
25844 sk_load_byte_ind:
25845@@ -66,6 +69,7 @@ sk_load_byte:
25846 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
25847 jle bpf_slow_path_byte
25848 movzbl (SKBDATA,%rsi),%eax
25849+ pax_force_retaddr
25850 ret
25851
25852 /**
25853@@ -82,6 +86,7 @@ ENTRY(sk_load_byte_msh)
25854 movzbl (SKBDATA,%rsi),%ebx
25855 and $15,%bl
25856 shl $2,%bl
25857+ pax_force_retaddr
25858 ret
25859 CFI_ENDPROC
25860 ENDPROC(sk_load_byte_msh)
25861@@ -91,6 +96,7 @@ bpf_error:
25862 xor %eax,%eax
25863 mov -8(%rbp),%rbx
25864 leaveq
25865+ pax_force_retaddr
25866 ret
25867
25868 /* rsi contains offset and can be scratched */
25869@@ -113,6 +119,7 @@ bpf_slow_path_word:
25870 js bpf_error
25871 mov -12(%rbp),%eax
25872 bswap %eax
25873+ pax_force_retaddr
25874 ret
25875
25876 bpf_slow_path_half:
25877@@ -121,12 +128,14 @@ bpf_slow_path_half:
25878 mov -12(%rbp),%ax
25879 rol $8,%ax
25880 movzwl %ax,%eax
25881+ pax_force_retaddr
25882 ret
25883
25884 bpf_slow_path_byte:
25885 bpf_slow_path_common(1)
25886 js bpf_error
25887 movzbl -12(%rbp),%eax
25888+ pax_force_retaddr
25889 ret
25890
25891 bpf_slow_path_byte_msh:
25892@@ -137,4 +146,5 @@ bpf_slow_path_byte_msh:
25893 and $15,%al
25894 shl $2,%al
25895 xchg %eax,%ebx
25896+ pax_force_retaddr
25897 ret
25898diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
25899index 5a5b6e4..201d42e 100644
25900--- a/arch/x86/net/bpf_jit_comp.c
25901+++ b/arch/x86/net/bpf_jit_comp.c
25902@@ -117,6 +117,10 @@ static inline void bpf_flush_icache(void *start, void *end)
25903 set_fs(old_fs);
25904 }
25905
25906+struct bpf_jit_work {
25907+ struct work_struct work;
25908+ void *image;
25909+};
25910
25911 void bpf_jit_compile(struct sk_filter *fp)
25912 {
25913@@ -141,6 +145,10 @@ void bpf_jit_compile(struct sk_filter *fp)
25914 if (addrs == NULL)
25915 return;
25916
25917+ fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL);
25918+ if (!fp->work)
25919+ goto out;
25920+
25921 /* Before first pass, make a rough estimation of addrs[]
25922 * each bpf instruction is translated to less than 64 bytes
25923 */
25924@@ -477,7 +485,7 @@ void bpf_jit_compile(struct sk_filter *fp)
25925 common_load: seen |= SEEN_DATAREF;
25926 if ((int)K < 0) {
25927 /* Abort the JIT because __load_pointer() is needed. */
25928- goto out;
25929+ goto error;
25930 }
25931 t_offset = func - (image + addrs[i]);
25932 EMIT1_off32(0xbe, K); /* mov imm32,%esi */
25933@@ -492,7 +500,7 @@ common_load: seen |= SEEN_DATAREF;
25934 case BPF_S_LDX_B_MSH:
25935 if ((int)K < 0) {
25936 /* Abort the JIT because __load_pointer() is needed. */
25937- goto out;
25938+ goto error;
25939 }
25940 seen |= SEEN_DATAREF | SEEN_XREG;
25941 t_offset = sk_load_byte_msh - (image + addrs[i]);
25942@@ -582,17 +590,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25943 break;
25944 default:
25945 /* hmm, too complex filter, give up with jit compiler */
25946- goto out;
25947+ goto error;
25948 }
25949 ilen = prog - temp;
25950 if (image) {
25951 if (unlikely(proglen + ilen > oldproglen)) {
25952 pr_err("bpb_jit_compile fatal error\n");
25953- kfree(addrs);
25954- module_free(NULL, image);
25955- return;
25956+ module_free_exec(NULL, image);
25957+ goto error;
25958 }
25959+ pax_open_kernel();
25960 memcpy(image + proglen, temp, ilen);
25961+ pax_close_kernel();
25962 }
25963 proglen += ilen;
25964 addrs[i] = proglen;
25965@@ -613,11 +622,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25966 break;
25967 }
25968 if (proglen == oldproglen) {
25969- image = module_alloc(max_t(unsigned int,
25970- proglen,
25971- sizeof(struct work_struct)));
25972+ image = module_alloc_exec(proglen);
25973 if (!image)
25974- goto out;
25975+ goto error;
25976 }
25977 oldproglen = proglen;
25978 }
25979@@ -633,7 +640,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25980 bpf_flush_icache(image, image + proglen);
25981
25982 fp->bpf_func = (void *)image;
25983- }
25984+ } else
25985+error:
25986+ kfree(fp->work);
25987+
25988 out:
25989 kfree(addrs);
25990 return;
25991@@ -641,18 +651,20 @@ out:
25992
25993 static void jit_free_defer(struct work_struct *arg)
25994 {
25995- module_free(NULL, arg);
25996+ module_free_exec(NULL, ((struct bpf_jit_work *)arg)->image);
25997+ kfree(arg);
25998 }
25999
26000 /* run from softirq, we must use a work_struct to call
26001- * module_free() from process context
26002+ * module_free_exec() from process context
26003 */
26004 void bpf_jit_free(struct sk_filter *fp)
26005 {
26006 if (fp->bpf_func != sk_run_filter) {
26007- struct work_struct *work = (struct work_struct *)fp->bpf_func;
26008+ struct work_struct *work = &fp->work->work;
26009
26010 INIT_WORK(work, jit_free_defer);
26011+ fp->work->image = fp->bpf_func;
26012 schedule_work(work);
26013 }
26014 }
26015diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
26016index bff89df..377758a 100644
26017--- a/arch/x86/oprofile/backtrace.c
26018+++ b/arch/x86/oprofile/backtrace.c
26019@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
26020 struct stack_frame_ia32 *fp;
26021 unsigned long bytes;
26022
26023- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
26024+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
26025 if (bytes != sizeof(bufhead))
26026 return NULL;
26027
26028- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
26029+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
26030
26031 oprofile_add_trace(bufhead[0].return_address);
26032
26033@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
26034 struct stack_frame bufhead[2];
26035 unsigned long bytes;
26036
26037- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
26038+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
26039 if (bytes != sizeof(bufhead))
26040 return NULL;
26041
26042@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
26043 {
26044 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
26045
26046- if (!user_mode_vm(regs)) {
26047+ if (!user_mode(regs)) {
26048 unsigned long stack = kernel_stack_pointer(regs);
26049 if (depth)
26050 dump_trace(NULL, regs, (unsigned long *)stack, 0,
26051diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
26052index cb29191..036766d 100644
26053--- a/arch/x86/pci/mrst.c
26054+++ b/arch/x86/pci/mrst.c
26055@@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
26056 printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
26057 pci_mmcfg_late_init();
26058 pcibios_enable_irq = mrst_pci_irq_enable;
26059- pci_root_ops = pci_mrst_ops;
26060+ pax_open_kernel();
26061+ memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
26062+ pax_close_kernel();
26063 /* Continue with standard init */
26064 return 1;
26065 }
26066diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
26067index da8fe05..7ee6704 100644
26068--- a/arch/x86/pci/pcbios.c
26069+++ b/arch/x86/pci/pcbios.c
26070@@ -79,50 +79,93 @@ union bios32 {
26071 static struct {
26072 unsigned long address;
26073 unsigned short segment;
26074-} bios32_indirect = { 0, __KERNEL_CS };
26075+} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
26076
26077 /*
26078 * Returns the entry point for the given service, NULL on error
26079 */
26080
26081-static unsigned long bios32_service(unsigned long service)
26082+static unsigned long __devinit bios32_service(unsigned long service)
26083 {
26084 unsigned char return_code; /* %al */
26085 unsigned long address; /* %ebx */
26086 unsigned long length; /* %ecx */
26087 unsigned long entry; /* %edx */
26088 unsigned long flags;
26089+ struct desc_struct d, *gdt;
26090
26091 local_irq_save(flags);
26092- __asm__("lcall *(%%edi); cld"
26093+
26094+ gdt = get_cpu_gdt_table(smp_processor_id());
26095+
26096+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
26097+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
26098+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
26099+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
26100+
26101+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
26102 : "=a" (return_code),
26103 "=b" (address),
26104 "=c" (length),
26105 "=d" (entry)
26106 : "0" (service),
26107 "1" (0),
26108- "D" (&bios32_indirect));
26109+ "D" (&bios32_indirect),
26110+ "r"(__PCIBIOS_DS)
26111+ : "memory");
26112+
26113+ pax_open_kernel();
26114+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
26115+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
26116+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
26117+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
26118+ pax_close_kernel();
26119+
26120 local_irq_restore(flags);
26121
26122 switch (return_code) {
26123- case 0:
26124- return address + entry;
26125- case 0x80: /* Not present */
26126- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
26127- return 0;
26128- default: /* Shouldn't happen */
26129- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
26130- service, return_code);
26131+ case 0: {
26132+ int cpu;
26133+ unsigned char flags;
26134+
26135+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
26136+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
26137+ printk(KERN_WARNING "bios32_service: not valid\n");
26138 return 0;
26139+ }
26140+ address = address + PAGE_OFFSET;
26141+ length += 16UL; /* some BIOSs underreport this... */
26142+ flags = 4;
26143+ if (length >= 64*1024*1024) {
26144+ length >>= PAGE_SHIFT;
26145+ flags |= 8;
26146+ }
26147+
26148+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
26149+ gdt = get_cpu_gdt_table(cpu);
26150+ pack_descriptor(&d, address, length, 0x9b, flags);
26151+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
26152+ pack_descriptor(&d, address, length, 0x93, flags);
26153+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
26154+ }
26155+ return entry;
26156+ }
26157+ case 0x80: /* Not present */
26158+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
26159+ return 0;
26160+ default: /* Shouldn't happen */
26161+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
26162+ service, return_code);
26163+ return 0;
26164 }
26165 }
26166
26167 static struct {
26168 unsigned long address;
26169 unsigned short segment;
26170-} pci_indirect = { 0, __KERNEL_CS };
26171+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
26172
26173-static int pci_bios_present;
26174+static int pci_bios_present __read_only;
26175
26176 static int __devinit check_pcibios(void)
26177 {
26178@@ -131,11 +174,13 @@ static int __devinit check_pcibios(void)
26179 unsigned long flags, pcibios_entry;
26180
26181 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
26182- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
26183+ pci_indirect.address = pcibios_entry;
26184
26185 local_irq_save(flags);
26186- __asm__(
26187- "lcall *(%%edi); cld\n\t"
26188+ __asm__("movw %w6, %%ds\n\t"
26189+ "lcall *%%ss:(%%edi); cld\n\t"
26190+ "push %%ss\n\t"
26191+ "pop %%ds\n\t"
26192 "jc 1f\n\t"
26193 "xor %%ah, %%ah\n"
26194 "1:"
26195@@ -144,7 +189,8 @@ static int __devinit check_pcibios(void)
26196 "=b" (ebx),
26197 "=c" (ecx)
26198 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
26199- "D" (&pci_indirect)
26200+ "D" (&pci_indirect),
26201+ "r" (__PCIBIOS_DS)
26202 : "memory");
26203 local_irq_restore(flags);
26204
26205@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26206
26207 switch (len) {
26208 case 1:
26209- __asm__("lcall *(%%esi); cld\n\t"
26210+ __asm__("movw %w6, %%ds\n\t"
26211+ "lcall *%%ss:(%%esi); cld\n\t"
26212+ "push %%ss\n\t"
26213+ "pop %%ds\n\t"
26214 "jc 1f\n\t"
26215 "xor %%ah, %%ah\n"
26216 "1:"
26217@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26218 : "1" (PCIBIOS_READ_CONFIG_BYTE),
26219 "b" (bx),
26220 "D" ((long)reg),
26221- "S" (&pci_indirect));
26222+ "S" (&pci_indirect),
26223+ "r" (__PCIBIOS_DS));
26224 /*
26225 * Zero-extend the result beyond 8 bits, do not trust the
26226 * BIOS having done it:
26227@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26228 *value &= 0xff;
26229 break;
26230 case 2:
26231- __asm__("lcall *(%%esi); cld\n\t"
26232+ __asm__("movw %w6, %%ds\n\t"
26233+ "lcall *%%ss:(%%esi); cld\n\t"
26234+ "push %%ss\n\t"
26235+ "pop %%ds\n\t"
26236 "jc 1f\n\t"
26237 "xor %%ah, %%ah\n"
26238 "1:"
26239@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26240 : "1" (PCIBIOS_READ_CONFIG_WORD),
26241 "b" (bx),
26242 "D" ((long)reg),
26243- "S" (&pci_indirect));
26244+ "S" (&pci_indirect),
26245+ "r" (__PCIBIOS_DS));
26246 /*
26247 * Zero-extend the result beyond 16 bits, do not trust the
26248 * BIOS having done it:
26249@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26250 *value &= 0xffff;
26251 break;
26252 case 4:
26253- __asm__("lcall *(%%esi); cld\n\t"
26254+ __asm__("movw %w6, %%ds\n\t"
26255+ "lcall *%%ss:(%%esi); cld\n\t"
26256+ "push %%ss\n\t"
26257+ "pop %%ds\n\t"
26258 "jc 1f\n\t"
26259 "xor %%ah, %%ah\n"
26260 "1:"
26261@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26262 : "1" (PCIBIOS_READ_CONFIG_DWORD),
26263 "b" (bx),
26264 "D" ((long)reg),
26265- "S" (&pci_indirect));
26266+ "S" (&pci_indirect),
26267+ "r" (__PCIBIOS_DS));
26268 break;
26269 }
26270
26271@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26272
26273 switch (len) {
26274 case 1:
26275- __asm__("lcall *(%%esi); cld\n\t"
26276+ __asm__("movw %w6, %%ds\n\t"
26277+ "lcall *%%ss:(%%esi); cld\n\t"
26278+ "push %%ss\n\t"
26279+ "pop %%ds\n\t"
26280 "jc 1f\n\t"
26281 "xor %%ah, %%ah\n"
26282 "1:"
26283@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26284 "c" (value),
26285 "b" (bx),
26286 "D" ((long)reg),
26287- "S" (&pci_indirect));
26288+ "S" (&pci_indirect),
26289+ "r" (__PCIBIOS_DS));
26290 break;
26291 case 2:
26292- __asm__("lcall *(%%esi); cld\n\t"
26293+ __asm__("movw %w6, %%ds\n\t"
26294+ "lcall *%%ss:(%%esi); cld\n\t"
26295+ "push %%ss\n\t"
26296+ "pop %%ds\n\t"
26297 "jc 1f\n\t"
26298 "xor %%ah, %%ah\n"
26299 "1:"
26300@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26301 "c" (value),
26302 "b" (bx),
26303 "D" ((long)reg),
26304- "S" (&pci_indirect));
26305+ "S" (&pci_indirect),
26306+ "r" (__PCIBIOS_DS));
26307 break;
26308 case 4:
26309- __asm__("lcall *(%%esi); cld\n\t"
26310+ __asm__("movw %w6, %%ds\n\t"
26311+ "lcall *%%ss:(%%esi); cld\n\t"
26312+ "push %%ss\n\t"
26313+ "pop %%ds\n\t"
26314 "jc 1f\n\t"
26315 "xor %%ah, %%ah\n"
26316 "1:"
26317@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26318 "c" (value),
26319 "b" (bx),
26320 "D" ((long)reg),
26321- "S" (&pci_indirect));
26322+ "S" (&pci_indirect),
26323+ "r" (__PCIBIOS_DS));
26324 break;
26325 }
26326
26327@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26328
26329 DBG("PCI: Fetching IRQ routing table... ");
26330 __asm__("push %%es\n\t"
26331+ "movw %w8, %%ds\n\t"
26332 "push %%ds\n\t"
26333 "pop %%es\n\t"
26334- "lcall *(%%esi); cld\n\t"
26335+ "lcall *%%ss:(%%esi); cld\n\t"
26336 "pop %%es\n\t"
26337+ "push %%ss\n\t"
26338+ "pop %%ds\n"
26339 "jc 1f\n\t"
26340 "xor %%ah, %%ah\n"
26341 "1:"
26342@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26343 "1" (0),
26344 "D" ((long) &opt),
26345 "S" (&pci_indirect),
26346- "m" (opt)
26347+ "m" (opt),
26348+ "r" (__PCIBIOS_DS)
26349 : "memory");
26350 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
26351 if (ret & 0xff00)
26352@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26353 {
26354 int ret;
26355
26356- __asm__("lcall *(%%esi); cld\n\t"
26357+ __asm__("movw %w5, %%ds\n\t"
26358+ "lcall *%%ss:(%%esi); cld\n\t"
26359+ "push %%ss\n\t"
26360+ "pop %%ds\n"
26361 "jc 1f\n\t"
26362 "xor %%ah, %%ah\n"
26363 "1:"
26364@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26365 : "0" (PCIBIOS_SET_PCI_HW_INT),
26366 "b" ((dev->bus->number << 8) | dev->devfn),
26367 "c" ((irq << 8) | (pin + 10)),
26368- "S" (&pci_indirect));
26369+ "S" (&pci_indirect),
26370+ "r" (__PCIBIOS_DS));
26371 return !(ret & 0xff00);
26372 }
26373 EXPORT_SYMBOL(pcibios_set_irq_routing);
26374diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
26375index 40e4469..1ab536e 100644
26376--- a/arch/x86/platform/efi/efi_32.c
26377+++ b/arch/x86/platform/efi/efi_32.c
26378@@ -44,11 +44,22 @@ void efi_call_phys_prelog(void)
26379 {
26380 struct desc_ptr gdt_descr;
26381
26382+#ifdef CONFIG_PAX_KERNEXEC
26383+ struct desc_struct d;
26384+#endif
26385+
26386 local_irq_save(efi_rt_eflags);
26387
26388 load_cr3(initial_page_table);
26389 __flush_tlb_all();
26390
26391+#ifdef CONFIG_PAX_KERNEXEC
26392+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
26393+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26394+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
26395+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26396+#endif
26397+
26398 gdt_descr.address = __pa(get_cpu_gdt_table(0));
26399 gdt_descr.size = GDT_SIZE - 1;
26400 load_gdt(&gdt_descr);
26401@@ -58,6 +69,14 @@ void efi_call_phys_epilog(void)
26402 {
26403 struct desc_ptr gdt_descr;
26404
26405+#ifdef CONFIG_PAX_KERNEXEC
26406+ struct desc_struct d;
26407+
26408+ memset(&d, 0, sizeof d);
26409+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26410+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26411+#endif
26412+
26413 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
26414 gdt_descr.size = GDT_SIZE - 1;
26415 load_gdt(&gdt_descr);
26416diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
26417index fbe66e6..c5c0dd2 100644
26418--- a/arch/x86/platform/efi/efi_stub_32.S
26419+++ b/arch/x86/platform/efi/efi_stub_32.S
26420@@ -6,7 +6,9 @@
26421 */
26422
26423 #include <linux/linkage.h>
26424+#include <linux/init.h>
26425 #include <asm/page_types.h>
26426+#include <asm/segment.h>
26427
26428 /*
26429 * efi_call_phys(void *, ...) is a function with variable parameters.
26430@@ -20,7 +22,7 @@
26431 * service functions will comply with gcc calling convention, too.
26432 */
26433
26434-.text
26435+__INIT
26436 ENTRY(efi_call_phys)
26437 /*
26438 * 0. The function can only be called in Linux kernel. So CS has been
26439@@ -36,9 +38,11 @@ ENTRY(efi_call_phys)
26440 * The mapping of lower virtual memory has been created in prelog and
26441 * epilog.
26442 */
26443- movl $1f, %edx
26444- subl $__PAGE_OFFSET, %edx
26445- jmp *%edx
26446+ movl $(__KERNEXEC_EFI_DS), %edx
26447+ mov %edx, %ds
26448+ mov %edx, %es
26449+ mov %edx, %ss
26450+ ljmp $(__KERNEXEC_EFI_CS),$1f-__PAGE_OFFSET
26451 1:
26452
26453 /*
26454@@ -47,14 +51,8 @@ ENTRY(efi_call_phys)
26455 * parameter 2, ..., param n. To make things easy, we save the return
26456 * address of efi_call_phys in a global variable.
26457 */
26458- popl %edx
26459- movl %edx, saved_return_addr
26460- /* get the function pointer into ECX*/
26461- popl %ecx
26462- movl %ecx, efi_rt_function_ptr
26463- movl $2f, %edx
26464- subl $__PAGE_OFFSET, %edx
26465- pushl %edx
26466+ popl (saved_return_addr)
26467+ popl (efi_rt_function_ptr)
26468
26469 /*
26470 * 3. Clear PG bit in %CR0.
26471@@ -73,9 +71,8 @@ ENTRY(efi_call_phys)
26472 /*
26473 * 5. Call the physical function.
26474 */
26475- jmp *%ecx
26476+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
26477
26478-2:
26479 /*
26480 * 6. After EFI runtime service returns, control will return to
26481 * following instruction. We'd better readjust stack pointer first.
26482@@ -88,35 +85,32 @@ ENTRY(efi_call_phys)
26483 movl %cr0, %edx
26484 orl $0x80000000, %edx
26485 movl %edx, %cr0
26486- jmp 1f
26487-1:
26488+
26489 /*
26490 * 8. Now restore the virtual mode from flat mode by
26491 * adding EIP with PAGE_OFFSET.
26492 */
26493- movl $1f, %edx
26494- jmp *%edx
26495+ ljmp $(__KERNEL_CS),$1f+__PAGE_OFFSET
26496 1:
26497+ movl $(__KERNEL_DS), %edx
26498+ mov %edx, %ds
26499+ mov %edx, %es
26500+ mov %edx, %ss
26501
26502 /*
26503 * 9. Balance the stack. And because EAX contain the return value,
26504 * we'd better not clobber it.
26505 */
26506- leal efi_rt_function_ptr, %edx
26507- movl (%edx), %ecx
26508- pushl %ecx
26509+ pushl (efi_rt_function_ptr)
26510
26511 /*
26512- * 10. Push the saved return address onto the stack and return.
26513+ * 10. Return to the saved return address.
26514 */
26515- leal saved_return_addr, %edx
26516- movl (%edx), %ecx
26517- pushl %ecx
26518- ret
26519+ jmpl *(saved_return_addr)
26520 ENDPROC(efi_call_phys)
26521 .previous
26522
26523-.data
26524+__INITDATA
26525 saved_return_addr:
26526 .long 0
26527 efi_rt_function_ptr:
26528diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
26529index 4c07cca..2c8427d 100644
26530--- a/arch/x86/platform/efi/efi_stub_64.S
26531+++ b/arch/x86/platform/efi/efi_stub_64.S
26532@@ -7,6 +7,7 @@
26533 */
26534
26535 #include <linux/linkage.h>
26536+#include <asm/alternative-asm.h>
26537
26538 #define SAVE_XMM \
26539 mov %rsp, %rax; \
26540@@ -40,6 +41,7 @@ ENTRY(efi_call0)
26541 call *%rdi
26542 addq $32, %rsp
26543 RESTORE_XMM
26544+ pax_force_retaddr 0, 1
26545 ret
26546 ENDPROC(efi_call0)
26547
26548@@ -50,6 +52,7 @@ ENTRY(efi_call1)
26549 call *%rdi
26550 addq $32, %rsp
26551 RESTORE_XMM
26552+ pax_force_retaddr 0, 1
26553 ret
26554 ENDPROC(efi_call1)
26555
26556@@ -60,6 +63,7 @@ ENTRY(efi_call2)
26557 call *%rdi
26558 addq $32, %rsp
26559 RESTORE_XMM
26560+ pax_force_retaddr 0, 1
26561 ret
26562 ENDPROC(efi_call2)
26563
26564@@ -71,6 +75,7 @@ ENTRY(efi_call3)
26565 call *%rdi
26566 addq $32, %rsp
26567 RESTORE_XMM
26568+ pax_force_retaddr 0, 1
26569 ret
26570 ENDPROC(efi_call3)
26571
26572@@ -83,6 +88,7 @@ ENTRY(efi_call4)
26573 call *%rdi
26574 addq $32, %rsp
26575 RESTORE_XMM
26576+ pax_force_retaddr 0, 1
26577 ret
26578 ENDPROC(efi_call4)
26579
26580@@ -96,6 +102,7 @@ ENTRY(efi_call5)
26581 call *%rdi
26582 addq $48, %rsp
26583 RESTORE_XMM
26584+ pax_force_retaddr 0, 1
26585 ret
26586 ENDPROC(efi_call5)
26587
26588@@ -112,5 +119,6 @@ ENTRY(efi_call6)
26589 call *%rdi
26590 addq $48, %rsp
26591 RESTORE_XMM
26592+ pax_force_retaddr 0, 1
26593 ret
26594 ENDPROC(efi_call6)
26595diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
26596index 475e2cd..1b8e708 100644
26597--- a/arch/x86/platform/mrst/mrst.c
26598+++ b/arch/x86/platform/mrst/mrst.c
26599@@ -76,18 +76,20 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
26600 EXPORT_SYMBOL_GPL(sfi_mrtc_array);
26601 int sfi_mrtc_num;
26602
26603-static void mrst_power_off(void)
26604+static __noreturn void mrst_power_off(void)
26605 {
26606 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
26607 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 1);
26608+ BUG();
26609 }
26610
26611-static void mrst_reboot(void)
26612+static __noreturn void mrst_reboot(void)
26613 {
26614 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
26615 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 0);
26616 else
26617 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
26618+ BUG();
26619 }
26620
26621 /* parse all the mtimer info to a static mtimer array */
26622diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
26623index 3ae0e61..4202d86 100644
26624--- a/arch/x86/platform/uv/tlb_uv.c
26625+++ b/arch/x86/platform/uv/tlb_uv.c
26626@@ -1424,6 +1424,8 @@ static ssize_t tunables_read(struct file *file, char __user *userbuf,
26627 * 0: display meaning of the statistics
26628 */
26629 static ssize_t ptc_proc_write(struct file *file, const char __user *user,
26630+ size_t count, loff_t *data) __size_overflow(3);
26631+static ssize_t ptc_proc_write(struct file *file, const char __user *user,
26632 size_t count, loff_t *data)
26633 {
26634 int cpu;
26635@@ -1539,6 +1541,8 @@ static int parse_tunables_write(struct bau_control *bcp, char *instr,
26636 * Handle a write to debugfs. (/sys/kernel/debug/sgi_uv/bau_tunables)
26637 */
26638 static ssize_t tunables_write(struct file *file, const char __user *user,
26639+ size_t count, loff_t *data) __size_overflow(3);
26640+static ssize_t tunables_write(struct file *file, const char __user *user,
26641 size_t count, loff_t *data)
26642 {
26643 int cpu;
26644diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
26645index f10c0af..3ec1f95 100644
26646--- a/arch/x86/power/cpu.c
26647+++ b/arch/x86/power/cpu.c
26648@@ -131,7 +131,7 @@ static void do_fpu_end(void)
26649 static void fix_processor_context(void)
26650 {
26651 int cpu = smp_processor_id();
26652- struct tss_struct *t = &per_cpu(init_tss, cpu);
26653+ struct tss_struct *t = init_tss + cpu;
26654
26655 set_tss_desc(cpu, t); /*
26656 * This just modifies memory; should not be
26657@@ -141,7 +141,9 @@ static void fix_processor_context(void)
26658 */
26659
26660 #ifdef CONFIG_X86_64
26661+ pax_open_kernel();
26662 get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
26663+ pax_close_kernel();
26664
26665 syscall_init(); /* This sets MSR_*STAR and related */
26666 #endif
26667diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
26668index 5d17950..2253fc9 100644
26669--- a/arch/x86/vdso/Makefile
26670+++ b/arch/x86/vdso/Makefile
26671@@ -137,7 +137,7 @@ quiet_cmd_vdso = VDSO $@
26672 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
26673 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
26674
26675-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26676+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26677 GCOV_PROFILE := n
26678
26679 #
26680diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
26681index 468d591..8e80a0a 100644
26682--- a/arch/x86/vdso/vdso32-setup.c
26683+++ b/arch/x86/vdso/vdso32-setup.c
26684@@ -25,6 +25,7 @@
26685 #include <asm/tlbflush.h>
26686 #include <asm/vdso.h>
26687 #include <asm/proto.h>
26688+#include <asm/mman.h>
26689
26690 enum {
26691 VDSO_DISABLED = 0,
26692@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
26693 void enable_sep_cpu(void)
26694 {
26695 int cpu = get_cpu();
26696- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26697+ struct tss_struct *tss = init_tss + cpu;
26698
26699 if (!boot_cpu_has(X86_FEATURE_SEP)) {
26700 put_cpu();
26701@@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
26702 gate_vma.vm_start = FIXADDR_USER_START;
26703 gate_vma.vm_end = FIXADDR_USER_END;
26704 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
26705- gate_vma.vm_page_prot = __P101;
26706+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
26707 /*
26708 * Make sure the vDSO gets into every core dump.
26709 * Dumping its contents makes post-mortem fully interpretable later
26710@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26711 if (compat)
26712 addr = VDSO_HIGH_BASE;
26713 else {
26714- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
26715+ addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
26716 if (IS_ERR_VALUE(addr)) {
26717 ret = addr;
26718 goto up_fail;
26719 }
26720 }
26721
26722- current->mm->context.vdso = (void *)addr;
26723+ current->mm->context.vdso = addr;
26724
26725 if (compat_uses_vma || !compat) {
26726 /*
26727@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26728 }
26729
26730 current_thread_info()->sysenter_return =
26731- VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26732+ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26733
26734 up_fail:
26735 if (ret)
26736- current->mm->context.vdso = NULL;
26737+ current->mm->context.vdso = 0;
26738
26739 up_write(&mm->mmap_sem);
26740
26741@@ -412,8 +413,14 @@ __initcall(ia32_binfmt_init);
26742
26743 const char *arch_vma_name(struct vm_area_struct *vma)
26744 {
26745- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
26746+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
26747 return "[vdso]";
26748+
26749+#ifdef CONFIG_PAX_SEGMEXEC
26750+ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
26751+ return "[vdso]";
26752+#endif
26753+
26754 return NULL;
26755 }
26756
26757@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
26758 * Check to see if the corresponding task was created in compat vdso
26759 * mode.
26760 */
26761- if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
26762+ if (mm && mm->context.vdso == VDSO_HIGH_BASE)
26763 return &gate_vma;
26764 return NULL;
26765 }
26766diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
26767index 153407c..611cba9 100644
26768--- a/arch/x86/vdso/vma.c
26769+++ b/arch/x86/vdso/vma.c
26770@@ -16,8 +16,6 @@
26771 #include <asm/vdso.h>
26772 #include <asm/page.h>
26773
26774-unsigned int __read_mostly vdso_enabled = 1;
26775-
26776 extern char vdso_start[], vdso_end[];
26777 extern unsigned short vdso_sync_cpuid;
26778
26779@@ -96,7 +94,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
26780 * unaligned here as a result of stack start randomization.
26781 */
26782 addr = PAGE_ALIGN(addr);
26783- addr = align_addr(addr, NULL, ALIGN_VDSO);
26784
26785 return addr;
26786 }
26787@@ -106,40 +103,35 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
26788 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26789 {
26790 struct mm_struct *mm = current->mm;
26791- unsigned long addr;
26792+ unsigned long addr = 0;
26793 int ret;
26794
26795- if (!vdso_enabled)
26796- return 0;
26797-
26798 down_write(&mm->mmap_sem);
26799+
26800+#ifdef CONFIG_PAX_RANDMMAP
26801+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26802+#endif
26803+
26804 addr = vdso_addr(mm->start_stack, vdso_size);
26805+ addr = align_addr(addr, NULL, ALIGN_VDSO);
26806 addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
26807 if (IS_ERR_VALUE(addr)) {
26808 ret = addr;
26809 goto up_fail;
26810 }
26811
26812- current->mm->context.vdso = (void *)addr;
26813+ mm->context.vdso = addr;
26814
26815 ret = install_special_mapping(mm, addr, vdso_size,
26816 VM_READ|VM_EXEC|
26817 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
26818 VM_ALWAYSDUMP,
26819 vdso_pages);
26820- if (ret) {
26821- current->mm->context.vdso = NULL;
26822- goto up_fail;
26823- }
26824+
26825+ if (ret)
26826+ mm->context.vdso = 0;
26827
26828 up_fail:
26829 up_write(&mm->mmap_sem);
26830 return ret;
26831 }
26832-
26833-static __init int vdso_setup(char *s)
26834-{
26835- vdso_enabled = simple_strtoul(s, NULL, 0);
26836- return 0;
26837-}
26838-__setup("vdso=", vdso_setup);
26839diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
26840index 4172af8..2c8ed7f 100644
26841--- a/arch/x86/xen/enlighten.c
26842+++ b/arch/x86/xen/enlighten.c
26843@@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
26844
26845 struct shared_info xen_dummy_shared_info;
26846
26847-void *xen_initial_gdt;
26848-
26849 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
26850 __read_mostly int xen_have_vector_callback;
26851 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
26852@@ -1029,30 +1027,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
26853 #endif
26854 };
26855
26856-static void xen_reboot(int reason)
26857+static __noreturn void xen_reboot(int reason)
26858 {
26859 struct sched_shutdown r = { .reason = reason };
26860
26861- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
26862- BUG();
26863+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
26864+ BUG();
26865 }
26866
26867-static void xen_restart(char *msg)
26868+static __noreturn void xen_restart(char *msg)
26869 {
26870 xen_reboot(SHUTDOWN_reboot);
26871 }
26872
26873-static void xen_emergency_restart(void)
26874+static __noreturn void xen_emergency_restart(void)
26875 {
26876 xen_reboot(SHUTDOWN_reboot);
26877 }
26878
26879-static void xen_machine_halt(void)
26880+static __noreturn void xen_machine_halt(void)
26881 {
26882 xen_reboot(SHUTDOWN_poweroff);
26883 }
26884
26885-static void xen_machine_power_off(void)
26886+static __noreturn void xen_machine_power_off(void)
26887 {
26888 if (pm_power_off)
26889 pm_power_off();
26890@@ -1155,7 +1153,17 @@ asmlinkage void __init xen_start_kernel(void)
26891 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
26892
26893 /* Work out if we support NX */
26894- x86_configure_nx();
26895+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
26896+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
26897+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
26898+ unsigned l, h;
26899+
26900+ __supported_pte_mask |= _PAGE_NX;
26901+ rdmsr(MSR_EFER, l, h);
26902+ l |= EFER_NX;
26903+ wrmsr(MSR_EFER, l, h);
26904+ }
26905+#endif
26906
26907 xen_setup_features();
26908
26909@@ -1186,13 +1194,6 @@ asmlinkage void __init xen_start_kernel(void)
26910
26911 machine_ops = xen_machine_ops;
26912
26913- /*
26914- * The only reliable way to retain the initial address of the
26915- * percpu gdt_page is to remember it here, so we can go and
26916- * mark it RW later, when the initial percpu area is freed.
26917- */
26918- xen_initial_gdt = &per_cpu(gdt_page, 0);
26919-
26920 xen_smp_init();
26921
26922 #ifdef CONFIG_ACPI_NUMA
26923diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
26924index 95c1cf6..4bfa5be 100644
26925--- a/arch/x86/xen/mmu.c
26926+++ b/arch/x86/xen/mmu.c
26927@@ -1733,6 +1733,9 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
26928 convert_pfn_mfn(init_level4_pgt);
26929 convert_pfn_mfn(level3_ident_pgt);
26930 convert_pfn_mfn(level3_kernel_pgt);
26931+ convert_pfn_mfn(level3_vmalloc_start_pgt);
26932+ convert_pfn_mfn(level3_vmalloc_end_pgt);
26933+ convert_pfn_mfn(level3_vmemmap_pgt);
26934
26935 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
26936 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
26937@@ -1751,7 +1754,11 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
26938 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
26939 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
26940 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
26941+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
26942+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
26943+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
26944 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
26945+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
26946 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
26947 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
26948
26949@@ -1958,6 +1965,7 @@ static void __init xen_post_allocator_init(void)
26950 pv_mmu_ops.set_pud = xen_set_pud;
26951 #if PAGETABLE_LEVELS == 4
26952 pv_mmu_ops.set_pgd = xen_set_pgd;
26953+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
26954 #endif
26955
26956 /* This will work as long as patching hasn't happened yet
26957@@ -2039,6 +2047,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
26958 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
26959 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
26960 .set_pgd = xen_set_pgd_hyper,
26961+ .set_pgd_batched = xen_set_pgd_hyper,
26962
26963 .alloc_pud = xen_alloc_pmd_init,
26964 .release_pud = xen_release_pmd_init,
26965diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
26966index f2ce60a..14e08dc 100644
26967--- a/arch/x86/xen/smp.c
26968+++ b/arch/x86/xen/smp.c
26969@@ -209,11 +209,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
26970 {
26971 BUG_ON(smp_processor_id() != 0);
26972 native_smp_prepare_boot_cpu();
26973-
26974- /* We've switched to the "real" per-cpu gdt, so make sure the
26975- old memory can be recycled */
26976- make_lowmem_page_readwrite(xen_initial_gdt);
26977-
26978 xen_filter_cpu_maps();
26979 xen_setup_vcpu_info_placement();
26980 }
26981@@ -290,12 +285,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
26982 gdt = get_cpu_gdt_table(cpu);
26983
26984 ctxt->flags = VGCF_IN_KERNEL;
26985- ctxt->user_regs.ds = __USER_DS;
26986- ctxt->user_regs.es = __USER_DS;
26987+ ctxt->user_regs.ds = __KERNEL_DS;
26988+ ctxt->user_regs.es = __KERNEL_DS;
26989 ctxt->user_regs.ss = __KERNEL_DS;
26990 #ifdef CONFIG_X86_32
26991 ctxt->user_regs.fs = __KERNEL_PERCPU;
26992- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
26993+ savesegment(gs, ctxt->user_regs.gs);
26994 #else
26995 ctxt->gs_base_kernel = per_cpu_offset(cpu);
26996 #endif
26997@@ -346,13 +341,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
26998 int rc;
26999
27000 per_cpu(current_task, cpu) = idle;
27001+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27002 #ifdef CONFIG_X86_32
27003 irq_ctx_init(cpu);
27004 #else
27005 clear_tsk_thread_flag(idle, TIF_FORK);
27006- per_cpu(kernel_stack, cpu) =
27007- (unsigned long)task_stack_page(idle) -
27008- KERNEL_STACK_OFFSET + THREAD_SIZE;
27009+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27010 #endif
27011 xen_setup_runstate_info(cpu);
27012 xen_setup_timer(cpu);
27013diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
27014index b040b0e..8cc4fe0 100644
27015--- a/arch/x86/xen/xen-asm_32.S
27016+++ b/arch/x86/xen/xen-asm_32.S
27017@@ -83,14 +83,14 @@ ENTRY(xen_iret)
27018 ESP_OFFSET=4 # bytes pushed onto stack
27019
27020 /*
27021- * Store vcpu_info pointer for easy access. Do it this way to
27022- * avoid having to reload %fs
27023+ * Store vcpu_info pointer for easy access.
27024 */
27025 #ifdef CONFIG_SMP
27026- GET_THREAD_INFO(%eax)
27027- movl TI_cpu(%eax), %eax
27028- movl __per_cpu_offset(,%eax,4), %eax
27029- mov xen_vcpu(%eax), %eax
27030+ push %fs
27031+ mov $(__KERNEL_PERCPU), %eax
27032+ mov %eax, %fs
27033+ mov PER_CPU_VAR(xen_vcpu), %eax
27034+ pop %fs
27035 #else
27036 movl xen_vcpu, %eax
27037 #endif
27038diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
27039index aaa7291..3f77960 100644
27040--- a/arch/x86/xen/xen-head.S
27041+++ b/arch/x86/xen/xen-head.S
27042@@ -19,6 +19,17 @@ ENTRY(startup_xen)
27043 #ifdef CONFIG_X86_32
27044 mov %esi,xen_start_info
27045 mov $init_thread_union+THREAD_SIZE,%esp
27046+#ifdef CONFIG_SMP
27047+ movl $cpu_gdt_table,%edi
27048+ movl $__per_cpu_load,%eax
27049+ movw %ax,__KERNEL_PERCPU + 2(%edi)
27050+ rorl $16,%eax
27051+ movb %al,__KERNEL_PERCPU + 4(%edi)
27052+ movb %ah,__KERNEL_PERCPU + 7(%edi)
27053+ movl $__per_cpu_end - 1,%eax
27054+ subl $__per_cpu_start,%eax
27055+ movw %ax,__KERNEL_PERCPU + 0(%edi)
27056+#endif
27057 #else
27058 mov %rsi,xen_start_info
27059 mov $init_thread_union+THREAD_SIZE,%rsp
27060diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
27061index b095739..8c17bcd 100644
27062--- a/arch/x86/xen/xen-ops.h
27063+++ b/arch/x86/xen/xen-ops.h
27064@@ -10,8 +10,6 @@
27065 extern const char xen_hypervisor_callback[];
27066 extern const char xen_failsafe_callback[];
27067
27068-extern void *xen_initial_gdt;
27069-
27070 struct trap_info;
27071 void xen_copy_trap_info(struct trap_info *traps);
27072
27073diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
27074index 525bd3d..ef888b1 100644
27075--- a/arch/xtensa/variants/dc232b/include/variant/core.h
27076+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
27077@@ -119,9 +119,9 @@
27078 ----------------------------------------------------------------------*/
27079
27080 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
27081-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
27082 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
27083 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
27084+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
27085
27086 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
27087 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
27088diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
27089index 2f33760..835e50a 100644
27090--- a/arch/xtensa/variants/fsf/include/variant/core.h
27091+++ b/arch/xtensa/variants/fsf/include/variant/core.h
27092@@ -11,6 +11,7 @@
27093 #ifndef _XTENSA_CORE_H
27094 #define _XTENSA_CORE_H
27095
27096+#include <linux/const.h>
27097
27098 /****************************************************************************
27099 Parameters Useful for Any Code, USER or PRIVILEGED
27100@@ -112,9 +113,9 @@
27101 ----------------------------------------------------------------------*/
27102
27103 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
27104-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
27105 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
27106 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
27107+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
27108
27109 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
27110 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
27111diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
27112index af00795..2bb8105 100644
27113--- a/arch/xtensa/variants/s6000/include/variant/core.h
27114+++ b/arch/xtensa/variants/s6000/include/variant/core.h
27115@@ -11,6 +11,7 @@
27116 #ifndef _XTENSA_CORE_CONFIGURATION_H
27117 #define _XTENSA_CORE_CONFIGURATION_H
27118
27119+#include <linux/const.h>
27120
27121 /****************************************************************************
27122 Parameters Useful for Any Code, USER or PRIVILEGED
27123@@ -118,9 +119,9 @@
27124 ----------------------------------------------------------------------*/
27125
27126 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
27127-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
27128 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
27129 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
27130+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
27131
27132 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
27133 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
27134diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
27135index 58916af..9cb880b 100644
27136--- a/block/blk-iopoll.c
27137+++ b/block/blk-iopoll.c
27138@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
27139 }
27140 EXPORT_SYMBOL(blk_iopoll_complete);
27141
27142-static void blk_iopoll_softirq(struct softirq_action *h)
27143+static void blk_iopoll_softirq(void)
27144 {
27145 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
27146 int rearm = 0, budget = blk_iopoll_budget;
27147diff --git a/block/blk-map.c b/block/blk-map.c
27148index 623e1cd..ca1e109 100644
27149--- a/block/blk-map.c
27150+++ b/block/blk-map.c
27151@@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
27152 if (!len || !kbuf)
27153 return -EINVAL;
27154
27155- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
27156+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
27157 if (do_copy)
27158 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
27159 else
27160diff --git a/block/blk-softirq.c b/block/blk-softirq.c
27161index 1366a89..e17f54b 100644
27162--- a/block/blk-softirq.c
27163+++ b/block/blk-softirq.c
27164@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
27165 * Softirq action handler - move entries to local list and loop over them
27166 * while passing them to the queue registered handler.
27167 */
27168-static void blk_done_softirq(struct softirq_action *h)
27169+static void blk_done_softirq(void)
27170 {
27171 struct list_head *cpu_list, local_list;
27172
27173diff --git a/block/bsg.c b/block/bsg.c
27174index ff64ae3..593560c 100644
27175--- a/block/bsg.c
27176+++ b/block/bsg.c
27177@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
27178 struct sg_io_v4 *hdr, struct bsg_device *bd,
27179 fmode_t has_write_perm)
27180 {
27181+ unsigned char tmpcmd[sizeof(rq->__cmd)];
27182+ unsigned char *cmdptr;
27183+
27184 if (hdr->request_len > BLK_MAX_CDB) {
27185 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
27186 if (!rq->cmd)
27187 return -ENOMEM;
27188- }
27189+ cmdptr = rq->cmd;
27190+ } else
27191+ cmdptr = tmpcmd;
27192
27193- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
27194+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
27195 hdr->request_len))
27196 return -EFAULT;
27197
27198+ if (cmdptr != rq->cmd)
27199+ memcpy(rq->cmd, cmdptr, hdr->request_len);
27200+
27201 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
27202 if (blk_verify_command(rq->cmd, has_write_perm))
27203 return -EPERM;
27204diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
27205index 7c668c8..db3521c 100644
27206--- a/block/compat_ioctl.c
27207+++ b/block/compat_ioctl.c
27208@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
27209 err |= __get_user(f->spec1, &uf->spec1);
27210 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
27211 err |= __get_user(name, &uf->name);
27212- f->name = compat_ptr(name);
27213+ f->name = (void __force_kernel *)compat_ptr(name);
27214 if (err) {
27215 err = -EFAULT;
27216 goto out;
27217diff --git a/block/partitions/efi.c b/block/partitions/efi.c
27218index 6296b40..417c00f 100644
27219--- a/block/partitions/efi.c
27220+++ b/block/partitions/efi.c
27221@@ -234,14 +234,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
27222 if (!gpt)
27223 return NULL;
27224
27225+ if (!le32_to_cpu(gpt->num_partition_entries))
27226+ return NULL;
27227+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
27228+ if (!pte)
27229+ return NULL;
27230+
27231 count = le32_to_cpu(gpt->num_partition_entries) *
27232 le32_to_cpu(gpt->sizeof_partition_entry);
27233- if (!count)
27234- return NULL;
27235- pte = kzalloc(count, GFP_KERNEL);
27236- if (!pte)
27237- return NULL;
27238-
27239 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
27240 (u8 *) pte,
27241 count) < count) {
27242diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
27243index 260fa80..e8f3caf 100644
27244--- a/block/scsi_ioctl.c
27245+++ b/block/scsi_ioctl.c
27246@@ -223,8 +223,20 @@ EXPORT_SYMBOL(blk_verify_command);
27247 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
27248 struct sg_io_hdr *hdr, fmode_t mode)
27249 {
27250- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
27251+ unsigned char tmpcmd[sizeof(rq->__cmd)];
27252+ unsigned char *cmdptr;
27253+
27254+ if (rq->cmd != rq->__cmd)
27255+ cmdptr = rq->cmd;
27256+ else
27257+ cmdptr = tmpcmd;
27258+
27259+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
27260 return -EFAULT;
27261+
27262+ if (cmdptr != rq->cmd)
27263+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
27264+
27265 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
27266 return -EPERM;
27267
27268@@ -433,6 +445,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27269 int err;
27270 unsigned int in_len, out_len, bytes, opcode, cmdlen;
27271 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
27272+ unsigned char tmpcmd[sizeof(rq->__cmd)];
27273+ unsigned char *cmdptr;
27274
27275 if (!sic)
27276 return -EINVAL;
27277@@ -466,9 +480,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27278 */
27279 err = -EFAULT;
27280 rq->cmd_len = cmdlen;
27281- if (copy_from_user(rq->cmd, sic->data, cmdlen))
27282+
27283+ if (rq->cmd != rq->__cmd)
27284+ cmdptr = rq->cmd;
27285+ else
27286+ cmdptr = tmpcmd;
27287+
27288+ if (copy_from_user(cmdptr, sic->data, cmdlen))
27289 goto error;
27290
27291+ if (rq->cmd != cmdptr)
27292+ memcpy(rq->cmd, cmdptr, cmdlen);
27293+
27294 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
27295 goto error;
27296
27297diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
27298index a0f768c..1da9c73 100644
27299--- a/crypto/ablkcipher.c
27300+++ b/crypto/ablkcipher.c
27301@@ -307,6 +307,8 @@ int ablkcipher_walk_phys(struct ablkcipher_request *req,
27302 EXPORT_SYMBOL_GPL(ablkcipher_walk_phys);
27303
27304 static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27305+ unsigned int keylen) __size_overflow(3);
27306+static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27307 unsigned int keylen)
27308 {
27309 struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
27310@@ -329,6 +331,8 @@ static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27311 }
27312
27313 static int setkey(struct crypto_ablkcipher *tfm, const u8 *key,
27314+ unsigned int keylen) __size_overflow(3);
27315+static int setkey(struct crypto_ablkcipher *tfm, const u8 *key,
27316 unsigned int keylen)
27317 {
27318 struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
27319diff --git a/crypto/aead.c b/crypto/aead.c
27320index 04add3dc..983032f 100644
27321--- a/crypto/aead.c
27322+++ b/crypto/aead.c
27323@@ -27,6 +27,8 @@
27324 #include "internal.h"
27325
27326 static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27327+ unsigned int keylen) __size_overflow(3);
27328+static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27329 unsigned int keylen)
27330 {
27331 struct aead_alg *aead = crypto_aead_alg(tfm);
27332@@ -48,6 +50,7 @@ static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27333 return ret;
27334 }
27335
27336+static int setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27337 static int setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen)
27338 {
27339 struct aead_alg *aead = crypto_aead_alg(tfm);
27340diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
27341index 1e61d1a..cf06b86 100644
27342--- a/crypto/blkcipher.c
27343+++ b/crypto/blkcipher.c
27344@@ -359,6 +359,8 @@ int blkcipher_walk_virt_block(struct blkcipher_desc *desc,
27345 EXPORT_SYMBOL_GPL(blkcipher_walk_virt_block);
27346
27347 static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27348+ unsigned int keylen) __size_overflow(3);
27349+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27350 unsigned int keylen)
27351 {
27352 struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
27353@@ -380,6 +382,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27354 return ret;
27355 }
27356
27357+static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27358 static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
27359 {
27360 struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
27361diff --git a/crypto/cipher.c b/crypto/cipher.c
27362index 39541e0..802d956 100644
27363--- a/crypto/cipher.c
27364+++ b/crypto/cipher.c
27365@@ -21,6 +21,8 @@
27366 #include "internal.h"
27367
27368 static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27369+ unsigned int keylen) __size_overflow(3);
27370+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27371 unsigned int keylen)
27372 {
27373 struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
27374@@ -43,6 +45,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27375
27376 }
27377
27378+static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27379 static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
27380 {
27381 struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
27382diff --git a/crypto/cryptd.c b/crypto/cryptd.c
27383index 671d4d6..5f24030 100644
27384--- a/crypto/cryptd.c
27385+++ b/crypto/cryptd.c
27386@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
27387
27388 struct cryptd_blkcipher_request_ctx {
27389 crypto_completion_t complete;
27390-};
27391+} __no_const;
27392
27393 struct cryptd_hash_ctx {
27394 struct crypto_shash *child;
27395@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
27396
27397 struct cryptd_aead_request_ctx {
27398 crypto_completion_t complete;
27399-};
27400+} __no_const;
27401
27402 static void cryptd_queue_worker(struct work_struct *work);
27403
27404diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
27405index 5d41894..22021e4 100644
27406--- a/drivers/acpi/apei/cper.c
27407+++ b/drivers/acpi/apei/cper.c
27408@@ -38,12 +38,12 @@
27409 */
27410 u64 cper_next_record_id(void)
27411 {
27412- static atomic64_t seq;
27413+ static atomic64_unchecked_t seq;
27414
27415- if (!atomic64_read(&seq))
27416- atomic64_set(&seq, ((u64)get_seconds()) << 32);
27417+ if (!atomic64_read_unchecked(&seq))
27418+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
27419
27420- return atomic64_inc_return(&seq);
27421+ return atomic64_inc_return_unchecked(&seq);
27422 }
27423 EXPORT_SYMBOL_GPL(cper_next_record_id);
27424
27425diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
27426index 86933ca..5cb1a69 100644
27427--- a/drivers/acpi/battery.c
27428+++ b/drivers/acpi/battery.c
27429@@ -787,6 +787,9 @@ static int acpi_battery_print_alarm(struct seq_file *seq, int result)
27430
27431 static ssize_t acpi_battery_write_alarm(struct file *file,
27432 const char __user * buffer,
27433+ size_t count, loff_t * ppos) __size_overflow(3);
27434+static ssize_t acpi_battery_write_alarm(struct file *file,
27435+ const char __user * buffer,
27436 size_t count, loff_t * ppos)
27437 {
27438 int result = 0;
27439diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
27440index b258cab..3fb7da7 100644
27441--- a/drivers/acpi/ec_sys.c
27442+++ b/drivers/acpi/ec_sys.c
27443@@ -12,6 +12,7 @@
27444 #include <linux/acpi.h>
27445 #include <linux/debugfs.h>
27446 #include <linux/module.h>
27447+#include <linux/uaccess.h>
27448 #include "internal.h"
27449
27450 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
27451@@ -40,7 +41,7 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
27452 * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
27453 */
27454 unsigned int size = EC_SPACE_SIZE;
27455- u8 *data = (u8 *) buf;
27456+ u8 data;
27457 loff_t init_off = *off;
27458 int err = 0;
27459
27460@@ -53,9 +54,11 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
27461 size = count;
27462
27463 while (size) {
27464- err = ec_read(*off, &data[*off - init_off]);
27465+ err = ec_read(*off, &data);
27466 if (err)
27467 return err;
27468+ if (put_user(data, &buf[*off - init_off]))
27469+ return -EFAULT;
27470 *off += 1;
27471 size--;
27472 }
27473@@ -71,7 +74,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
27474
27475 unsigned int size = count;
27476 loff_t init_off = *off;
27477- u8 *data = (u8 *) buf;
27478 int err = 0;
27479
27480 if (*off >= EC_SPACE_SIZE)
27481@@ -82,7 +84,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
27482 }
27483
27484 while (size) {
27485- u8 byte_write = data[*off - init_off];
27486+ u8 byte_write;
27487+ if (get_user(byte_write, &buf[*off - init_off]))
27488+ return -EFAULT;
27489 err = ec_write(*off, byte_write);
27490 if (err)
27491 return err;
27492diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
27493index 251c7b62..000462d 100644
27494--- a/drivers/acpi/proc.c
27495+++ b/drivers/acpi/proc.c
27496@@ -343,19 +343,13 @@ acpi_system_write_wakeup_device(struct file *file,
27497 size_t count, loff_t * ppos)
27498 {
27499 struct list_head *node, *next;
27500- char strbuf[5];
27501- char str[5] = "";
27502- unsigned int len = count;
27503+ char strbuf[5] = {0};
27504
27505- if (len > 4)
27506- len = 4;
27507- if (len < 0)
27508+ if (count > 4)
27509+ count = 4;
27510+ if (copy_from_user(strbuf, buffer, count))
27511 return -EFAULT;
27512-
27513- if (copy_from_user(strbuf, buffer, len))
27514- return -EFAULT;
27515- strbuf[len] = '\0';
27516- sscanf(strbuf, "%s", str);
27517+ strbuf[count] = '\0';
27518
27519 mutex_lock(&acpi_device_lock);
27520 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
27521@@ -364,7 +358,7 @@ acpi_system_write_wakeup_device(struct file *file,
27522 if (!dev->wakeup.flags.valid)
27523 continue;
27524
27525- if (!strncmp(dev->pnp.bus_id, str, 4)) {
27526+ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
27527 if (device_can_wakeup(&dev->dev)) {
27528 bool enable = !device_may_wakeup(&dev->dev);
27529 device_set_wakeup_enable(&dev->dev, enable);
27530diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
27531index 8ae05ce..7dbbed9 100644
27532--- a/drivers/acpi/processor_driver.c
27533+++ b/drivers/acpi/processor_driver.c
27534@@ -555,7 +555,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
27535 return 0;
27536 #endif
27537
27538- BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
27539+ BUG_ON(pr->id >= nr_cpu_ids);
27540
27541 /*
27542 * Buggy BIOS check
27543diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
27544index 6e36d0c..f319944 100644
27545--- a/drivers/acpi/sbs.c
27546+++ b/drivers/acpi/sbs.c
27547@@ -655,6 +655,9 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
27548
27549 static ssize_t
27550 acpi_battery_write_alarm(struct file *file, const char __user * buffer,
27551+ size_t count, loff_t * ppos) __size_overflow(3);
27552+static ssize_t
27553+acpi_battery_write_alarm(struct file *file, const char __user * buffer,
27554 size_t count, loff_t * ppos)
27555 {
27556 struct seq_file *seq = file->private_data;
27557diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
27558index c06e0ec..a2c06ba 100644
27559--- a/drivers/ata/libata-core.c
27560+++ b/drivers/ata/libata-core.c
27561@@ -4736,7 +4736,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
27562 struct ata_port *ap;
27563 unsigned int tag;
27564
27565- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27566+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27567 ap = qc->ap;
27568
27569 qc->flags = 0;
27570@@ -4752,7 +4752,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
27571 struct ata_port *ap;
27572 struct ata_link *link;
27573
27574- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27575+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27576 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
27577 ap = qc->ap;
27578 link = qc->dev->link;
27579@@ -5816,6 +5816,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27580 return;
27581
27582 spin_lock(&lock);
27583+ pax_open_kernel();
27584
27585 for (cur = ops->inherits; cur; cur = cur->inherits) {
27586 void **inherit = (void **)cur;
27587@@ -5829,8 +5830,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27588 if (IS_ERR(*pp))
27589 *pp = NULL;
27590
27591- ops->inherits = NULL;
27592+ *(struct ata_port_operations **)&ops->inherits = NULL;
27593
27594+ pax_close_kernel();
27595 spin_unlock(&lock);
27596 }
27597
27598diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
27599index 048589f..4002b98 100644
27600--- a/drivers/ata/pata_arasan_cf.c
27601+++ b/drivers/ata/pata_arasan_cf.c
27602@@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
27603 /* Handle platform specific quirks */
27604 if (pdata->quirk) {
27605 if (pdata->quirk & CF_BROKEN_PIO) {
27606- ap->ops->set_piomode = NULL;
27607+ pax_open_kernel();
27608+ *(void **)&ap->ops->set_piomode = NULL;
27609+ pax_close_kernel();
27610 ap->pio_mask = 0;
27611 }
27612 if (pdata->quirk & CF_BROKEN_MWDMA)
27613diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
27614index f9b983a..887b9d8 100644
27615--- a/drivers/atm/adummy.c
27616+++ b/drivers/atm/adummy.c
27617@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
27618 vcc->pop(vcc, skb);
27619 else
27620 dev_kfree_skb_any(skb);
27621- atomic_inc(&vcc->stats->tx);
27622+ atomic_inc_unchecked(&vcc->stats->tx);
27623
27624 return 0;
27625 }
27626diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
27627index f8f41e0..1f987dd 100644
27628--- a/drivers/atm/ambassador.c
27629+++ b/drivers/atm/ambassador.c
27630@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
27631 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
27632
27633 // VC layer stats
27634- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27635+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27636
27637 // free the descriptor
27638 kfree (tx_descr);
27639@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
27640 dump_skb ("<<<", vc, skb);
27641
27642 // VC layer stats
27643- atomic_inc(&atm_vcc->stats->rx);
27644+ atomic_inc_unchecked(&atm_vcc->stats->rx);
27645 __net_timestamp(skb);
27646 // end of our responsibility
27647 atm_vcc->push (atm_vcc, skb);
27648@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
27649 } else {
27650 PRINTK (KERN_INFO, "dropped over-size frame");
27651 // should we count this?
27652- atomic_inc(&atm_vcc->stats->rx_drop);
27653+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27654 }
27655
27656 } else {
27657@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
27658 }
27659
27660 if (check_area (skb->data, skb->len)) {
27661- atomic_inc(&atm_vcc->stats->tx_err);
27662+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
27663 return -ENOMEM; // ?
27664 }
27665
27666diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
27667index b22d71c..d6e1049 100644
27668--- a/drivers/atm/atmtcp.c
27669+++ b/drivers/atm/atmtcp.c
27670@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27671 if (vcc->pop) vcc->pop(vcc,skb);
27672 else dev_kfree_skb(skb);
27673 if (dev_data) return 0;
27674- atomic_inc(&vcc->stats->tx_err);
27675+ atomic_inc_unchecked(&vcc->stats->tx_err);
27676 return -ENOLINK;
27677 }
27678 size = skb->len+sizeof(struct atmtcp_hdr);
27679@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27680 if (!new_skb) {
27681 if (vcc->pop) vcc->pop(vcc,skb);
27682 else dev_kfree_skb(skb);
27683- atomic_inc(&vcc->stats->tx_err);
27684+ atomic_inc_unchecked(&vcc->stats->tx_err);
27685 return -ENOBUFS;
27686 }
27687 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
27688@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27689 if (vcc->pop) vcc->pop(vcc,skb);
27690 else dev_kfree_skb(skb);
27691 out_vcc->push(out_vcc,new_skb);
27692- atomic_inc(&vcc->stats->tx);
27693- atomic_inc(&out_vcc->stats->rx);
27694+ atomic_inc_unchecked(&vcc->stats->tx);
27695+ atomic_inc_unchecked(&out_vcc->stats->rx);
27696 return 0;
27697 }
27698
27699@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
27700 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
27701 read_unlock(&vcc_sklist_lock);
27702 if (!out_vcc) {
27703- atomic_inc(&vcc->stats->tx_err);
27704+ atomic_inc_unchecked(&vcc->stats->tx_err);
27705 goto done;
27706 }
27707 skb_pull(skb,sizeof(struct atmtcp_hdr));
27708@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
27709 __net_timestamp(new_skb);
27710 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
27711 out_vcc->push(out_vcc,new_skb);
27712- atomic_inc(&vcc->stats->tx);
27713- atomic_inc(&out_vcc->stats->rx);
27714+ atomic_inc_unchecked(&vcc->stats->tx);
27715+ atomic_inc_unchecked(&out_vcc->stats->rx);
27716 done:
27717 if (vcc->pop) vcc->pop(vcc,skb);
27718 else dev_kfree_skb(skb);
27719diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
27720index 956e9ac..133516d 100644
27721--- a/drivers/atm/eni.c
27722+++ b/drivers/atm/eni.c
27723@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
27724 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
27725 vcc->dev->number);
27726 length = 0;
27727- atomic_inc(&vcc->stats->rx_err);
27728+ atomic_inc_unchecked(&vcc->stats->rx_err);
27729 }
27730 else {
27731 length = ATM_CELL_SIZE-1; /* no HEC */
27732@@ -581,7 +581,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27733 size);
27734 }
27735 eff = length = 0;
27736- atomic_inc(&vcc->stats->rx_err);
27737+ atomic_inc_unchecked(&vcc->stats->rx_err);
27738 }
27739 else {
27740 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
27741@@ -598,7 +598,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27742 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
27743 vcc->dev->number,vcc->vci,length,size << 2,descr);
27744 length = eff = 0;
27745- atomic_inc(&vcc->stats->rx_err);
27746+ atomic_inc_unchecked(&vcc->stats->rx_err);
27747 }
27748 }
27749 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
27750@@ -771,7 +771,7 @@ rx_dequeued++;
27751 vcc->push(vcc,skb);
27752 pushed++;
27753 }
27754- atomic_inc(&vcc->stats->rx);
27755+ atomic_inc_unchecked(&vcc->stats->rx);
27756 }
27757 wake_up(&eni_dev->rx_wait);
27758 }
27759@@ -1229,7 +1229,7 @@ static void dequeue_tx(struct atm_dev *dev)
27760 PCI_DMA_TODEVICE);
27761 if (vcc->pop) vcc->pop(vcc,skb);
27762 else dev_kfree_skb_irq(skb);
27763- atomic_inc(&vcc->stats->tx);
27764+ atomic_inc_unchecked(&vcc->stats->tx);
27765 wake_up(&eni_dev->tx_wait);
27766 dma_complete++;
27767 }
27768@@ -1569,7 +1569,7 @@ tx_complete++;
27769 /*--------------------------------- entries ---------------------------------*/
27770
27771
27772-static const char *media_name[] __devinitdata = {
27773+static const char *media_name[] __devinitconst = {
27774 "MMF", "SMF", "MMF", "03?", /* 0- 3 */
27775 "UTP", "05?", "06?", "07?", /* 4- 7 */
27776 "TAXI","09?", "10?", "11?", /* 8-11 */
27777diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
27778index 5072f8a..fa52520d 100644
27779--- a/drivers/atm/firestream.c
27780+++ b/drivers/atm/firestream.c
27781@@ -750,7 +750,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
27782 }
27783 }
27784
27785- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27786+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27787
27788 fs_dprintk (FS_DEBUG_TXMEM, "i");
27789 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
27790@@ -817,7 +817,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
27791 #endif
27792 skb_put (skb, qe->p1 & 0xffff);
27793 ATM_SKB(skb)->vcc = atm_vcc;
27794- atomic_inc(&atm_vcc->stats->rx);
27795+ atomic_inc_unchecked(&atm_vcc->stats->rx);
27796 __net_timestamp(skb);
27797 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
27798 atm_vcc->push (atm_vcc, skb);
27799@@ -838,12 +838,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
27800 kfree (pe);
27801 }
27802 if (atm_vcc)
27803- atomic_inc(&atm_vcc->stats->rx_drop);
27804+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27805 break;
27806 case 0x1f: /* Reassembly abort: no buffers. */
27807 /* Silently increment error counter. */
27808 if (atm_vcc)
27809- atomic_inc(&atm_vcc->stats->rx_drop);
27810+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27811 break;
27812 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
27813 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
27814diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
27815index 361f5ae..7fc552d 100644
27816--- a/drivers/atm/fore200e.c
27817+++ b/drivers/atm/fore200e.c
27818@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
27819 #endif
27820 /* check error condition */
27821 if (*entry->status & STATUS_ERROR)
27822- atomic_inc(&vcc->stats->tx_err);
27823+ atomic_inc_unchecked(&vcc->stats->tx_err);
27824 else
27825- atomic_inc(&vcc->stats->tx);
27826+ atomic_inc_unchecked(&vcc->stats->tx);
27827 }
27828 }
27829
27830@@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
27831 if (skb == NULL) {
27832 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
27833
27834- atomic_inc(&vcc->stats->rx_drop);
27835+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27836 return -ENOMEM;
27837 }
27838
27839@@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
27840
27841 dev_kfree_skb_any(skb);
27842
27843- atomic_inc(&vcc->stats->rx_drop);
27844+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27845 return -ENOMEM;
27846 }
27847
27848 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27849
27850 vcc->push(vcc, skb);
27851- atomic_inc(&vcc->stats->rx);
27852+ atomic_inc_unchecked(&vcc->stats->rx);
27853
27854 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27855
27856@@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
27857 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
27858 fore200e->atm_dev->number,
27859 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
27860- atomic_inc(&vcc->stats->rx_err);
27861+ atomic_inc_unchecked(&vcc->stats->rx_err);
27862 }
27863 }
27864
27865@@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
27866 goto retry_here;
27867 }
27868
27869- atomic_inc(&vcc->stats->tx_err);
27870+ atomic_inc_unchecked(&vcc->stats->tx_err);
27871
27872 fore200e->tx_sat++;
27873 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
27874diff --git a/drivers/atm/he.c b/drivers/atm/he.c
27875index b182c2f..1c6fa8a 100644
27876--- a/drivers/atm/he.c
27877+++ b/drivers/atm/he.c
27878@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27879
27880 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
27881 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
27882- atomic_inc(&vcc->stats->rx_drop);
27883+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27884 goto return_host_buffers;
27885 }
27886
27887@@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27888 RBRQ_LEN_ERR(he_dev->rbrq_head)
27889 ? "LEN_ERR" : "",
27890 vcc->vpi, vcc->vci);
27891- atomic_inc(&vcc->stats->rx_err);
27892+ atomic_inc_unchecked(&vcc->stats->rx_err);
27893 goto return_host_buffers;
27894 }
27895
27896@@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27897 vcc->push(vcc, skb);
27898 spin_lock(&he_dev->global_lock);
27899
27900- atomic_inc(&vcc->stats->rx);
27901+ atomic_inc_unchecked(&vcc->stats->rx);
27902
27903 return_host_buffers:
27904 ++pdus_assembled;
27905@@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
27906 tpd->vcc->pop(tpd->vcc, tpd->skb);
27907 else
27908 dev_kfree_skb_any(tpd->skb);
27909- atomic_inc(&tpd->vcc->stats->tx_err);
27910+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
27911 }
27912 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
27913 return;
27914@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27915 vcc->pop(vcc, skb);
27916 else
27917 dev_kfree_skb_any(skb);
27918- atomic_inc(&vcc->stats->tx_err);
27919+ atomic_inc_unchecked(&vcc->stats->tx_err);
27920 return -EINVAL;
27921 }
27922
27923@@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27924 vcc->pop(vcc, skb);
27925 else
27926 dev_kfree_skb_any(skb);
27927- atomic_inc(&vcc->stats->tx_err);
27928+ atomic_inc_unchecked(&vcc->stats->tx_err);
27929 return -EINVAL;
27930 }
27931 #endif
27932@@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27933 vcc->pop(vcc, skb);
27934 else
27935 dev_kfree_skb_any(skb);
27936- atomic_inc(&vcc->stats->tx_err);
27937+ atomic_inc_unchecked(&vcc->stats->tx_err);
27938 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27939 return -ENOMEM;
27940 }
27941@@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27942 vcc->pop(vcc, skb);
27943 else
27944 dev_kfree_skb_any(skb);
27945- atomic_inc(&vcc->stats->tx_err);
27946+ atomic_inc_unchecked(&vcc->stats->tx_err);
27947 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27948 return -ENOMEM;
27949 }
27950@@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27951 __enqueue_tpd(he_dev, tpd, cid);
27952 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27953
27954- atomic_inc(&vcc->stats->tx);
27955+ atomic_inc_unchecked(&vcc->stats->tx);
27956
27957 return 0;
27958 }
27959diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
27960index b812103..e391a49 100644
27961--- a/drivers/atm/horizon.c
27962+++ b/drivers/atm/horizon.c
27963@@ -1035,7 +1035,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
27964 {
27965 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
27966 // VC layer stats
27967- atomic_inc(&vcc->stats->rx);
27968+ atomic_inc_unchecked(&vcc->stats->rx);
27969 __net_timestamp(skb);
27970 // end of our responsibility
27971 vcc->push (vcc, skb);
27972@@ -1187,7 +1187,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
27973 dev->tx_iovec = NULL;
27974
27975 // VC layer stats
27976- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27977+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27978
27979 // free the skb
27980 hrz_kfree_skb (skb);
27981diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
27982index 1c05212..c28e200 100644
27983--- a/drivers/atm/idt77252.c
27984+++ b/drivers/atm/idt77252.c
27985@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
27986 else
27987 dev_kfree_skb(skb);
27988
27989- atomic_inc(&vcc->stats->tx);
27990+ atomic_inc_unchecked(&vcc->stats->tx);
27991 }
27992
27993 atomic_dec(&scq->used);
27994@@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27995 if ((sb = dev_alloc_skb(64)) == NULL) {
27996 printk("%s: Can't allocate buffers for aal0.\n",
27997 card->name);
27998- atomic_add(i, &vcc->stats->rx_drop);
27999+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
28000 break;
28001 }
28002 if (!atm_charge(vcc, sb->truesize)) {
28003 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
28004 card->name);
28005- atomic_add(i - 1, &vcc->stats->rx_drop);
28006+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
28007 dev_kfree_skb(sb);
28008 break;
28009 }
28010@@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28011 ATM_SKB(sb)->vcc = vcc;
28012 __net_timestamp(sb);
28013 vcc->push(vcc, sb);
28014- atomic_inc(&vcc->stats->rx);
28015+ atomic_inc_unchecked(&vcc->stats->rx);
28016
28017 cell += ATM_CELL_PAYLOAD;
28018 }
28019@@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28020 "(CDC: %08x)\n",
28021 card->name, len, rpp->len, readl(SAR_REG_CDC));
28022 recycle_rx_pool_skb(card, rpp);
28023- atomic_inc(&vcc->stats->rx_err);
28024+ atomic_inc_unchecked(&vcc->stats->rx_err);
28025 return;
28026 }
28027 if (stat & SAR_RSQE_CRC) {
28028 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
28029 recycle_rx_pool_skb(card, rpp);
28030- atomic_inc(&vcc->stats->rx_err);
28031+ atomic_inc_unchecked(&vcc->stats->rx_err);
28032 return;
28033 }
28034 if (skb_queue_len(&rpp->queue) > 1) {
28035@@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28036 RXPRINTK("%s: Can't alloc RX skb.\n",
28037 card->name);
28038 recycle_rx_pool_skb(card, rpp);
28039- atomic_inc(&vcc->stats->rx_err);
28040+ atomic_inc_unchecked(&vcc->stats->rx_err);
28041 return;
28042 }
28043 if (!atm_charge(vcc, skb->truesize)) {
28044@@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28045 __net_timestamp(skb);
28046
28047 vcc->push(vcc, skb);
28048- atomic_inc(&vcc->stats->rx);
28049+ atomic_inc_unchecked(&vcc->stats->rx);
28050
28051 return;
28052 }
28053@@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28054 __net_timestamp(skb);
28055
28056 vcc->push(vcc, skb);
28057- atomic_inc(&vcc->stats->rx);
28058+ atomic_inc_unchecked(&vcc->stats->rx);
28059
28060 if (skb->truesize > SAR_FB_SIZE_3)
28061 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
28062@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
28063 if (vcc->qos.aal != ATM_AAL0) {
28064 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
28065 card->name, vpi, vci);
28066- atomic_inc(&vcc->stats->rx_drop);
28067+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28068 goto drop;
28069 }
28070
28071 if ((sb = dev_alloc_skb(64)) == NULL) {
28072 printk("%s: Can't allocate buffers for AAL0.\n",
28073 card->name);
28074- atomic_inc(&vcc->stats->rx_err);
28075+ atomic_inc_unchecked(&vcc->stats->rx_err);
28076 goto drop;
28077 }
28078
28079@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
28080 ATM_SKB(sb)->vcc = vcc;
28081 __net_timestamp(sb);
28082 vcc->push(vcc, sb);
28083- atomic_inc(&vcc->stats->rx);
28084+ atomic_inc_unchecked(&vcc->stats->rx);
28085
28086 drop:
28087 skb_pull(queue, 64);
28088@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
28089
28090 if (vc == NULL) {
28091 printk("%s: NULL connection in send().\n", card->name);
28092- atomic_inc(&vcc->stats->tx_err);
28093+ atomic_inc_unchecked(&vcc->stats->tx_err);
28094 dev_kfree_skb(skb);
28095 return -EINVAL;
28096 }
28097 if (!test_bit(VCF_TX, &vc->flags)) {
28098 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
28099- atomic_inc(&vcc->stats->tx_err);
28100+ atomic_inc_unchecked(&vcc->stats->tx_err);
28101 dev_kfree_skb(skb);
28102 return -EINVAL;
28103 }
28104@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
28105 break;
28106 default:
28107 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
28108- atomic_inc(&vcc->stats->tx_err);
28109+ atomic_inc_unchecked(&vcc->stats->tx_err);
28110 dev_kfree_skb(skb);
28111 return -EINVAL;
28112 }
28113
28114 if (skb_shinfo(skb)->nr_frags != 0) {
28115 printk("%s: No scatter-gather yet.\n", card->name);
28116- atomic_inc(&vcc->stats->tx_err);
28117+ atomic_inc_unchecked(&vcc->stats->tx_err);
28118 dev_kfree_skb(skb);
28119 return -EINVAL;
28120 }
28121@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
28122
28123 err = queue_skb(card, vc, skb, oam);
28124 if (err) {
28125- atomic_inc(&vcc->stats->tx_err);
28126+ atomic_inc_unchecked(&vcc->stats->tx_err);
28127 dev_kfree_skb(skb);
28128 return err;
28129 }
28130@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
28131 skb = dev_alloc_skb(64);
28132 if (!skb) {
28133 printk("%s: Out of memory in send_oam().\n", card->name);
28134- atomic_inc(&vcc->stats->tx_err);
28135+ atomic_inc_unchecked(&vcc->stats->tx_err);
28136 return -ENOMEM;
28137 }
28138 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
28139diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
28140index 9e373ba..cf93727 100644
28141--- a/drivers/atm/iphase.c
28142+++ b/drivers/atm/iphase.c
28143@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev)
28144 status = (u_short) (buf_desc_ptr->desc_mode);
28145 if (status & (RX_CER | RX_PTE | RX_OFL))
28146 {
28147- atomic_inc(&vcc->stats->rx_err);
28148+ atomic_inc_unchecked(&vcc->stats->rx_err);
28149 IF_ERR(printk("IA: bad packet, dropping it");)
28150 if (status & RX_CER) {
28151 IF_ERR(printk(" cause: packet CRC error\n");)
28152@@ -1169,7 +1169,7 @@ static int rx_pkt(struct atm_dev *dev)
28153 len = dma_addr - buf_addr;
28154 if (len > iadev->rx_buf_sz) {
28155 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
28156- atomic_inc(&vcc->stats->rx_err);
28157+ atomic_inc_unchecked(&vcc->stats->rx_err);
28158 goto out_free_desc;
28159 }
28160
28161@@ -1319,7 +1319,7 @@ static void rx_dle_intr(struct atm_dev *dev)
28162 ia_vcc = INPH_IA_VCC(vcc);
28163 if (ia_vcc == NULL)
28164 {
28165- atomic_inc(&vcc->stats->rx_err);
28166+ atomic_inc_unchecked(&vcc->stats->rx_err);
28167 atm_return(vcc, skb->truesize);
28168 dev_kfree_skb_any(skb);
28169 goto INCR_DLE;
28170@@ -1331,7 +1331,7 @@ static void rx_dle_intr(struct atm_dev *dev)
28171 if ((length > iadev->rx_buf_sz) || (length >
28172 (skb->len - sizeof(struct cpcs_trailer))))
28173 {
28174- atomic_inc(&vcc->stats->rx_err);
28175+ atomic_inc_unchecked(&vcc->stats->rx_err);
28176 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
28177 length, skb->len);)
28178 atm_return(vcc, skb->truesize);
28179@@ -1347,7 +1347,7 @@ static void rx_dle_intr(struct atm_dev *dev)
28180
28181 IF_RX(printk("rx_dle_intr: skb push");)
28182 vcc->push(vcc,skb);
28183- atomic_inc(&vcc->stats->rx);
28184+ atomic_inc_unchecked(&vcc->stats->rx);
28185 iadev->rx_pkt_cnt++;
28186 }
28187 INCR_DLE:
28188@@ -2827,15 +2827,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
28189 {
28190 struct k_sonet_stats *stats;
28191 stats = &PRIV(_ia_dev[board])->sonet_stats;
28192- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
28193- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
28194- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
28195- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
28196- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
28197- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
28198- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
28199- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
28200- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
28201+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
28202+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
28203+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
28204+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
28205+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
28206+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
28207+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
28208+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
28209+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
28210 }
28211 ia_cmds.status = 0;
28212 break;
28213@@ -2940,7 +2940,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
28214 if ((desc == 0) || (desc > iadev->num_tx_desc))
28215 {
28216 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
28217- atomic_inc(&vcc->stats->tx);
28218+ atomic_inc_unchecked(&vcc->stats->tx);
28219 if (vcc->pop)
28220 vcc->pop(vcc, skb);
28221 else
28222@@ -3045,14 +3045,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
28223 ATM_DESC(skb) = vcc->vci;
28224 skb_queue_tail(&iadev->tx_dma_q, skb);
28225
28226- atomic_inc(&vcc->stats->tx);
28227+ atomic_inc_unchecked(&vcc->stats->tx);
28228 iadev->tx_pkt_cnt++;
28229 /* Increment transaction counter */
28230 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
28231
28232 #if 0
28233 /* add flow control logic */
28234- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
28235+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
28236 if (iavcc->vc_desc_cnt > 10) {
28237 vcc->tx_quota = vcc->tx_quota * 3 / 4;
28238 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
28239diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
28240index f556969..0da15eb 100644
28241--- a/drivers/atm/lanai.c
28242+++ b/drivers/atm/lanai.c
28243@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
28244 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
28245 lanai_endtx(lanai, lvcc);
28246 lanai_free_skb(lvcc->tx.atmvcc, skb);
28247- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
28248+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
28249 }
28250
28251 /* Try to fill the buffer - don't call unless there is backlog */
28252@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
28253 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
28254 __net_timestamp(skb);
28255 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
28256- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
28257+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
28258 out:
28259 lvcc->rx.buf.ptr = end;
28260 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
28261@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28262 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
28263 "vcc %d\n", lanai->number, (unsigned int) s, vci);
28264 lanai->stats.service_rxnotaal5++;
28265- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28266+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28267 return 0;
28268 }
28269 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
28270@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28271 int bytes;
28272 read_unlock(&vcc_sklist_lock);
28273 DPRINTK("got trashed rx pdu on vci %d\n", vci);
28274- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28275+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28276 lvcc->stats.x.aal5.service_trash++;
28277 bytes = (SERVICE_GET_END(s) * 16) -
28278 (((unsigned long) lvcc->rx.buf.ptr) -
28279@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28280 }
28281 if (s & SERVICE_STREAM) {
28282 read_unlock(&vcc_sklist_lock);
28283- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28284+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28285 lvcc->stats.x.aal5.service_stream++;
28286 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
28287 "PDU on VCI %d!\n", lanai->number, vci);
28288@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28289 return 0;
28290 }
28291 DPRINTK("got rx crc error on vci %d\n", vci);
28292- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28293+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28294 lvcc->stats.x.aal5.service_rxcrc++;
28295 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
28296 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
28297diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
28298index 1c70c45..300718d 100644
28299--- a/drivers/atm/nicstar.c
28300+++ b/drivers/atm/nicstar.c
28301@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28302 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
28303 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
28304 card->index);
28305- atomic_inc(&vcc->stats->tx_err);
28306+ atomic_inc_unchecked(&vcc->stats->tx_err);
28307 dev_kfree_skb_any(skb);
28308 return -EINVAL;
28309 }
28310@@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28311 if (!vc->tx) {
28312 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
28313 card->index);
28314- atomic_inc(&vcc->stats->tx_err);
28315+ atomic_inc_unchecked(&vcc->stats->tx_err);
28316 dev_kfree_skb_any(skb);
28317 return -EINVAL;
28318 }
28319@@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28320 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
28321 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
28322 card->index);
28323- atomic_inc(&vcc->stats->tx_err);
28324+ atomic_inc_unchecked(&vcc->stats->tx_err);
28325 dev_kfree_skb_any(skb);
28326 return -EINVAL;
28327 }
28328
28329 if (skb_shinfo(skb)->nr_frags != 0) {
28330 printk("nicstar%d: No scatter-gather yet.\n", card->index);
28331- atomic_inc(&vcc->stats->tx_err);
28332+ atomic_inc_unchecked(&vcc->stats->tx_err);
28333 dev_kfree_skb_any(skb);
28334 return -EINVAL;
28335 }
28336@@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28337 }
28338
28339 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
28340- atomic_inc(&vcc->stats->tx_err);
28341+ atomic_inc_unchecked(&vcc->stats->tx_err);
28342 dev_kfree_skb_any(skb);
28343 return -EIO;
28344 }
28345- atomic_inc(&vcc->stats->tx);
28346+ atomic_inc_unchecked(&vcc->stats->tx);
28347
28348 return 0;
28349 }
28350@@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28351 printk
28352 ("nicstar%d: Can't allocate buffers for aal0.\n",
28353 card->index);
28354- atomic_add(i, &vcc->stats->rx_drop);
28355+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
28356 break;
28357 }
28358 if (!atm_charge(vcc, sb->truesize)) {
28359 RXPRINTK
28360 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
28361 card->index);
28362- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28363+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28364 dev_kfree_skb_any(sb);
28365 break;
28366 }
28367@@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28368 ATM_SKB(sb)->vcc = vcc;
28369 __net_timestamp(sb);
28370 vcc->push(vcc, sb);
28371- atomic_inc(&vcc->stats->rx);
28372+ atomic_inc_unchecked(&vcc->stats->rx);
28373 cell += ATM_CELL_PAYLOAD;
28374 }
28375
28376@@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28377 if (iovb == NULL) {
28378 printk("nicstar%d: Out of iovec buffers.\n",
28379 card->index);
28380- atomic_inc(&vcc->stats->rx_drop);
28381+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28382 recycle_rx_buf(card, skb);
28383 return;
28384 }
28385@@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28386 small or large buffer itself. */
28387 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
28388 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
28389- atomic_inc(&vcc->stats->rx_err);
28390+ atomic_inc_unchecked(&vcc->stats->rx_err);
28391 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28392 NS_MAX_IOVECS);
28393 NS_PRV_IOVCNT(iovb) = 0;
28394@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28395 ("nicstar%d: Expected a small buffer, and this is not one.\n",
28396 card->index);
28397 which_list(card, skb);
28398- atomic_inc(&vcc->stats->rx_err);
28399+ atomic_inc_unchecked(&vcc->stats->rx_err);
28400 recycle_rx_buf(card, skb);
28401 vc->rx_iov = NULL;
28402 recycle_iov_buf(card, iovb);
28403@@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28404 ("nicstar%d: Expected a large buffer, and this is not one.\n",
28405 card->index);
28406 which_list(card, skb);
28407- atomic_inc(&vcc->stats->rx_err);
28408+ atomic_inc_unchecked(&vcc->stats->rx_err);
28409 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28410 NS_PRV_IOVCNT(iovb));
28411 vc->rx_iov = NULL;
28412@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28413 printk(" - PDU size mismatch.\n");
28414 else
28415 printk(".\n");
28416- atomic_inc(&vcc->stats->rx_err);
28417+ atomic_inc_unchecked(&vcc->stats->rx_err);
28418 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28419 NS_PRV_IOVCNT(iovb));
28420 vc->rx_iov = NULL;
28421@@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28422 /* skb points to a small buffer */
28423 if (!atm_charge(vcc, skb->truesize)) {
28424 push_rxbufs(card, skb);
28425- atomic_inc(&vcc->stats->rx_drop);
28426+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28427 } else {
28428 skb_put(skb, len);
28429 dequeue_sm_buf(card, skb);
28430@@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28431 ATM_SKB(skb)->vcc = vcc;
28432 __net_timestamp(skb);
28433 vcc->push(vcc, skb);
28434- atomic_inc(&vcc->stats->rx);
28435+ atomic_inc_unchecked(&vcc->stats->rx);
28436 }
28437 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
28438 struct sk_buff *sb;
28439@@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28440 if (len <= NS_SMBUFSIZE) {
28441 if (!atm_charge(vcc, sb->truesize)) {
28442 push_rxbufs(card, sb);
28443- atomic_inc(&vcc->stats->rx_drop);
28444+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28445 } else {
28446 skb_put(sb, len);
28447 dequeue_sm_buf(card, sb);
28448@@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28449 ATM_SKB(sb)->vcc = vcc;
28450 __net_timestamp(sb);
28451 vcc->push(vcc, sb);
28452- atomic_inc(&vcc->stats->rx);
28453+ atomic_inc_unchecked(&vcc->stats->rx);
28454 }
28455
28456 push_rxbufs(card, skb);
28457@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28458
28459 if (!atm_charge(vcc, skb->truesize)) {
28460 push_rxbufs(card, skb);
28461- atomic_inc(&vcc->stats->rx_drop);
28462+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28463 } else {
28464 dequeue_lg_buf(card, skb);
28465 #ifdef NS_USE_DESTRUCTORS
28466@@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28467 ATM_SKB(skb)->vcc = vcc;
28468 __net_timestamp(skb);
28469 vcc->push(vcc, skb);
28470- atomic_inc(&vcc->stats->rx);
28471+ atomic_inc_unchecked(&vcc->stats->rx);
28472 }
28473
28474 push_rxbufs(card, sb);
28475@@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28476 printk
28477 ("nicstar%d: Out of huge buffers.\n",
28478 card->index);
28479- atomic_inc(&vcc->stats->rx_drop);
28480+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28481 recycle_iovec_rx_bufs(card,
28482 (struct iovec *)
28483 iovb->data,
28484@@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28485 card->hbpool.count++;
28486 } else
28487 dev_kfree_skb_any(hb);
28488- atomic_inc(&vcc->stats->rx_drop);
28489+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28490 } else {
28491 /* Copy the small buffer to the huge buffer */
28492 sb = (struct sk_buff *)iov->iov_base;
28493@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28494 #endif /* NS_USE_DESTRUCTORS */
28495 __net_timestamp(hb);
28496 vcc->push(vcc, hb);
28497- atomic_inc(&vcc->stats->rx);
28498+ atomic_inc_unchecked(&vcc->stats->rx);
28499 }
28500 }
28501
28502diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
28503index e8cd652..bbbd1fc 100644
28504--- a/drivers/atm/solos-pci.c
28505+++ b/drivers/atm/solos-pci.c
28506@@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
28507 }
28508 atm_charge(vcc, skb->truesize);
28509 vcc->push(vcc, skb);
28510- atomic_inc(&vcc->stats->rx);
28511+ atomic_inc_unchecked(&vcc->stats->rx);
28512 break;
28513
28514 case PKT_STATUS:
28515@@ -1008,7 +1008,7 @@ static uint32_t fpga_tx(struct solos_card *card)
28516 vcc = SKB_CB(oldskb)->vcc;
28517
28518 if (vcc) {
28519- atomic_inc(&vcc->stats->tx);
28520+ atomic_inc_unchecked(&vcc->stats->tx);
28521 solos_pop(vcc, oldskb);
28522 } else
28523 dev_kfree_skb_irq(oldskb);
28524diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
28525index 90f1ccc..04c4a1e 100644
28526--- a/drivers/atm/suni.c
28527+++ b/drivers/atm/suni.c
28528@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
28529
28530
28531 #define ADD_LIMITED(s,v) \
28532- atomic_add((v),&stats->s); \
28533- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
28534+ atomic_add_unchecked((v),&stats->s); \
28535+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
28536
28537
28538 static void suni_hz(unsigned long from_timer)
28539diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
28540index 5120a96..e2572bd 100644
28541--- a/drivers/atm/uPD98402.c
28542+++ b/drivers/atm/uPD98402.c
28543@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
28544 struct sonet_stats tmp;
28545 int error = 0;
28546
28547- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
28548+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
28549 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
28550 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
28551 if (zero && !error) {
28552@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
28553
28554
28555 #define ADD_LIMITED(s,v) \
28556- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
28557- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
28558- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
28559+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
28560+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
28561+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
28562
28563
28564 static void stat_event(struct atm_dev *dev)
28565@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
28566 if (reason & uPD98402_INT_PFM) stat_event(dev);
28567 if (reason & uPD98402_INT_PCO) {
28568 (void) GET(PCOCR); /* clear interrupt cause */
28569- atomic_add(GET(HECCT),
28570+ atomic_add_unchecked(GET(HECCT),
28571 &PRIV(dev)->sonet_stats.uncorr_hcs);
28572 }
28573 if ((reason & uPD98402_INT_RFO) &&
28574@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
28575 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
28576 uPD98402_INT_LOS),PIMR); /* enable them */
28577 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
28578- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28579- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
28580- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
28581+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28582+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
28583+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
28584 return 0;
28585 }
28586
28587diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
28588index d889f56..17eb71e 100644
28589--- a/drivers/atm/zatm.c
28590+++ b/drivers/atm/zatm.c
28591@@ -460,7 +460,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
28592 }
28593 if (!size) {
28594 dev_kfree_skb_irq(skb);
28595- if (vcc) atomic_inc(&vcc->stats->rx_err);
28596+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
28597 continue;
28598 }
28599 if (!atm_charge(vcc,skb->truesize)) {
28600@@ -470,7 +470,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
28601 skb->len = size;
28602 ATM_SKB(skb)->vcc = vcc;
28603 vcc->push(vcc,skb);
28604- atomic_inc(&vcc->stats->rx);
28605+ atomic_inc_unchecked(&vcc->stats->rx);
28606 }
28607 zout(pos & 0xffff,MTA(mbx));
28608 #if 0 /* probably a stupid idea */
28609@@ -734,7 +734,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
28610 skb_queue_head(&zatm_vcc->backlog,skb);
28611 break;
28612 }
28613- atomic_inc(&vcc->stats->tx);
28614+ atomic_inc_unchecked(&vcc->stats->tx);
28615 wake_up(&zatm_vcc->tx_wait);
28616 }
28617
28618diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
28619index 8493536..31adee0 100644
28620--- a/drivers/base/devtmpfs.c
28621+++ b/drivers/base/devtmpfs.c
28622@@ -368,7 +368,7 @@ int devtmpfs_mount(const char *mntdir)
28623 if (!thread)
28624 return 0;
28625
28626- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
28627+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
28628 if (err)
28629 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
28630 else
28631diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
28632index caf995f..6f76697 100644
28633--- a/drivers/base/power/wakeup.c
28634+++ b/drivers/base/power/wakeup.c
28635@@ -30,14 +30,14 @@ bool events_check_enabled;
28636 * They need to be modified together atomically, so it's better to use one
28637 * atomic variable to hold them both.
28638 */
28639-static atomic_t combined_event_count = ATOMIC_INIT(0);
28640+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
28641
28642 #define IN_PROGRESS_BITS (sizeof(int) * 4)
28643 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
28644
28645 static void split_counters(unsigned int *cnt, unsigned int *inpr)
28646 {
28647- unsigned int comb = atomic_read(&combined_event_count);
28648+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
28649
28650 *cnt = (comb >> IN_PROGRESS_BITS);
28651 *inpr = comb & MAX_IN_PROGRESS;
28652@@ -353,7 +353,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
28653 ws->last_time = ktime_get();
28654
28655 /* Increment the counter of events in progress. */
28656- atomic_inc(&combined_event_count);
28657+ atomic_inc_unchecked(&combined_event_count);
28658 }
28659
28660 /**
28661@@ -443,7 +443,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
28662 * Increment the counter of registered wakeup events and decrement the
28663 * couter of wakeup events in progress simultaneously.
28664 */
28665- atomic_add(MAX_IN_PROGRESS, &combined_event_count);
28666+ atomic_add_unchecked(MAX_IN_PROGRESS, &combined_event_count);
28667 }
28668
28669 /**
28670diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
28671index b0f553b..77b928b 100644
28672--- a/drivers/block/cciss.c
28673+++ b/drivers/block/cciss.c
28674@@ -1198,6 +1198,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
28675 int err;
28676 u32 cp;
28677
28678+ memset(&arg64, 0, sizeof(arg64));
28679+
28680 err = 0;
28681 err |=
28682 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
28683@@ -3007,7 +3009,7 @@ static void start_io(ctlr_info_t *h)
28684 while (!list_empty(&h->reqQ)) {
28685 c = list_entry(h->reqQ.next, CommandList_struct, list);
28686 /* can't do anything if fifo is full */
28687- if ((h->access.fifo_full(h))) {
28688+ if ((h->access->fifo_full(h))) {
28689 dev_warn(&h->pdev->dev, "fifo full\n");
28690 break;
28691 }
28692@@ -3017,7 +3019,7 @@ static void start_io(ctlr_info_t *h)
28693 h->Qdepth--;
28694
28695 /* Tell the controller execute command */
28696- h->access.submit_command(h, c);
28697+ h->access->submit_command(h, c);
28698
28699 /* Put job onto the completed Q */
28700 addQ(&h->cmpQ, c);
28701@@ -3443,17 +3445,17 @@ startio:
28702
28703 static inline unsigned long get_next_completion(ctlr_info_t *h)
28704 {
28705- return h->access.command_completed(h);
28706+ return h->access->command_completed(h);
28707 }
28708
28709 static inline int interrupt_pending(ctlr_info_t *h)
28710 {
28711- return h->access.intr_pending(h);
28712+ return h->access->intr_pending(h);
28713 }
28714
28715 static inline long interrupt_not_for_us(ctlr_info_t *h)
28716 {
28717- return ((h->access.intr_pending(h) == 0) ||
28718+ return ((h->access->intr_pending(h) == 0) ||
28719 (h->interrupts_enabled == 0));
28720 }
28721
28722@@ -3486,7 +3488,7 @@ static inline u32 next_command(ctlr_info_t *h)
28723 u32 a;
28724
28725 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
28726- return h->access.command_completed(h);
28727+ return h->access->command_completed(h);
28728
28729 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
28730 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
28731@@ -4044,7 +4046,7 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h)
28732 trans_support & CFGTBL_Trans_use_short_tags);
28733
28734 /* Change the access methods to the performant access methods */
28735- h->access = SA5_performant_access;
28736+ h->access = &SA5_performant_access;
28737 h->transMethod = CFGTBL_Trans_Performant;
28738
28739 return;
28740@@ -4316,7 +4318,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
28741 if (prod_index < 0)
28742 return -ENODEV;
28743 h->product_name = products[prod_index].product_name;
28744- h->access = *(products[prod_index].access);
28745+ h->access = products[prod_index].access;
28746
28747 if (cciss_board_disabled(h)) {
28748 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
28749@@ -5041,7 +5043,7 @@ reinit_after_soft_reset:
28750 }
28751
28752 /* make sure the board interrupts are off */
28753- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28754+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28755 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
28756 if (rc)
28757 goto clean2;
28758@@ -5093,7 +5095,7 @@ reinit_after_soft_reset:
28759 * fake ones to scoop up any residual completions.
28760 */
28761 spin_lock_irqsave(&h->lock, flags);
28762- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28763+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28764 spin_unlock_irqrestore(&h->lock, flags);
28765 free_irq(h->intr[h->intr_mode], h);
28766 rc = cciss_request_irq(h, cciss_msix_discard_completions,
28767@@ -5113,9 +5115,9 @@ reinit_after_soft_reset:
28768 dev_info(&h->pdev->dev, "Board READY.\n");
28769 dev_info(&h->pdev->dev,
28770 "Waiting for stale completions to drain.\n");
28771- h->access.set_intr_mask(h, CCISS_INTR_ON);
28772+ h->access->set_intr_mask(h, CCISS_INTR_ON);
28773 msleep(10000);
28774- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28775+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28776
28777 rc = controller_reset_failed(h->cfgtable);
28778 if (rc)
28779@@ -5138,7 +5140,7 @@ reinit_after_soft_reset:
28780 cciss_scsi_setup(h);
28781
28782 /* Turn the interrupts on so we can service requests */
28783- h->access.set_intr_mask(h, CCISS_INTR_ON);
28784+ h->access->set_intr_mask(h, CCISS_INTR_ON);
28785
28786 /* Get the firmware version */
28787 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
28788@@ -5211,7 +5213,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
28789 kfree(flush_buf);
28790 if (return_code != IO_OK)
28791 dev_warn(&h->pdev->dev, "Error flushing cache\n");
28792- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28793+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28794 free_irq(h->intr[h->intr_mode], h);
28795 }
28796
28797diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
28798index 7fda30e..eb5dfe0 100644
28799--- a/drivers/block/cciss.h
28800+++ b/drivers/block/cciss.h
28801@@ -101,7 +101,7 @@ struct ctlr_info
28802 /* information about each logical volume */
28803 drive_info_struct *drv[CISS_MAX_LUN];
28804
28805- struct access_method access;
28806+ struct access_method *access;
28807
28808 /* queue and queue Info */
28809 struct list_head reqQ;
28810diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
28811index 9125bbe..eede5c8 100644
28812--- a/drivers/block/cpqarray.c
28813+++ b/drivers/block/cpqarray.c
28814@@ -404,7 +404,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
28815 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
28816 goto Enomem4;
28817 }
28818- hba[i]->access.set_intr_mask(hba[i], 0);
28819+ hba[i]->access->set_intr_mask(hba[i], 0);
28820 if (request_irq(hba[i]->intr, do_ida_intr,
28821 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
28822 {
28823@@ -459,7 +459,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
28824 add_timer(&hba[i]->timer);
28825
28826 /* Enable IRQ now that spinlock and rate limit timer are set up */
28827- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28828+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28829
28830 for(j=0; j<NWD; j++) {
28831 struct gendisk *disk = ida_gendisk[i][j];
28832@@ -694,7 +694,7 @@ DBGINFO(
28833 for(i=0; i<NR_PRODUCTS; i++) {
28834 if (board_id == products[i].board_id) {
28835 c->product_name = products[i].product_name;
28836- c->access = *(products[i].access);
28837+ c->access = products[i].access;
28838 break;
28839 }
28840 }
28841@@ -792,7 +792,7 @@ static int __devinit cpqarray_eisa_detect(void)
28842 hba[ctlr]->intr = intr;
28843 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
28844 hba[ctlr]->product_name = products[j].product_name;
28845- hba[ctlr]->access = *(products[j].access);
28846+ hba[ctlr]->access = products[j].access;
28847 hba[ctlr]->ctlr = ctlr;
28848 hba[ctlr]->board_id = board_id;
28849 hba[ctlr]->pci_dev = NULL; /* not PCI */
28850@@ -980,7 +980,7 @@ static void start_io(ctlr_info_t *h)
28851
28852 while((c = h->reqQ) != NULL) {
28853 /* Can't do anything if we're busy */
28854- if (h->access.fifo_full(h) == 0)
28855+ if (h->access->fifo_full(h) == 0)
28856 return;
28857
28858 /* Get the first entry from the request Q */
28859@@ -988,7 +988,7 @@ static void start_io(ctlr_info_t *h)
28860 h->Qdepth--;
28861
28862 /* Tell the controller to do our bidding */
28863- h->access.submit_command(h, c);
28864+ h->access->submit_command(h, c);
28865
28866 /* Get onto the completion Q */
28867 addQ(&h->cmpQ, c);
28868@@ -1050,7 +1050,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
28869 unsigned long flags;
28870 __u32 a,a1;
28871
28872- istat = h->access.intr_pending(h);
28873+ istat = h->access->intr_pending(h);
28874 /* Is this interrupt for us? */
28875 if (istat == 0)
28876 return IRQ_NONE;
28877@@ -1061,7 +1061,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
28878 */
28879 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
28880 if (istat & FIFO_NOT_EMPTY) {
28881- while((a = h->access.command_completed(h))) {
28882+ while((a = h->access->command_completed(h))) {
28883 a1 = a; a &= ~3;
28884 if ((c = h->cmpQ) == NULL)
28885 {
28886@@ -1449,11 +1449,11 @@ static int sendcmd(
28887 /*
28888 * Disable interrupt
28889 */
28890- info_p->access.set_intr_mask(info_p, 0);
28891+ info_p->access->set_intr_mask(info_p, 0);
28892 /* Make sure there is room in the command FIFO */
28893 /* Actually it should be completely empty at this time. */
28894 for (i = 200000; i > 0; i--) {
28895- temp = info_p->access.fifo_full(info_p);
28896+ temp = info_p->access->fifo_full(info_p);
28897 if (temp != 0) {
28898 break;
28899 }
28900@@ -1466,7 +1466,7 @@ DBG(
28901 /*
28902 * Send the cmd
28903 */
28904- info_p->access.submit_command(info_p, c);
28905+ info_p->access->submit_command(info_p, c);
28906 complete = pollcomplete(ctlr);
28907
28908 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
28909@@ -1549,9 +1549,9 @@ static int revalidate_allvol(ctlr_info_t *host)
28910 * we check the new geometry. Then turn interrupts back on when
28911 * we're done.
28912 */
28913- host->access.set_intr_mask(host, 0);
28914+ host->access->set_intr_mask(host, 0);
28915 getgeometry(ctlr);
28916- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
28917+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
28918
28919 for(i=0; i<NWD; i++) {
28920 struct gendisk *disk = ida_gendisk[ctlr][i];
28921@@ -1591,7 +1591,7 @@ static int pollcomplete(int ctlr)
28922 /* Wait (up to 2 seconds) for a command to complete */
28923
28924 for (i = 200000; i > 0; i--) {
28925- done = hba[ctlr]->access.command_completed(hba[ctlr]);
28926+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
28927 if (done == 0) {
28928 udelay(10); /* a short fixed delay */
28929 } else
28930diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
28931index be73e9d..7fbf140 100644
28932--- a/drivers/block/cpqarray.h
28933+++ b/drivers/block/cpqarray.h
28934@@ -99,7 +99,7 @@ struct ctlr_info {
28935 drv_info_t drv[NWD];
28936 struct proc_dir_entry *proc;
28937
28938- struct access_method access;
28939+ struct access_method *access;
28940
28941 cmdlist_t *reqQ;
28942 cmdlist_t *cmpQ;
28943diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
28944index 8d68056..e67050f 100644
28945--- a/drivers/block/drbd/drbd_int.h
28946+++ b/drivers/block/drbd/drbd_int.h
28947@@ -736,7 +736,7 @@ struct drbd_request;
28948 struct drbd_epoch {
28949 struct list_head list;
28950 unsigned int barrier_nr;
28951- atomic_t epoch_size; /* increased on every request added. */
28952+ atomic_unchecked_t epoch_size; /* increased on every request added. */
28953 atomic_t active; /* increased on every req. added, and dec on every finished. */
28954 unsigned long flags;
28955 };
28956@@ -1108,7 +1108,7 @@ struct drbd_conf {
28957 void *int_dig_in;
28958 void *int_dig_vv;
28959 wait_queue_head_t seq_wait;
28960- atomic_t packet_seq;
28961+ atomic_unchecked_t packet_seq;
28962 unsigned int peer_seq;
28963 spinlock_t peer_seq_lock;
28964 unsigned int minor;
28965@@ -1617,30 +1617,30 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
28966
28967 static inline void drbd_tcp_cork(struct socket *sock)
28968 {
28969- int __user val = 1;
28970+ int val = 1;
28971 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
28972- (char __user *)&val, sizeof(val));
28973+ (char __force_user *)&val, sizeof(val));
28974 }
28975
28976 static inline void drbd_tcp_uncork(struct socket *sock)
28977 {
28978- int __user val = 0;
28979+ int val = 0;
28980 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
28981- (char __user *)&val, sizeof(val));
28982+ (char __force_user *)&val, sizeof(val));
28983 }
28984
28985 static inline void drbd_tcp_nodelay(struct socket *sock)
28986 {
28987- int __user val = 1;
28988+ int val = 1;
28989 (void) drbd_setsockopt(sock, SOL_TCP, TCP_NODELAY,
28990- (char __user *)&val, sizeof(val));
28991+ (char __force_user *)&val, sizeof(val));
28992 }
28993
28994 static inline void drbd_tcp_quickack(struct socket *sock)
28995 {
28996- int __user val = 2;
28997+ int val = 2;
28998 (void) drbd_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
28999- (char __user *)&val, sizeof(val));
29000+ (char __force_user *)&val, sizeof(val));
29001 }
29002
29003 void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
29004diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
29005index 211fc44..c5116f1 100644
29006--- a/drivers/block/drbd/drbd_main.c
29007+++ b/drivers/block/drbd/drbd_main.c
29008@@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd,
29009 p.sector = sector;
29010 p.block_id = block_id;
29011 p.blksize = blksize;
29012- p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
29013+ p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
29014
29015 if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED)
29016 return false;
29017@@ -2696,7 +2696,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
29018 p.sector = cpu_to_be64(req->sector);
29019 p.block_id = (unsigned long)req;
29020 p.seq_num = cpu_to_be32(req->seq_num =
29021- atomic_add_return(1, &mdev->packet_seq));
29022+ atomic_add_return_unchecked(1, &mdev->packet_seq));
29023
29024 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
29025
29026@@ -2981,7 +2981,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
29027 atomic_set(&mdev->unacked_cnt, 0);
29028 atomic_set(&mdev->local_cnt, 0);
29029 atomic_set(&mdev->net_cnt, 0);
29030- atomic_set(&mdev->packet_seq, 0);
29031+ atomic_set_unchecked(&mdev->packet_seq, 0);
29032 atomic_set(&mdev->pp_in_use, 0);
29033 atomic_set(&mdev->pp_in_use_by_net, 0);
29034 atomic_set(&mdev->rs_sect_in, 0);
29035@@ -3063,8 +3063,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev)
29036 mdev->receiver.t_state);
29037
29038 /* no need to lock it, I'm the only thread alive */
29039- if (atomic_read(&mdev->current_epoch->epoch_size) != 0)
29040- dev_err(DEV, "epoch_size:%d\n", atomic_read(&mdev->current_epoch->epoch_size));
29041+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size) != 0)
29042+ dev_err(DEV, "epoch_size:%d\n", atomic_read_unchecked(&mdev->current_epoch->epoch_size));
29043 mdev->al_writ_cnt =
29044 mdev->bm_writ_cnt =
29045 mdev->read_cnt =
29046diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
29047index af2a250..219c74b 100644
29048--- a/drivers/block/drbd/drbd_nl.c
29049+++ b/drivers/block/drbd/drbd_nl.c
29050@@ -2359,7 +2359,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
29051 module_put(THIS_MODULE);
29052 }
29053
29054-static atomic_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
29055+static atomic_unchecked_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
29056
29057 static unsigned short *
29058 __tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data,
29059@@ -2430,7 +2430,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
29060 cn_reply->id.idx = CN_IDX_DRBD;
29061 cn_reply->id.val = CN_VAL_DRBD;
29062
29063- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
29064+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
29065 cn_reply->ack = 0; /* not used here. */
29066 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
29067 (int)((char *)tl - (char *)reply->tag_list);
29068@@ -2462,7 +2462,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
29069 cn_reply->id.idx = CN_IDX_DRBD;
29070 cn_reply->id.val = CN_VAL_DRBD;
29071
29072- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
29073+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
29074 cn_reply->ack = 0; /* not used here. */
29075 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
29076 (int)((char *)tl - (char *)reply->tag_list);
29077@@ -2540,7 +2540,7 @@ void drbd_bcast_ee(struct drbd_conf *mdev,
29078 cn_reply->id.idx = CN_IDX_DRBD;
29079 cn_reply->id.val = CN_VAL_DRBD;
29080
29081- cn_reply->seq = atomic_add_return(1,&drbd_nl_seq);
29082+ cn_reply->seq = atomic_add_return_unchecked(1,&drbd_nl_seq);
29083 cn_reply->ack = 0; // not used here.
29084 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
29085 (int)((char*)tl - (char*)reply->tag_list);
29086@@ -2579,7 +2579,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
29087 cn_reply->id.idx = CN_IDX_DRBD;
29088 cn_reply->id.val = CN_VAL_DRBD;
29089
29090- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
29091+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
29092 cn_reply->ack = 0; /* not used here. */
29093 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
29094 (int)((char *)tl - (char *)reply->tag_list);
29095diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
29096index 43beaca..4a5b1dd 100644
29097--- a/drivers/block/drbd/drbd_receiver.c
29098+++ b/drivers/block/drbd/drbd_receiver.c
29099@@ -894,7 +894,7 @@ retry:
29100 sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
29101 sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
29102
29103- atomic_set(&mdev->packet_seq, 0);
29104+ atomic_set_unchecked(&mdev->packet_seq, 0);
29105 mdev->peer_seq = 0;
29106
29107 drbd_thread_start(&mdev->asender);
29108@@ -985,7 +985,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
29109 do {
29110 next_epoch = NULL;
29111
29112- epoch_size = atomic_read(&epoch->epoch_size);
29113+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
29114
29115 switch (ev & ~EV_CLEANUP) {
29116 case EV_PUT:
29117@@ -1020,7 +1020,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
29118 rv = FE_DESTROYED;
29119 } else {
29120 epoch->flags = 0;
29121- atomic_set(&epoch->epoch_size, 0);
29122+ atomic_set_unchecked(&epoch->epoch_size, 0);
29123 /* atomic_set(&epoch->active, 0); is already zero */
29124 if (rv == FE_STILL_LIVE)
29125 rv = FE_RECYCLED;
29126@@ -1191,14 +1191,14 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
29127 drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
29128 drbd_flush(mdev);
29129
29130- if (atomic_read(&mdev->current_epoch->epoch_size)) {
29131+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
29132 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
29133 if (epoch)
29134 break;
29135 }
29136
29137 epoch = mdev->current_epoch;
29138- wait_event(mdev->ee_wait, atomic_read(&epoch->epoch_size) == 0);
29139+ wait_event(mdev->ee_wait, atomic_read_unchecked(&epoch->epoch_size) == 0);
29140
29141 D_ASSERT(atomic_read(&epoch->active) == 0);
29142 D_ASSERT(epoch->flags == 0);
29143@@ -1210,11 +1210,11 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
29144 }
29145
29146 epoch->flags = 0;
29147- atomic_set(&epoch->epoch_size, 0);
29148+ atomic_set_unchecked(&epoch->epoch_size, 0);
29149 atomic_set(&epoch->active, 0);
29150
29151 spin_lock(&mdev->epoch_lock);
29152- if (atomic_read(&mdev->current_epoch->epoch_size)) {
29153+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
29154 list_add(&epoch->list, &mdev->current_epoch->list);
29155 mdev->current_epoch = epoch;
29156 mdev->epochs++;
29157@@ -1663,7 +1663,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
29158 spin_unlock(&mdev->peer_seq_lock);
29159
29160 drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
29161- atomic_inc(&mdev->current_epoch->epoch_size);
29162+ atomic_inc_unchecked(&mdev->current_epoch->epoch_size);
29163 return drbd_drain_block(mdev, data_size);
29164 }
29165
29166@@ -1689,7 +1689,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
29167
29168 spin_lock(&mdev->epoch_lock);
29169 e->epoch = mdev->current_epoch;
29170- atomic_inc(&e->epoch->epoch_size);
29171+ atomic_inc_unchecked(&e->epoch->epoch_size);
29172 atomic_inc(&e->epoch->active);
29173 spin_unlock(&mdev->epoch_lock);
29174
29175@@ -3885,7 +3885,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
29176 D_ASSERT(list_empty(&mdev->done_ee));
29177
29178 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
29179- atomic_set(&mdev->current_epoch->epoch_size, 0);
29180+ atomic_set_unchecked(&mdev->current_epoch->epoch_size, 0);
29181 D_ASSERT(list_empty(&mdev->current_epoch->list));
29182 }
29183
29184diff --git a/drivers/block/loop.c b/drivers/block/loop.c
29185index cd50435..ba1ffb5 100644
29186--- a/drivers/block/loop.c
29187+++ b/drivers/block/loop.c
29188@@ -226,7 +226,7 @@ static int __do_lo_send_write(struct file *file,
29189 mm_segment_t old_fs = get_fs();
29190
29191 set_fs(get_ds());
29192- bw = file->f_op->write(file, buf, len, &pos);
29193+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
29194 set_fs(old_fs);
29195 if (likely(bw == len))
29196 return 0;
29197diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
29198index 4364303..9adf4ee 100644
29199--- a/drivers/char/Kconfig
29200+++ b/drivers/char/Kconfig
29201@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
29202
29203 config DEVKMEM
29204 bool "/dev/kmem virtual device support"
29205- default y
29206+ default n
29207+ depends on !GRKERNSEC_KMEM
29208 help
29209 Say Y here if you want to support the /dev/kmem device. The
29210 /dev/kmem device is rarely used, but can be used for certain
29211@@ -596,6 +597,7 @@ config DEVPORT
29212 bool
29213 depends on !M68K
29214 depends on ISA || PCI
29215+ depends on !GRKERNSEC_KMEM
29216 default y
29217
29218 source "drivers/s390/char/Kconfig"
29219diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
29220index 2e04433..22afc64 100644
29221--- a/drivers/char/agp/frontend.c
29222+++ b/drivers/char/agp/frontend.c
29223@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
29224 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
29225 return -EFAULT;
29226
29227- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
29228+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
29229 return -EFAULT;
29230
29231 client = agp_find_client_by_pid(reserve.pid);
29232diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
29233index 095ab90..afad0a4 100644
29234--- a/drivers/char/briq_panel.c
29235+++ b/drivers/char/briq_panel.c
29236@@ -9,6 +9,7 @@
29237 #include <linux/types.h>
29238 #include <linux/errno.h>
29239 #include <linux/tty.h>
29240+#include <linux/mutex.h>
29241 #include <linux/timer.h>
29242 #include <linux/kernel.h>
29243 #include <linux/wait.h>
29244@@ -34,6 +35,7 @@ static int vfd_is_open;
29245 static unsigned char vfd[40];
29246 static int vfd_cursor;
29247 static unsigned char ledpb, led;
29248+static DEFINE_MUTEX(vfd_mutex);
29249
29250 static void update_vfd(void)
29251 {
29252@@ -140,12 +142,15 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
29253 if (!vfd_is_open)
29254 return -EBUSY;
29255
29256+ mutex_lock(&vfd_mutex);
29257 for (;;) {
29258 char c;
29259 if (!indx)
29260 break;
29261- if (get_user(c, buf))
29262+ if (get_user(c, buf)) {
29263+ mutex_unlock(&vfd_mutex);
29264 return -EFAULT;
29265+ }
29266 if (esc) {
29267 set_led(c);
29268 esc = 0;
29269@@ -175,6 +180,7 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
29270 buf++;
29271 }
29272 update_vfd();
29273+ mutex_unlock(&vfd_mutex);
29274
29275 return len;
29276 }
29277diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
29278index f773a9d..65cd683 100644
29279--- a/drivers/char/genrtc.c
29280+++ b/drivers/char/genrtc.c
29281@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
29282 switch (cmd) {
29283
29284 case RTC_PLL_GET:
29285+ memset(&pll, 0, sizeof(pll));
29286 if (get_rtc_pll(&pll))
29287 return -EINVAL;
29288 else
29289diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
29290index 0833896..cccce52 100644
29291--- a/drivers/char/hpet.c
29292+++ b/drivers/char/hpet.c
29293@@ -572,7 +572,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
29294 }
29295
29296 static int
29297-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
29298+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
29299 struct hpet_info *info)
29300 {
29301 struct hpet_timer __iomem *timer;
29302diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
29303index 58c0e63..46c16bf 100644
29304--- a/drivers/char/ipmi/ipmi_msghandler.c
29305+++ b/drivers/char/ipmi/ipmi_msghandler.c
29306@@ -415,7 +415,7 @@ struct ipmi_smi {
29307 struct proc_dir_entry *proc_dir;
29308 char proc_dir_name[10];
29309
29310- atomic_t stats[IPMI_NUM_STATS];
29311+ atomic_unchecked_t stats[IPMI_NUM_STATS];
29312
29313 /*
29314 * run_to_completion duplicate of smb_info, smi_info
29315@@ -448,9 +448,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
29316
29317
29318 #define ipmi_inc_stat(intf, stat) \
29319- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
29320+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
29321 #define ipmi_get_stat(intf, stat) \
29322- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
29323+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
29324
29325 static int is_lan_addr(struct ipmi_addr *addr)
29326 {
29327@@ -2868,7 +2868,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
29328 INIT_LIST_HEAD(&intf->cmd_rcvrs);
29329 init_waitqueue_head(&intf->waitq);
29330 for (i = 0; i < IPMI_NUM_STATS; i++)
29331- atomic_set(&intf->stats[i], 0);
29332+ atomic_set_unchecked(&intf->stats[i], 0);
29333
29334 intf->proc_dir = NULL;
29335
29336diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
29337index 50fcf9c..91b5528 100644
29338--- a/drivers/char/ipmi/ipmi_si_intf.c
29339+++ b/drivers/char/ipmi/ipmi_si_intf.c
29340@@ -277,7 +277,7 @@ struct smi_info {
29341 unsigned char slave_addr;
29342
29343 /* Counters and things for the proc filesystem. */
29344- atomic_t stats[SI_NUM_STATS];
29345+ atomic_unchecked_t stats[SI_NUM_STATS];
29346
29347 struct task_struct *thread;
29348
29349@@ -286,9 +286,9 @@ struct smi_info {
29350 };
29351
29352 #define smi_inc_stat(smi, stat) \
29353- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
29354+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
29355 #define smi_get_stat(smi, stat) \
29356- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
29357+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
29358
29359 #define SI_MAX_PARMS 4
29360
29361@@ -3230,7 +3230,7 @@ static int try_smi_init(struct smi_info *new_smi)
29362 atomic_set(&new_smi->req_events, 0);
29363 new_smi->run_to_completion = 0;
29364 for (i = 0; i < SI_NUM_STATS; i++)
29365- atomic_set(&new_smi->stats[i], 0);
29366+ atomic_set_unchecked(&new_smi->stats[i], 0);
29367
29368 new_smi->interrupt_disabled = 1;
29369 atomic_set(&new_smi->stop_operation, 0);
29370diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
29371index 1aeaaba..e018570 100644
29372--- a/drivers/char/mbcs.c
29373+++ b/drivers/char/mbcs.c
29374@@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *dev)
29375 return 0;
29376 }
29377
29378-static const struct cx_device_id __devinitdata mbcs_id_table[] = {
29379+static const struct cx_device_id __devinitconst mbcs_id_table[] = {
29380 {
29381 .part_num = MBCS_PART_NUM,
29382 .mfg_num = MBCS_MFG_NUM,
29383diff --git a/drivers/char/mem.c b/drivers/char/mem.c
29384index d6e9d08..4493e89 100644
29385--- a/drivers/char/mem.c
29386+++ b/drivers/char/mem.c
29387@@ -18,6 +18,7 @@
29388 #include <linux/raw.h>
29389 #include <linux/tty.h>
29390 #include <linux/capability.h>
29391+#include <linux/security.h>
29392 #include <linux/ptrace.h>
29393 #include <linux/device.h>
29394 #include <linux/highmem.h>
29395@@ -35,6 +36,10 @@
29396 # include <linux/efi.h>
29397 #endif
29398
29399+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29400+extern const struct file_operations grsec_fops;
29401+#endif
29402+
29403 static inline unsigned long size_inside_page(unsigned long start,
29404 unsigned long size)
29405 {
29406@@ -66,9 +71,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29407
29408 while (cursor < to) {
29409 if (!devmem_is_allowed(pfn)) {
29410+#ifdef CONFIG_GRKERNSEC_KMEM
29411+ gr_handle_mem_readwrite(from, to);
29412+#else
29413 printk(KERN_INFO
29414 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
29415 current->comm, from, to);
29416+#endif
29417 return 0;
29418 }
29419 cursor += PAGE_SIZE;
29420@@ -76,6 +85,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29421 }
29422 return 1;
29423 }
29424+#elif defined(CONFIG_GRKERNSEC_KMEM)
29425+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29426+{
29427+ return 0;
29428+}
29429 #else
29430 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29431 {
29432@@ -118,6 +132,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
29433
29434 while (count > 0) {
29435 unsigned long remaining;
29436+ char *temp;
29437
29438 sz = size_inside_page(p, count);
29439
29440@@ -133,7 +148,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
29441 if (!ptr)
29442 return -EFAULT;
29443
29444- remaining = copy_to_user(buf, ptr, sz);
29445+#ifdef CONFIG_PAX_USERCOPY
29446+ temp = kmalloc(sz, GFP_KERNEL);
29447+ if (!temp) {
29448+ unxlate_dev_mem_ptr(p, ptr);
29449+ return -ENOMEM;
29450+ }
29451+ memcpy(temp, ptr, sz);
29452+#else
29453+ temp = ptr;
29454+#endif
29455+
29456+ remaining = copy_to_user(buf, temp, sz);
29457+
29458+#ifdef CONFIG_PAX_USERCOPY
29459+ kfree(temp);
29460+#endif
29461+
29462 unxlate_dev_mem_ptr(p, ptr);
29463 if (remaining)
29464 return -EFAULT;
29465@@ -396,9 +427,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29466 size_t count, loff_t *ppos)
29467 {
29468 unsigned long p = *ppos;
29469- ssize_t low_count, read, sz;
29470+ ssize_t low_count, read, sz, err = 0;
29471 char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
29472- int err = 0;
29473
29474 read = 0;
29475 if (p < (unsigned long) high_memory) {
29476@@ -420,6 +450,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29477 }
29478 #endif
29479 while (low_count > 0) {
29480+ char *temp;
29481+
29482 sz = size_inside_page(p, low_count);
29483
29484 /*
29485@@ -429,7 +461,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29486 */
29487 kbuf = xlate_dev_kmem_ptr((char *)p);
29488
29489- if (copy_to_user(buf, kbuf, sz))
29490+#ifdef CONFIG_PAX_USERCOPY
29491+ temp = kmalloc(sz, GFP_KERNEL);
29492+ if (!temp)
29493+ return -ENOMEM;
29494+ memcpy(temp, kbuf, sz);
29495+#else
29496+ temp = kbuf;
29497+#endif
29498+
29499+ err = copy_to_user(buf, temp, sz);
29500+
29501+#ifdef CONFIG_PAX_USERCOPY
29502+ kfree(temp);
29503+#endif
29504+
29505+ if (err)
29506 return -EFAULT;
29507 buf += sz;
29508 p += sz;
29509@@ -867,6 +914,9 @@ static const struct memdev {
29510 #ifdef CONFIG_CRASH_DUMP
29511 [12] = { "oldmem", 0, &oldmem_fops, NULL },
29512 #endif
29513+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29514+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
29515+#endif
29516 };
29517
29518 static int memory_open(struct inode *inode, struct file *filp)
29519diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
29520index da3cfee..a5a6606 100644
29521--- a/drivers/char/nvram.c
29522+++ b/drivers/char/nvram.c
29523@@ -248,7 +248,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
29524
29525 spin_unlock_irq(&rtc_lock);
29526
29527- if (copy_to_user(buf, contents, tmp - contents))
29528+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
29529 return -EFAULT;
29530
29531 *ppos = i;
29532diff --git a/drivers/char/random.c b/drivers/char/random.c
29533index 54ca8b2..4a092ed 100644
29534--- a/drivers/char/random.c
29535+++ b/drivers/char/random.c
29536@@ -261,8 +261,13 @@
29537 /*
29538 * Configuration information
29539 */
29540+#ifdef CONFIG_GRKERNSEC_RANDNET
29541+#define INPUT_POOL_WORDS 512
29542+#define OUTPUT_POOL_WORDS 128
29543+#else
29544 #define INPUT_POOL_WORDS 128
29545 #define OUTPUT_POOL_WORDS 32
29546+#endif
29547 #define SEC_XFER_SIZE 512
29548 #define EXTRACT_SIZE 10
29549
29550@@ -300,10 +305,17 @@ static struct poolinfo {
29551 int poolwords;
29552 int tap1, tap2, tap3, tap4, tap5;
29553 } poolinfo_table[] = {
29554+#ifdef CONFIG_GRKERNSEC_RANDNET
29555+ /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
29556+ { 512, 411, 308, 208, 104, 1 },
29557+ /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
29558+ { 128, 103, 76, 51, 25, 1 },
29559+#else
29560 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
29561 { 128, 103, 76, 51, 25, 1 },
29562 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
29563 { 32, 26, 20, 14, 7, 1 },
29564+#endif
29565 #if 0
29566 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
29567 { 2048, 1638, 1231, 819, 411, 1 },
29568@@ -913,7 +925,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
29569
29570 extract_buf(r, tmp);
29571 i = min_t(int, nbytes, EXTRACT_SIZE);
29572- if (copy_to_user(buf, tmp, i)) {
29573+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
29574 ret = -EFAULT;
29575 break;
29576 }
29577@@ -1238,7 +1250,7 @@ EXPORT_SYMBOL(generate_random_uuid);
29578 #include <linux/sysctl.h>
29579
29580 static int min_read_thresh = 8, min_write_thresh;
29581-static int max_read_thresh = INPUT_POOL_WORDS * 32;
29582+static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
29583 static int max_write_thresh = INPUT_POOL_WORDS * 32;
29584 static char sysctl_bootid[16];
29585
29586@@ -1260,10 +1272,15 @@ static int proc_do_uuid(ctl_table *table, int write,
29587 uuid = table->data;
29588 if (!uuid) {
29589 uuid = tmp_uuid;
29590- uuid[8] = 0;
29591- }
29592- if (uuid[8] == 0)
29593 generate_random_uuid(uuid);
29594+ } else {
29595+ static DEFINE_SPINLOCK(bootid_spinlock);
29596+
29597+ spin_lock(&bootid_spinlock);
29598+ if (!uuid[8])
29599+ generate_random_uuid(uuid);
29600+ spin_unlock(&bootid_spinlock);
29601+ }
29602
29603 sprintf(buf, "%pU", uuid);
29604
29605diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
29606index 1ee8ce7..b778bef 100644
29607--- a/drivers/char/sonypi.c
29608+++ b/drivers/char/sonypi.c
29609@@ -55,6 +55,7 @@
29610 #include <asm/uaccess.h>
29611 #include <asm/io.h>
29612 #include <asm/system.h>
29613+#include <asm/local.h>
29614
29615 #include <linux/sonypi.h>
29616
29617@@ -491,7 +492,7 @@ static struct sonypi_device {
29618 spinlock_t fifo_lock;
29619 wait_queue_head_t fifo_proc_list;
29620 struct fasync_struct *fifo_async;
29621- int open_count;
29622+ local_t open_count;
29623 int model;
29624 struct input_dev *input_jog_dev;
29625 struct input_dev *input_key_dev;
29626@@ -898,7 +899,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
29627 static int sonypi_misc_release(struct inode *inode, struct file *file)
29628 {
29629 mutex_lock(&sonypi_device.lock);
29630- sonypi_device.open_count--;
29631+ local_dec(&sonypi_device.open_count);
29632 mutex_unlock(&sonypi_device.lock);
29633 return 0;
29634 }
29635@@ -907,9 +908,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
29636 {
29637 mutex_lock(&sonypi_device.lock);
29638 /* Flush input queue on first open */
29639- if (!sonypi_device.open_count)
29640+ if (!local_read(&sonypi_device.open_count))
29641 kfifo_reset(&sonypi_device.fifo);
29642- sonypi_device.open_count++;
29643+ local_inc(&sonypi_device.open_count);
29644 mutex_unlock(&sonypi_device.lock);
29645
29646 return 0;
29647diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
29648index ad7c732..5aa8054 100644
29649--- a/drivers/char/tpm/tpm.c
29650+++ b/drivers/char/tpm/tpm.c
29651@@ -415,7 +415,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
29652 chip->vendor.req_complete_val)
29653 goto out_recv;
29654
29655- if ((status == chip->vendor.req_canceled)) {
29656+ if (status == chip->vendor.req_canceled) {
29657 dev_err(chip->dev, "Operation Canceled\n");
29658 rc = -ECANCELED;
29659 goto out;
29660diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
29661index 0636520..169c1d0 100644
29662--- a/drivers/char/tpm/tpm_bios.c
29663+++ b/drivers/char/tpm/tpm_bios.c
29664@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
29665 event = addr;
29666
29667 if ((event->event_type == 0 && event->event_size == 0) ||
29668- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
29669+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
29670 return NULL;
29671
29672 return addr;
29673@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
29674 return NULL;
29675
29676 if ((event->event_type == 0 && event->event_size == 0) ||
29677- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
29678+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
29679 return NULL;
29680
29681 (*pos)++;
29682@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
29683 int i;
29684
29685 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
29686- seq_putc(m, data[i]);
29687+ if (!seq_putc(m, data[i]))
29688+ return -EFAULT;
29689
29690 return 0;
29691 }
29692@@ -410,8 +411,13 @@ static int read_log(struct tpm_bios_log *log)
29693 log->bios_event_log_end = log->bios_event_log + len;
29694
29695 virt = acpi_os_map_memory(start, len);
29696+ if (!virt) {
29697+ kfree(log->bios_event_log);
29698+ log->bios_event_log = NULL;
29699+ return -EFAULT;
29700+ }
29701
29702- memcpy(log->bios_event_log, virt, len);
29703+ memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
29704
29705 acpi_os_unmap_memory(virt, len);
29706 return 0;
29707diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
29708index b58b561..c9088c8 100644
29709--- a/drivers/char/virtio_console.c
29710+++ b/drivers/char/virtio_console.c
29711@@ -563,7 +563,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
29712 if (to_user) {
29713 ssize_t ret;
29714
29715- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
29716+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
29717 if (ret)
29718 return -EFAULT;
29719 } else {
29720@@ -662,7 +662,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
29721 if (!port_has_data(port) && !port->host_connected)
29722 return 0;
29723
29724- return fill_readbuf(port, ubuf, count, true);
29725+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
29726 }
29727
29728 static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
29729diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
29730index c9eee6d..f9d5280 100644
29731--- a/drivers/edac/amd64_edac.c
29732+++ b/drivers/edac/amd64_edac.c
29733@@ -2685,7 +2685,7 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)
29734 * PCI core identifies what devices are on a system during boot, and then
29735 * inquiry this table to see if this driver is for a given device found.
29736 */
29737-static const struct pci_device_id amd64_pci_table[] __devinitdata = {
29738+static const struct pci_device_id amd64_pci_table[] __devinitconst = {
29739 {
29740 .vendor = PCI_VENDOR_ID_AMD,
29741 .device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
29742diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
29743index e47e73b..348e0bd 100644
29744--- a/drivers/edac/amd76x_edac.c
29745+++ b/drivers/edac/amd76x_edac.c
29746@@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
29747 edac_mc_free(mci);
29748 }
29749
29750-static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
29751+static const struct pci_device_id amd76x_pci_tbl[] __devinitconst = {
29752 {
29753 PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29754 AMD762},
29755diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
29756index 1af531a..3a8ff27 100644
29757--- a/drivers/edac/e752x_edac.c
29758+++ b/drivers/edac/e752x_edac.c
29759@@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
29760 edac_mc_free(mci);
29761 }
29762
29763-static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
29764+static const struct pci_device_id e752x_pci_tbl[] __devinitconst = {
29765 {
29766 PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29767 E7520},
29768diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
29769index 6ffb6d2..383d8d7 100644
29770--- a/drivers/edac/e7xxx_edac.c
29771+++ b/drivers/edac/e7xxx_edac.c
29772@@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
29773 edac_mc_free(mci);
29774 }
29775
29776-static const struct pci_device_id e7xxx_pci_tbl[] __devinitdata = {
29777+static const struct pci_device_id e7xxx_pci_tbl[] __devinitconst = {
29778 {
29779 PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29780 E7205},
29781diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
29782index 97f5064..202b6e6 100644
29783--- a/drivers/edac/edac_pci_sysfs.c
29784+++ b/drivers/edac/edac_pci_sysfs.c
29785@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
29786 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
29787 static int edac_pci_poll_msec = 1000; /* one second workq period */
29788
29789-static atomic_t pci_parity_count = ATOMIC_INIT(0);
29790-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
29791+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
29792+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
29793
29794 static struct kobject *edac_pci_top_main_kobj;
29795 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
29796@@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29797 edac_printk(KERN_CRIT, EDAC_PCI,
29798 "Signaled System Error on %s\n",
29799 pci_name(dev));
29800- atomic_inc(&pci_nonparity_count);
29801+ atomic_inc_unchecked(&pci_nonparity_count);
29802 }
29803
29804 if (status & (PCI_STATUS_PARITY)) {
29805@@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29806 "Master Data Parity Error on %s\n",
29807 pci_name(dev));
29808
29809- atomic_inc(&pci_parity_count);
29810+ atomic_inc_unchecked(&pci_parity_count);
29811 }
29812
29813 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29814@@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29815 "Detected Parity Error on %s\n",
29816 pci_name(dev));
29817
29818- atomic_inc(&pci_parity_count);
29819+ atomic_inc_unchecked(&pci_parity_count);
29820 }
29821 }
29822
29823@@ -619,7 +619,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29824 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
29825 "Signaled System Error on %s\n",
29826 pci_name(dev));
29827- atomic_inc(&pci_nonparity_count);
29828+ atomic_inc_unchecked(&pci_nonparity_count);
29829 }
29830
29831 if (status & (PCI_STATUS_PARITY)) {
29832@@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29833 "Master Data Parity Error on "
29834 "%s\n", pci_name(dev));
29835
29836- atomic_inc(&pci_parity_count);
29837+ atomic_inc_unchecked(&pci_parity_count);
29838 }
29839
29840 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29841@@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29842 "Detected Parity Error on %s\n",
29843 pci_name(dev));
29844
29845- atomic_inc(&pci_parity_count);
29846+ atomic_inc_unchecked(&pci_parity_count);
29847 }
29848 }
29849 }
29850@@ -677,7 +677,7 @@ void edac_pci_do_parity_check(void)
29851 if (!check_pci_errors)
29852 return;
29853
29854- before_count = atomic_read(&pci_parity_count);
29855+ before_count = atomic_read_unchecked(&pci_parity_count);
29856
29857 /* scan all PCI devices looking for a Parity Error on devices and
29858 * bridges.
29859@@ -689,7 +689,7 @@ void edac_pci_do_parity_check(void)
29860 /* Only if operator has selected panic on PCI Error */
29861 if (edac_pci_get_panic_on_pe()) {
29862 /* If the count is different 'after' from 'before' */
29863- if (before_count != atomic_read(&pci_parity_count))
29864+ if (before_count != atomic_read_unchecked(&pci_parity_count))
29865 panic("EDAC: PCI Parity Error");
29866 }
29867 }
29868diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
29869index c0510b3..6e2a954 100644
29870--- a/drivers/edac/i3000_edac.c
29871+++ b/drivers/edac/i3000_edac.c
29872@@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
29873 edac_mc_free(mci);
29874 }
29875
29876-static const struct pci_device_id i3000_pci_tbl[] __devinitdata = {
29877+static const struct pci_device_id i3000_pci_tbl[] __devinitconst = {
29878 {
29879 PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29880 I3000},
29881diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
29882index 73f55e200..5faaf59 100644
29883--- a/drivers/edac/i3200_edac.c
29884+++ b/drivers/edac/i3200_edac.c
29885@@ -445,7 +445,7 @@ static void __devexit i3200_remove_one(struct pci_dev *pdev)
29886 edac_mc_free(mci);
29887 }
29888
29889-static const struct pci_device_id i3200_pci_tbl[] __devinitdata = {
29890+static const struct pci_device_id i3200_pci_tbl[] __devinitconst = {
29891 {
29892 PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29893 I3200},
29894diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
29895index 4dc3ac2..67d05a6 100644
29896--- a/drivers/edac/i5000_edac.c
29897+++ b/drivers/edac/i5000_edac.c
29898@@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)
29899 *
29900 * The "E500P" device is the first device supported.
29901 */
29902-static const struct pci_device_id i5000_pci_tbl[] __devinitdata = {
29903+static const struct pci_device_id i5000_pci_tbl[] __devinitconst = {
29904 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
29905 .driver_data = I5000P},
29906
29907diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
29908index bcbdeec..9886d16 100644
29909--- a/drivers/edac/i5100_edac.c
29910+++ b/drivers/edac/i5100_edac.c
29911@@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(struct pci_dev *pdev)
29912 edac_mc_free(mci);
29913 }
29914
29915-static const struct pci_device_id i5100_pci_tbl[] __devinitdata = {
29916+static const struct pci_device_id i5100_pci_tbl[] __devinitconst = {
29917 /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
29918 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
29919 { 0, }
29920diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
29921index 74d6ec34..baff517 100644
29922--- a/drivers/edac/i5400_edac.c
29923+++ b/drivers/edac/i5400_edac.c
29924@@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(struct pci_dev *pdev)
29925 *
29926 * The "E500P" device is the first device supported.
29927 */
29928-static const struct pci_device_id i5400_pci_tbl[] __devinitdata = {
29929+static const struct pci_device_id i5400_pci_tbl[] __devinitconst = {
29930 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
29931 {0,} /* 0 terminated list. */
29932 };
29933diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
29934index 6104dba..e7ea8e1 100644
29935--- a/drivers/edac/i7300_edac.c
29936+++ b/drivers/edac/i7300_edac.c
29937@@ -1192,7 +1192,7 @@ static void __devexit i7300_remove_one(struct pci_dev *pdev)
29938 *
29939 * Has only 8086:360c PCI ID
29940 */
29941-static const struct pci_device_id i7300_pci_tbl[] __devinitdata = {
29942+static const struct pci_device_id i7300_pci_tbl[] __devinitconst = {
29943 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
29944 {0,} /* 0 terminated list. */
29945 };
29946diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
29947index 8568d9b..42b2fa8 100644
29948--- a/drivers/edac/i7core_edac.c
29949+++ b/drivers/edac/i7core_edac.c
29950@@ -391,7 +391,7 @@ static const struct pci_id_table pci_dev_table[] = {
29951 /*
29952 * pci_device_id table for which devices we are looking for
29953 */
29954-static const struct pci_device_id i7core_pci_tbl[] __devinitdata = {
29955+static const struct pci_device_id i7core_pci_tbl[] __devinitconst = {
29956 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
29957 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
29958 {0,} /* 0 terminated list. */
29959diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
29960index 4329d39..f3022ef 100644
29961--- a/drivers/edac/i82443bxgx_edac.c
29962+++ b/drivers/edac/i82443bxgx_edac.c
29963@@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
29964
29965 EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
29966
29967-static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitdata = {
29968+static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitconst = {
29969 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
29970 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
29971 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
29972diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
29973index 931a057..fd28340 100644
29974--- a/drivers/edac/i82860_edac.c
29975+++ b/drivers/edac/i82860_edac.c
29976@@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
29977 edac_mc_free(mci);
29978 }
29979
29980-static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
29981+static const struct pci_device_id i82860_pci_tbl[] __devinitconst = {
29982 {
29983 PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29984 I82860},
29985diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
29986index 33864c6..01edc61 100644
29987--- a/drivers/edac/i82875p_edac.c
29988+++ b/drivers/edac/i82875p_edac.c
29989@@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
29990 edac_mc_free(mci);
29991 }
29992
29993-static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
29994+static const struct pci_device_id i82875p_pci_tbl[] __devinitconst = {
29995 {
29996 PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29997 I82875P},
29998diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
29999index 4184e01..dcb2cd3 100644
30000--- a/drivers/edac/i82975x_edac.c
30001+++ b/drivers/edac/i82975x_edac.c
30002@@ -612,7 +612,7 @@ static void __devexit i82975x_remove_one(struct pci_dev *pdev)
30003 edac_mc_free(mci);
30004 }
30005
30006-static const struct pci_device_id i82975x_pci_tbl[] __devinitdata = {
30007+static const struct pci_device_id i82975x_pci_tbl[] __devinitconst = {
30008 {
30009 PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
30010 I82975X
30011diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
30012index 0106747..0b40417 100644
30013--- a/drivers/edac/mce_amd.h
30014+++ b/drivers/edac/mce_amd.h
30015@@ -83,7 +83,7 @@ struct amd_decoder_ops {
30016 bool (*dc_mce)(u16, u8);
30017 bool (*ic_mce)(u16, u8);
30018 bool (*nb_mce)(u16, u8);
30019-};
30020+} __no_const;
30021
30022 void amd_report_gart_errors(bool);
30023 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
30024diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
30025index e294e1b..a41b05b 100644
30026--- a/drivers/edac/r82600_edac.c
30027+++ b/drivers/edac/r82600_edac.c
30028@@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev)
30029 edac_mc_free(mci);
30030 }
30031
30032-static const struct pci_device_id r82600_pci_tbl[] __devinitdata = {
30033+static const struct pci_device_id r82600_pci_tbl[] __devinitconst = {
30034 {
30035 PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
30036 },
30037diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
30038index 1dc118d..8c68af9 100644
30039--- a/drivers/edac/sb_edac.c
30040+++ b/drivers/edac/sb_edac.c
30041@@ -367,7 +367,7 @@ static const struct pci_id_table pci_dev_descr_sbridge_table[] = {
30042 /*
30043 * pci_device_id table for which devices we are looking for
30044 */
30045-static const struct pci_device_id sbridge_pci_tbl[] __devinitdata = {
30046+static const struct pci_device_id sbridge_pci_tbl[] __devinitconst = {
30047 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)},
30048 {0,} /* 0 terminated list. */
30049 };
30050diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
30051index b6f47de..c5acf3a 100644
30052--- a/drivers/edac/x38_edac.c
30053+++ b/drivers/edac/x38_edac.c
30054@@ -440,7 +440,7 @@ static void __devexit x38_remove_one(struct pci_dev *pdev)
30055 edac_mc_free(mci);
30056 }
30057
30058-static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
30059+static const struct pci_device_id x38_pci_tbl[] __devinitconst = {
30060 {
30061 PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
30062 X38},
30063diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
30064index 85661b0..c784559a 100644
30065--- a/drivers/firewire/core-card.c
30066+++ b/drivers/firewire/core-card.c
30067@@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
30068
30069 void fw_core_remove_card(struct fw_card *card)
30070 {
30071- struct fw_card_driver dummy_driver = dummy_driver_template;
30072+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
30073
30074 card->driver->update_phy_reg(card, 4,
30075 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
30076diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
30077index 4799393..37bd3ab 100644
30078--- a/drivers/firewire/core-cdev.c
30079+++ b/drivers/firewire/core-cdev.c
30080@@ -1331,8 +1331,7 @@ static int init_iso_resource(struct client *client,
30081 int ret;
30082
30083 if ((request->channels == 0 && request->bandwidth == 0) ||
30084- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
30085- request->bandwidth < 0)
30086+ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
30087 return -EINVAL;
30088
30089 r = kmalloc(sizeof(*r), GFP_KERNEL);
30090diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
30091index 855ab3f..11f4bbd 100644
30092--- a/drivers/firewire/core-transaction.c
30093+++ b/drivers/firewire/core-transaction.c
30094@@ -37,6 +37,7 @@
30095 #include <linux/timer.h>
30096 #include <linux/types.h>
30097 #include <linux/workqueue.h>
30098+#include <linux/sched.h>
30099
30100 #include <asm/byteorder.h>
30101
30102diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
30103index b45be57..5fad18b 100644
30104--- a/drivers/firewire/core.h
30105+++ b/drivers/firewire/core.h
30106@@ -101,6 +101,7 @@ struct fw_card_driver {
30107
30108 int (*stop_iso)(struct fw_iso_context *ctx);
30109 };
30110+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
30111
30112 void fw_card_initialize(struct fw_card *card,
30113 const struct fw_card_driver *driver, struct device *device);
30114diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
30115index 153980b..4b4d046 100644
30116--- a/drivers/firmware/dmi_scan.c
30117+++ b/drivers/firmware/dmi_scan.c
30118@@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
30119 }
30120 }
30121 else {
30122- /*
30123- * no iounmap() for that ioremap(); it would be a no-op, but
30124- * it's so early in setup that sucker gets confused into doing
30125- * what it shouldn't if we actually call it.
30126- */
30127 p = dmi_ioremap(0xF0000, 0x10000);
30128 if (p == NULL)
30129 goto error;
30130@@ -723,7 +718,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
30131 if (buf == NULL)
30132 return -1;
30133
30134- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
30135+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
30136
30137 iounmap(buf);
30138 return 0;
30139diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
30140index 82d5c20..44a7177 100644
30141--- a/drivers/gpio/gpio-vr41xx.c
30142+++ b/drivers/gpio/gpio-vr41xx.c
30143@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
30144 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
30145 maskl, pendl, maskh, pendh);
30146
30147- atomic_inc(&irq_err_count);
30148+ atomic_inc_unchecked(&irq_err_count);
30149
30150 return -EINVAL;
30151 }
30152diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
30153index 84a4a80..ce0306e 100644
30154--- a/drivers/gpu/drm/drm_crtc_helper.c
30155+++ b/drivers/gpu/drm/drm_crtc_helper.c
30156@@ -280,7 +280,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
30157 struct drm_crtc *tmp;
30158 int crtc_mask = 1;
30159
30160- WARN(!crtc, "checking null crtc?\n");
30161+ BUG_ON(!crtc);
30162
30163 dev = crtc->dev;
30164
30165diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
30166index ebf7d3f..d64c436 100644
30167--- a/drivers/gpu/drm/drm_drv.c
30168+++ b/drivers/gpu/drm/drm_drv.c
30169@@ -312,7 +312,7 @@ module_exit(drm_core_exit);
30170 /**
30171 * Copy and IOCTL return string to user space
30172 */
30173-static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
30174+static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
30175 {
30176 int len;
30177
30178@@ -391,7 +391,7 @@ long drm_ioctl(struct file *filp,
30179
30180 dev = file_priv->minor->dev;
30181 atomic_inc(&dev->ioctl_count);
30182- atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
30183+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
30184 ++file_priv->ioctl_count;
30185
30186 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
30187diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
30188index 6263b01..7987f55 100644
30189--- a/drivers/gpu/drm/drm_fops.c
30190+++ b/drivers/gpu/drm/drm_fops.c
30191@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev)
30192 }
30193
30194 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
30195- atomic_set(&dev->counts[i], 0);
30196+ atomic_set_unchecked(&dev->counts[i], 0);
30197
30198 dev->sigdata.lock = NULL;
30199
30200@@ -135,8 +135,8 @@ int drm_open(struct inode *inode, struct file *filp)
30201
30202 retcode = drm_open_helper(inode, filp, dev);
30203 if (!retcode) {
30204- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
30205- if (!dev->open_count++)
30206+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
30207+ if (local_inc_return(&dev->open_count) == 1)
30208 retcode = drm_setup(dev);
30209 }
30210 if (!retcode) {
30211@@ -473,7 +473,7 @@ int drm_release(struct inode *inode, struct file *filp)
30212
30213 mutex_lock(&drm_global_mutex);
30214
30215- DRM_DEBUG("open_count = %d\n", dev->open_count);
30216+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
30217
30218 if (dev->driver->preclose)
30219 dev->driver->preclose(dev, file_priv);
30220@@ -482,10 +482,10 @@ int drm_release(struct inode *inode, struct file *filp)
30221 * Begin inline drm_release
30222 */
30223
30224- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
30225+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
30226 task_pid_nr(current),
30227 (long)old_encode_dev(file_priv->minor->device),
30228- dev->open_count);
30229+ local_read(&dev->open_count));
30230
30231 /* Release any auth tokens that might point to this file_priv,
30232 (do that under the drm_global_mutex) */
30233@@ -571,8 +571,8 @@ int drm_release(struct inode *inode, struct file *filp)
30234 * End inline drm_release
30235 */
30236
30237- atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
30238- if (!--dev->open_count) {
30239+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
30240+ if (local_dec_and_test(&dev->open_count)) {
30241 if (atomic_read(&dev->ioctl_count)) {
30242 DRM_ERROR("Device busy: %d\n",
30243 atomic_read(&dev->ioctl_count));
30244diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
30245index c87dc96..326055d 100644
30246--- a/drivers/gpu/drm/drm_global.c
30247+++ b/drivers/gpu/drm/drm_global.c
30248@@ -36,7 +36,7 @@
30249 struct drm_global_item {
30250 struct mutex mutex;
30251 void *object;
30252- int refcount;
30253+ atomic_t refcount;
30254 };
30255
30256 static struct drm_global_item glob[DRM_GLOBAL_NUM];
30257@@ -49,7 +49,7 @@ void drm_global_init(void)
30258 struct drm_global_item *item = &glob[i];
30259 mutex_init(&item->mutex);
30260 item->object = NULL;
30261- item->refcount = 0;
30262+ atomic_set(&item->refcount, 0);
30263 }
30264 }
30265
30266@@ -59,7 +59,7 @@ void drm_global_release(void)
30267 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
30268 struct drm_global_item *item = &glob[i];
30269 BUG_ON(item->object != NULL);
30270- BUG_ON(item->refcount != 0);
30271+ BUG_ON(atomic_read(&item->refcount) != 0);
30272 }
30273 }
30274
30275@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30276 void *object;
30277
30278 mutex_lock(&item->mutex);
30279- if (item->refcount == 0) {
30280+ if (atomic_read(&item->refcount) == 0) {
30281 item->object = kzalloc(ref->size, GFP_KERNEL);
30282 if (unlikely(item->object == NULL)) {
30283 ret = -ENOMEM;
30284@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30285 goto out_err;
30286
30287 }
30288- ++item->refcount;
30289+ atomic_inc(&item->refcount);
30290 ref->object = item->object;
30291 object = item->object;
30292 mutex_unlock(&item->mutex);
30293@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
30294 struct drm_global_item *item = &glob[ref->global_type];
30295
30296 mutex_lock(&item->mutex);
30297- BUG_ON(item->refcount == 0);
30298+ BUG_ON(atomic_read(&item->refcount) == 0);
30299 BUG_ON(ref->object != item->object);
30300- if (--item->refcount == 0) {
30301+ if (atomic_dec_and_test(&item->refcount)) {
30302 ref->release(ref);
30303 item->object = NULL;
30304 }
30305diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
30306index ab1162d..42587b2 100644
30307--- a/drivers/gpu/drm/drm_info.c
30308+++ b/drivers/gpu/drm/drm_info.c
30309@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
30310 struct drm_local_map *map;
30311 struct drm_map_list *r_list;
30312
30313- /* Hardcoded from _DRM_FRAME_BUFFER,
30314- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
30315- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
30316- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
30317+ static const char * const types[] = {
30318+ [_DRM_FRAME_BUFFER] = "FB",
30319+ [_DRM_REGISTERS] = "REG",
30320+ [_DRM_SHM] = "SHM",
30321+ [_DRM_AGP] = "AGP",
30322+ [_DRM_SCATTER_GATHER] = "SG",
30323+ [_DRM_CONSISTENT] = "PCI",
30324+ [_DRM_GEM] = "GEM" };
30325 const char *type;
30326 int i;
30327
30328@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
30329 map = r_list->map;
30330 if (!map)
30331 continue;
30332- if (map->type < 0 || map->type > 5)
30333+ if (map->type >= ARRAY_SIZE(types))
30334 type = "??";
30335 else
30336 type = types[map->type];
30337@@ -290,7 +294,11 @@ int drm_vma_info(struct seq_file *m, void *data)
30338 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
30339 vma->vm_flags & VM_LOCKED ? 'l' : '-',
30340 vma->vm_flags & VM_IO ? 'i' : '-',
30341+#ifdef CONFIG_GRKERNSEC_HIDESYM
30342+ 0);
30343+#else
30344 vma->vm_pgoff);
30345+#endif
30346
30347 #if defined(__i386__)
30348 pgprot = pgprot_val(vma->vm_page_prot);
30349diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
30350index 637fcc3..e890b33 100644
30351--- a/drivers/gpu/drm/drm_ioc32.c
30352+++ b/drivers/gpu/drm/drm_ioc32.c
30353@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
30354 request = compat_alloc_user_space(nbytes);
30355 if (!access_ok(VERIFY_WRITE, request, nbytes))
30356 return -EFAULT;
30357- list = (struct drm_buf_desc *) (request + 1);
30358+ list = (struct drm_buf_desc __user *) (request + 1);
30359
30360 if (__put_user(count, &request->count)
30361 || __put_user(list, &request->list))
30362@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
30363 request = compat_alloc_user_space(nbytes);
30364 if (!access_ok(VERIFY_WRITE, request, nbytes))
30365 return -EFAULT;
30366- list = (struct drm_buf_pub *) (request + 1);
30367+ list = (struct drm_buf_pub __user *) (request + 1);
30368
30369 if (__put_user(count, &request->count)
30370 || __put_user(list, &request->list))
30371diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
30372index 956fd38..e52167a 100644
30373--- a/drivers/gpu/drm/drm_ioctl.c
30374+++ b/drivers/gpu/drm/drm_ioctl.c
30375@@ -251,7 +251,7 @@ int drm_getstats(struct drm_device *dev, void *data,
30376 stats->data[i].value =
30377 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
30378 else
30379- stats->data[i].value = atomic_read(&dev->counts[i]);
30380+ stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
30381 stats->data[i].type = dev->types[i];
30382 }
30383
30384diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
30385index c79c713..2048588 100644
30386--- a/drivers/gpu/drm/drm_lock.c
30387+++ b/drivers/gpu/drm/drm_lock.c
30388@@ -90,7 +90,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30389 if (drm_lock_take(&master->lock, lock->context)) {
30390 master->lock.file_priv = file_priv;
30391 master->lock.lock_time = jiffies;
30392- atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
30393+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
30394 break; /* Got lock */
30395 }
30396
30397@@ -161,7 +161,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30398 return -EINVAL;
30399 }
30400
30401- atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
30402+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
30403
30404 if (drm_lock_free(&master->lock, lock->context)) {
30405 /* FIXME: Should really bail out here. */
30406diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
30407index 7f4b4e1..bf4def2 100644
30408--- a/drivers/gpu/drm/i810/i810_dma.c
30409+++ b/drivers/gpu/drm/i810/i810_dma.c
30410@@ -948,8 +948,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
30411 dma->buflist[vertex->idx],
30412 vertex->discard, vertex->used);
30413
30414- atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30415- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30416+ atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30417+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30418 sarea_priv->last_enqueue = dev_priv->counter - 1;
30419 sarea_priv->last_dispatch = (int)hw_status[5];
30420
30421@@ -1109,8 +1109,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
30422 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
30423 mc->last_render);
30424
30425- atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30426- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30427+ atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30428+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30429 sarea_priv->last_enqueue = dev_priv->counter - 1;
30430 sarea_priv->last_dispatch = (int)hw_status[5];
30431
30432diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
30433index c9339f4..f5e1b9d 100644
30434--- a/drivers/gpu/drm/i810/i810_drv.h
30435+++ b/drivers/gpu/drm/i810/i810_drv.h
30436@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
30437 int page_flipping;
30438
30439 wait_queue_head_t irq_queue;
30440- atomic_t irq_received;
30441- atomic_t irq_emitted;
30442+ atomic_unchecked_t irq_received;
30443+ atomic_unchecked_t irq_emitted;
30444
30445 int front_offset;
30446 } drm_i810_private_t;
30447diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
30448index deaa657..e0fd296 100644
30449--- a/drivers/gpu/drm/i915/i915_debugfs.c
30450+++ b/drivers/gpu/drm/i915/i915_debugfs.c
30451@@ -499,7 +499,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
30452 I915_READ(GTIMR));
30453 }
30454 seq_printf(m, "Interrupts received: %d\n",
30455- atomic_read(&dev_priv->irq_received));
30456+ atomic_read_unchecked(&dev_priv->irq_received));
30457 for (i = 0; i < I915_NUM_RINGS; i++) {
30458 if (IS_GEN6(dev) || IS_GEN7(dev)) {
30459 seq_printf(m, "Graphics Interrupt mask (%s): %08x\n",
30460@@ -1321,7 +1321,7 @@ static int i915_opregion(struct seq_file *m, void *unused)
30461 return ret;
30462
30463 if (opregion->header)
30464- seq_write(m, opregion->header, OPREGION_SIZE);
30465+ seq_write(m, (const void __force_kernel *)opregion->header, OPREGION_SIZE);
30466
30467 mutex_unlock(&dev->struct_mutex);
30468
30469diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
30470index ddfe3d9..f6e6b21 100644
30471--- a/drivers/gpu/drm/i915/i915_dma.c
30472+++ b/drivers/gpu/drm/i915/i915_dma.c
30473@@ -1175,7 +1175,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
30474 bool can_switch;
30475
30476 spin_lock(&dev->count_lock);
30477- can_switch = (dev->open_count == 0);
30478+ can_switch = (local_read(&dev->open_count) == 0);
30479 spin_unlock(&dev->count_lock);
30480 return can_switch;
30481 }
30482diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
30483index 9689ca3..294f9c1 100644
30484--- a/drivers/gpu/drm/i915/i915_drv.h
30485+++ b/drivers/gpu/drm/i915/i915_drv.h
30486@@ -231,7 +231,7 @@ struct drm_i915_display_funcs {
30487 /* render clock increase/decrease */
30488 /* display clock increase/decrease */
30489 /* pll clock increase/decrease */
30490-};
30491+} __no_const;
30492
30493 struct intel_device_info {
30494 u8 gen;
30495@@ -320,7 +320,7 @@ typedef struct drm_i915_private {
30496 int current_page;
30497 int page_flipping;
30498
30499- atomic_t irq_received;
30500+ atomic_unchecked_t irq_received;
30501
30502 /* protects the irq masks */
30503 spinlock_t irq_lock;
30504@@ -896,7 +896,7 @@ struct drm_i915_gem_object {
30505 * will be page flipped away on the next vblank. When it
30506 * reaches 0, dev_priv->pending_flip_queue will be woken up.
30507 */
30508- atomic_t pending_flip;
30509+ atomic_unchecked_t pending_flip;
30510 };
30511
30512 #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
30513@@ -1276,7 +1276,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
30514 extern void intel_teardown_gmbus(struct drm_device *dev);
30515 extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
30516 extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
30517-extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30518+static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30519 {
30520 return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
30521 }
30522diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30523index e159e33..cdcc663 100644
30524--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30525+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30526@@ -189,7 +189,7 @@ i915_gem_object_set_to_gpu_domain(struct drm_i915_gem_object *obj,
30527 i915_gem_clflush_object(obj);
30528
30529 if (obj->base.pending_write_domain)
30530- cd->flips |= atomic_read(&obj->pending_flip);
30531+ cd->flips |= atomic_read_unchecked(&obj->pending_flip);
30532
30533 /* The actual obj->write_domain will be updated with
30534 * pending_write_domain after we emit the accumulated flush for all
30535@@ -882,9 +882,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
30536
30537 static int
30538 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
30539- int count)
30540+ unsigned int count)
30541 {
30542- int i;
30543+ unsigned int i;
30544
30545 for (i = 0; i < count; i++) {
30546 char __user *ptr = (char __user *)(uintptr_t)exec[i].relocs_ptr;
30547diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
30548index 5bd4361..0241a42 100644
30549--- a/drivers/gpu/drm/i915/i915_irq.c
30550+++ b/drivers/gpu/drm/i915/i915_irq.c
30551@@ -475,7 +475,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
30552 u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
30553 struct drm_i915_master_private *master_priv;
30554
30555- atomic_inc(&dev_priv->irq_received);
30556+ atomic_inc_unchecked(&dev_priv->irq_received);
30557
30558 /* disable master interrupt before clearing iir */
30559 de_ier = I915_READ(DEIER);
30560@@ -566,7 +566,7 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
30561 struct drm_i915_master_private *master_priv;
30562 u32 bsd_usr_interrupt = GT_BSD_USER_INTERRUPT;
30563
30564- atomic_inc(&dev_priv->irq_received);
30565+ atomic_inc_unchecked(&dev_priv->irq_received);
30566
30567 if (IS_GEN6(dev))
30568 bsd_usr_interrupt = GT_GEN6_BSD_USER_INTERRUPT;
30569@@ -1231,7 +1231,7 @@ static irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
30570 int ret = IRQ_NONE, pipe;
30571 bool blc_event = false;
30572
30573- atomic_inc(&dev_priv->irq_received);
30574+ atomic_inc_unchecked(&dev_priv->irq_received);
30575
30576 iir = I915_READ(IIR);
30577
30578@@ -1743,7 +1743,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
30579 {
30580 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30581
30582- atomic_set(&dev_priv->irq_received, 0);
30583+ atomic_set_unchecked(&dev_priv->irq_received, 0);
30584
30585 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
30586 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
30587@@ -1932,7 +1932,7 @@ static void i915_driver_irq_preinstall(struct drm_device * dev)
30588 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30589 int pipe;
30590
30591- atomic_set(&dev_priv->irq_received, 0);
30592+ atomic_set_unchecked(&dev_priv->irq_received, 0);
30593
30594 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
30595 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
30596diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
30597index 2163818..cede019 100644
30598--- a/drivers/gpu/drm/i915/intel_display.c
30599+++ b/drivers/gpu/drm/i915/intel_display.c
30600@@ -2238,7 +2238,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
30601
30602 wait_event(dev_priv->pending_flip_queue,
30603 atomic_read(&dev_priv->mm.wedged) ||
30604- atomic_read(&obj->pending_flip) == 0);
30605+ atomic_read_unchecked(&obj->pending_flip) == 0);
30606
30607 /* Big Hammer, we also need to ensure that any pending
30608 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
30609@@ -2859,7 +2859,7 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
30610 obj = to_intel_framebuffer(crtc->fb)->obj;
30611 dev_priv = crtc->dev->dev_private;
30612 wait_event(dev_priv->pending_flip_queue,
30613- atomic_read(&obj->pending_flip) == 0);
30614+ atomic_read_unchecked(&obj->pending_flip) == 0);
30615 }
30616
30617 static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
30618@@ -7171,7 +7171,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
30619
30620 atomic_clear_mask(1 << intel_crtc->plane,
30621 &obj->pending_flip.counter);
30622- if (atomic_read(&obj->pending_flip) == 0)
30623+ if (atomic_read_unchecked(&obj->pending_flip) == 0)
30624 wake_up(&dev_priv->pending_flip_queue);
30625
30626 schedule_work(&work->work);
30627@@ -7354,7 +7354,13 @@ static int intel_gen6_queue_flip(struct drm_device *dev,
30628 OUT_RING(fb->pitches[0] | obj->tiling_mode);
30629 OUT_RING(obj->gtt_offset);
30630
30631- pf = I915_READ(PF_CTL(intel_crtc->pipe)) & PF_ENABLE;
30632+ /* Contrary to the suggestions in the documentation,
30633+ * "Enable Panel Fitter" does not seem to be required when page
30634+ * flipping with a non-native mode, and worse causes a normal
30635+ * modeset to fail.
30636+ * pf = I915_READ(PF_CTL(intel_crtc->pipe)) & PF_ENABLE;
30637+ */
30638+ pf = 0;
30639 pipesrc = I915_READ(PIPESRC(intel_crtc->pipe)) & 0x0fff0fff;
30640 OUT_RING(pf | pipesrc);
30641 ADVANCE_LP_RING();
30642@@ -7461,7 +7467,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
30643 /* Block clients from rendering to the new back buffer until
30644 * the flip occurs and the object is no longer visible.
30645 */
30646- atomic_add(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30647+ atomic_add_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30648
30649 ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
30650 if (ret)
30651@@ -7475,7 +7481,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
30652 return 0;
30653
30654 cleanup_pending:
30655- atomic_sub(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30656+ atomic_sub_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30657 drm_gem_object_unreference(&work->old_fb_obj->base);
30658 drm_gem_object_unreference(&obj->base);
30659 mutex_unlock(&dev->struct_mutex);
30660diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
30661index 54558a0..2d97005 100644
30662--- a/drivers/gpu/drm/mga/mga_drv.h
30663+++ b/drivers/gpu/drm/mga/mga_drv.h
30664@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
30665 u32 clear_cmd;
30666 u32 maccess;
30667
30668- atomic_t vbl_received; /**< Number of vblanks received. */
30669+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
30670 wait_queue_head_t fence_queue;
30671- atomic_t last_fence_retired;
30672+ atomic_unchecked_t last_fence_retired;
30673 u32 next_fence_to_post;
30674
30675 unsigned int fb_cpp;
30676diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
30677index 2581202..f230a8d9 100644
30678--- a/drivers/gpu/drm/mga/mga_irq.c
30679+++ b/drivers/gpu/drm/mga/mga_irq.c
30680@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
30681 if (crtc != 0)
30682 return 0;
30683
30684- return atomic_read(&dev_priv->vbl_received);
30685+ return atomic_read_unchecked(&dev_priv->vbl_received);
30686 }
30687
30688
30689@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
30690 /* VBLANK interrupt */
30691 if (status & MGA_VLINEPEN) {
30692 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
30693- atomic_inc(&dev_priv->vbl_received);
30694+ atomic_inc_unchecked(&dev_priv->vbl_received);
30695 drm_handle_vblank(dev, 0);
30696 handled = 1;
30697 }
30698@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
30699 if ((prim_start & ~0x03) != (prim_end & ~0x03))
30700 MGA_WRITE(MGA_PRIMEND, prim_end);
30701
30702- atomic_inc(&dev_priv->last_fence_retired);
30703+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
30704 DRM_WAKEUP(&dev_priv->fence_queue);
30705 handled = 1;
30706 }
30707@@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
30708 * using fences.
30709 */
30710 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
30711- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
30712+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
30713 - *sequence) <= (1 << 23)));
30714
30715 *sequence = cur_fence;
30716diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
30717index e5cbead..6c354a3 100644
30718--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
30719+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
30720@@ -199,7 +199,7 @@ struct methods {
30721 const char desc[8];
30722 void (*loadbios)(struct drm_device *, uint8_t *);
30723 const bool rw;
30724-};
30725+} __do_const;
30726
30727 static struct methods shadow_methods[] = {
30728 { "PRAMIN", load_vbios_pramin, true },
30729@@ -5290,7 +5290,7 @@ parse_bit_U_tbl_entry(struct drm_device *dev, struct nvbios *bios,
30730 struct bit_table {
30731 const char id;
30732 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
30733-};
30734+} __no_const;
30735
30736 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
30737
30738diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
30739index b827098..c31a797 100644
30740--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
30741+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
30742@@ -242,7 +242,7 @@ struct nouveau_channel {
30743 struct list_head pending;
30744 uint32_t sequence;
30745 uint32_t sequence_ack;
30746- atomic_t last_sequence_irq;
30747+ atomic_unchecked_t last_sequence_irq;
30748 struct nouveau_vma vma;
30749 } fence;
30750
30751@@ -323,7 +323,7 @@ struct nouveau_exec_engine {
30752 u32 handle, u16 class);
30753 void (*set_tile_region)(struct drm_device *dev, int i);
30754 void (*tlb_flush)(struct drm_device *, int engine);
30755-};
30756+} __no_const;
30757
30758 struct nouveau_instmem_engine {
30759 void *priv;
30760@@ -345,13 +345,13 @@ struct nouveau_instmem_engine {
30761 struct nouveau_mc_engine {
30762 int (*init)(struct drm_device *dev);
30763 void (*takedown)(struct drm_device *dev);
30764-};
30765+} __no_const;
30766
30767 struct nouveau_timer_engine {
30768 int (*init)(struct drm_device *dev);
30769 void (*takedown)(struct drm_device *dev);
30770 uint64_t (*read)(struct drm_device *dev);
30771-};
30772+} __no_const;
30773
30774 struct nouveau_fb_engine {
30775 int num_tiles;
30776@@ -566,7 +566,7 @@ struct nouveau_vram_engine {
30777 void (*put)(struct drm_device *, struct nouveau_mem **);
30778
30779 bool (*flags_valid)(struct drm_device *, u32 tile_flags);
30780-};
30781+} __no_const;
30782
30783 struct nouveau_engine {
30784 struct nouveau_instmem_engine instmem;
30785@@ -714,7 +714,7 @@ struct drm_nouveau_private {
30786 struct drm_global_reference mem_global_ref;
30787 struct ttm_bo_global_ref bo_global_ref;
30788 struct ttm_bo_device bdev;
30789- atomic_t validate_sequence;
30790+ atomic_unchecked_t validate_sequence;
30791 } ttm;
30792
30793 struct {
30794diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
30795index 2f6daae..c9d7b9e 100644
30796--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
30797+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
30798@@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_channel *chan)
30799 if (USE_REFCNT(dev))
30800 sequence = nvchan_rd32(chan, 0x48);
30801 else
30802- sequence = atomic_read(&chan->fence.last_sequence_irq);
30803+ sequence = atomic_read_unchecked(&chan->fence.last_sequence_irq);
30804
30805 if (chan->fence.sequence_ack == sequence)
30806 goto out;
30807@@ -539,7 +539,7 @@ nouveau_fence_channel_init(struct nouveau_channel *chan)
30808 return ret;
30809 }
30810
30811- atomic_set(&chan->fence.last_sequence_irq, 0);
30812+ atomic_set_unchecked(&chan->fence.last_sequence_irq, 0);
30813 return 0;
30814 }
30815
30816diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
30817index 7ce3fde..cb3ea04 100644
30818--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
30819+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
30820@@ -314,7 +314,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
30821 int trycnt = 0;
30822 int ret, i;
30823
30824- sequence = atomic_add_return(1, &dev_priv->ttm.validate_sequence);
30825+ sequence = atomic_add_return_unchecked(1, &dev_priv->ttm.validate_sequence);
30826 retry:
30827 if (++trycnt > 100000) {
30828 NV_ERROR(dev, "%s failed and gave up.\n", __func__);
30829diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
30830index f80c5e0..936baa7 100644
30831--- a/drivers/gpu/drm/nouveau/nouveau_state.c
30832+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
30833@@ -543,7 +543,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
30834 bool can_switch;
30835
30836 spin_lock(&dev->count_lock);
30837- can_switch = (dev->open_count == 0);
30838+ can_switch = (local_read(&dev->open_count) == 0);
30839 spin_unlock(&dev->count_lock);
30840 return can_switch;
30841 }
30842diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
30843index dbdea8e..cd6eeeb 100644
30844--- a/drivers/gpu/drm/nouveau/nv04_graph.c
30845+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
30846@@ -554,7 +554,7 @@ static int
30847 nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
30848 u32 class, u32 mthd, u32 data)
30849 {
30850- atomic_set(&chan->fence.last_sequence_irq, data);
30851+ atomic_set_unchecked(&chan->fence.last_sequence_irq, data);
30852 return 0;
30853 }
30854
30855diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
30856index bcac90b..53bfc76 100644
30857--- a/drivers/gpu/drm/r128/r128_cce.c
30858+++ b/drivers/gpu/drm/r128/r128_cce.c
30859@@ -378,7 +378,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
30860
30861 /* GH: Simple idle check.
30862 */
30863- atomic_set(&dev_priv->idle_count, 0);
30864+ atomic_set_unchecked(&dev_priv->idle_count, 0);
30865
30866 /* We don't support anything other than bus-mastering ring mode,
30867 * but the ring can be in either AGP or PCI space for the ring
30868diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
30869index 930c71b..499aded 100644
30870--- a/drivers/gpu/drm/r128/r128_drv.h
30871+++ b/drivers/gpu/drm/r128/r128_drv.h
30872@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
30873 int is_pci;
30874 unsigned long cce_buffers_offset;
30875
30876- atomic_t idle_count;
30877+ atomic_unchecked_t idle_count;
30878
30879 int page_flipping;
30880 int current_page;
30881 u32 crtc_offset;
30882 u32 crtc_offset_cntl;
30883
30884- atomic_t vbl_received;
30885+ atomic_unchecked_t vbl_received;
30886
30887 u32 color_fmt;
30888 unsigned int front_offset;
30889diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
30890index 429d5a0..7e899ed 100644
30891--- a/drivers/gpu/drm/r128/r128_irq.c
30892+++ b/drivers/gpu/drm/r128/r128_irq.c
30893@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
30894 if (crtc != 0)
30895 return 0;
30896
30897- return atomic_read(&dev_priv->vbl_received);
30898+ return atomic_read_unchecked(&dev_priv->vbl_received);
30899 }
30900
30901 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
30902@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
30903 /* VBLANK interrupt */
30904 if (status & R128_CRTC_VBLANK_INT) {
30905 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
30906- atomic_inc(&dev_priv->vbl_received);
30907+ atomic_inc_unchecked(&dev_priv->vbl_received);
30908 drm_handle_vblank(dev, 0);
30909 return IRQ_HANDLED;
30910 }
30911diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
30912index a9e33ce..09edd4b 100644
30913--- a/drivers/gpu/drm/r128/r128_state.c
30914+++ b/drivers/gpu/drm/r128/r128_state.c
30915@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
30916
30917 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
30918 {
30919- if (atomic_read(&dev_priv->idle_count) == 0)
30920+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
30921 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
30922 else
30923- atomic_set(&dev_priv->idle_count, 0);
30924+ atomic_set_unchecked(&dev_priv->idle_count, 0);
30925 }
30926
30927 #endif
30928diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
30929index 5a82b6b..9e69c73 100644
30930--- a/drivers/gpu/drm/radeon/mkregtable.c
30931+++ b/drivers/gpu/drm/radeon/mkregtable.c
30932@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
30933 regex_t mask_rex;
30934 regmatch_t match[4];
30935 char buf[1024];
30936- size_t end;
30937+ long end;
30938 int len;
30939 int done = 0;
30940 int r;
30941 unsigned o;
30942 struct offset *offset;
30943 char last_reg_s[10];
30944- int last_reg;
30945+ unsigned long last_reg;
30946
30947 if (regcomp
30948 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
30949diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
30950index 1668ec1..30ebdab 100644
30951--- a/drivers/gpu/drm/radeon/radeon.h
30952+++ b/drivers/gpu/drm/radeon/radeon.h
30953@@ -250,7 +250,7 @@ struct radeon_fence_driver {
30954 uint32_t scratch_reg;
30955 uint64_t gpu_addr;
30956 volatile uint32_t *cpu_addr;
30957- atomic_t seq;
30958+ atomic_unchecked_t seq;
30959 uint32_t last_seq;
30960 unsigned long last_jiffies;
30961 unsigned long last_timeout;
30962@@ -752,7 +752,7 @@ struct r600_blit_cp_primitives {
30963 int x2, int y2);
30964 void (*draw_auto)(struct radeon_device *rdev);
30965 void (*set_default_state)(struct radeon_device *rdev);
30966-};
30967+} __no_const;
30968
30969 struct r600_blit {
30970 struct mutex mutex;
30971@@ -1201,7 +1201,7 @@ struct radeon_asic {
30972 void (*pre_page_flip)(struct radeon_device *rdev, int crtc);
30973 u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base);
30974 void (*post_page_flip)(struct radeon_device *rdev, int crtc);
30975-};
30976+} __no_const;
30977
30978 /*
30979 * Asic structures
30980diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
30981index 49f7cb7..2fcb48f 100644
30982--- a/drivers/gpu/drm/radeon/radeon_device.c
30983+++ b/drivers/gpu/drm/radeon/radeon_device.c
30984@@ -687,7 +687,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
30985 bool can_switch;
30986
30987 spin_lock(&dev->count_lock);
30988- can_switch = (dev->open_count == 0);
30989+ can_switch = (local_read(&dev->open_count) == 0);
30990 spin_unlock(&dev->count_lock);
30991 return can_switch;
30992 }
30993diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
30994index a1b59ca..86f2d44 100644
30995--- a/drivers/gpu/drm/radeon/radeon_drv.h
30996+++ b/drivers/gpu/drm/radeon/radeon_drv.h
30997@@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
30998
30999 /* SW interrupt */
31000 wait_queue_head_t swi_queue;
31001- atomic_t swi_emitted;
31002+ atomic_unchecked_t swi_emitted;
31003 int vblank_crtc;
31004 uint32_t irq_enable_reg;
31005 uint32_t r500_disp_irq_reg;
31006diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
31007index 4bd36a3..e66fe9c 100644
31008--- a/drivers/gpu/drm/radeon/radeon_fence.c
31009+++ b/drivers/gpu/drm/radeon/radeon_fence.c
31010@@ -70,7 +70,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
31011 write_unlock_irqrestore(&rdev->fence_lock, irq_flags);
31012 return 0;
31013 }
31014- fence->seq = atomic_add_return(1, &rdev->fence_drv[fence->ring].seq);
31015+ fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv[fence->ring].seq);
31016 if (!rdev->ring[fence->ring].ready)
31017 /* FIXME: cp is not running assume everythings is done right
31018 * away
31019@@ -405,7 +405,7 @@ int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring)
31020 }
31021 rdev->fence_drv[ring].cpu_addr = &rdev->wb.wb[index/4];
31022 rdev->fence_drv[ring].gpu_addr = rdev->wb.gpu_addr + index;
31023- radeon_fence_write(rdev, atomic_read(&rdev->fence_drv[ring].seq), ring);
31024+ radeon_fence_write(rdev, atomic_read_unchecked(&rdev->fence_drv[ring].seq), ring);
31025 rdev->fence_drv[ring].initialized = true;
31026 DRM_INFO("fence driver on ring %d use gpu addr 0x%08Lx and cpu addr 0x%p\n",
31027 ring, rdev->fence_drv[ring].gpu_addr, rdev->fence_drv[ring].cpu_addr);
31028@@ -418,7 +418,7 @@ static void radeon_fence_driver_init_ring(struct radeon_device *rdev, int ring)
31029 rdev->fence_drv[ring].scratch_reg = -1;
31030 rdev->fence_drv[ring].cpu_addr = NULL;
31031 rdev->fence_drv[ring].gpu_addr = 0;
31032- atomic_set(&rdev->fence_drv[ring].seq, 0);
31033+ atomic_set_unchecked(&rdev->fence_drv[ring].seq, 0);
31034 INIT_LIST_HEAD(&rdev->fence_drv[ring].created);
31035 INIT_LIST_HEAD(&rdev->fence_drv[ring].emitted);
31036 INIT_LIST_HEAD(&rdev->fence_drv[ring].signaled);
31037diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
31038index 48b7cea..342236f 100644
31039--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
31040+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
31041@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
31042 request = compat_alloc_user_space(sizeof(*request));
31043 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
31044 || __put_user(req32.param, &request->param)
31045- || __put_user((void __user *)(unsigned long)req32.value,
31046+ || __put_user((unsigned long)req32.value,
31047 &request->value))
31048 return -EFAULT;
31049
31050diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
31051index 00da384..32f972d 100644
31052--- a/drivers/gpu/drm/radeon/radeon_irq.c
31053+++ b/drivers/gpu/drm/radeon/radeon_irq.c
31054@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
31055 unsigned int ret;
31056 RING_LOCALS;
31057
31058- atomic_inc(&dev_priv->swi_emitted);
31059- ret = atomic_read(&dev_priv->swi_emitted);
31060+ atomic_inc_unchecked(&dev_priv->swi_emitted);
31061+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
31062
31063 BEGIN_RING(4);
31064 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
31065@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
31066 drm_radeon_private_t *dev_priv =
31067 (drm_radeon_private_t *) dev->dev_private;
31068
31069- atomic_set(&dev_priv->swi_emitted, 0);
31070+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
31071 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
31072
31073 dev->max_vblank_count = 0x001fffff;
31074diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
31075index e8422ae..d22d4a8 100644
31076--- a/drivers/gpu/drm/radeon/radeon_state.c
31077+++ b/drivers/gpu/drm/radeon/radeon_state.c
31078@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
31079 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
31080 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
31081
31082- if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
31083+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
31084 sarea_priv->nbox * sizeof(depth_boxes[0])))
31085 return -EFAULT;
31086
31087@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
31088 {
31089 drm_radeon_private_t *dev_priv = dev->dev_private;
31090 drm_radeon_getparam_t *param = data;
31091- int value;
31092+ int value = 0;
31093
31094 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
31095
31096diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
31097index c421e77..e6bf2e8 100644
31098--- a/drivers/gpu/drm/radeon/radeon_ttm.c
31099+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
31100@@ -842,8 +842,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
31101 }
31102 if (unlikely(ttm_vm_ops == NULL)) {
31103 ttm_vm_ops = vma->vm_ops;
31104- radeon_ttm_vm_ops = *ttm_vm_ops;
31105- radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
31106+ pax_open_kernel();
31107+ memcpy((void *)&radeon_ttm_vm_ops, ttm_vm_ops, sizeof(radeon_ttm_vm_ops));
31108+ *(void **)&radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
31109+ pax_close_kernel();
31110 }
31111 vma->vm_ops = &radeon_ttm_vm_ops;
31112 return 0;
31113diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
31114index f68dff2..8df955c 100644
31115--- a/drivers/gpu/drm/radeon/rs690.c
31116+++ b/drivers/gpu/drm/radeon/rs690.c
31117@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
31118 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
31119 rdev->pm.sideport_bandwidth.full)
31120 rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
31121- read_delay_latency.full = dfixed_const(370 * 800 * 1000);
31122+ read_delay_latency.full = dfixed_const(800 * 1000);
31123 read_delay_latency.full = dfixed_div(read_delay_latency,
31124 rdev->pm.igp_sideport_mclk);
31125+ a.full = dfixed_const(370);
31126+ read_delay_latency.full = dfixed_mul(read_delay_latency, a);
31127 } else {
31128 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
31129 rdev->pm.k8_bandwidth.full)
31130diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
31131index 499debd..66fce72 100644
31132--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
31133+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
31134@@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages(void)
31135 static int ttm_pool_mm_shrink(struct shrinker *shrink,
31136 struct shrink_control *sc)
31137 {
31138- static atomic_t start_pool = ATOMIC_INIT(0);
31139+ static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
31140 unsigned i;
31141- unsigned pool_offset = atomic_add_return(1, &start_pool);
31142+ unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
31143 struct ttm_page_pool *pool;
31144 int shrink_pages = sc->nr_to_scan;
31145
31146diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
31147index 88edacc..1e5412b 100644
31148--- a/drivers/gpu/drm/via/via_drv.h
31149+++ b/drivers/gpu/drm/via/via_drv.h
31150@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
31151 typedef uint32_t maskarray_t[5];
31152
31153 typedef struct drm_via_irq {
31154- atomic_t irq_received;
31155+ atomic_unchecked_t irq_received;
31156 uint32_t pending_mask;
31157 uint32_t enable_mask;
31158 wait_queue_head_t irq_queue;
31159@@ -75,7 +75,7 @@ typedef struct drm_via_private {
31160 struct timeval last_vblank;
31161 int last_vblank_valid;
31162 unsigned usec_per_vblank;
31163- atomic_t vbl_received;
31164+ atomic_unchecked_t vbl_received;
31165 drm_via_state_t hc_state;
31166 char pci_buf[VIA_PCI_BUF_SIZE];
31167 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
31168diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
31169index d391f48..10c8ca3 100644
31170--- a/drivers/gpu/drm/via/via_irq.c
31171+++ b/drivers/gpu/drm/via/via_irq.c
31172@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
31173 if (crtc != 0)
31174 return 0;
31175
31176- return atomic_read(&dev_priv->vbl_received);
31177+ return atomic_read_unchecked(&dev_priv->vbl_received);
31178 }
31179
31180 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31181@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31182
31183 status = VIA_READ(VIA_REG_INTERRUPT);
31184 if (status & VIA_IRQ_VBLANK_PENDING) {
31185- atomic_inc(&dev_priv->vbl_received);
31186- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
31187+ atomic_inc_unchecked(&dev_priv->vbl_received);
31188+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
31189 do_gettimeofday(&cur_vblank);
31190 if (dev_priv->last_vblank_valid) {
31191 dev_priv->usec_per_vblank =
31192@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31193 dev_priv->last_vblank = cur_vblank;
31194 dev_priv->last_vblank_valid = 1;
31195 }
31196- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
31197+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
31198 DRM_DEBUG("US per vblank is: %u\n",
31199 dev_priv->usec_per_vblank);
31200 }
31201@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31202
31203 for (i = 0; i < dev_priv->num_irqs; ++i) {
31204 if (status & cur_irq->pending_mask) {
31205- atomic_inc(&cur_irq->irq_received);
31206+ atomic_inc_unchecked(&cur_irq->irq_received);
31207 DRM_WAKEUP(&cur_irq->irq_queue);
31208 handled = 1;
31209 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
31210@@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
31211 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31212 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
31213 masks[irq][4]));
31214- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
31215+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
31216 } else {
31217 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31218 (((cur_irq_sequence =
31219- atomic_read(&cur_irq->irq_received)) -
31220+ atomic_read_unchecked(&cur_irq->irq_received)) -
31221 *sequence) <= (1 << 23)));
31222 }
31223 *sequence = cur_irq_sequence;
31224@@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
31225 }
31226
31227 for (i = 0; i < dev_priv->num_irqs; ++i) {
31228- atomic_set(&cur_irq->irq_received, 0);
31229+ atomic_set_unchecked(&cur_irq->irq_received, 0);
31230 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
31231 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
31232 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
31233@@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
31234 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
31235 case VIA_IRQ_RELATIVE:
31236 irqwait->request.sequence +=
31237- atomic_read(&cur_irq->irq_received);
31238+ atomic_read_unchecked(&cur_irq->irq_received);
31239 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
31240 case VIA_IRQ_ABSOLUTE:
31241 break;
31242diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31243index dc27970..f18b008 100644
31244--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31245+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31246@@ -260,7 +260,7 @@ struct vmw_private {
31247 * Fencing and IRQs.
31248 */
31249
31250- atomic_t marker_seq;
31251+ atomic_unchecked_t marker_seq;
31252 wait_queue_head_t fence_queue;
31253 wait_queue_head_t fifo_queue;
31254 int fence_queue_waiters; /* Protected by hw_mutex */
31255diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31256index a0c2f12..68ae6cb 100644
31257--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31258+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31259@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
31260 (unsigned int) min,
31261 (unsigned int) fifo->capabilities);
31262
31263- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31264+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31265 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
31266 vmw_marker_queue_init(&fifo->marker_queue);
31267 return vmw_fifo_send_fence(dev_priv, &dummy);
31268@@ -355,7 +355,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
31269 if (reserveable)
31270 iowrite32(bytes, fifo_mem +
31271 SVGA_FIFO_RESERVED);
31272- return fifo_mem + (next_cmd >> 2);
31273+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
31274 } else {
31275 need_bounce = true;
31276 }
31277@@ -475,7 +475,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31278
31279 fm = vmw_fifo_reserve(dev_priv, bytes);
31280 if (unlikely(fm == NULL)) {
31281- *seqno = atomic_read(&dev_priv->marker_seq);
31282+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31283 ret = -ENOMEM;
31284 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
31285 false, 3*HZ);
31286@@ -483,7 +483,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31287 }
31288
31289 do {
31290- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
31291+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
31292 } while (*seqno == 0);
31293
31294 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
31295diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31296index cabc95f..14b3d77 100644
31297--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31298+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31299@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
31300 * emitted. Then the fence is stale and signaled.
31301 */
31302
31303- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
31304+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
31305 > VMW_FENCE_WRAP);
31306
31307 return ret;
31308@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
31309
31310 if (fifo_idle)
31311 down_read(&fifo_state->rwsem);
31312- signal_seq = atomic_read(&dev_priv->marker_seq);
31313+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
31314 ret = 0;
31315
31316 for (;;) {
31317diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31318index 8a8725c..afed796 100644
31319--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31320+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31321@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
31322 while (!vmw_lag_lt(queue, us)) {
31323 spin_lock(&queue->lock);
31324 if (list_empty(&queue->head))
31325- seqno = atomic_read(&dev_priv->marker_seq);
31326+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31327 else {
31328 marker = list_first_entry(&queue->head,
31329 struct vmw_marker, head);
31330diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
31331index 75dbe34..f9204a8 100644
31332--- a/drivers/hid/hid-core.c
31333+++ b/drivers/hid/hid-core.c
31334@@ -2021,7 +2021,7 @@ static bool hid_ignore(struct hid_device *hdev)
31335
31336 int hid_add_device(struct hid_device *hdev)
31337 {
31338- static atomic_t id = ATOMIC_INIT(0);
31339+ static atomic_unchecked_t id = ATOMIC_INIT(0);
31340 int ret;
31341
31342 if (WARN_ON(hdev->status & HID_STAT_ADDED))
31343@@ -2036,7 +2036,7 @@ int hid_add_device(struct hid_device *hdev)
31344 /* XXX hack, any other cleaner solution after the driver core
31345 * is converted to allow more than 20 bytes as the device name? */
31346 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
31347- hdev->vendor, hdev->product, atomic_inc_return(&id));
31348+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
31349
31350 hid_debug_register(hdev, dev_name(&hdev->dev));
31351 ret = device_add(&hdev->dev);
31352diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
31353index b1ec0e2..c295a61 100644
31354--- a/drivers/hid/usbhid/hiddev.c
31355+++ b/drivers/hid/usbhid/hiddev.c
31356@@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
31357 break;
31358
31359 case HIDIOCAPPLICATION:
31360- if (arg < 0 || arg >= hid->maxapplication)
31361+ if (arg >= hid->maxapplication)
31362 break;
31363
31364 for (i = 0; i < hid->maxcollection; i++)
31365diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
31366index 4065374..10ed7dc 100644
31367--- a/drivers/hv/channel.c
31368+++ b/drivers/hv/channel.c
31369@@ -400,8 +400,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
31370 int ret = 0;
31371 int t;
31372
31373- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
31374- atomic_inc(&vmbus_connection.next_gpadl_handle);
31375+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
31376+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
31377
31378 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
31379 if (ret)
31380diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
31381index 12aa97f..c0679f7 100644
31382--- a/drivers/hv/hv.c
31383+++ b/drivers/hv/hv.c
31384@@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
31385 u64 output_address = (output) ? virt_to_phys(output) : 0;
31386 u32 output_address_hi = output_address >> 32;
31387 u32 output_address_lo = output_address & 0xFFFFFFFF;
31388- void *hypercall_page = hv_context.hypercall_page;
31389+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
31390
31391 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
31392 "=a"(hv_status_lo) : "d" (control_hi),
31393diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
31394index 6d7d286..92b0873 100644
31395--- a/drivers/hv/hyperv_vmbus.h
31396+++ b/drivers/hv/hyperv_vmbus.h
31397@@ -556,7 +556,7 @@ enum vmbus_connect_state {
31398 struct vmbus_connection {
31399 enum vmbus_connect_state conn_state;
31400
31401- atomic_t next_gpadl_handle;
31402+ atomic_unchecked_t next_gpadl_handle;
31403
31404 /*
31405 * Represents channel interrupts. Each bit position represents a
31406diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
31407index a220e57..428f54d 100644
31408--- a/drivers/hv/vmbus_drv.c
31409+++ b/drivers/hv/vmbus_drv.c
31410@@ -663,10 +663,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
31411 {
31412 int ret = 0;
31413
31414- static atomic_t device_num = ATOMIC_INIT(0);
31415+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
31416
31417 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
31418- atomic_inc_return(&device_num));
31419+ atomic_inc_return_unchecked(&device_num));
31420
31421 child_device_obj->device.bus = &hv_bus;
31422 child_device_obj->device.parent = &hv_acpi_dev->dev;
31423diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
31424index 554f046..f8b4729 100644
31425--- a/drivers/hwmon/acpi_power_meter.c
31426+++ b/drivers/hwmon/acpi_power_meter.c
31427@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
31428 return res;
31429
31430 temp /= 1000;
31431- if (temp < 0)
31432- return -EINVAL;
31433
31434 mutex_lock(&resource->lock);
31435 resource->trip[attr->index - 7] = temp;
31436diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
31437index 91fdd1f..b66a686 100644
31438--- a/drivers/hwmon/sht15.c
31439+++ b/drivers/hwmon/sht15.c
31440@@ -166,7 +166,7 @@ struct sht15_data {
31441 int supply_uV;
31442 bool supply_uV_valid;
31443 struct work_struct update_supply_work;
31444- atomic_t interrupt_handled;
31445+ atomic_unchecked_t interrupt_handled;
31446 };
31447
31448 /**
31449@@ -509,13 +509,13 @@ static int sht15_measurement(struct sht15_data *data,
31450 return ret;
31451
31452 gpio_direction_input(data->pdata->gpio_data);
31453- atomic_set(&data->interrupt_handled, 0);
31454+ atomic_set_unchecked(&data->interrupt_handled, 0);
31455
31456 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31457 if (gpio_get_value(data->pdata->gpio_data) == 0) {
31458 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
31459 /* Only relevant if the interrupt hasn't occurred. */
31460- if (!atomic_read(&data->interrupt_handled))
31461+ if (!atomic_read_unchecked(&data->interrupt_handled))
31462 schedule_work(&data->read_work);
31463 }
31464 ret = wait_event_timeout(data->wait_queue,
31465@@ -782,7 +782,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
31466
31467 /* First disable the interrupt */
31468 disable_irq_nosync(irq);
31469- atomic_inc(&data->interrupt_handled);
31470+ atomic_inc_unchecked(&data->interrupt_handled);
31471 /* Then schedule a reading work struct */
31472 if (data->state != SHT15_READING_NOTHING)
31473 schedule_work(&data->read_work);
31474@@ -804,11 +804,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
31475 * If not, then start the interrupt again - care here as could
31476 * have gone low in meantime so verify it hasn't!
31477 */
31478- atomic_set(&data->interrupt_handled, 0);
31479+ atomic_set_unchecked(&data->interrupt_handled, 0);
31480 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31481 /* If still not occurred or another handler has been scheduled */
31482 if (gpio_get_value(data->pdata->gpio_data)
31483- || atomic_read(&data->interrupt_handled))
31484+ || atomic_read_unchecked(&data->interrupt_handled))
31485 return;
31486 }
31487
31488diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
31489index 378fcb5..5e91fa8 100644
31490--- a/drivers/i2c/busses/i2c-amd756-s4882.c
31491+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
31492@@ -43,7 +43,7 @@
31493 extern struct i2c_adapter amd756_smbus;
31494
31495 static struct i2c_adapter *s4882_adapter;
31496-static struct i2c_algorithm *s4882_algo;
31497+static i2c_algorithm_no_const *s4882_algo;
31498
31499 /* Wrapper access functions for multiplexed SMBus */
31500 static DEFINE_MUTEX(amd756_lock);
31501diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
31502index 29015eb..af2d8e9 100644
31503--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
31504+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
31505@@ -41,7 +41,7 @@
31506 extern struct i2c_adapter *nforce2_smbus;
31507
31508 static struct i2c_adapter *s4985_adapter;
31509-static struct i2c_algorithm *s4985_algo;
31510+static i2c_algorithm_no_const *s4985_algo;
31511
31512 /* Wrapper access functions for multiplexed SMBus */
31513 static DEFINE_MUTEX(nforce2_lock);
31514diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
31515index d7a4833..7fae376 100644
31516--- a/drivers/i2c/i2c-mux.c
31517+++ b/drivers/i2c/i2c-mux.c
31518@@ -28,7 +28,7 @@
31519 /* multiplexer per channel data */
31520 struct i2c_mux_priv {
31521 struct i2c_adapter adap;
31522- struct i2c_algorithm algo;
31523+ i2c_algorithm_no_const algo;
31524
31525 struct i2c_adapter *parent;
31526 void *mux_dev; /* the mux chip/device */
31527diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
31528index 57d00ca..0145194 100644
31529--- a/drivers/ide/aec62xx.c
31530+++ b/drivers/ide/aec62xx.c
31531@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = {
31532 .cable_detect = atp86x_cable_detect,
31533 };
31534
31535-static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
31536+static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
31537 { /* 0: AEC6210 */
31538 .name = DRV_NAME,
31539 .init_chipset = init_chipset_aec62xx,
31540diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
31541index 2c8016a..911a27c 100644
31542--- a/drivers/ide/alim15x3.c
31543+++ b/drivers/ide/alim15x3.c
31544@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ops = {
31545 .dma_sff_read_status = ide_dma_sff_read_status,
31546 };
31547
31548-static const struct ide_port_info ali15x3_chipset __devinitdata = {
31549+static const struct ide_port_info ali15x3_chipset __devinitconst = {
31550 .name = DRV_NAME,
31551 .init_chipset = init_chipset_ali15x3,
31552 .init_hwif = init_hwif_ali15x3,
31553diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
31554index 3747b25..56fc995 100644
31555--- a/drivers/ide/amd74xx.c
31556+++ b/drivers/ide/amd74xx.c
31557@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = {
31558 .udma_mask = udma, \
31559 }
31560
31561-static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
31562+static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
31563 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
31564 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
31565 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
31566diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
31567index 15f0ead..cb43480 100644
31568--- a/drivers/ide/atiixp.c
31569+++ b/drivers/ide/atiixp.c
31570@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = {
31571 .cable_detect = atiixp_cable_detect,
31572 };
31573
31574-static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
31575+static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
31576 { /* 0: IXP200/300/400/700 */
31577 .name = DRV_NAME,
31578 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
31579diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
31580index 5f80312..d1fc438 100644
31581--- a/drivers/ide/cmd64x.c
31582+++ b/drivers/ide/cmd64x.c
31583@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
31584 .dma_sff_read_status = ide_dma_sff_read_status,
31585 };
31586
31587-static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
31588+static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
31589 { /* 0: CMD643 */
31590 .name = DRV_NAME,
31591 .init_chipset = init_chipset_cmd64x,
31592diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
31593index 2c1e5f7..1444762 100644
31594--- a/drivers/ide/cs5520.c
31595+++ b/drivers/ide/cs5520.c
31596@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = {
31597 .set_dma_mode = cs5520_set_dma_mode,
31598 };
31599
31600-static const struct ide_port_info cyrix_chipset __devinitdata = {
31601+static const struct ide_port_info cyrix_chipset __devinitconst = {
31602 .name = DRV_NAME,
31603 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
31604 .port_ops = &cs5520_port_ops,
31605diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
31606index 4dc4eb9..49b40ad 100644
31607--- a/drivers/ide/cs5530.c
31608+++ b/drivers/ide/cs5530.c
31609@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = {
31610 .udma_filter = cs5530_udma_filter,
31611 };
31612
31613-static const struct ide_port_info cs5530_chipset __devinitdata = {
31614+static const struct ide_port_info cs5530_chipset __devinitconst = {
31615 .name = DRV_NAME,
31616 .init_chipset = init_chipset_cs5530,
31617 .init_hwif = init_hwif_cs5530,
31618diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
31619index 5059faf..18d4c85 100644
31620--- a/drivers/ide/cs5535.c
31621+++ b/drivers/ide/cs5535.c
31622@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
31623 .cable_detect = cs5535_cable_detect,
31624 };
31625
31626-static const struct ide_port_info cs5535_chipset __devinitdata = {
31627+static const struct ide_port_info cs5535_chipset __devinitconst = {
31628 .name = DRV_NAME,
31629 .port_ops = &cs5535_port_ops,
31630 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
31631diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
31632index 847553f..3ffb49d 100644
31633--- a/drivers/ide/cy82c693.c
31634+++ b/drivers/ide/cy82c693.c
31635@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
31636 .set_dma_mode = cy82c693_set_dma_mode,
31637 };
31638
31639-static const struct ide_port_info cy82c693_chipset __devinitdata = {
31640+static const struct ide_port_info cy82c693_chipset __devinitconst = {
31641 .name = DRV_NAME,
31642 .init_iops = init_iops_cy82c693,
31643 .port_ops = &cy82c693_port_ops,
31644diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
31645index 58c51cd..4aec3b8 100644
31646--- a/drivers/ide/hpt366.c
31647+++ b/drivers/ide/hpt366.c
31648@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = {
31649 }
31650 };
31651
31652-static const struct hpt_info hpt36x __devinitdata = {
31653+static const struct hpt_info hpt36x __devinitconst = {
31654 .chip_name = "HPT36x",
31655 .chip_type = HPT36x,
31656 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
31657@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitdata = {
31658 .timings = &hpt36x_timings
31659 };
31660
31661-static const struct hpt_info hpt370 __devinitdata = {
31662+static const struct hpt_info hpt370 __devinitconst = {
31663 .chip_name = "HPT370",
31664 .chip_type = HPT370,
31665 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
31666@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitdata = {
31667 .timings = &hpt37x_timings
31668 };
31669
31670-static const struct hpt_info hpt370a __devinitdata = {
31671+static const struct hpt_info hpt370a __devinitconst = {
31672 .chip_name = "HPT370A",
31673 .chip_type = HPT370A,
31674 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
31675@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitdata = {
31676 .timings = &hpt37x_timings
31677 };
31678
31679-static const struct hpt_info hpt374 __devinitdata = {
31680+static const struct hpt_info hpt374 __devinitconst = {
31681 .chip_name = "HPT374",
31682 .chip_type = HPT374,
31683 .udma_mask = ATA_UDMA5,
31684@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitdata = {
31685 .timings = &hpt37x_timings
31686 };
31687
31688-static const struct hpt_info hpt372 __devinitdata = {
31689+static const struct hpt_info hpt372 __devinitconst = {
31690 .chip_name = "HPT372",
31691 .chip_type = HPT372,
31692 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31693@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitdata = {
31694 .timings = &hpt37x_timings
31695 };
31696
31697-static const struct hpt_info hpt372a __devinitdata = {
31698+static const struct hpt_info hpt372a __devinitconst = {
31699 .chip_name = "HPT372A",
31700 .chip_type = HPT372A,
31701 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31702@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitdata = {
31703 .timings = &hpt37x_timings
31704 };
31705
31706-static const struct hpt_info hpt302 __devinitdata = {
31707+static const struct hpt_info hpt302 __devinitconst = {
31708 .chip_name = "HPT302",
31709 .chip_type = HPT302,
31710 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31711@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitdata = {
31712 .timings = &hpt37x_timings
31713 };
31714
31715-static const struct hpt_info hpt371 __devinitdata = {
31716+static const struct hpt_info hpt371 __devinitconst = {
31717 .chip_name = "HPT371",
31718 .chip_type = HPT371,
31719 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31720@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitdata = {
31721 .timings = &hpt37x_timings
31722 };
31723
31724-static const struct hpt_info hpt372n __devinitdata = {
31725+static const struct hpt_info hpt372n __devinitconst = {
31726 .chip_name = "HPT372N",
31727 .chip_type = HPT372N,
31728 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31729@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitdata = {
31730 .timings = &hpt37x_timings
31731 };
31732
31733-static const struct hpt_info hpt302n __devinitdata = {
31734+static const struct hpt_info hpt302n __devinitconst = {
31735 .chip_name = "HPT302N",
31736 .chip_type = HPT302N,
31737 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31738@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitdata = {
31739 .timings = &hpt37x_timings
31740 };
31741
31742-static const struct hpt_info hpt371n __devinitdata = {
31743+static const struct hpt_info hpt371n __devinitconst = {
31744 .chip_name = "HPT371N",
31745 .chip_type = HPT371N,
31746 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31747@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
31748 .dma_sff_read_status = ide_dma_sff_read_status,
31749 };
31750
31751-static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
31752+static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
31753 { /* 0: HPT36x */
31754 .name = DRV_NAME,
31755 .init_chipset = init_chipset_hpt366,
31756diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
31757index 8126824..55a2798 100644
31758--- a/drivers/ide/ide-cd.c
31759+++ b/drivers/ide/ide-cd.c
31760@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
31761 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
31762 if ((unsigned long)buf & alignment
31763 || blk_rq_bytes(rq) & q->dma_pad_mask
31764- || object_is_on_stack(buf))
31765+ || object_starts_on_stack(buf))
31766 drive->dma = 0;
31767 }
31768 }
31769diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
31770index 7f56b73..dab5b67 100644
31771--- a/drivers/ide/ide-pci-generic.c
31772+++ b/drivers/ide/ide-pci-generic.c
31773@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
31774 .udma_mask = ATA_UDMA6, \
31775 }
31776
31777-static const struct ide_port_info generic_chipsets[] __devinitdata = {
31778+static const struct ide_port_info generic_chipsets[] __devinitconst = {
31779 /* 0: Unknown */
31780 DECLARE_GENERIC_PCI_DEV(0),
31781
31782diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
31783index 560e66d..d5dd180 100644
31784--- a/drivers/ide/it8172.c
31785+++ b/drivers/ide/it8172.c
31786@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
31787 .set_dma_mode = it8172_set_dma_mode,
31788 };
31789
31790-static const struct ide_port_info it8172_port_info __devinitdata = {
31791+static const struct ide_port_info it8172_port_info __devinitconst = {
31792 .name = DRV_NAME,
31793 .port_ops = &it8172_port_ops,
31794 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
31795diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
31796index 46816ba..1847aeb 100644
31797--- a/drivers/ide/it8213.c
31798+++ b/drivers/ide/it8213.c
31799@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
31800 .cable_detect = it8213_cable_detect,
31801 };
31802
31803-static const struct ide_port_info it8213_chipset __devinitdata = {
31804+static const struct ide_port_info it8213_chipset __devinitconst = {
31805 .name = DRV_NAME,
31806 .enablebits = { {0x41, 0x80, 0x80} },
31807 .port_ops = &it8213_port_ops,
31808diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
31809index 2e3169f..c5611db 100644
31810--- a/drivers/ide/it821x.c
31811+++ b/drivers/ide/it821x.c
31812@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = {
31813 .cable_detect = it821x_cable_detect,
31814 };
31815
31816-static const struct ide_port_info it821x_chipset __devinitdata = {
31817+static const struct ide_port_info it821x_chipset __devinitconst = {
31818 .name = DRV_NAME,
31819 .init_chipset = init_chipset_it821x,
31820 .init_hwif = init_hwif_it821x,
31821diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
31822index 74c2c4a..efddd7d 100644
31823--- a/drivers/ide/jmicron.c
31824+++ b/drivers/ide/jmicron.c
31825@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
31826 .cable_detect = jmicron_cable_detect,
31827 };
31828
31829-static const struct ide_port_info jmicron_chipset __devinitdata = {
31830+static const struct ide_port_info jmicron_chipset __devinitconst = {
31831 .name = DRV_NAME,
31832 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
31833 .port_ops = &jmicron_port_ops,
31834diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
31835index 95327a2..73f78d8 100644
31836--- a/drivers/ide/ns87415.c
31837+++ b/drivers/ide/ns87415.c
31838@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
31839 .dma_sff_read_status = superio_dma_sff_read_status,
31840 };
31841
31842-static const struct ide_port_info ns87415_chipset __devinitdata = {
31843+static const struct ide_port_info ns87415_chipset __devinitconst = {
31844 .name = DRV_NAME,
31845 .init_hwif = init_hwif_ns87415,
31846 .tp_ops = &ns87415_tp_ops,
31847diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
31848index 1a53a4c..39edc66 100644
31849--- a/drivers/ide/opti621.c
31850+++ b/drivers/ide/opti621.c
31851@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = {
31852 .set_pio_mode = opti621_set_pio_mode,
31853 };
31854
31855-static const struct ide_port_info opti621_chipset __devinitdata = {
31856+static const struct ide_port_info opti621_chipset __devinitconst = {
31857 .name = DRV_NAME,
31858 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
31859 .port_ops = &opti621_port_ops,
31860diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
31861index 9546fe2..2e5ceb6 100644
31862--- a/drivers/ide/pdc202xx_new.c
31863+++ b/drivers/ide/pdc202xx_new.c
31864@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
31865 .udma_mask = udma, \
31866 }
31867
31868-static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
31869+static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
31870 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
31871 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
31872 };
31873diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
31874index 3a35ec6..5634510 100644
31875--- a/drivers/ide/pdc202xx_old.c
31876+++ b/drivers/ide/pdc202xx_old.c
31877@@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
31878 .max_sectors = sectors, \
31879 }
31880
31881-static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
31882+static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
31883 { /* 0: PDC20246 */
31884 .name = DRV_NAME,
31885 .init_chipset = init_chipset_pdc202xx,
31886diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
31887index 1892e81..fe0fd60 100644
31888--- a/drivers/ide/piix.c
31889+++ b/drivers/ide/piix.c
31890@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
31891 .udma_mask = udma, \
31892 }
31893
31894-static const struct ide_port_info piix_pci_info[] __devinitdata = {
31895+static const struct ide_port_info piix_pci_info[] __devinitconst = {
31896 /* 0: MPIIX */
31897 { /*
31898 * MPIIX actually has only a single IDE channel mapped to
31899diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
31900index a6414a8..c04173e 100644
31901--- a/drivers/ide/rz1000.c
31902+++ b/drivers/ide/rz1000.c
31903@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
31904 }
31905 }
31906
31907-static const struct ide_port_info rz1000_chipset __devinitdata = {
31908+static const struct ide_port_info rz1000_chipset __devinitconst = {
31909 .name = DRV_NAME,
31910 .host_flags = IDE_HFLAG_NO_DMA,
31911 };
31912diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
31913index 356b9b5..d4758eb 100644
31914--- a/drivers/ide/sc1200.c
31915+++ b/drivers/ide/sc1200.c
31916@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
31917 .dma_sff_read_status = ide_dma_sff_read_status,
31918 };
31919
31920-static const struct ide_port_info sc1200_chipset __devinitdata = {
31921+static const struct ide_port_info sc1200_chipset __devinitconst = {
31922 .name = DRV_NAME,
31923 .port_ops = &sc1200_port_ops,
31924 .dma_ops = &sc1200_dma_ops,
31925diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
31926index b7f5b0c..9701038 100644
31927--- a/drivers/ide/scc_pata.c
31928+++ b/drivers/ide/scc_pata.c
31929@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ops = {
31930 .dma_sff_read_status = scc_dma_sff_read_status,
31931 };
31932
31933-static const struct ide_port_info scc_chipset __devinitdata = {
31934+static const struct ide_port_info scc_chipset __devinitconst = {
31935 .name = "sccIDE",
31936 .init_iops = init_iops_scc,
31937 .init_dma = scc_init_dma,
31938diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
31939index 35fb8da..24d72ef 100644
31940--- a/drivers/ide/serverworks.c
31941+++ b/drivers/ide/serverworks.c
31942@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = {
31943 .cable_detect = svwks_cable_detect,
31944 };
31945
31946-static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
31947+static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
31948 { /* 0: OSB4 */
31949 .name = DRV_NAME,
31950 .init_chipset = init_chipset_svwks,
31951diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
31952index ddeda44..46f7e30 100644
31953--- a/drivers/ide/siimage.c
31954+++ b/drivers/ide/siimage.c
31955@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
31956 .udma_mask = ATA_UDMA6, \
31957 }
31958
31959-static const struct ide_port_info siimage_chipsets[] __devinitdata = {
31960+static const struct ide_port_info siimage_chipsets[] __devinitconst = {
31961 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
31962 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
31963 };
31964diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
31965index 4a00225..09e61b4 100644
31966--- a/drivers/ide/sis5513.c
31967+++ b/drivers/ide/sis5513.c
31968@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
31969 .cable_detect = sis_cable_detect,
31970 };
31971
31972-static const struct ide_port_info sis5513_chipset __devinitdata = {
31973+static const struct ide_port_info sis5513_chipset __devinitconst = {
31974 .name = DRV_NAME,
31975 .init_chipset = init_chipset_sis5513,
31976 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
31977diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
31978index f21dc2a..d051cd2 100644
31979--- a/drivers/ide/sl82c105.c
31980+++ b/drivers/ide/sl82c105.c
31981@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
31982 .dma_sff_read_status = ide_dma_sff_read_status,
31983 };
31984
31985-static const struct ide_port_info sl82c105_chipset __devinitdata = {
31986+static const struct ide_port_info sl82c105_chipset __devinitconst = {
31987 .name = DRV_NAME,
31988 .init_chipset = init_chipset_sl82c105,
31989 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
31990diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
31991index 864ffe0..863a5e9 100644
31992--- a/drivers/ide/slc90e66.c
31993+++ b/drivers/ide/slc90e66.c
31994@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
31995 .cable_detect = slc90e66_cable_detect,
31996 };
31997
31998-static const struct ide_port_info slc90e66_chipset __devinitdata = {
31999+static const struct ide_port_info slc90e66_chipset __devinitconst = {
32000 .name = DRV_NAME,
32001 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
32002 .port_ops = &slc90e66_port_ops,
32003diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
32004index 4799d5c..1794678 100644
32005--- a/drivers/ide/tc86c001.c
32006+++ b/drivers/ide/tc86c001.c
32007@@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
32008 .dma_sff_read_status = ide_dma_sff_read_status,
32009 };
32010
32011-static const struct ide_port_info tc86c001_chipset __devinitdata = {
32012+static const struct ide_port_info tc86c001_chipset __devinitconst = {
32013 .name = DRV_NAME,
32014 .init_hwif = init_hwif_tc86c001,
32015 .port_ops = &tc86c001_port_ops,
32016diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
32017index 281c914..55ce1b8 100644
32018--- a/drivers/ide/triflex.c
32019+++ b/drivers/ide/triflex.c
32020@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
32021 .set_dma_mode = triflex_set_mode,
32022 };
32023
32024-static const struct ide_port_info triflex_device __devinitdata = {
32025+static const struct ide_port_info triflex_device __devinitconst = {
32026 .name = DRV_NAME,
32027 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
32028 .port_ops = &triflex_port_ops,
32029diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
32030index 4b42ca0..e494a98 100644
32031--- a/drivers/ide/trm290.c
32032+++ b/drivers/ide/trm290.c
32033@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
32034 .dma_check = trm290_dma_check,
32035 };
32036
32037-static const struct ide_port_info trm290_chipset __devinitdata = {
32038+static const struct ide_port_info trm290_chipset __devinitconst = {
32039 .name = DRV_NAME,
32040 .init_hwif = init_hwif_trm290,
32041 .tp_ops = &trm290_tp_ops,
32042diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
32043index f46f49c..eb77678 100644
32044--- a/drivers/ide/via82cxxx.c
32045+++ b/drivers/ide/via82cxxx.c
32046@@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = {
32047 .cable_detect = via82cxxx_cable_detect,
32048 };
32049
32050-static const struct ide_port_info via82cxxx_chipset __devinitdata = {
32051+static const struct ide_port_info via82cxxx_chipset __devinitconst = {
32052 .name = DRV_NAME,
32053 .init_chipset = init_chipset_via82cxxx,
32054 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
32055diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
32056index 73d4531..c90cd2d 100644
32057--- a/drivers/ieee802154/fakehard.c
32058+++ b/drivers/ieee802154/fakehard.c
32059@@ -386,7 +386,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
32060 phy->transmit_power = 0xbf;
32061
32062 dev->netdev_ops = &fake_ops;
32063- dev->ml_priv = &fake_mlme;
32064+ dev->ml_priv = (void *)&fake_mlme;
32065
32066 priv = netdev_priv(dev);
32067 priv->phy = phy;
32068diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
32069index c889aae..6cf5aa7 100644
32070--- a/drivers/infiniband/core/cm.c
32071+++ b/drivers/infiniband/core/cm.c
32072@@ -114,7 +114,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
32073
32074 struct cm_counter_group {
32075 struct kobject obj;
32076- atomic_long_t counter[CM_ATTR_COUNT];
32077+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
32078 };
32079
32080 struct cm_counter_attribute {
32081@@ -1394,7 +1394,7 @@ static void cm_dup_req_handler(struct cm_work *work,
32082 struct ib_mad_send_buf *msg = NULL;
32083 int ret;
32084
32085- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32086+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32087 counter[CM_REQ_COUNTER]);
32088
32089 /* Quick state check to discard duplicate REQs. */
32090@@ -1778,7 +1778,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
32091 if (!cm_id_priv)
32092 return;
32093
32094- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32095+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32096 counter[CM_REP_COUNTER]);
32097 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
32098 if (ret)
32099@@ -1945,7 +1945,7 @@ static int cm_rtu_handler(struct cm_work *work)
32100 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
32101 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
32102 spin_unlock_irq(&cm_id_priv->lock);
32103- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32104+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32105 counter[CM_RTU_COUNTER]);
32106 goto out;
32107 }
32108@@ -2128,7 +2128,7 @@ static int cm_dreq_handler(struct cm_work *work)
32109 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
32110 dreq_msg->local_comm_id);
32111 if (!cm_id_priv) {
32112- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32113+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32114 counter[CM_DREQ_COUNTER]);
32115 cm_issue_drep(work->port, work->mad_recv_wc);
32116 return -EINVAL;
32117@@ -2153,7 +2153,7 @@ static int cm_dreq_handler(struct cm_work *work)
32118 case IB_CM_MRA_REP_RCVD:
32119 break;
32120 case IB_CM_TIMEWAIT:
32121- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32122+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32123 counter[CM_DREQ_COUNTER]);
32124 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
32125 goto unlock;
32126@@ -2167,7 +2167,7 @@ static int cm_dreq_handler(struct cm_work *work)
32127 cm_free_msg(msg);
32128 goto deref;
32129 case IB_CM_DREQ_RCVD:
32130- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32131+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32132 counter[CM_DREQ_COUNTER]);
32133 goto unlock;
32134 default:
32135@@ -2534,7 +2534,7 @@ static int cm_mra_handler(struct cm_work *work)
32136 ib_modify_mad(cm_id_priv->av.port->mad_agent,
32137 cm_id_priv->msg, timeout)) {
32138 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
32139- atomic_long_inc(&work->port->
32140+ atomic_long_inc_unchecked(&work->port->
32141 counter_group[CM_RECV_DUPLICATES].
32142 counter[CM_MRA_COUNTER]);
32143 goto out;
32144@@ -2543,7 +2543,7 @@ static int cm_mra_handler(struct cm_work *work)
32145 break;
32146 case IB_CM_MRA_REQ_RCVD:
32147 case IB_CM_MRA_REP_RCVD:
32148- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32149+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32150 counter[CM_MRA_COUNTER]);
32151 /* fall through */
32152 default:
32153@@ -2705,7 +2705,7 @@ static int cm_lap_handler(struct cm_work *work)
32154 case IB_CM_LAP_IDLE:
32155 break;
32156 case IB_CM_MRA_LAP_SENT:
32157- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32158+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32159 counter[CM_LAP_COUNTER]);
32160 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
32161 goto unlock;
32162@@ -2721,7 +2721,7 @@ static int cm_lap_handler(struct cm_work *work)
32163 cm_free_msg(msg);
32164 goto deref;
32165 case IB_CM_LAP_RCVD:
32166- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32167+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32168 counter[CM_LAP_COUNTER]);
32169 goto unlock;
32170 default:
32171@@ -3005,7 +3005,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
32172 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
32173 if (cur_cm_id_priv) {
32174 spin_unlock_irq(&cm.lock);
32175- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32176+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32177 counter[CM_SIDR_REQ_COUNTER]);
32178 goto out; /* Duplicate message. */
32179 }
32180@@ -3217,10 +3217,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
32181 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
32182 msg->retries = 1;
32183
32184- atomic_long_add(1 + msg->retries,
32185+ atomic_long_add_unchecked(1 + msg->retries,
32186 &port->counter_group[CM_XMIT].counter[attr_index]);
32187 if (msg->retries)
32188- atomic_long_add(msg->retries,
32189+ atomic_long_add_unchecked(msg->retries,
32190 &port->counter_group[CM_XMIT_RETRIES].
32191 counter[attr_index]);
32192
32193@@ -3430,7 +3430,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
32194 }
32195
32196 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
32197- atomic_long_inc(&port->counter_group[CM_RECV].
32198+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
32199 counter[attr_id - CM_ATTR_ID_OFFSET]);
32200
32201 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
32202@@ -3635,7 +3635,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
32203 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
32204
32205 return sprintf(buf, "%ld\n",
32206- atomic_long_read(&group->counter[cm_attr->index]));
32207+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
32208 }
32209
32210 static const struct sysfs_ops cm_counter_ops = {
32211diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
32212index 176c8f9..2627b62 100644
32213--- a/drivers/infiniband/core/fmr_pool.c
32214+++ b/drivers/infiniband/core/fmr_pool.c
32215@@ -98,8 +98,8 @@ struct ib_fmr_pool {
32216
32217 struct task_struct *thread;
32218
32219- atomic_t req_ser;
32220- atomic_t flush_ser;
32221+ atomic_unchecked_t req_ser;
32222+ atomic_unchecked_t flush_ser;
32223
32224 wait_queue_head_t force_wait;
32225 };
32226@@ -180,10 +180,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
32227 struct ib_fmr_pool *pool = pool_ptr;
32228
32229 do {
32230- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
32231+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
32232 ib_fmr_batch_release(pool);
32233
32234- atomic_inc(&pool->flush_ser);
32235+ atomic_inc_unchecked(&pool->flush_ser);
32236 wake_up_interruptible(&pool->force_wait);
32237
32238 if (pool->flush_function)
32239@@ -191,7 +191,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
32240 }
32241
32242 set_current_state(TASK_INTERRUPTIBLE);
32243- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
32244+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
32245 !kthread_should_stop())
32246 schedule();
32247 __set_current_state(TASK_RUNNING);
32248@@ -283,8 +283,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
32249 pool->dirty_watermark = params->dirty_watermark;
32250 pool->dirty_len = 0;
32251 spin_lock_init(&pool->pool_lock);
32252- atomic_set(&pool->req_ser, 0);
32253- atomic_set(&pool->flush_ser, 0);
32254+ atomic_set_unchecked(&pool->req_ser, 0);
32255+ atomic_set_unchecked(&pool->flush_ser, 0);
32256 init_waitqueue_head(&pool->force_wait);
32257
32258 pool->thread = kthread_run(ib_fmr_cleanup_thread,
32259@@ -412,11 +412,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
32260 }
32261 spin_unlock_irq(&pool->pool_lock);
32262
32263- serial = atomic_inc_return(&pool->req_ser);
32264+ serial = atomic_inc_return_unchecked(&pool->req_ser);
32265 wake_up_process(pool->thread);
32266
32267 if (wait_event_interruptible(pool->force_wait,
32268- atomic_read(&pool->flush_ser) - serial >= 0))
32269+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
32270 return -EINTR;
32271
32272 return 0;
32273@@ -526,7 +526,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
32274 } else {
32275 list_add_tail(&fmr->list, &pool->dirty_list);
32276 if (++pool->dirty_len >= pool->dirty_watermark) {
32277- atomic_inc(&pool->req_ser);
32278+ atomic_inc_unchecked(&pool->req_ser);
32279 wake_up_process(pool->thread);
32280 }
32281 }
32282diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
32283index 40c8353..946b0e4 100644
32284--- a/drivers/infiniband/hw/cxgb4/mem.c
32285+++ b/drivers/infiniband/hw/cxgb4/mem.c
32286@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32287 int err;
32288 struct fw_ri_tpte tpt;
32289 u32 stag_idx;
32290- static atomic_t key;
32291+ static atomic_unchecked_t key;
32292
32293 if (c4iw_fatal_error(rdev))
32294 return -EIO;
32295@@ -135,7 +135,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32296 &rdev->resource.tpt_fifo_lock);
32297 if (!stag_idx)
32298 return -ENOMEM;
32299- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
32300+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
32301 }
32302 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
32303 __func__, stag_state, type, pdid, stag_idx);
32304diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
32305index a4de9d5..5fa20c3 100644
32306--- a/drivers/infiniband/hw/ipath/ipath_fs.c
32307+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
32308@@ -126,6 +126,8 @@ static const struct file_operations atomic_counters_ops = {
32309 };
32310
32311 static ssize_t flash_read(struct file *file, char __user *buf,
32312+ size_t count, loff_t *ppos) __size_overflow(3);
32313+static ssize_t flash_read(struct file *file, char __user *buf,
32314 size_t count, loff_t *ppos)
32315 {
32316 struct ipath_devdata *dd;
32317@@ -177,6 +179,8 @@ bail:
32318 }
32319
32320 static ssize_t flash_write(struct file *file, const char __user *buf,
32321+ size_t count, loff_t *ppos) __size_overflow(3);
32322+static ssize_t flash_write(struct file *file, const char __user *buf,
32323 size_t count, loff_t *ppos)
32324 {
32325 struct ipath_devdata *dd;
32326diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
32327index 79b3dbc..96e5fcc 100644
32328--- a/drivers/infiniband/hw/ipath/ipath_rc.c
32329+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
32330@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32331 struct ib_atomic_eth *ateth;
32332 struct ipath_ack_entry *e;
32333 u64 vaddr;
32334- atomic64_t *maddr;
32335+ atomic64_unchecked_t *maddr;
32336 u64 sdata;
32337 u32 rkey;
32338 u8 next;
32339@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32340 IB_ACCESS_REMOTE_ATOMIC)))
32341 goto nack_acc_unlck;
32342 /* Perform atomic OP and save result. */
32343- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32344+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32345 sdata = be64_to_cpu(ateth->swap_data);
32346 e = &qp->s_ack_queue[qp->r_head_ack_queue];
32347 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
32348- (u64) atomic64_add_return(sdata, maddr) - sdata :
32349+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32350 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32351 be64_to_cpu(ateth->compare_data),
32352 sdata);
32353diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
32354index 1f95bba..9530f87 100644
32355--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
32356+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
32357@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
32358 unsigned long flags;
32359 struct ib_wc wc;
32360 u64 sdata;
32361- atomic64_t *maddr;
32362+ atomic64_unchecked_t *maddr;
32363 enum ib_wc_status send_status;
32364
32365 /*
32366@@ -382,11 +382,11 @@ again:
32367 IB_ACCESS_REMOTE_ATOMIC)))
32368 goto acc_err;
32369 /* Perform atomic OP and save result. */
32370- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32371+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32372 sdata = wqe->wr.wr.atomic.compare_add;
32373 *(u64 *) sqp->s_sge.sge.vaddr =
32374 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
32375- (u64) atomic64_add_return(sdata, maddr) - sdata :
32376+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32377 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32378 sdata, wqe->wr.wr.atomic.swap);
32379 goto send_comp;
32380diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
32381index 7140199..da60063 100644
32382--- a/drivers/infiniband/hw/nes/nes.c
32383+++ b/drivers/infiniband/hw/nes/nes.c
32384@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
32385 LIST_HEAD(nes_adapter_list);
32386 static LIST_HEAD(nes_dev_list);
32387
32388-atomic_t qps_destroyed;
32389+atomic_unchecked_t qps_destroyed;
32390
32391 static unsigned int ee_flsh_adapter;
32392 static unsigned int sysfs_nonidx_addr;
32393@@ -272,7 +272,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
32394 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
32395 struct nes_adapter *nesadapter = nesdev->nesadapter;
32396
32397- atomic_inc(&qps_destroyed);
32398+ atomic_inc_unchecked(&qps_destroyed);
32399
32400 /* Free the control structures */
32401
32402diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
32403index c438e46..ca30356 100644
32404--- a/drivers/infiniband/hw/nes/nes.h
32405+++ b/drivers/infiniband/hw/nes/nes.h
32406@@ -178,17 +178,17 @@ extern unsigned int nes_debug_level;
32407 extern unsigned int wqm_quanta;
32408 extern struct list_head nes_adapter_list;
32409
32410-extern atomic_t cm_connects;
32411-extern atomic_t cm_accepts;
32412-extern atomic_t cm_disconnects;
32413-extern atomic_t cm_closes;
32414-extern atomic_t cm_connecteds;
32415-extern atomic_t cm_connect_reqs;
32416-extern atomic_t cm_rejects;
32417-extern atomic_t mod_qp_timouts;
32418-extern atomic_t qps_created;
32419-extern atomic_t qps_destroyed;
32420-extern atomic_t sw_qps_destroyed;
32421+extern atomic_unchecked_t cm_connects;
32422+extern atomic_unchecked_t cm_accepts;
32423+extern atomic_unchecked_t cm_disconnects;
32424+extern atomic_unchecked_t cm_closes;
32425+extern atomic_unchecked_t cm_connecteds;
32426+extern atomic_unchecked_t cm_connect_reqs;
32427+extern atomic_unchecked_t cm_rejects;
32428+extern atomic_unchecked_t mod_qp_timouts;
32429+extern atomic_unchecked_t qps_created;
32430+extern atomic_unchecked_t qps_destroyed;
32431+extern atomic_unchecked_t sw_qps_destroyed;
32432 extern u32 mh_detected;
32433 extern u32 mh_pauses_sent;
32434 extern u32 cm_packets_sent;
32435@@ -197,16 +197,16 @@ extern u32 cm_packets_created;
32436 extern u32 cm_packets_received;
32437 extern u32 cm_packets_dropped;
32438 extern u32 cm_packets_retrans;
32439-extern atomic_t cm_listens_created;
32440-extern atomic_t cm_listens_destroyed;
32441+extern atomic_unchecked_t cm_listens_created;
32442+extern atomic_unchecked_t cm_listens_destroyed;
32443 extern u32 cm_backlog_drops;
32444-extern atomic_t cm_loopbacks;
32445-extern atomic_t cm_nodes_created;
32446-extern atomic_t cm_nodes_destroyed;
32447-extern atomic_t cm_accel_dropped_pkts;
32448-extern atomic_t cm_resets_recvd;
32449-extern atomic_t pau_qps_created;
32450-extern atomic_t pau_qps_destroyed;
32451+extern atomic_unchecked_t cm_loopbacks;
32452+extern atomic_unchecked_t cm_nodes_created;
32453+extern atomic_unchecked_t cm_nodes_destroyed;
32454+extern atomic_unchecked_t cm_accel_dropped_pkts;
32455+extern atomic_unchecked_t cm_resets_recvd;
32456+extern atomic_unchecked_t pau_qps_created;
32457+extern atomic_unchecked_t pau_qps_destroyed;
32458
32459 extern u32 int_mod_timer_init;
32460 extern u32 int_mod_cq_depth_256;
32461diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
32462index a4972ab..1bcfc31 100644
32463--- a/drivers/infiniband/hw/nes/nes_cm.c
32464+++ b/drivers/infiniband/hw/nes/nes_cm.c
32465@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
32466 u32 cm_packets_retrans;
32467 u32 cm_packets_created;
32468 u32 cm_packets_received;
32469-atomic_t cm_listens_created;
32470-atomic_t cm_listens_destroyed;
32471+atomic_unchecked_t cm_listens_created;
32472+atomic_unchecked_t cm_listens_destroyed;
32473 u32 cm_backlog_drops;
32474-atomic_t cm_loopbacks;
32475-atomic_t cm_nodes_created;
32476-atomic_t cm_nodes_destroyed;
32477-atomic_t cm_accel_dropped_pkts;
32478-atomic_t cm_resets_recvd;
32479+atomic_unchecked_t cm_loopbacks;
32480+atomic_unchecked_t cm_nodes_created;
32481+atomic_unchecked_t cm_nodes_destroyed;
32482+atomic_unchecked_t cm_accel_dropped_pkts;
32483+atomic_unchecked_t cm_resets_recvd;
32484
32485 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
32486 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
32487@@ -148,13 +148,13 @@ static struct nes_cm_ops nes_cm_api = {
32488
32489 static struct nes_cm_core *g_cm_core;
32490
32491-atomic_t cm_connects;
32492-atomic_t cm_accepts;
32493-atomic_t cm_disconnects;
32494-atomic_t cm_closes;
32495-atomic_t cm_connecteds;
32496-atomic_t cm_connect_reqs;
32497-atomic_t cm_rejects;
32498+atomic_unchecked_t cm_connects;
32499+atomic_unchecked_t cm_accepts;
32500+atomic_unchecked_t cm_disconnects;
32501+atomic_unchecked_t cm_closes;
32502+atomic_unchecked_t cm_connecteds;
32503+atomic_unchecked_t cm_connect_reqs;
32504+atomic_unchecked_t cm_rejects;
32505
32506 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
32507 {
32508@@ -1274,7 +1274,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
32509 kfree(listener);
32510 listener = NULL;
32511 ret = 0;
32512- atomic_inc(&cm_listens_destroyed);
32513+ atomic_inc_unchecked(&cm_listens_destroyed);
32514 } else {
32515 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
32516 }
32517@@ -1473,7 +1473,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
32518 cm_node->rem_mac);
32519
32520 add_hte_node(cm_core, cm_node);
32521- atomic_inc(&cm_nodes_created);
32522+ atomic_inc_unchecked(&cm_nodes_created);
32523
32524 return cm_node;
32525 }
32526@@ -1531,7 +1531,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
32527 }
32528
32529 atomic_dec(&cm_core->node_cnt);
32530- atomic_inc(&cm_nodes_destroyed);
32531+ atomic_inc_unchecked(&cm_nodes_destroyed);
32532 nesqp = cm_node->nesqp;
32533 if (nesqp) {
32534 nesqp->cm_node = NULL;
32535@@ -1595,7 +1595,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
32536
32537 static void drop_packet(struct sk_buff *skb)
32538 {
32539- atomic_inc(&cm_accel_dropped_pkts);
32540+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
32541 dev_kfree_skb_any(skb);
32542 }
32543
32544@@ -1658,7 +1658,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
32545 {
32546
32547 int reset = 0; /* whether to send reset in case of err.. */
32548- atomic_inc(&cm_resets_recvd);
32549+ atomic_inc_unchecked(&cm_resets_recvd);
32550 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
32551 " refcnt=%d\n", cm_node, cm_node->state,
32552 atomic_read(&cm_node->ref_count));
32553@@ -2299,7 +2299,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
32554 rem_ref_cm_node(cm_node->cm_core, cm_node);
32555 return NULL;
32556 }
32557- atomic_inc(&cm_loopbacks);
32558+ atomic_inc_unchecked(&cm_loopbacks);
32559 loopbackremotenode->loopbackpartner = cm_node;
32560 loopbackremotenode->tcp_cntxt.rcv_wscale =
32561 NES_CM_DEFAULT_RCV_WND_SCALE;
32562@@ -2574,7 +2574,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
32563 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
32564 else {
32565 rem_ref_cm_node(cm_core, cm_node);
32566- atomic_inc(&cm_accel_dropped_pkts);
32567+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
32568 dev_kfree_skb_any(skb);
32569 }
32570 break;
32571@@ -2881,7 +2881,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32572
32573 if ((cm_id) && (cm_id->event_handler)) {
32574 if (issue_disconn) {
32575- atomic_inc(&cm_disconnects);
32576+ atomic_inc_unchecked(&cm_disconnects);
32577 cm_event.event = IW_CM_EVENT_DISCONNECT;
32578 cm_event.status = disconn_status;
32579 cm_event.local_addr = cm_id->local_addr;
32580@@ -2903,7 +2903,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32581 }
32582
32583 if (issue_close) {
32584- atomic_inc(&cm_closes);
32585+ atomic_inc_unchecked(&cm_closes);
32586 nes_disconnect(nesqp, 1);
32587
32588 cm_id->provider_data = nesqp;
32589@@ -3039,7 +3039,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
32590
32591 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
32592 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
32593- atomic_inc(&cm_accepts);
32594+ atomic_inc_unchecked(&cm_accepts);
32595
32596 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
32597 netdev_refcnt_read(nesvnic->netdev));
32598@@ -3241,7 +3241,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
32599 struct nes_cm_core *cm_core;
32600 u8 *start_buff;
32601
32602- atomic_inc(&cm_rejects);
32603+ atomic_inc_unchecked(&cm_rejects);
32604 cm_node = (struct nes_cm_node *)cm_id->provider_data;
32605 loopback = cm_node->loopbackpartner;
32606 cm_core = cm_node->cm_core;
32607@@ -3301,7 +3301,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
32608 ntohl(cm_id->local_addr.sin_addr.s_addr),
32609 ntohs(cm_id->local_addr.sin_port));
32610
32611- atomic_inc(&cm_connects);
32612+ atomic_inc_unchecked(&cm_connects);
32613 nesqp->active_conn = 1;
32614
32615 /* cache the cm_id in the qp */
32616@@ -3407,7 +3407,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
32617 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
32618 return err;
32619 }
32620- atomic_inc(&cm_listens_created);
32621+ atomic_inc_unchecked(&cm_listens_created);
32622 }
32623
32624 cm_id->add_ref(cm_id);
32625@@ -3508,7 +3508,7 @@ static void cm_event_connected(struct nes_cm_event *event)
32626
32627 if (nesqp->destroyed)
32628 return;
32629- atomic_inc(&cm_connecteds);
32630+ atomic_inc_unchecked(&cm_connecteds);
32631 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
32632 " local port 0x%04X. jiffies = %lu.\n",
32633 nesqp->hwqp.qp_id,
32634@@ -3695,7 +3695,7 @@ static void cm_event_reset(struct nes_cm_event *event)
32635
32636 cm_id->add_ref(cm_id);
32637 ret = cm_id->event_handler(cm_id, &cm_event);
32638- atomic_inc(&cm_closes);
32639+ atomic_inc_unchecked(&cm_closes);
32640 cm_event.event = IW_CM_EVENT_CLOSE;
32641 cm_event.status = 0;
32642 cm_event.provider_data = cm_id->provider_data;
32643@@ -3731,7 +3731,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
32644 return;
32645 cm_id = cm_node->cm_id;
32646
32647- atomic_inc(&cm_connect_reqs);
32648+ atomic_inc_unchecked(&cm_connect_reqs);
32649 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32650 cm_node, cm_id, jiffies);
32651
32652@@ -3771,7 +3771,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
32653 return;
32654 cm_id = cm_node->cm_id;
32655
32656- atomic_inc(&cm_connect_reqs);
32657+ atomic_inc_unchecked(&cm_connect_reqs);
32658 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32659 cm_node, cm_id, jiffies);
32660
32661diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
32662index 3ba7be3..c81f6ff 100644
32663--- a/drivers/infiniband/hw/nes/nes_mgt.c
32664+++ b/drivers/infiniband/hw/nes/nes_mgt.c
32665@@ -40,8 +40,8 @@
32666 #include "nes.h"
32667 #include "nes_mgt.h"
32668
32669-atomic_t pau_qps_created;
32670-atomic_t pau_qps_destroyed;
32671+atomic_unchecked_t pau_qps_created;
32672+atomic_unchecked_t pau_qps_destroyed;
32673
32674 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
32675 {
32676@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
32677 {
32678 struct sk_buff *skb;
32679 unsigned long flags;
32680- atomic_inc(&pau_qps_destroyed);
32681+ atomic_inc_unchecked(&pau_qps_destroyed);
32682
32683 /* Free packets that have not yet been forwarded */
32684 /* Lock is acquired by skb_dequeue when removing the skb */
32685@@ -812,7 +812,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
32686 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
32687 skb_queue_head_init(&nesqp->pau_list);
32688 spin_lock_init(&nesqp->pau_lock);
32689- atomic_inc(&pau_qps_created);
32690+ atomic_inc_unchecked(&pau_qps_created);
32691 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
32692 }
32693
32694diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
32695index f3a3ecf..57d311d 100644
32696--- a/drivers/infiniband/hw/nes/nes_nic.c
32697+++ b/drivers/infiniband/hw/nes/nes_nic.c
32698@@ -1277,39 +1277,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
32699 target_stat_values[++index] = mh_detected;
32700 target_stat_values[++index] = mh_pauses_sent;
32701 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
32702- target_stat_values[++index] = atomic_read(&cm_connects);
32703- target_stat_values[++index] = atomic_read(&cm_accepts);
32704- target_stat_values[++index] = atomic_read(&cm_disconnects);
32705- target_stat_values[++index] = atomic_read(&cm_connecteds);
32706- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
32707- target_stat_values[++index] = atomic_read(&cm_rejects);
32708- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
32709- target_stat_values[++index] = atomic_read(&qps_created);
32710- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
32711- target_stat_values[++index] = atomic_read(&qps_destroyed);
32712- target_stat_values[++index] = atomic_read(&cm_closes);
32713+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
32714+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
32715+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
32716+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
32717+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
32718+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
32719+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
32720+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
32721+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
32722+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
32723+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
32724 target_stat_values[++index] = cm_packets_sent;
32725 target_stat_values[++index] = cm_packets_bounced;
32726 target_stat_values[++index] = cm_packets_created;
32727 target_stat_values[++index] = cm_packets_received;
32728 target_stat_values[++index] = cm_packets_dropped;
32729 target_stat_values[++index] = cm_packets_retrans;
32730- target_stat_values[++index] = atomic_read(&cm_listens_created);
32731- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
32732+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
32733+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
32734 target_stat_values[++index] = cm_backlog_drops;
32735- target_stat_values[++index] = atomic_read(&cm_loopbacks);
32736- target_stat_values[++index] = atomic_read(&cm_nodes_created);
32737- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
32738- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
32739- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
32740+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
32741+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
32742+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
32743+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
32744+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
32745 target_stat_values[++index] = nesadapter->free_4kpbl;
32746 target_stat_values[++index] = nesadapter->free_256pbl;
32747 target_stat_values[++index] = int_mod_timer_init;
32748 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
32749 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
32750 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
32751- target_stat_values[++index] = atomic_read(&pau_qps_created);
32752- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
32753+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
32754+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
32755 }
32756
32757 /**
32758diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
32759index 0927b5c..ed67986 100644
32760--- a/drivers/infiniband/hw/nes/nes_verbs.c
32761+++ b/drivers/infiniband/hw/nes/nes_verbs.c
32762@@ -46,9 +46,9 @@
32763
32764 #include <rdma/ib_umem.h>
32765
32766-atomic_t mod_qp_timouts;
32767-atomic_t qps_created;
32768-atomic_t sw_qps_destroyed;
32769+atomic_unchecked_t mod_qp_timouts;
32770+atomic_unchecked_t qps_created;
32771+atomic_unchecked_t sw_qps_destroyed;
32772
32773 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
32774
32775@@ -1131,7 +1131,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
32776 if (init_attr->create_flags)
32777 return ERR_PTR(-EINVAL);
32778
32779- atomic_inc(&qps_created);
32780+ atomic_inc_unchecked(&qps_created);
32781 switch (init_attr->qp_type) {
32782 case IB_QPT_RC:
32783 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
32784@@ -1460,7 +1460,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
32785 struct iw_cm_event cm_event;
32786 int ret = 0;
32787
32788- atomic_inc(&sw_qps_destroyed);
32789+ atomic_inc_unchecked(&sw_qps_destroyed);
32790 nesqp->destroyed = 1;
32791
32792 /* Blow away the connection if it exists. */
32793diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
32794index b881bdc..c2e360c 100644
32795--- a/drivers/infiniband/hw/qib/qib.h
32796+++ b/drivers/infiniband/hw/qib/qib.h
32797@@ -51,6 +51,7 @@
32798 #include <linux/completion.h>
32799 #include <linux/kref.h>
32800 #include <linux/sched.h>
32801+#include <linux/slab.h>
32802
32803 #include "qib_common.h"
32804 #include "qib_verbs.h"
32805diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
32806index 05e0f17..0275789 100644
32807--- a/drivers/infiniband/hw/qib/qib_fs.c
32808+++ b/drivers/infiniband/hw/qib/qib_fs.c
32809@@ -267,6 +267,8 @@ static const struct file_operations qsfp_ops[] = {
32810 };
32811
32812 static ssize_t flash_read(struct file *file, char __user *buf,
32813+ size_t count, loff_t *ppos) __size_overflow(3);
32814+static ssize_t flash_read(struct file *file, char __user *buf,
32815 size_t count, loff_t *ppos)
32816 {
32817 struct qib_devdata *dd;
32818@@ -318,6 +320,8 @@ bail:
32819 }
32820
32821 static ssize_t flash_write(struct file *file, const char __user *buf,
32822+ size_t count, loff_t *ppos) __size_overflow(3);
32823+static ssize_t flash_write(struct file *file, const char __user *buf,
32824 size_t count, loff_t *ppos)
32825 {
32826 struct qib_devdata *dd;
32827diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
32828index c351aa4..e6967c2 100644
32829--- a/drivers/input/gameport/gameport.c
32830+++ b/drivers/input/gameport/gameport.c
32831@@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
32832 */
32833 static void gameport_init_port(struct gameport *gameport)
32834 {
32835- static atomic_t gameport_no = ATOMIC_INIT(0);
32836+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
32837
32838 __module_get(THIS_MODULE);
32839
32840 mutex_init(&gameport->drv_mutex);
32841 device_initialize(&gameport->dev);
32842 dev_set_name(&gameport->dev, "gameport%lu",
32843- (unsigned long)atomic_inc_return(&gameport_no) - 1);
32844+ (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
32845 gameport->dev.bus = &gameport_bus;
32846 gameport->dev.release = gameport_release_port;
32847 if (gameport->parent)
32848diff --git a/drivers/input/input.c b/drivers/input/input.c
32849index 1f78c95..3cddc6c 100644
32850--- a/drivers/input/input.c
32851+++ b/drivers/input/input.c
32852@@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev)
32853 */
32854 int input_register_device(struct input_dev *dev)
32855 {
32856- static atomic_t input_no = ATOMIC_INIT(0);
32857+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
32858 struct input_handler *handler;
32859 const char *path;
32860 int error;
32861@@ -1851,7 +1851,7 @@ int input_register_device(struct input_dev *dev)
32862 dev->setkeycode = input_default_setkeycode;
32863
32864 dev_set_name(&dev->dev, "input%ld",
32865- (unsigned long) atomic_inc_return(&input_no) - 1);
32866+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
32867
32868 error = device_add(&dev->dev);
32869 if (error)
32870diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
32871index b8d8611..7a4a04b 100644
32872--- a/drivers/input/joystick/sidewinder.c
32873+++ b/drivers/input/joystick/sidewinder.c
32874@@ -30,6 +30,7 @@
32875 #include <linux/kernel.h>
32876 #include <linux/module.h>
32877 #include <linux/slab.h>
32878+#include <linux/sched.h>
32879 #include <linux/init.h>
32880 #include <linux/input.h>
32881 #include <linux/gameport.h>
32882diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
32883index fd7a0d5..a4af10c 100644
32884--- a/drivers/input/joystick/xpad.c
32885+++ b/drivers/input/joystick/xpad.c
32886@@ -710,7 +710,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
32887
32888 static int xpad_led_probe(struct usb_xpad *xpad)
32889 {
32890- static atomic_t led_seq = ATOMIC_INIT(0);
32891+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
32892 long led_no;
32893 struct xpad_led *led;
32894 struct led_classdev *led_cdev;
32895@@ -723,7 +723,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
32896 if (!led)
32897 return -ENOMEM;
32898
32899- led_no = (long)atomic_inc_return(&led_seq) - 1;
32900+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
32901
32902 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
32903 led->xpad = xpad;
32904diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
32905index 0110b5a..d3ad144 100644
32906--- a/drivers/input/mousedev.c
32907+++ b/drivers/input/mousedev.c
32908@@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
32909
32910 spin_unlock_irq(&client->packet_lock);
32911
32912- if (copy_to_user(buffer, data, count))
32913+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
32914 return -EFAULT;
32915
32916 return count;
32917diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
32918index ba70058..571d25d 100644
32919--- a/drivers/input/serio/serio.c
32920+++ b/drivers/input/serio/serio.c
32921@@ -497,7 +497,7 @@ static void serio_release_port(struct device *dev)
32922 */
32923 static void serio_init_port(struct serio *serio)
32924 {
32925- static atomic_t serio_no = ATOMIC_INIT(0);
32926+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
32927
32928 __module_get(THIS_MODULE);
32929
32930@@ -508,7 +508,7 @@ static void serio_init_port(struct serio *serio)
32931 mutex_init(&serio->drv_mutex);
32932 device_initialize(&serio->dev);
32933 dev_set_name(&serio->dev, "serio%ld",
32934- (long)atomic_inc_return(&serio_no) - 1);
32935+ (long)atomic_inc_return_unchecked(&serio_no) - 1);
32936 serio->dev.bus = &serio_bus;
32937 serio->dev.release = serio_release_port;
32938 serio->dev.groups = serio_device_attr_groups;
32939diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
32940index e44933d..9ba484a 100644
32941--- a/drivers/isdn/capi/capi.c
32942+++ b/drivers/isdn/capi/capi.c
32943@@ -83,8 +83,8 @@ struct capiminor {
32944
32945 struct capi20_appl *ap;
32946 u32 ncci;
32947- atomic_t datahandle;
32948- atomic_t msgid;
32949+ atomic_unchecked_t datahandle;
32950+ atomic_unchecked_t msgid;
32951
32952 struct tty_port port;
32953 int ttyinstop;
32954@@ -397,7 +397,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
32955 capimsg_setu16(s, 2, mp->ap->applid);
32956 capimsg_setu8 (s, 4, CAPI_DATA_B3);
32957 capimsg_setu8 (s, 5, CAPI_RESP);
32958- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
32959+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
32960 capimsg_setu32(s, 8, mp->ncci);
32961 capimsg_setu16(s, 12, datahandle);
32962 }
32963@@ -518,14 +518,14 @@ static void handle_minor_send(struct capiminor *mp)
32964 mp->outbytes -= len;
32965 spin_unlock_bh(&mp->outlock);
32966
32967- datahandle = atomic_inc_return(&mp->datahandle);
32968+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
32969 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
32970 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
32971 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
32972 capimsg_setu16(skb->data, 2, mp->ap->applid);
32973 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
32974 capimsg_setu8 (skb->data, 5, CAPI_REQ);
32975- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
32976+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
32977 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
32978 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
32979 capimsg_setu16(skb->data, 16, len); /* Data length */
32980diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
32981index db621db..825ea1a 100644
32982--- a/drivers/isdn/gigaset/common.c
32983+++ b/drivers/isdn/gigaset/common.c
32984@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
32985 cs->commands_pending = 0;
32986 cs->cur_at_seq = 0;
32987 cs->gotfwver = -1;
32988- cs->open_count = 0;
32989+ local_set(&cs->open_count, 0);
32990 cs->dev = NULL;
32991 cs->tty = NULL;
32992 cs->tty_dev = NULL;
32993diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
32994index 212efaf..f187c6b 100644
32995--- a/drivers/isdn/gigaset/gigaset.h
32996+++ b/drivers/isdn/gigaset/gigaset.h
32997@@ -35,6 +35,7 @@
32998 #include <linux/tty_driver.h>
32999 #include <linux/list.h>
33000 #include <linux/atomic.h>
33001+#include <asm/local.h>
33002
33003 #define GIG_VERSION {0, 5, 0, 0}
33004 #define GIG_COMPAT {0, 4, 0, 0}
33005@@ -433,7 +434,7 @@ struct cardstate {
33006 spinlock_t cmdlock;
33007 unsigned curlen, cmdbytes;
33008
33009- unsigned open_count;
33010+ local_t open_count;
33011 struct tty_struct *tty;
33012 struct tasklet_struct if_wake_tasklet;
33013 unsigned control_state;
33014diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
33015index ee0a549..a7c9798 100644
33016--- a/drivers/isdn/gigaset/interface.c
33017+++ b/drivers/isdn/gigaset/interface.c
33018@@ -163,9 +163,7 @@ static int if_open(struct tty_struct *tty, struct file *filp)
33019 }
33020 tty->driver_data = cs;
33021
33022- ++cs->open_count;
33023-
33024- if (cs->open_count == 1) {
33025+ if (local_inc_return(&cs->open_count) == 1) {
33026 spin_lock_irqsave(&cs->lock, flags);
33027 cs->tty = tty;
33028 spin_unlock_irqrestore(&cs->lock, flags);
33029@@ -193,10 +191,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
33030
33031 if (!cs->connected)
33032 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
33033- else if (!cs->open_count)
33034+ else if (!local_read(&cs->open_count))
33035 dev_warn(cs->dev, "%s: device not opened\n", __func__);
33036 else {
33037- if (!--cs->open_count) {
33038+ if (!local_dec_return(&cs->open_count)) {
33039 spin_lock_irqsave(&cs->lock, flags);
33040 cs->tty = NULL;
33041 spin_unlock_irqrestore(&cs->lock, flags);
33042@@ -231,7 +229,7 @@ static int if_ioctl(struct tty_struct *tty,
33043 if (!cs->connected) {
33044 gig_dbg(DEBUG_IF, "not connected");
33045 retval = -ENODEV;
33046- } else if (!cs->open_count)
33047+ } else if (!local_read(&cs->open_count))
33048 dev_warn(cs->dev, "%s: device not opened\n", __func__);
33049 else {
33050 retval = 0;
33051@@ -361,7 +359,7 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
33052 retval = -ENODEV;
33053 goto done;
33054 }
33055- if (!cs->open_count) {
33056+ if (!local_read(&cs->open_count)) {
33057 dev_warn(cs->dev, "%s: device not opened\n", __func__);
33058 retval = -ENODEV;
33059 goto done;
33060@@ -414,7 +412,7 @@ static int if_write_room(struct tty_struct *tty)
33061 if (!cs->connected) {
33062 gig_dbg(DEBUG_IF, "not connected");
33063 retval = -ENODEV;
33064- } else if (!cs->open_count)
33065+ } else if (!local_read(&cs->open_count))
33066 dev_warn(cs->dev, "%s: device not opened\n", __func__);
33067 else if (cs->mstate != MS_LOCKED) {
33068 dev_warn(cs->dev, "can't write to unlocked device\n");
33069@@ -444,7 +442,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
33070
33071 if (!cs->connected)
33072 gig_dbg(DEBUG_IF, "not connected");
33073- else if (!cs->open_count)
33074+ else if (!local_read(&cs->open_count))
33075 dev_warn(cs->dev, "%s: device not opened\n", __func__);
33076 else if (cs->mstate != MS_LOCKED)
33077 dev_warn(cs->dev, "can't write to unlocked device\n");
33078@@ -472,7 +470,7 @@ static void if_throttle(struct tty_struct *tty)
33079
33080 if (!cs->connected)
33081 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
33082- else if (!cs->open_count)
33083+ else if (!local_read(&cs->open_count))
33084 dev_warn(cs->dev, "%s: device not opened\n", __func__);
33085 else
33086 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
33087@@ -496,7 +494,7 @@ static void if_unthrottle(struct tty_struct *tty)
33088
33089 if (!cs->connected)
33090 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
33091- else if (!cs->open_count)
33092+ else if (!local_read(&cs->open_count))
33093 dev_warn(cs->dev, "%s: device not opened\n", __func__);
33094 else
33095 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
33096@@ -527,7 +525,7 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
33097 goto out;
33098 }
33099
33100- if (!cs->open_count) {
33101+ if (!local_read(&cs->open_count)) {
33102 dev_warn(cs->dev, "%s: device not opened\n", __func__);
33103 goto out;
33104 }
33105diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
33106index 2a57da59..e7a12ed 100644
33107--- a/drivers/isdn/hardware/avm/b1.c
33108+++ b/drivers/isdn/hardware/avm/b1.c
33109@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart * t4file)
33110 }
33111 if (left) {
33112 if (t4file->user) {
33113- if (copy_from_user(buf, dp, left))
33114+ if (left > sizeof buf || copy_from_user(buf, dp, left))
33115 return -EFAULT;
33116 } else {
33117 memcpy(buf, dp, left);
33118@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart * config)
33119 }
33120 if (left) {
33121 if (config->user) {
33122- if (copy_from_user(buf, dp, left))
33123+ if (left > sizeof buf || copy_from_user(buf, dp, left))
33124 return -EFAULT;
33125 } else {
33126 memcpy(buf, dp, left);
33127diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h
33128index 85784a7..a19ca98 100644
33129--- a/drivers/isdn/hardware/eicon/divasync.h
33130+++ b/drivers/isdn/hardware/eicon/divasync.h
33131@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
33132 } diva_didd_add_adapter_t;
33133 typedef struct _diva_didd_remove_adapter {
33134 IDI_CALL p_request;
33135-} diva_didd_remove_adapter_t;
33136+} __no_const diva_didd_remove_adapter_t;
33137 typedef struct _diva_didd_read_adapter_array {
33138 void * buffer;
33139 dword length;
33140diff --git a/drivers/isdn/hardware/eicon/xdi_adapter.h b/drivers/isdn/hardware/eicon/xdi_adapter.h
33141index a3bd163..8956575 100644
33142--- a/drivers/isdn/hardware/eicon/xdi_adapter.h
33143+++ b/drivers/isdn/hardware/eicon/xdi_adapter.h
33144@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
33145 typedef struct _diva_os_idi_adapter_interface {
33146 diva_init_card_proc_t cleanup_adapter_proc;
33147 diva_cmd_card_proc_t cmd_proc;
33148-} diva_os_idi_adapter_interface_t;
33149+} __no_const diva_os_idi_adapter_interface_t;
33150
33151 typedef struct _diva_os_xdi_adapter {
33152 struct list_head link;
33153diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
33154index 1f355bb..43f1fea 100644
33155--- a/drivers/isdn/icn/icn.c
33156+++ b/drivers/isdn/icn/icn.c
33157@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card)
33158 if (count > len)
33159 count = len;
33160 if (user) {
33161- if (copy_from_user(msg, buf, count))
33162+ if (count > sizeof msg || copy_from_user(msg, buf, count))
33163 return -EFAULT;
33164 } else
33165 memcpy(msg, buf, count);
33166diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
33167index b5fdcb7..5b6c59f 100644
33168--- a/drivers/lguest/core.c
33169+++ b/drivers/lguest/core.c
33170@@ -92,9 +92,17 @@ static __init int map_switcher(void)
33171 * it's worked so far. The end address needs +1 because __get_vm_area
33172 * allocates an extra guard page, so we need space for that.
33173 */
33174+
33175+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
33176+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
33177+ VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR
33178+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
33179+#else
33180 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
33181 VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR
33182 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
33183+#endif
33184+
33185 if (!switcher_vma) {
33186 err = -ENOMEM;
33187 printk("lguest: could not map switcher pages high\n");
33188@@ -119,7 +127,7 @@ static __init int map_switcher(void)
33189 * Now the Switcher is mapped at the right address, we can't fail!
33190 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
33191 */
33192- memcpy(switcher_vma->addr, start_switcher_text,
33193+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
33194 end_switcher_text - start_switcher_text);
33195
33196 printk(KERN_INFO "lguest: mapped switcher at %p\n",
33197diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c
33198index ff4a0bc..f5fdd9c 100644
33199--- a/drivers/lguest/lguest_user.c
33200+++ b/drivers/lguest/lguest_user.c
33201@@ -198,6 +198,7 @@ static int user_send_irq(struct lg_cpu *cpu, const unsigned long __user *input)
33202 * Once our Guest is initialized, the Launcher makes it run by reading
33203 * from /dev/lguest.
33204 */
33205+static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o) __size_overflow(3);
33206 static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o)
33207 {
33208 struct lguest *lg = file->private_data;
33209diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
33210index 3980903..ce25c5e 100644
33211--- a/drivers/lguest/x86/core.c
33212+++ b/drivers/lguest/x86/core.c
33213@@ -59,7 +59,7 @@ static struct {
33214 /* Offset from where switcher.S was compiled to where we've copied it */
33215 static unsigned long switcher_offset(void)
33216 {
33217- return SWITCHER_ADDR - (unsigned long)start_switcher_text;
33218+ return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
33219 }
33220
33221 /* This cpu's struct lguest_pages. */
33222@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
33223 * These copies are pretty cheap, so we do them unconditionally: */
33224 /* Save the current Host top-level page directory.
33225 */
33226+
33227+#ifdef CONFIG_PAX_PER_CPU_PGD
33228+ pages->state.host_cr3 = read_cr3();
33229+#else
33230 pages->state.host_cr3 = __pa(current->mm->pgd);
33231+#endif
33232+
33233 /*
33234 * Set up the Guest's page tables to see this CPU's pages (and no
33235 * other CPU's pages).
33236@@ -472,7 +478,7 @@ void __init lguest_arch_host_init(void)
33237 * compiled-in switcher code and the high-mapped copy we just made.
33238 */
33239 for (i = 0; i < IDT_ENTRIES; i++)
33240- default_idt_entries[i] += switcher_offset();
33241+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
33242
33243 /*
33244 * Set up the Switcher's per-cpu areas.
33245@@ -555,7 +561,7 @@ void __init lguest_arch_host_init(void)
33246 * it will be undisturbed when we switch. To change %cs and jump we
33247 * need this structure to feed to Intel's "lcall" instruction.
33248 */
33249- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
33250+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
33251 lguest_entry.segment = LGUEST_CS;
33252
33253 /*
33254diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
33255index 40634b0..4f5855e 100644
33256--- a/drivers/lguest/x86/switcher_32.S
33257+++ b/drivers/lguest/x86/switcher_32.S
33258@@ -87,6 +87,7 @@
33259 #include <asm/page.h>
33260 #include <asm/segment.h>
33261 #include <asm/lguest.h>
33262+#include <asm/processor-flags.h>
33263
33264 // We mark the start of the code to copy
33265 // It's placed in .text tho it's never run here
33266@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
33267 // Changes type when we load it: damn Intel!
33268 // For after we switch over our page tables
33269 // That entry will be read-only: we'd crash.
33270+
33271+#ifdef CONFIG_PAX_KERNEXEC
33272+ mov %cr0, %edx
33273+ xor $X86_CR0_WP, %edx
33274+ mov %edx, %cr0
33275+#endif
33276+
33277 movl $(GDT_ENTRY_TSS*8), %edx
33278 ltr %dx
33279
33280@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
33281 // Let's clear it again for our return.
33282 // The GDT descriptor of the Host
33283 // Points to the table after two "size" bytes
33284- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
33285+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
33286 // Clear "used" from type field (byte 5, bit 2)
33287- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
33288+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
33289+
33290+#ifdef CONFIG_PAX_KERNEXEC
33291+ mov %cr0, %eax
33292+ xor $X86_CR0_WP, %eax
33293+ mov %eax, %cr0
33294+#endif
33295
33296 // Once our page table's switched, the Guest is live!
33297 // The Host fades as we run this final step.
33298@@ -295,13 +309,12 @@ deliver_to_host:
33299 // I consulted gcc, and it gave
33300 // These instructions, which I gladly credit:
33301 leal (%edx,%ebx,8), %eax
33302- movzwl (%eax),%edx
33303- movl 4(%eax), %eax
33304- xorw %ax, %ax
33305- orl %eax, %edx
33306+ movl 4(%eax), %edx
33307+ movw (%eax), %dx
33308 // Now the address of the handler's in %edx
33309 // We call it now: its "iret" drops us home.
33310- jmp *%edx
33311+ ljmp $__KERNEL_CS, $1f
33312+1: jmp *%edx
33313
33314 // Every interrupt can come to us here
33315 // But we must truly tell each apart.
33316diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
33317index 4daf9e5..b8d1d0f 100644
33318--- a/drivers/macintosh/macio_asic.c
33319+++ b/drivers/macintosh/macio_asic.c
33320@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
33321 * MacIO is matched against any Apple ID, it's probe() function
33322 * will then decide wether it applies or not
33323 */
33324-static const struct pci_device_id __devinitdata pci_ids [] = { {
33325+static const struct pci_device_id __devinitconst pci_ids [] = { {
33326 .vendor = PCI_VENDOR_ID_APPLE,
33327 .device = PCI_ANY_ID,
33328 .subvendor = PCI_ANY_ID,
33329diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
33330index 1ce84ed..0fdd40a 100644
33331--- a/drivers/md/dm-ioctl.c
33332+++ b/drivers/md/dm-ioctl.c
33333@@ -1589,7 +1589,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
33334 cmd == DM_LIST_VERSIONS_CMD)
33335 return 0;
33336
33337- if ((cmd == DM_DEV_CREATE_CMD)) {
33338+ if (cmd == DM_DEV_CREATE_CMD) {
33339 if (!*param->name) {
33340 DMWARN("name not supplied when creating device");
33341 return -EINVAL;
33342diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
33343index 9bfd057..5373ff3 100644
33344--- a/drivers/md/dm-raid1.c
33345+++ b/drivers/md/dm-raid1.c
33346@@ -40,7 +40,7 @@ enum dm_raid1_error {
33347
33348 struct mirror {
33349 struct mirror_set *ms;
33350- atomic_t error_count;
33351+ atomic_unchecked_t error_count;
33352 unsigned long error_type;
33353 struct dm_dev *dev;
33354 sector_t offset;
33355@@ -185,7 +185,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
33356 struct mirror *m;
33357
33358 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
33359- if (!atomic_read(&m->error_count))
33360+ if (!atomic_read_unchecked(&m->error_count))
33361 return m;
33362
33363 return NULL;
33364@@ -217,7 +217,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
33365 * simple way to tell if a device has encountered
33366 * errors.
33367 */
33368- atomic_inc(&m->error_count);
33369+ atomic_inc_unchecked(&m->error_count);
33370
33371 if (test_and_set_bit(error_type, &m->error_type))
33372 return;
33373@@ -408,7 +408,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
33374 struct mirror *m = get_default_mirror(ms);
33375
33376 do {
33377- if (likely(!atomic_read(&m->error_count)))
33378+ if (likely(!atomic_read_unchecked(&m->error_count)))
33379 return m;
33380
33381 if (m-- == ms->mirror)
33382@@ -422,7 +422,7 @@ static int default_ok(struct mirror *m)
33383 {
33384 struct mirror *default_mirror = get_default_mirror(m->ms);
33385
33386- return !atomic_read(&default_mirror->error_count);
33387+ return !atomic_read_unchecked(&default_mirror->error_count);
33388 }
33389
33390 static int mirror_available(struct mirror_set *ms, struct bio *bio)
33391@@ -559,7 +559,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
33392 */
33393 if (likely(region_in_sync(ms, region, 1)))
33394 m = choose_mirror(ms, bio->bi_sector);
33395- else if (m && atomic_read(&m->error_count))
33396+ else if (m && atomic_read_unchecked(&m->error_count))
33397 m = NULL;
33398
33399 if (likely(m))
33400@@ -848,6 +848,10 @@ static void do_mirror(struct work_struct *work)
33401 static struct mirror_set *alloc_context(unsigned int nr_mirrors,
33402 uint32_t region_size,
33403 struct dm_target *ti,
33404+ struct dm_dirty_log *dl) __size_overflow(1);
33405+static struct mirror_set *alloc_context(unsigned int nr_mirrors,
33406+ uint32_t region_size,
33407+ struct dm_target *ti,
33408 struct dm_dirty_log *dl)
33409 {
33410 size_t len;
33411@@ -937,7 +941,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
33412 }
33413
33414 ms->mirror[mirror].ms = ms;
33415- atomic_set(&(ms->mirror[mirror].error_count), 0);
33416+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
33417 ms->mirror[mirror].error_type = 0;
33418 ms->mirror[mirror].offset = offset;
33419
33420@@ -1347,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
33421 */
33422 static char device_status_char(struct mirror *m)
33423 {
33424- if (!atomic_read(&(m->error_count)))
33425+ if (!atomic_read_unchecked(&(m->error_count)))
33426 return 'A';
33427
33428 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
33429diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
33430index 3d80cf0..7d98e1a 100644
33431--- a/drivers/md/dm-stripe.c
33432+++ b/drivers/md/dm-stripe.c
33433@@ -20,7 +20,7 @@ struct stripe {
33434 struct dm_dev *dev;
33435 sector_t physical_start;
33436
33437- atomic_t error_count;
33438+ atomic_unchecked_t error_count;
33439 };
33440
33441 struct stripe_c {
33442@@ -55,6 +55,7 @@ static void trigger_event(struct work_struct *work)
33443 dm_table_event(sc->ti->table);
33444 }
33445
33446+static inline struct stripe_c *alloc_context(unsigned int stripes) __size_overflow(1);
33447 static inline struct stripe_c *alloc_context(unsigned int stripes)
33448 {
33449 size_t len;
33450@@ -192,7 +193,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
33451 kfree(sc);
33452 return r;
33453 }
33454- atomic_set(&(sc->stripe[i].error_count), 0);
33455+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
33456 }
33457
33458 ti->private = sc;
33459@@ -314,7 +315,7 @@ static int stripe_status(struct dm_target *ti,
33460 DMEMIT("%d ", sc->stripes);
33461 for (i = 0; i < sc->stripes; i++) {
33462 DMEMIT("%s ", sc->stripe[i].dev->name);
33463- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
33464+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
33465 'D' : 'A';
33466 }
33467 buffer[i] = '\0';
33468@@ -361,8 +362,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
33469 */
33470 for (i = 0; i < sc->stripes; i++)
33471 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
33472- atomic_inc(&(sc->stripe[i].error_count));
33473- if (atomic_read(&(sc->stripe[i].error_count)) <
33474+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
33475+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
33476 DM_IO_ERROR_THRESHOLD)
33477 schedule_work(&sc->trigger_event);
33478 }
33479diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
33480index 63cc542..8d45caf3 100644
33481--- a/drivers/md/dm-table.c
33482+++ b/drivers/md/dm-table.c
33483@@ -391,7 +391,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
33484 if (!dev_size)
33485 return 0;
33486
33487- if ((start >= dev_size) || (start + len > dev_size)) {
33488+ if ((start >= dev_size) || (len > dev_size - start)) {
33489 DMWARN("%s: %s too small for target: "
33490 "start=%llu, len=%llu, dev_size=%llu",
33491 dm_device_name(ti->table->md), bdevname(bdev, b),
33492diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
33493index 237571a..fb6d19b 100644
33494--- a/drivers/md/dm-thin-metadata.c
33495+++ b/drivers/md/dm-thin-metadata.c
33496@@ -432,7 +432,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
33497
33498 pmd->info.tm = tm;
33499 pmd->info.levels = 2;
33500- pmd->info.value_type.context = pmd->data_sm;
33501+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33502 pmd->info.value_type.size = sizeof(__le64);
33503 pmd->info.value_type.inc = data_block_inc;
33504 pmd->info.value_type.dec = data_block_dec;
33505@@ -451,7 +451,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
33506
33507 pmd->bl_info.tm = tm;
33508 pmd->bl_info.levels = 1;
33509- pmd->bl_info.value_type.context = pmd->data_sm;
33510+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33511 pmd->bl_info.value_type.size = sizeof(__le64);
33512 pmd->bl_info.value_type.inc = data_block_inc;
33513 pmd->bl_info.value_type.dec = data_block_dec;
33514diff --git a/drivers/md/dm.c b/drivers/md/dm.c
33515index b89c548..2af3ce4 100644
33516--- a/drivers/md/dm.c
33517+++ b/drivers/md/dm.c
33518@@ -176,9 +176,9 @@ struct mapped_device {
33519 /*
33520 * Event handling.
33521 */
33522- atomic_t event_nr;
33523+ atomic_unchecked_t event_nr;
33524 wait_queue_head_t eventq;
33525- atomic_t uevent_seq;
33526+ atomic_unchecked_t uevent_seq;
33527 struct list_head uevent_list;
33528 spinlock_t uevent_lock; /* Protect access to uevent_list */
33529
33530@@ -1844,8 +1844,8 @@ static struct mapped_device *alloc_dev(int minor)
33531 rwlock_init(&md->map_lock);
33532 atomic_set(&md->holders, 1);
33533 atomic_set(&md->open_count, 0);
33534- atomic_set(&md->event_nr, 0);
33535- atomic_set(&md->uevent_seq, 0);
33536+ atomic_set_unchecked(&md->event_nr, 0);
33537+ atomic_set_unchecked(&md->uevent_seq, 0);
33538 INIT_LIST_HEAD(&md->uevent_list);
33539 spin_lock_init(&md->uevent_lock);
33540
33541@@ -1979,7 +1979,7 @@ static void event_callback(void *context)
33542
33543 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
33544
33545- atomic_inc(&md->event_nr);
33546+ atomic_inc_unchecked(&md->event_nr);
33547 wake_up(&md->eventq);
33548 }
33549
33550@@ -2621,18 +2621,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
33551
33552 uint32_t dm_next_uevent_seq(struct mapped_device *md)
33553 {
33554- return atomic_add_return(1, &md->uevent_seq);
33555+ return atomic_add_return_unchecked(1, &md->uevent_seq);
33556 }
33557
33558 uint32_t dm_get_event_nr(struct mapped_device *md)
33559 {
33560- return atomic_read(&md->event_nr);
33561+ return atomic_read_unchecked(&md->event_nr);
33562 }
33563
33564 int dm_wait_event(struct mapped_device *md, int event_nr)
33565 {
33566 return wait_event_interruptible(md->eventq,
33567- (event_nr != atomic_read(&md->event_nr)));
33568+ (event_nr != atomic_read_unchecked(&md->event_nr)));
33569 }
33570
33571 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
33572diff --git a/drivers/md/md.c b/drivers/md/md.c
33573index 58027d8..d9cddcd 100644
33574--- a/drivers/md/md.c
33575+++ b/drivers/md/md.c
33576@@ -277,10 +277,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
33577 * start build, activate spare
33578 */
33579 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
33580-static atomic_t md_event_count;
33581+static atomic_unchecked_t md_event_count;
33582 void md_new_event(struct mddev *mddev)
33583 {
33584- atomic_inc(&md_event_count);
33585+ atomic_inc_unchecked(&md_event_count);
33586 wake_up(&md_event_waiters);
33587 }
33588 EXPORT_SYMBOL_GPL(md_new_event);
33589@@ -290,7 +290,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
33590 */
33591 static void md_new_event_inintr(struct mddev *mddev)
33592 {
33593- atomic_inc(&md_event_count);
33594+ atomic_inc_unchecked(&md_event_count);
33595 wake_up(&md_event_waiters);
33596 }
33597
33598@@ -1524,7 +1524,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
33599
33600 rdev->preferred_minor = 0xffff;
33601 rdev->data_offset = le64_to_cpu(sb->data_offset);
33602- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33603+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33604
33605 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
33606 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
33607@@ -1743,7 +1743,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
33608 else
33609 sb->resync_offset = cpu_to_le64(0);
33610
33611- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
33612+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
33613
33614 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
33615 sb->size = cpu_to_le64(mddev->dev_sectors);
33616@@ -2689,7 +2689,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
33617 static ssize_t
33618 errors_show(struct md_rdev *rdev, char *page)
33619 {
33620- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
33621+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
33622 }
33623
33624 static ssize_t
33625@@ -2698,7 +2698,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
33626 char *e;
33627 unsigned long n = simple_strtoul(buf, &e, 10);
33628 if (*buf && (*e == 0 || *e == '\n')) {
33629- atomic_set(&rdev->corrected_errors, n);
33630+ atomic_set_unchecked(&rdev->corrected_errors, n);
33631 return len;
33632 }
33633 return -EINVAL;
33634@@ -3084,8 +3084,8 @@ int md_rdev_init(struct md_rdev *rdev)
33635 rdev->sb_loaded = 0;
33636 rdev->bb_page = NULL;
33637 atomic_set(&rdev->nr_pending, 0);
33638- atomic_set(&rdev->read_errors, 0);
33639- atomic_set(&rdev->corrected_errors, 0);
33640+ atomic_set_unchecked(&rdev->read_errors, 0);
33641+ atomic_set_unchecked(&rdev->corrected_errors, 0);
33642
33643 INIT_LIST_HEAD(&rdev->same_set);
33644 init_waitqueue_head(&rdev->blocked_wait);
33645@@ -6736,7 +6736,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
33646
33647 spin_unlock(&pers_lock);
33648 seq_printf(seq, "\n");
33649- seq->poll_event = atomic_read(&md_event_count);
33650+ seq->poll_event = atomic_read_unchecked(&md_event_count);
33651 return 0;
33652 }
33653 if (v == (void*)2) {
33654@@ -6828,7 +6828,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
33655 chunk_kb ? "KB" : "B");
33656 if (bitmap->file) {
33657 seq_printf(seq, ", file: ");
33658- seq_path(seq, &bitmap->file->f_path, " \t\n");
33659+ seq_path(seq, &bitmap->file->f_path, " \t\n\\");
33660 }
33661
33662 seq_printf(seq, "\n");
33663@@ -6859,7 +6859,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
33664 return error;
33665
33666 seq = file->private_data;
33667- seq->poll_event = atomic_read(&md_event_count);
33668+ seq->poll_event = atomic_read_unchecked(&md_event_count);
33669 return error;
33670 }
33671
33672@@ -6873,7 +6873,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
33673 /* always allow read */
33674 mask = POLLIN | POLLRDNORM;
33675
33676- if (seq->poll_event != atomic_read(&md_event_count))
33677+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
33678 mask |= POLLERR | POLLPRI;
33679 return mask;
33680 }
33681@@ -6917,7 +6917,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
33682 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
33683 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
33684 (int)part_stat_read(&disk->part0, sectors[1]) -
33685- atomic_read(&disk->sync_io);
33686+ atomic_read_unchecked(&disk->sync_io);
33687 /* sync IO will cause sync_io to increase before the disk_stats
33688 * as sync_io is counted when a request starts, and
33689 * disk_stats is counted when it completes.
33690diff --git a/drivers/md/md.h b/drivers/md/md.h
33691index 44c63df..b795d1a 100644
33692--- a/drivers/md/md.h
33693+++ b/drivers/md/md.h
33694@@ -93,13 +93,13 @@ struct md_rdev {
33695 * only maintained for arrays that
33696 * support hot removal
33697 */
33698- atomic_t read_errors; /* number of consecutive read errors that
33699+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
33700 * we have tried to ignore.
33701 */
33702 struct timespec last_read_error; /* monotonic time since our
33703 * last read error
33704 */
33705- atomic_t corrected_errors; /* number of corrected read errors,
33706+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
33707 * for reporting to userspace and storing
33708 * in superblock.
33709 */
33710@@ -421,7 +421,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
33711
33712 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
33713 {
33714- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33715+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33716 }
33717
33718 struct md_personality
33719diff --git a/drivers/md/persistent-data/dm-space-map-checker.c b/drivers/md/persistent-data/dm-space-map-checker.c
33720index 50ed53b..4f29d7d 100644
33721--- a/drivers/md/persistent-data/dm-space-map-checker.c
33722+++ b/drivers/md/persistent-data/dm-space-map-checker.c
33723@@ -159,7 +159,7 @@ static void ca_destroy(struct count_array *ca)
33724 /*----------------------------------------------------------------*/
33725
33726 struct sm_checker {
33727- struct dm_space_map sm;
33728+ dm_space_map_no_const sm;
33729
33730 struct count_array old_counts;
33731 struct count_array counts;
33732diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
33733index fc469ba..2d91555 100644
33734--- a/drivers/md/persistent-data/dm-space-map-disk.c
33735+++ b/drivers/md/persistent-data/dm-space-map-disk.c
33736@@ -23,7 +23,7 @@
33737 * Space map interface.
33738 */
33739 struct sm_disk {
33740- struct dm_space_map sm;
33741+ dm_space_map_no_const sm;
33742
33743 struct ll_disk ll;
33744 struct ll_disk old_ll;
33745diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
33746index e89ae5e..062e4c2 100644
33747--- a/drivers/md/persistent-data/dm-space-map-metadata.c
33748+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
33749@@ -43,7 +43,7 @@ struct block_op {
33750 };
33751
33752 struct sm_metadata {
33753- struct dm_space_map sm;
33754+ dm_space_map_no_const sm;
33755
33756 struct ll_disk ll;
33757 struct ll_disk old_ll;
33758diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
33759index 1cbfc6b..56e1dbb 100644
33760--- a/drivers/md/persistent-data/dm-space-map.h
33761+++ b/drivers/md/persistent-data/dm-space-map.h
33762@@ -60,6 +60,7 @@ struct dm_space_map {
33763 int (*root_size)(struct dm_space_map *sm, size_t *result);
33764 int (*copy_root)(struct dm_space_map *sm, void *copy_to_here_le, size_t len);
33765 };
33766+typedef struct dm_space_map __no_const dm_space_map_no_const;
33767
33768 /*----------------------------------------------------------------*/
33769
33770diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
33771index edc735a..e9b97f1 100644
33772--- a/drivers/md/raid1.c
33773+++ b/drivers/md/raid1.c
33774@@ -1645,7 +1645,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
33775 if (r1_sync_page_io(rdev, sect, s,
33776 bio->bi_io_vec[idx].bv_page,
33777 READ) != 0)
33778- atomic_add(s, &rdev->corrected_errors);
33779+ atomic_add_unchecked(s, &rdev->corrected_errors);
33780 }
33781 sectors -= s;
33782 sect += s;
33783@@ -1859,7 +1859,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
33784 test_bit(In_sync, &rdev->flags)) {
33785 if (r1_sync_page_io(rdev, sect, s,
33786 conf->tmppage, READ)) {
33787- atomic_add(s, &rdev->corrected_errors);
33788+ atomic_add_unchecked(s, &rdev->corrected_errors);
33789 printk(KERN_INFO
33790 "md/raid1:%s: read error corrected "
33791 "(%d sectors at %llu on %s)\n",
33792diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
33793index 1898389..a3aa617 100644
33794--- a/drivers/md/raid10.c
33795+++ b/drivers/md/raid10.c
33796@@ -1636,7 +1636,7 @@ static void end_sync_read(struct bio *bio, int error)
33797 /* The write handler will notice the lack of
33798 * R10BIO_Uptodate and record any errors etc
33799 */
33800- atomic_add(r10_bio->sectors,
33801+ atomic_add_unchecked(r10_bio->sectors,
33802 &conf->mirrors[d].rdev->corrected_errors);
33803
33804 /* for reconstruct, we always reschedule after a read.
33805@@ -1987,7 +1987,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
33806 {
33807 struct timespec cur_time_mon;
33808 unsigned long hours_since_last;
33809- unsigned int read_errors = atomic_read(&rdev->read_errors);
33810+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
33811
33812 ktime_get_ts(&cur_time_mon);
33813
33814@@ -2009,9 +2009,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
33815 * overflowing the shift of read_errors by hours_since_last.
33816 */
33817 if (hours_since_last >= 8 * sizeof(read_errors))
33818- atomic_set(&rdev->read_errors, 0);
33819+ atomic_set_unchecked(&rdev->read_errors, 0);
33820 else
33821- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
33822+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
33823 }
33824
33825 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
33826@@ -2065,8 +2065,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33827 return;
33828
33829 check_decay_read_errors(mddev, rdev);
33830- atomic_inc(&rdev->read_errors);
33831- if (atomic_read(&rdev->read_errors) > max_read_errors) {
33832+ atomic_inc_unchecked(&rdev->read_errors);
33833+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
33834 char b[BDEVNAME_SIZE];
33835 bdevname(rdev->bdev, b);
33836
33837@@ -2074,7 +2074,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33838 "md/raid10:%s: %s: Raid device exceeded "
33839 "read_error threshold [cur %d:max %d]\n",
33840 mdname(mddev), b,
33841- atomic_read(&rdev->read_errors), max_read_errors);
33842+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
33843 printk(KERN_NOTICE
33844 "md/raid10:%s: %s: Failing raid device\n",
33845 mdname(mddev), b);
33846@@ -2223,7 +2223,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33847 (unsigned long long)(
33848 sect + rdev->data_offset),
33849 bdevname(rdev->bdev, b));
33850- atomic_add(s, &rdev->corrected_errors);
33851+ atomic_add_unchecked(s, &rdev->corrected_errors);
33852 }
33853
33854 rdev_dec_pending(rdev, mddev);
33855diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
33856index d1162e5..c7cd902 100644
33857--- a/drivers/md/raid5.c
33858+++ b/drivers/md/raid5.c
33859@@ -1687,18 +1687,18 @@ static void raid5_end_read_request(struct bio * bi, int error)
33860 (unsigned long long)(sh->sector
33861 + rdev->data_offset),
33862 bdevname(rdev->bdev, b));
33863- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
33864+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
33865 clear_bit(R5_ReadError, &sh->dev[i].flags);
33866 clear_bit(R5_ReWrite, &sh->dev[i].flags);
33867 }
33868- if (atomic_read(&rdev->read_errors))
33869- atomic_set(&rdev->read_errors, 0);
33870+ if (atomic_read_unchecked(&rdev->read_errors))
33871+ atomic_set_unchecked(&rdev->read_errors, 0);
33872 } else {
33873 const char *bdn = bdevname(rdev->bdev, b);
33874 int retry = 0;
33875
33876 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
33877- atomic_inc(&rdev->read_errors);
33878+ atomic_inc_unchecked(&rdev->read_errors);
33879 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
33880 printk_ratelimited(
33881 KERN_WARNING
33882@@ -1727,7 +1727,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
33883 (unsigned long long)(sh->sector
33884 + rdev->data_offset),
33885 bdn);
33886- else if (atomic_read(&rdev->read_errors)
33887+ else if (atomic_read_unchecked(&rdev->read_errors)
33888 > conf->max_nr_stripes)
33889 printk(KERN_WARNING
33890 "md/raid:%s: Too many read errors, failing device %s.\n",
33891diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
33892index ce4f858..7bcfb46 100644
33893--- a/drivers/media/dvb/ddbridge/ddbridge-core.c
33894+++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
33895@@ -1678,7 +1678,7 @@ static struct ddb_info ddb_v6 = {
33896 .subvendor = _subvend, .subdevice = _subdev, \
33897 .driver_data = (unsigned long)&_driverdata }
33898
33899-static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
33900+static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
33901 DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
33902 DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
33903 DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
33904diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb/dvb-core/dvb_demux.h
33905index a7d876f..8c21b61 100644
33906--- a/drivers/media/dvb/dvb-core/dvb_demux.h
33907+++ b/drivers/media/dvb/dvb-core/dvb_demux.h
33908@@ -73,7 +73,7 @@ struct dvb_demux_feed {
33909 union {
33910 dmx_ts_cb ts;
33911 dmx_section_cb sec;
33912- } cb;
33913+ } __no_const cb;
33914
33915 struct dvb_demux *demux;
33916 void *priv;
33917diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
33918index 00a6732..70a682e 100644
33919--- a/drivers/media/dvb/dvb-core/dvbdev.c
33920+++ b/drivers/media/dvb/dvb-core/dvbdev.c
33921@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
33922 const struct dvb_device *template, void *priv, int type)
33923 {
33924 struct dvb_device *dvbdev;
33925- struct file_operations *dvbdevfops;
33926+ file_operations_no_const *dvbdevfops;
33927 struct device *clsdev;
33928 int minor;
33929 int id;
33930diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
33931index 3940bb0..fb3952a 100644
33932--- a/drivers/media/dvb/dvb-usb/cxusb.c
33933+++ b/drivers/media/dvb/dvb-usb/cxusb.c
33934@@ -1068,7 +1068,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
33935
33936 struct dib0700_adapter_state {
33937 int (*set_param_save) (struct dvb_frontend *);
33938-};
33939+} __no_const;
33940
33941 static int dib7070_set_param_override(struct dvb_frontend *fe)
33942 {
33943diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
33944index 451c5a7..649f711 100644
33945--- a/drivers/media/dvb/dvb-usb/dw2102.c
33946+++ b/drivers/media/dvb/dvb-usb/dw2102.c
33947@@ -95,7 +95,7 @@ struct su3000_state {
33948
33949 struct s6x0_state {
33950 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
33951-};
33952+} __no_const;
33953
33954 /* debug */
33955 static int dvb_usb_dw2102_debug;
33956diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
33957index 404f63a..4796533 100644
33958--- a/drivers/media/dvb/frontends/dib3000.h
33959+++ b/drivers/media/dvb/frontends/dib3000.h
33960@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
33961 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
33962 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
33963 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
33964-};
33965+} __no_const;
33966
33967 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
33968 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
33969diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
33970index 8418c02..8555013 100644
33971--- a/drivers/media/dvb/ngene/ngene-cards.c
33972+++ b/drivers/media/dvb/ngene/ngene-cards.c
33973@@ -477,7 +477,7 @@ static struct ngene_info ngene_info_m780 = {
33974
33975 /****************************************************************************/
33976
33977-static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
33978+static const struct pci_device_id ngene_id_tbl[] __devinitconst = {
33979 NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
33980 NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
33981 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
33982diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
33983index 16a089f..ab1667d 100644
33984--- a/drivers/media/radio/radio-cadet.c
33985+++ b/drivers/media/radio/radio-cadet.c
33986@@ -326,6 +326,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
33987 unsigned char readbuf[RDS_BUFFER];
33988 int i = 0;
33989
33990+ if (count > RDS_BUFFER)
33991+ return -EFAULT;
33992 mutex_lock(&dev->lock);
33993 if (dev->rdsstat == 0) {
33994 dev->rdsstat = 1;
33995diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
33996index 9cde353..8c6a1c3 100644
33997--- a/drivers/media/video/au0828/au0828.h
33998+++ b/drivers/media/video/au0828/au0828.h
33999@@ -191,7 +191,7 @@ struct au0828_dev {
34000
34001 /* I2C */
34002 struct i2c_adapter i2c_adap;
34003- struct i2c_algorithm i2c_algo;
34004+ i2c_algorithm_no_const i2c_algo;
34005 struct i2c_client i2c_client;
34006 u32 i2c_rc;
34007
34008diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c
34009index ee91e295..04ad048 100644
34010--- a/drivers/media/video/cpia2/cpia2_core.c
34011+++ b/drivers/media/video/cpia2/cpia2_core.c
34012@@ -86,6 +86,7 @@ static inline unsigned long kvirt_to_pa(unsigned long adr)
34013 return ret;
34014 }
34015
34016+static void *rvmalloc(unsigned long size) __size_overflow(1);
34017 static void *rvmalloc(unsigned long size)
34018 {
34019 void *mem;
34020diff --git a/drivers/media/video/cx18/cx18-alsa-pcm.c b/drivers/media/video/cx18/cx18-alsa-pcm.c
34021index 82d195b..181103c 100644
34022--- a/drivers/media/video/cx18/cx18-alsa-pcm.c
34023+++ b/drivers/media/video/cx18/cx18-alsa-pcm.c
34024@@ -229,6 +229,8 @@ static int snd_cx18_pcm_ioctl(struct snd_pcm_substream *substream,
34025
34026
34027 static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
34028+ size_t size) __size_overflow(2);
34029+static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
34030 size_t size)
34031 {
34032 struct snd_pcm_runtime *runtime = subs->runtime;
34033diff --git a/drivers/media/video/cx231xx/cx231xx-audio.c b/drivers/media/video/cx231xx/cx231xx-audio.c
34034index a2c2b7d..8f1bec7 100644
34035--- a/drivers/media/video/cx231xx/cx231xx-audio.c
34036+++ b/drivers/media/video/cx231xx/cx231xx-audio.c
34037@@ -389,6 +389,8 @@ static int cx231xx_init_audio_bulk(struct cx231xx *dev)
34038 }
34039
34040 static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
34041+ size_t size) __size_overflow(2);
34042+static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
34043 size_t size)
34044 {
34045 struct snd_pcm_runtime *runtime = subs->runtime;
34046diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
34047index 04bf662..e0ac026 100644
34048--- a/drivers/media/video/cx88/cx88-alsa.c
34049+++ b/drivers/media/video/cx88/cx88-alsa.c
34050@@ -766,7 +766,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = {
34051 * Only boards with eeprom and byte 1 at eeprom=1 have it
34052 */
34053
34054-static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {
34055+static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitconst = {
34056 {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
34057 {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
34058 {0, }
34059diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
34060index e2a7b77..753d0ee 100644
34061--- a/drivers/media/video/em28xx/em28xx-audio.c
34062+++ b/drivers/media/video/em28xx/em28xx-audio.c
34063@@ -225,6 +225,8 @@ static int em28xx_init_audio_isoc(struct em28xx *dev)
34064 }
34065
34066 static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
34067+ size_t size) __size_overflow(2);
34068+static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
34069 size_t size)
34070 {
34071 struct snd_pcm_runtime *runtime = subs->runtime;
34072diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
34073index b09a3c8..6dcba0a 100644
34074--- a/drivers/media/video/meye.c
34075+++ b/drivers/media/video/meye.c
34076@@ -72,6 +72,7 @@ static struct meye meye;
34077 /****************************************************************************/
34078 /* Memory allocation routines (stolen from bttv-driver.c) */
34079 /****************************************************************************/
34080+static void *rvmalloc(unsigned long size) __size_overflow(1);
34081 static void *rvmalloc(unsigned long size)
34082 {
34083 void *mem;
34084diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
34085index 1fb7d5b..3901e77 100644
34086--- a/drivers/media/video/omap/omap_vout.c
34087+++ b/drivers/media/video/omap/omap_vout.c
34088@@ -64,7 +64,6 @@ enum omap_vout_channels {
34089 OMAP_VIDEO2,
34090 };
34091
34092-static struct videobuf_queue_ops video_vbq_ops;
34093 /* Variables configurable through module params*/
34094 static u32 video1_numbuffers = 3;
34095 static u32 video2_numbuffers = 3;
34096@@ -1000,6 +999,12 @@ static int omap_vout_open(struct file *file)
34097 {
34098 struct videobuf_queue *q;
34099 struct omap_vout_device *vout = NULL;
34100+ static struct videobuf_queue_ops video_vbq_ops = {
34101+ .buf_setup = omap_vout_buffer_setup,
34102+ .buf_prepare = omap_vout_buffer_prepare,
34103+ .buf_release = omap_vout_buffer_release,
34104+ .buf_queue = omap_vout_buffer_queue,
34105+ };
34106
34107 vout = video_drvdata(file);
34108 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
34109@@ -1017,10 +1022,6 @@ static int omap_vout_open(struct file *file)
34110 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
34111
34112 q = &vout->vbq;
34113- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
34114- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
34115- video_vbq_ops.buf_release = omap_vout_buffer_release;
34116- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
34117 spin_lock_init(&vout->vbq_lock);
34118
34119 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
34120diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
34121index 305e6aa..0143317 100644
34122--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
34123+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
34124@@ -196,7 +196,7 @@ struct pvr2_hdw {
34125
34126 /* I2C stuff */
34127 struct i2c_adapter i2c_adap;
34128- struct i2c_algorithm i2c_algo;
34129+ i2c_algorithm_no_const i2c_algo;
34130 pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
34131 int i2c_cx25840_hack_state;
34132 int i2c_linked;
34133diff --git a/drivers/media/video/saa7164/saa7164-encoder.c b/drivers/media/video/saa7164/saa7164-encoder.c
34134index 2fd38a0..ddec3c4 100644
34135--- a/drivers/media/video/saa7164/saa7164-encoder.c
34136+++ b/drivers/media/video/saa7164/saa7164-encoder.c
34137@@ -1136,6 +1136,8 @@ struct saa7164_user_buffer *saa7164_enc_next_buf(struct saa7164_port *port)
34138 }
34139
34140 static ssize_t fops_read(struct file *file, char __user *buffer,
34141+ size_t count, loff_t *pos) __size_overflow(3);
34142+static ssize_t fops_read(struct file *file, char __user *buffer,
34143 size_t count, loff_t *pos)
34144 {
34145 struct saa7164_encoder_fh *fh = file->private_data;
34146diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c
34147index e2e0341..b80056c 100644
34148--- a/drivers/media/video/saa7164/saa7164-vbi.c
34149+++ b/drivers/media/video/saa7164/saa7164-vbi.c
34150@@ -1081,6 +1081,8 @@ struct saa7164_user_buffer *saa7164_vbi_next_buf(struct saa7164_port *port)
34151 }
34152
34153 static ssize_t fops_read(struct file *file, char __user *buffer,
34154+ size_t count, loff_t *pos) __size_overflow(3);
34155+static ssize_t fops_read(struct file *file, char __user *buffer,
34156 size_t count, loff_t *pos)
34157 {
34158 struct saa7164_vbi_fh *fh = file->private_data;
34159diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
34160index 4ed1c7c2..8f15e13 100644
34161--- a/drivers/media/video/timblogiw.c
34162+++ b/drivers/media/video/timblogiw.c
34163@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
34164
34165 /* Platform device functions */
34166
34167-static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
34168+static __devinitconst v4l2_ioctl_ops_no_const timblogiw_ioctl_ops = {
34169 .vidioc_querycap = timblogiw_querycap,
34170 .vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt,
34171 .vidioc_g_fmt_vid_cap = timblogiw_g_fmt,
34172@@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
34173 .vidioc_enum_framesizes = timblogiw_enum_framesizes,
34174 };
34175
34176-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
34177+static __devinitconst v4l2_file_operations_no_const timblogiw_fops = {
34178 .owner = THIS_MODULE,
34179 .open = timblogiw_open,
34180 .release = timblogiw_close,
34181diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c
34182index c969111..a7910f4 100644
34183--- a/drivers/media/video/videobuf-dma-contig.c
34184+++ b/drivers/media/video/videobuf-dma-contig.c
34185@@ -184,6 +184,7 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem,
34186 return ret;
34187 }
34188
34189+static struct videobuf_buffer *__videobuf_alloc_vb(size_t size) __size_overflow(1);
34190 static struct videobuf_buffer *__videobuf_alloc_vb(size_t size)
34191 {
34192 struct videobuf_dma_contig_memory *mem;
34193diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
34194index f300dea..5fc9c4a 100644
34195--- a/drivers/media/video/videobuf-dma-sg.c
34196+++ b/drivers/media/video/videobuf-dma-sg.c
34197@@ -419,6 +419,7 @@ static const struct vm_operations_struct videobuf_vm_ops = {
34198 struct videobuf_dma_sg_memory
34199 */
34200
34201+static struct videobuf_buffer *__videobuf_alloc_vb(size_t size) __size_overflow(1);
34202 static struct videobuf_buffer *__videobuf_alloc_vb(size_t size)
34203 {
34204 struct videobuf_dma_sg_memory *mem;
34205diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
34206index df14258..12cc7a3 100644
34207--- a/drivers/media/video/videobuf-vmalloc.c
34208+++ b/drivers/media/video/videobuf-vmalloc.c
34209@@ -135,6 +135,7 @@ static const struct vm_operations_struct videobuf_vm_ops = {
34210 struct videobuf_dma_sg_memory
34211 */
34212
34213+static struct videobuf_buffer *__videobuf_alloc_vb(size_t size) __size_overflow(1);
34214 static struct videobuf_buffer *__videobuf_alloc_vb(size_t size)
34215 {
34216 struct videobuf_vmalloc_memory *mem;
34217diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
34218index a7dc467..a55c423 100644
34219--- a/drivers/message/fusion/mptbase.c
34220+++ b/drivers/message/fusion/mptbase.c
34221@@ -6754,8 +6754,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
34222 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
34223 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
34224
34225+#ifdef CONFIG_GRKERNSEC_HIDESYM
34226+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
34227+#else
34228 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
34229 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
34230+#endif
34231+
34232 /*
34233 * Rounding UP to nearest 4-kB boundary here...
34234 */
34235diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
34236index 551262e..7551198 100644
34237--- a/drivers/message/fusion/mptsas.c
34238+++ b/drivers/message/fusion/mptsas.c
34239@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
34240 return 0;
34241 }
34242
34243+static inline void
34244+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
34245+{
34246+ if (phy_info->port_details) {
34247+ phy_info->port_details->rphy = rphy;
34248+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
34249+ ioc->name, rphy));
34250+ }
34251+
34252+ if (rphy) {
34253+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
34254+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
34255+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
34256+ ioc->name, rphy, rphy->dev.release));
34257+ }
34258+}
34259+
34260 /* no mutex */
34261 static void
34262 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
34263@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
34264 return NULL;
34265 }
34266
34267-static inline void
34268-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
34269-{
34270- if (phy_info->port_details) {
34271- phy_info->port_details->rphy = rphy;
34272- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
34273- ioc->name, rphy));
34274- }
34275-
34276- if (rphy) {
34277- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
34278- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
34279- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
34280- ioc->name, rphy, rphy->dev.release));
34281- }
34282-}
34283-
34284 static inline struct sas_port *
34285 mptsas_get_port(struct mptsas_phyinfo *phy_info)
34286 {
34287diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
34288index 0c3ced7..1fe34ec 100644
34289--- a/drivers/message/fusion/mptscsih.c
34290+++ b/drivers/message/fusion/mptscsih.c
34291@@ -1270,15 +1270,16 @@ mptscsih_info(struct Scsi_Host *SChost)
34292
34293 h = shost_priv(SChost);
34294
34295- if (h) {
34296- if (h->info_kbuf == NULL)
34297- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
34298- return h->info_kbuf;
34299- h->info_kbuf[0] = '\0';
34300+ if (!h)
34301+ return NULL;
34302
34303- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
34304- h->info_kbuf[size-1] = '\0';
34305- }
34306+ if (h->info_kbuf == NULL)
34307+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
34308+ return h->info_kbuf;
34309+ h->info_kbuf[0] = '\0';
34310+
34311+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
34312+ h->info_kbuf[size-1] = '\0';
34313
34314 return h->info_kbuf;
34315 }
34316diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
34317index 6d115c7..58ff7fd 100644
34318--- a/drivers/message/i2o/i2o_proc.c
34319+++ b/drivers/message/i2o/i2o_proc.c
34320@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
34321 "Array Controller Device"
34322 };
34323
34324-static char *chtostr(u8 * chars, int n)
34325-{
34326- char tmp[256];
34327- tmp[0] = 0;
34328- return strncat(tmp, (char *)chars, n);
34329-}
34330-
34331 static int i2o_report_query_status(struct seq_file *seq, int block_status,
34332 char *group)
34333 {
34334@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
34335
34336 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
34337 seq_printf(seq, "%-#8x", ddm_table.module_id);
34338- seq_printf(seq, "%-29s",
34339- chtostr(ddm_table.module_name_version, 28));
34340+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
34341 seq_printf(seq, "%9d ", ddm_table.data_size);
34342 seq_printf(seq, "%8d", ddm_table.code_size);
34343
34344@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
34345
34346 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
34347 seq_printf(seq, "%-#8x", dst->module_id);
34348- seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
34349- seq_printf(seq, "%-9s", chtostr(dst->date, 8));
34350+ seq_printf(seq, "%-.28s", dst->module_name_version);
34351+ seq_printf(seq, "%-.8s", dst->date);
34352 seq_printf(seq, "%8d ", dst->module_size);
34353 seq_printf(seq, "%8d ", dst->mpb_size);
34354 seq_printf(seq, "0x%04x", dst->module_flags);
34355@@ -1272,14 +1264,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
34356 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
34357 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
34358 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
34359- seq_printf(seq, "Vendor info : %s\n",
34360- chtostr((u8 *) (work32 + 2), 16));
34361- seq_printf(seq, "Product info : %s\n",
34362- chtostr((u8 *) (work32 + 6), 16));
34363- seq_printf(seq, "Description : %s\n",
34364- chtostr((u8 *) (work32 + 10), 16));
34365- seq_printf(seq, "Product rev. : %s\n",
34366- chtostr((u8 *) (work32 + 14), 8));
34367+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
34368+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
34369+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
34370+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
34371
34372 seq_printf(seq, "Serial number : ");
34373 print_serial_number(seq, (u8 *) (work32 + 16),
34374@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
34375 }
34376
34377 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
34378- seq_printf(seq, "Module name : %s\n",
34379- chtostr(result.module_name, 24));
34380- seq_printf(seq, "Module revision : %s\n",
34381- chtostr(result.module_rev, 8));
34382+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
34383+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
34384
34385 seq_printf(seq, "Serial number : ");
34386 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
34387@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
34388 return 0;
34389 }
34390
34391- seq_printf(seq, "Device name : %s\n",
34392- chtostr(result.device_name, 64));
34393- seq_printf(seq, "Service name : %s\n",
34394- chtostr(result.service_name, 64));
34395- seq_printf(seq, "Physical name : %s\n",
34396- chtostr(result.physical_location, 64));
34397- seq_printf(seq, "Instance number : %s\n",
34398- chtostr(result.instance_number, 4));
34399+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
34400+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
34401+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
34402+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
34403
34404 return 0;
34405 }
34406diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
34407index a8c08f3..155fe3d 100644
34408--- a/drivers/message/i2o/iop.c
34409+++ b/drivers/message/i2o/iop.c
34410@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
34411
34412 spin_lock_irqsave(&c->context_list_lock, flags);
34413
34414- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
34415- atomic_inc(&c->context_list_counter);
34416+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
34417+ atomic_inc_unchecked(&c->context_list_counter);
34418
34419- entry->context = atomic_read(&c->context_list_counter);
34420+ entry->context = atomic_read_unchecked(&c->context_list_counter);
34421
34422 list_add(&entry->list, &c->context_list);
34423
34424@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
34425
34426 #if BITS_PER_LONG == 64
34427 spin_lock_init(&c->context_list_lock);
34428- atomic_set(&c->context_list_counter, 0);
34429+ atomic_set_unchecked(&c->context_list_counter, 0);
34430 INIT_LIST_HEAD(&c->context_list);
34431 #endif
34432
34433diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c
34434index 7ce65f4..e66e9bc 100644
34435--- a/drivers/mfd/abx500-core.c
34436+++ b/drivers/mfd/abx500-core.c
34437@@ -15,7 +15,7 @@ static LIST_HEAD(abx500_list);
34438
34439 struct abx500_device_entry {
34440 struct list_head list;
34441- struct abx500_ops ops;
34442+ abx500_ops_no_const ops;
34443 struct device *dev;
34444 };
34445
34446diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
34447index a9223ed..4127b13 100644
34448--- a/drivers/mfd/janz-cmodio.c
34449+++ b/drivers/mfd/janz-cmodio.c
34450@@ -13,6 +13,7 @@
34451
34452 #include <linux/kernel.h>
34453 #include <linux/module.h>
34454+#include <linux/slab.h>
34455 #include <linux/init.h>
34456 #include <linux/pci.h>
34457 #include <linux/interrupt.h>
34458diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
34459index a981e2a..5ca0c8b 100644
34460--- a/drivers/misc/lis3lv02d/lis3lv02d.c
34461+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
34462@@ -466,7 +466,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
34463 * the lid is closed. This leads to interrupts as soon as a little move
34464 * is done.
34465 */
34466- atomic_inc(&lis3->count);
34467+ atomic_inc_unchecked(&lis3->count);
34468
34469 wake_up_interruptible(&lis3->misc_wait);
34470 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
34471@@ -552,7 +552,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
34472 if (lis3->pm_dev)
34473 pm_runtime_get_sync(lis3->pm_dev);
34474
34475- atomic_set(&lis3->count, 0);
34476+ atomic_set_unchecked(&lis3->count, 0);
34477 return 0;
34478 }
34479
34480@@ -585,7 +585,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
34481 add_wait_queue(&lis3->misc_wait, &wait);
34482 while (true) {
34483 set_current_state(TASK_INTERRUPTIBLE);
34484- data = atomic_xchg(&lis3->count, 0);
34485+ data = atomic_xchg_unchecked(&lis3->count, 0);
34486 if (data)
34487 break;
34488
34489@@ -626,7 +626,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
34490 struct lis3lv02d, miscdev);
34491
34492 poll_wait(file, &lis3->misc_wait, wait);
34493- if (atomic_read(&lis3->count))
34494+ if (atomic_read_unchecked(&lis3->count))
34495 return POLLIN | POLLRDNORM;
34496 return 0;
34497 }
34498diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
34499index 2b1482a..5d33616 100644
34500--- a/drivers/misc/lis3lv02d/lis3lv02d.h
34501+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
34502@@ -266,7 +266,7 @@ struct lis3lv02d {
34503 struct input_polled_dev *idev; /* input device */
34504 struct platform_device *pdev; /* platform device */
34505 struct regulator_bulk_data regulators[2];
34506- atomic_t count; /* interrupt count after last read */
34507+ atomic_unchecked_t count; /* interrupt count after last read */
34508 union axis_conversion ac; /* hw -> logical axis */
34509 int mapped_btns[3];
34510
34511diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
34512index 2f30bad..c4c13d0 100644
34513--- a/drivers/misc/sgi-gru/gruhandles.c
34514+++ b/drivers/misc/sgi-gru/gruhandles.c
34515@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
34516 unsigned long nsec;
34517
34518 nsec = CLKS2NSEC(clks);
34519- atomic_long_inc(&mcs_op_statistics[op].count);
34520- atomic_long_add(nsec, &mcs_op_statistics[op].total);
34521+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
34522+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
34523 if (mcs_op_statistics[op].max < nsec)
34524 mcs_op_statistics[op].max = nsec;
34525 }
34526diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
34527index 950dbe9..eeef0f8 100644
34528--- a/drivers/misc/sgi-gru/gruprocfs.c
34529+++ b/drivers/misc/sgi-gru/gruprocfs.c
34530@@ -32,9 +32,9 @@
34531
34532 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
34533
34534-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
34535+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
34536 {
34537- unsigned long val = atomic_long_read(v);
34538+ unsigned long val = atomic_long_read_unchecked(v);
34539
34540 seq_printf(s, "%16lu %s\n", val, id);
34541 }
34542@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
34543
34544 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
34545 for (op = 0; op < mcsop_last; op++) {
34546- count = atomic_long_read(&mcs_op_statistics[op].count);
34547- total = atomic_long_read(&mcs_op_statistics[op].total);
34548+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
34549+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
34550 max = mcs_op_statistics[op].max;
34551 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
34552 count ? total / count : 0, max);
34553diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
34554index 5c3ce24..4915ccb 100644
34555--- a/drivers/misc/sgi-gru/grutables.h
34556+++ b/drivers/misc/sgi-gru/grutables.h
34557@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
34558 * GRU statistics.
34559 */
34560 struct gru_stats_s {
34561- atomic_long_t vdata_alloc;
34562- atomic_long_t vdata_free;
34563- atomic_long_t gts_alloc;
34564- atomic_long_t gts_free;
34565- atomic_long_t gms_alloc;
34566- atomic_long_t gms_free;
34567- atomic_long_t gts_double_allocate;
34568- atomic_long_t assign_context;
34569- atomic_long_t assign_context_failed;
34570- atomic_long_t free_context;
34571- atomic_long_t load_user_context;
34572- atomic_long_t load_kernel_context;
34573- atomic_long_t lock_kernel_context;
34574- atomic_long_t unlock_kernel_context;
34575- atomic_long_t steal_user_context;
34576- atomic_long_t steal_kernel_context;
34577- atomic_long_t steal_context_failed;
34578- atomic_long_t nopfn;
34579- atomic_long_t asid_new;
34580- atomic_long_t asid_next;
34581- atomic_long_t asid_wrap;
34582- atomic_long_t asid_reuse;
34583- atomic_long_t intr;
34584- atomic_long_t intr_cbr;
34585- atomic_long_t intr_tfh;
34586- atomic_long_t intr_spurious;
34587- atomic_long_t intr_mm_lock_failed;
34588- atomic_long_t call_os;
34589- atomic_long_t call_os_wait_queue;
34590- atomic_long_t user_flush_tlb;
34591- atomic_long_t user_unload_context;
34592- atomic_long_t user_exception;
34593- atomic_long_t set_context_option;
34594- atomic_long_t check_context_retarget_intr;
34595- atomic_long_t check_context_unload;
34596- atomic_long_t tlb_dropin;
34597- atomic_long_t tlb_preload_page;
34598- atomic_long_t tlb_dropin_fail_no_asid;
34599- atomic_long_t tlb_dropin_fail_upm;
34600- atomic_long_t tlb_dropin_fail_invalid;
34601- atomic_long_t tlb_dropin_fail_range_active;
34602- atomic_long_t tlb_dropin_fail_idle;
34603- atomic_long_t tlb_dropin_fail_fmm;
34604- atomic_long_t tlb_dropin_fail_no_exception;
34605- atomic_long_t tfh_stale_on_fault;
34606- atomic_long_t mmu_invalidate_range;
34607- atomic_long_t mmu_invalidate_page;
34608- atomic_long_t flush_tlb;
34609- atomic_long_t flush_tlb_gru;
34610- atomic_long_t flush_tlb_gru_tgh;
34611- atomic_long_t flush_tlb_gru_zero_asid;
34612+ atomic_long_unchecked_t vdata_alloc;
34613+ atomic_long_unchecked_t vdata_free;
34614+ atomic_long_unchecked_t gts_alloc;
34615+ atomic_long_unchecked_t gts_free;
34616+ atomic_long_unchecked_t gms_alloc;
34617+ atomic_long_unchecked_t gms_free;
34618+ atomic_long_unchecked_t gts_double_allocate;
34619+ atomic_long_unchecked_t assign_context;
34620+ atomic_long_unchecked_t assign_context_failed;
34621+ atomic_long_unchecked_t free_context;
34622+ atomic_long_unchecked_t load_user_context;
34623+ atomic_long_unchecked_t load_kernel_context;
34624+ atomic_long_unchecked_t lock_kernel_context;
34625+ atomic_long_unchecked_t unlock_kernel_context;
34626+ atomic_long_unchecked_t steal_user_context;
34627+ atomic_long_unchecked_t steal_kernel_context;
34628+ atomic_long_unchecked_t steal_context_failed;
34629+ atomic_long_unchecked_t nopfn;
34630+ atomic_long_unchecked_t asid_new;
34631+ atomic_long_unchecked_t asid_next;
34632+ atomic_long_unchecked_t asid_wrap;
34633+ atomic_long_unchecked_t asid_reuse;
34634+ atomic_long_unchecked_t intr;
34635+ atomic_long_unchecked_t intr_cbr;
34636+ atomic_long_unchecked_t intr_tfh;
34637+ atomic_long_unchecked_t intr_spurious;
34638+ atomic_long_unchecked_t intr_mm_lock_failed;
34639+ atomic_long_unchecked_t call_os;
34640+ atomic_long_unchecked_t call_os_wait_queue;
34641+ atomic_long_unchecked_t user_flush_tlb;
34642+ atomic_long_unchecked_t user_unload_context;
34643+ atomic_long_unchecked_t user_exception;
34644+ atomic_long_unchecked_t set_context_option;
34645+ atomic_long_unchecked_t check_context_retarget_intr;
34646+ atomic_long_unchecked_t check_context_unload;
34647+ atomic_long_unchecked_t tlb_dropin;
34648+ atomic_long_unchecked_t tlb_preload_page;
34649+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
34650+ atomic_long_unchecked_t tlb_dropin_fail_upm;
34651+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
34652+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
34653+ atomic_long_unchecked_t tlb_dropin_fail_idle;
34654+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
34655+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
34656+ atomic_long_unchecked_t tfh_stale_on_fault;
34657+ atomic_long_unchecked_t mmu_invalidate_range;
34658+ atomic_long_unchecked_t mmu_invalidate_page;
34659+ atomic_long_unchecked_t flush_tlb;
34660+ atomic_long_unchecked_t flush_tlb_gru;
34661+ atomic_long_unchecked_t flush_tlb_gru_tgh;
34662+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
34663
34664- atomic_long_t copy_gpa;
34665- atomic_long_t read_gpa;
34666+ atomic_long_unchecked_t copy_gpa;
34667+ atomic_long_unchecked_t read_gpa;
34668
34669- atomic_long_t mesq_receive;
34670- atomic_long_t mesq_receive_none;
34671- atomic_long_t mesq_send;
34672- atomic_long_t mesq_send_failed;
34673- atomic_long_t mesq_noop;
34674- atomic_long_t mesq_send_unexpected_error;
34675- atomic_long_t mesq_send_lb_overflow;
34676- atomic_long_t mesq_send_qlimit_reached;
34677- atomic_long_t mesq_send_amo_nacked;
34678- atomic_long_t mesq_send_put_nacked;
34679- atomic_long_t mesq_page_overflow;
34680- atomic_long_t mesq_qf_locked;
34681- atomic_long_t mesq_qf_noop_not_full;
34682- atomic_long_t mesq_qf_switch_head_failed;
34683- atomic_long_t mesq_qf_unexpected_error;
34684- atomic_long_t mesq_noop_unexpected_error;
34685- atomic_long_t mesq_noop_lb_overflow;
34686- atomic_long_t mesq_noop_qlimit_reached;
34687- atomic_long_t mesq_noop_amo_nacked;
34688- atomic_long_t mesq_noop_put_nacked;
34689- atomic_long_t mesq_noop_page_overflow;
34690+ atomic_long_unchecked_t mesq_receive;
34691+ atomic_long_unchecked_t mesq_receive_none;
34692+ atomic_long_unchecked_t mesq_send;
34693+ atomic_long_unchecked_t mesq_send_failed;
34694+ atomic_long_unchecked_t mesq_noop;
34695+ atomic_long_unchecked_t mesq_send_unexpected_error;
34696+ atomic_long_unchecked_t mesq_send_lb_overflow;
34697+ atomic_long_unchecked_t mesq_send_qlimit_reached;
34698+ atomic_long_unchecked_t mesq_send_amo_nacked;
34699+ atomic_long_unchecked_t mesq_send_put_nacked;
34700+ atomic_long_unchecked_t mesq_page_overflow;
34701+ atomic_long_unchecked_t mesq_qf_locked;
34702+ atomic_long_unchecked_t mesq_qf_noop_not_full;
34703+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
34704+ atomic_long_unchecked_t mesq_qf_unexpected_error;
34705+ atomic_long_unchecked_t mesq_noop_unexpected_error;
34706+ atomic_long_unchecked_t mesq_noop_lb_overflow;
34707+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
34708+ atomic_long_unchecked_t mesq_noop_amo_nacked;
34709+ atomic_long_unchecked_t mesq_noop_put_nacked;
34710+ atomic_long_unchecked_t mesq_noop_page_overflow;
34711
34712 };
34713
34714@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
34715 tghop_invalidate, mcsop_last};
34716
34717 struct mcs_op_statistic {
34718- atomic_long_t count;
34719- atomic_long_t total;
34720+ atomic_long_unchecked_t count;
34721+ atomic_long_unchecked_t total;
34722 unsigned long max;
34723 };
34724
34725@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
34726
34727 #define STAT(id) do { \
34728 if (gru_options & OPT_STATS) \
34729- atomic_long_inc(&gru_stats.id); \
34730+ atomic_long_inc_unchecked(&gru_stats.id); \
34731 } while (0)
34732
34733 #ifdef CONFIG_SGI_GRU_DEBUG
34734diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
34735index 851b2f2..a4ec097 100644
34736--- a/drivers/misc/sgi-xp/xp.h
34737+++ b/drivers/misc/sgi-xp/xp.h
34738@@ -289,7 +289,7 @@ struct xpc_interface {
34739 xpc_notify_func, void *);
34740 void (*received) (short, int, void *);
34741 enum xp_retval (*partid_to_nasids) (short, void *);
34742-};
34743+} __no_const;
34744
34745 extern struct xpc_interface xpc_interface;
34746
34747diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
34748index b94d5f7..7f494c5 100644
34749--- a/drivers/misc/sgi-xp/xpc.h
34750+++ b/drivers/misc/sgi-xp/xpc.h
34751@@ -835,6 +835,7 @@ struct xpc_arch_operations {
34752 void (*received_payload) (struct xpc_channel *, void *);
34753 void (*notify_senders_of_disconnect) (struct xpc_channel *);
34754 };
34755+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
34756
34757 /* struct xpc_partition act_state values (for XPC HB) */
34758
34759@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
34760 /* found in xpc_main.c */
34761 extern struct device *xpc_part;
34762 extern struct device *xpc_chan;
34763-extern struct xpc_arch_operations xpc_arch_ops;
34764+extern xpc_arch_operations_no_const xpc_arch_ops;
34765 extern int xpc_disengage_timelimit;
34766 extern int xpc_disengage_timedout;
34767 extern int xpc_activate_IRQ_rcvd;
34768diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
34769index 8d082b4..aa749ae 100644
34770--- a/drivers/misc/sgi-xp/xpc_main.c
34771+++ b/drivers/misc/sgi-xp/xpc_main.c
34772@@ -162,7 +162,7 @@ static struct notifier_block xpc_die_notifier = {
34773 .notifier_call = xpc_system_die,
34774 };
34775
34776-struct xpc_arch_operations xpc_arch_ops;
34777+xpc_arch_operations_no_const xpc_arch_ops;
34778
34779 /*
34780 * Timer function to enforce the timelimit on the partition disengage.
34781diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
34782index 6ebdc40..9edf5d8 100644
34783--- a/drivers/mmc/host/sdhci-pci.c
34784+++ b/drivers/mmc/host/sdhci-pci.c
34785@@ -631,7 +631,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
34786 .probe = via_probe,
34787 };
34788
34789-static const struct pci_device_id pci_ids[] __devinitdata = {
34790+static const struct pci_device_id pci_ids[] __devinitconst = {
34791 {
34792 .vendor = PCI_VENDOR_ID_RICOH,
34793 .device = PCI_DEVICE_ID_RICOH_R5C822,
34794diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
34795index 87a431c..4959b43 100644
34796--- a/drivers/mtd/devices/doc2000.c
34797+++ b/drivers/mtd/devices/doc2000.c
34798@@ -764,7 +764,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
34799
34800 /* The ECC will not be calculated correctly if less than 512 is written */
34801 /* DBB-
34802- if (len != 0x200 && eccbuf)
34803+ if (len != 0x200)
34804 printk(KERN_WARNING
34805 "ECC needs a full sector write (adr: %lx size %lx)\n",
34806 (long) to, (long) len);
34807diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
34808index 9eacf67..4534b5b 100644
34809--- a/drivers/mtd/devices/doc2001.c
34810+++ b/drivers/mtd/devices/doc2001.c
34811@@ -384,7 +384,7 @@ static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,
34812 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
34813
34814 /* Don't allow read past end of device */
34815- if (from >= this->totlen)
34816+ if (from >= this->totlen || !len)
34817 return -EINVAL;
34818
34819 /* Don't allow a single read to cross a 512-byte block boundary */
34820diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
34821index 3984d48..28aa897 100644
34822--- a/drivers/mtd/nand/denali.c
34823+++ b/drivers/mtd/nand/denali.c
34824@@ -26,6 +26,7 @@
34825 #include <linux/pci.h>
34826 #include <linux/mtd/mtd.h>
34827 #include <linux/module.h>
34828+#include <linux/slab.h>
34829
34830 #include "denali.h"
34831
34832diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
34833index 51b9d6a..52af9a7 100644
34834--- a/drivers/mtd/nftlmount.c
34835+++ b/drivers/mtd/nftlmount.c
34836@@ -24,6 +24,7 @@
34837 #include <asm/errno.h>
34838 #include <linux/delay.h>
34839 #include <linux/slab.h>
34840+#include <linux/sched.h>
34841 #include <linux/mtd/mtd.h>
34842 #include <linux/mtd/nand.h>
34843 #include <linux/mtd/nftl.h>
34844diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
34845index e2cdebf..d48183a 100644
34846--- a/drivers/mtd/ubi/debug.c
34847+++ b/drivers/mtd/ubi/debug.c
34848@@ -338,6 +338,8 @@ out:
34849
34850 /* Write an UBI debugfs file */
34851 static ssize_t dfs_file_write(struct file *file, const char __user *user_buf,
34852+ size_t count, loff_t *ppos) __size_overflow(3);
34853+static ssize_t dfs_file_write(struct file *file, const char __user *user_buf,
34854 size_t count, loff_t *ppos)
34855 {
34856 unsigned long ubi_num = (unsigned long)file->private_data;
34857diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
34858index 071f4c8..440862e 100644
34859--- a/drivers/net/ethernet/atheros/atlx/atl2.c
34860+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
34861@@ -2862,7 +2862,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
34862 */
34863
34864 #define ATL2_PARAM(X, desc) \
34865- static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
34866+ static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
34867 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
34868 MODULE_PARM_DESC(X, desc);
34869 #else
34870diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34871index 66da39f..5dc436d 100644
34872--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34873+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34874@@ -473,7 +473,7 @@ struct bnx2x_rx_mode_obj {
34875
34876 int (*wait_comp)(struct bnx2x *bp,
34877 struct bnx2x_rx_mode_ramrod_params *p);
34878-};
34879+} __no_const;
34880
34881 /********************** Set multicast group ***********************************/
34882
34883diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
34884index aea8f72..fcebf75 100644
34885--- a/drivers/net/ethernet/broadcom/tg3.h
34886+++ b/drivers/net/ethernet/broadcom/tg3.h
34887@@ -140,6 +140,7 @@
34888 #define CHIPREV_ID_5750_A0 0x4000
34889 #define CHIPREV_ID_5750_A1 0x4001
34890 #define CHIPREV_ID_5750_A3 0x4003
34891+#define CHIPREV_ID_5750_C1 0x4201
34892 #define CHIPREV_ID_5750_C2 0x4202
34893 #define CHIPREV_ID_5752_A0_HW 0x5000
34894 #define CHIPREV_ID_5752_A0 0x6000
34895diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c
34896index 47a8435..248e4b3 100644
34897--- a/drivers/net/ethernet/chelsio/cxgb/sge.c
34898+++ b/drivers/net/ethernet/chelsio/cxgb/sge.c
34899@@ -1052,6 +1052,8 @@ MODULE_PARM_DESC(copybreak, "Receive copy threshold");
34900 * be copied but there is no memory for the copy.
34901 */
34902 static inline struct sk_buff *get_packet(struct pci_dev *pdev,
34903+ struct freelQ *fl, unsigned int len) __size_overflow(3);
34904+static inline struct sk_buff *get_packet(struct pci_dev *pdev,
34905 struct freelQ *fl, unsigned int len)
34906 {
34907 struct sk_buff *skb;
34908diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34909index c4e8643..0979484 100644
34910--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34911+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34912@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
34913 */
34914 struct l2t_skb_cb {
34915 arp_failure_handler_func arp_failure_handler;
34916-};
34917+} __no_const;
34918
34919 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
34920
34921diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
34922index cfb60e1..94af340 100644
34923--- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
34924+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
34925@@ -611,6 +611,8 @@ static void recycle_rx_buf(struct adapter *adap, struct sge_fl *q,
34926 * of the SW ring.
34927 */
34928 static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size,
34929+ size_t sw_size, dma_addr_t * phys, void *metadata) __size_overflow(2,4);
34930+static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size,
34931 size_t sw_size, dma_addr_t * phys, void *metadata)
34932 {
34933 size_t len = nelem * elem_size;
34934@@ -777,6 +779,8 @@ static inline unsigned int flits_to_desc(unsigned int n)
34935 * be copied but there is no memory for the copy.
34936 */
34937 static struct sk_buff *get_packet(struct adapter *adap, struct sge_fl *fl,
34938+ unsigned int len, unsigned int drop_thres) __size_overflow(3);
34939+static struct sk_buff *get_packet(struct adapter *adap, struct sge_fl *fl,
34940 unsigned int len, unsigned int drop_thres)
34941 {
34942 struct sk_buff *skb = NULL;
34943diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
34944index 2dae795..73037d2 100644
34945--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
34946+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
34947@@ -593,6 +593,9 @@ static inline void __refill_fl(struct adapter *adap, struct sge_fl *fl)
34948 */
34949 static void *alloc_ring(struct device *dev, size_t nelem, size_t elem_size,
34950 size_t sw_size, dma_addr_t *phys, void *metadata,
34951+ size_t stat_size, int node) __size_overflow(2,4);
34952+static void *alloc_ring(struct device *dev, size_t nelem, size_t elem_size,
34953+ size_t sw_size, dma_addr_t *phys, void *metadata,
34954 size_t stat_size, int node)
34955 {
34956 size_t len = nelem * elem_size + stat_size;
34957diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34958index 0bd585b..d954ca5 100644
34959--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34960+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34961@@ -729,6 +729,9 @@ static inline void __refill_fl(struct adapter *adapter, struct sge_fl *fl)
34962 */
34963 static void *alloc_ring(struct device *dev, size_t nelem, size_t hwsize,
34964 size_t swsize, dma_addr_t *busaddrp, void *swringp,
34965+ size_t stat_size) __size_overflow(2,4);
34966+static void *alloc_ring(struct device *dev, size_t nelem, size_t hwsize,
34967+ size_t swsize, dma_addr_t *busaddrp, void *swringp,
34968 size_t stat_size)
34969 {
34970 /*
34971diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
34972index 4d71f5a..8004440 100644
34973--- a/drivers/net/ethernet/dec/tulip/de4x5.c
34974+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
34975@@ -5392,7 +5392,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
34976 for (i=0; i<ETH_ALEN; i++) {
34977 tmp.addr[i] = dev->dev_addr[i];
34978 }
34979- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
34980+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
34981 break;
34982
34983 case DE4X5_SET_HWADDR: /* Set the hardware address */
34984@@ -5432,7 +5432,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
34985 spin_lock_irqsave(&lp->lock, flags);
34986 memcpy(&statbuf, &lp->pktStats, ioc->len);
34987 spin_unlock_irqrestore(&lp->lock, flags);
34988- if (copy_to_user(ioc->data, &statbuf, ioc->len))
34989+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
34990 return -EFAULT;
34991 break;
34992 }
34993diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
34994index 14d5b61..1398636 100644
34995--- a/drivers/net/ethernet/dec/tulip/eeprom.c
34996+++ b/drivers/net/ethernet/dec/tulip/eeprom.c
34997@@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
34998 {NULL}};
34999
35000
35001-static const char *block_name[] __devinitdata = {
35002+static const char *block_name[] __devinitconst = {
35003 "21140 non-MII",
35004 "21140 MII PHY",
35005 "21142 Serial PHY",
35006diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
35007index 52da7b2..4ddfe1c 100644
35008--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
35009+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
35010@@ -236,7 +236,7 @@ struct pci_id_info {
35011 int drv_flags; /* Driver use, intended as capability flags. */
35012 };
35013
35014-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
35015+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
35016 { /* Sometime a Level-One switch card. */
35017 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
35018 { "Winbond W89c840", CanHaveMII | HasBrokenTx},
35019diff --git a/drivers/net/ethernet/dlink/dl2k.c b/drivers/net/ethernet/dlink/dl2k.c
35020index b2dc2c8..2e09edb 100644
35021--- a/drivers/net/ethernet/dlink/dl2k.c
35022+++ b/drivers/net/ethernet/dlink/dl2k.c
35023@@ -1259,55 +1259,21 @@ rio_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
35024 {
35025 int phy_addr;
35026 struct netdev_private *np = netdev_priv(dev);
35027- struct mii_data *miidata = (struct mii_data *) &rq->ifr_ifru;
35028-
35029- struct netdev_desc *desc;
35030- int i;
35031+ struct mii_ioctl_data *miidata = if_mii(rq);
35032
35033 phy_addr = np->phy_addr;
35034 switch (cmd) {
35035- case SIOCDEVPRIVATE:
35036+ case SIOCGMIIPHY:
35037+ miidata->phy_id = phy_addr;
35038 break;
35039-
35040- case SIOCDEVPRIVATE + 1:
35041- miidata->out_value = mii_read (dev, phy_addr, miidata->reg_num);
35042+ case SIOCGMIIREG:
35043+ miidata->val_out = mii_read (dev, phy_addr, miidata->reg_num);
35044 break;
35045- case SIOCDEVPRIVATE + 2:
35046- mii_write (dev, phy_addr, miidata->reg_num, miidata->in_value);
35047+ case SIOCSMIIREG:
35048+ if (!capable(CAP_NET_ADMIN))
35049+ return -EPERM;
35050+ mii_write (dev, phy_addr, miidata->reg_num, miidata->val_in);
35051 break;
35052- case SIOCDEVPRIVATE + 3:
35053- break;
35054- case SIOCDEVPRIVATE + 4:
35055- break;
35056- case SIOCDEVPRIVATE + 5:
35057- netif_stop_queue (dev);
35058- break;
35059- case SIOCDEVPRIVATE + 6:
35060- netif_wake_queue (dev);
35061- break;
35062- case SIOCDEVPRIVATE + 7:
35063- printk
35064- ("tx_full=%x cur_tx=%lx old_tx=%lx cur_rx=%lx old_rx=%lx\n",
35065- netif_queue_stopped(dev), np->cur_tx, np->old_tx, np->cur_rx,
35066- np->old_rx);
35067- break;
35068- case SIOCDEVPRIVATE + 8:
35069- printk("TX ring:\n");
35070- for (i = 0; i < TX_RING_SIZE; i++) {
35071- desc = &np->tx_ring[i];
35072- printk
35073- ("%02x:cur:%08x next:%08x status:%08x frag1:%08x frag0:%08x",
35074- i,
35075- (u32) (np->tx_ring_dma + i * sizeof (*desc)),
35076- (u32)le64_to_cpu(desc->next_desc),
35077- (u32)le64_to_cpu(desc->status),
35078- (u32)(le64_to_cpu(desc->fraginfo) >> 32),
35079- (u32)le64_to_cpu(desc->fraginfo));
35080- printk ("\n");
35081- }
35082- printk ("\n");
35083- break;
35084-
35085 default:
35086 return -EOPNOTSUPP;
35087 }
35088diff --git a/drivers/net/ethernet/dlink/dl2k.h b/drivers/net/ethernet/dlink/dl2k.h
35089index ba0adca..30c2da3 100644
35090--- a/drivers/net/ethernet/dlink/dl2k.h
35091+++ b/drivers/net/ethernet/dlink/dl2k.h
35092@@ -365,13 +365,6 @@ struct ioctl_data {
35093 char *data;
35094 };
35095
35096-struct mii_data {
35097- __u16 reserved;
35098- __u16 reg_num;
35099- __u16 in_value;
35100- __u16 out_value;
35101-};
35102-
35103 /* The Rx and Tx buffer descriptors. */
35104 struct netdev_desc {
35105 __le64 next_desc;
35106diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
35107index 28a3a9b..d96cb63 100644
35108--- a/drivers/net/ethernet/dlink/sundance.c
35109+++ b/drivers/net/ethernet/dlink/sundance.c
35110@@ -218,7 +218,7 @@ enum {
35111 struct pci_id_info {
35112 const char *name;
35113 };
35114-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
35115+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
35116 {"D-Link DFE-550TX FAST Ethernet Adapter"},
35117 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
35118 {"D-Link DFE-580TX 4 port Server Adapter"},
35119diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
35120index e703d64..d62ecf9 100644
35121--- a/drivers/net/ethernet/emulex/benet/be_main.c
35122+++ b/drivers/net/ethernet/emulex/benet/be_main.c
35123@@ -402,7 +402,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
35124
35125 if (wrapped)
35126 newacc += 65536;
35127- ACCESS_ONCE(*acc) = newacc;
35128+ ACCESS_ONCE_RW(*acc) = newacc;
35129 }
35130
35131 void be_parse_stats(struct be_adapter *adapter)
35132diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
35133index 47f85c3..82ab6c4 100644
35134--- a/drivers/net/ethernet/faraday/ftgmac100.c
35135+++ b/drivers/net/ethernet/faraday/ftgmac100.c
35136@@ -31,6 +31,8 @@
35137 #include <linux/netdevice.h>
35138 #include <linux/phy.h>
35139 #include <linux/platform_device.h>
35140+#include <linux/interrupt.h>
35141+#include <linux/irqreturn.h>
35142 #include <net/ip.h>
35143
35144 #include "ftgmac100.h"
35145diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
35146index bb336a0..4b472da 100644
35147--- a/drivers/net/ethernet/faraday/ftmac100.c
35148+++ b/drivers/net/ethernet/faraday/ftmac100.c
35149@@ -31,6 +31,8 @@
35150 #include <linux/module.h>
35151 #include <linux/netdevice.h>
35152 #include <linux/platform_device.h>
35153+#include <linux/interrupt.h>
35154+#include <linux/irqreturn.h>
35155
35156 #include "ftmac100.h"
35157
35158diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
35159index c82d444..0007fb4 100644
35160--- a/drivers/net/ethernet/fealnx.c
35161+++ b/drivers/net/ethernet/fealnx.c
35162@@ -150,7 +150,7 @@ struct chip_info {
35163 int flags;
35164 };
35165
35166-static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
35167+static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
35168 { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
35169 { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
35170 { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
35171diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
35172index e1159e5..e18684d 100644
35173--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
35174+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
35175@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
35176 {
35177 struct e1000_hw *hw = &adapter->hw;
35178 struct e1000_mac_info *mac = &hw->mac;
35179- struct e1000_mac_operations *func = &mac->ops;
35180+ e1000_mac_operations_no_const *func = &mac->ops;
35181
35182 /* Set media type */
35183 switch (adapter->pdev->device) {
35184diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
35185index a3e65fd..f451444 100644
35186--- a/drivers/net/ethernet/intel/e1000e/82571.c
35187+++ b/drivers/net/ethernet/intel/e1000e/82571.c
35188@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
35189 {
35190 struct e1000_hw *hw = &adapter->hw;
35191 struct e1000_mac_info *mac = &hw->mac;
35192- struct e1000_mac_operations *func = &mac->ops;
35193+ e1000_mac_operations_no_const *func = &mac->ops;
35194 u32 swsm = 0;
35195 u32 swsm2 = 0;
35196 bool force_clear_smbi = false;
35197diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
35198index 2967039..ca8c40c 100644
35199--- a/drivers/net/ethernet/intel/e1000e/hw.h
35200+++ b/drivers/net/ethernet/intel/e1000e/hw.h
35201@@ -778,6 +778,7 @@ struct e1000_mac_operations {
35202 void (*write_vfta)(struct e1000_hw *, u32, u32);
35203 s32 (*read_mac_addr)(struct e1000_hw *);
35204 };
35205+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
35206
35207 /*
35208 * When to use various PHY register access functions:
35209@@ -818,6 +819,7 @@ struct e1000_phy_operations {
35210 void (*power_up)(struct e1000_hw *);
35211 void (*power_down)(struct e1000_hw *);
35212 };
35213+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
35214
35215 /* Function pointers for the NVM. */
35216 struct e1000_nvm_operations {
35217@@ -829,9 +831,10 @@ struct e1000_nvm_operations {
35218 s32 (*validate)(struct e1000_hw *);
35219 s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
35220 };
35221+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
35222
35223 struct e1000_mac_info {
35224- struct e1000_mac_operations ops;
35225+ e1000_mac_operations_no_const ops;
35226 u8 addr[ETH_ALEN];
35227 u8 perm_addr[ETH_ALEN];
35228
35229@@ -872,7 +875,7 @@ struct e1000_mac_info {
35230 };
35231
35232 struct e1000_phy_info {
35233- struct e1000_phy_operations ops;
35234+ e1000_phy_operations_no_const ops;
35235
35236 enum e1000_phy_type type;
35237
35238@@ -906,7 +909,7 @@ struct e1000_phy_info {
35239 };
35240
35241 struct e1000_nvm_info {
35242- struct e1000_nvm_operations ops;
35243+ e1000_nvm_operations_no_const ops;
35244
35245 enum e1000_nvm_type type;
35246 enum e1000_nvm_override override;
35247diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
35248index f67cbd3..cef9e3d 100644
35249--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
35250+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
35251@@ -314,6 +314,7 @@ struct e1000_mac_operations {
35252 s32 (*read_mac_addr)(struct e1000_hw *);
35253 s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
35254 };
35255+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
35256
35257 struct e1000_phy_operations {
35258 s32 (*acquire)(struct e1000_hw *);
35259@@ -330,6 +331,7 @@ struct e1000_phy_operations {
35260 s32 (*set_d3_lplu_state)(struct e1000_hw *, bool);
35261 s32 (*write_reg)(struct e1000_hw *, u32, u16);
35262 };
35263+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
35264
35265 struct e1000_nvm_operations {
35266 s32 (*acquire)(struct e1000_hw *);
35267@@ -339,6 +341,7 @@ struct e1000_nvm_operations {
35268 s32 (*update)(struct e1000_hw *);
35269 s32 (*validate)(struct e1000_hw *);
35270 };
35271+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
35272
35273 struct e1000_info {
35274 s32 (*get_invariants)(struct e1000_hw *);
35275@@ -350,7 +353,7 @@ struct e1000_info {
35276 extern const struct e1000_info e1000_82575_info;
35277
35278 struct e1000_mac_info {
35279- struct e1000_mac_operations ops;
35280+ e1000_mac_operations_no_const ops;
35281
35282 u8 addr[6];
35283 u8 perm_addr[6];
35284@@ -388,7 +391,7 @@ struct e1000_mac_info {
35285 };
35286
35287 struct e1000_phy_info {
35288- struct e1000_phy_operations ops;
35289+ e1000_phy_operations_no_const ops;
35290
35291 enum e1000_phy_type type;
35292
35293@@ -423,7 +426,7 @@ struct e1000_phy_info {
35294 };
35295
35296 struct e1000_nvm_info {
35297- struct e1000_nvm_operations ops;
35298+ e1000_nvm_operations_no_const ops;
35299 enum e1000_nvm_type type;
35300 enum e1000_nvm_override override;
35301
35302@@ -468,6 +471,7 @@ struct e1000_mbx_operations {
35303 s32 (*check_for_ack)(struct e1000_hw *, u16);
35304 s32 (*check_for_rst)(struct e1000_hw *, u16);
35305 };
35306+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
35307
35308 struct e1000_mbx_stats {
35309 u32 msgs_tx;
35310@@ -479,7 +483,7 @@ struct e1000_mbx_stats {
35311 };
35312
35313 struct e1000_mbx_info {
35314- struct e1000_mbx_operations ops;
35315+ e1000_mbx_operations_no_const ops;
35316 struct e1000_mbx_stats stats;
35317 u32 timeout;
35318 u32 usec_delay;
35319diff --git a/drivers/net/ethernet/intel/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
35320index 57db3c6..aa825fc 100644
35321--- a/drivers/net/ethernet/intel/igbvf/vf.h
35322+++ b/drivers/net/ethernet/intel/igbvf/vf.h
35323@@ -189,9 +189,10 @@ struct e1000_mac_operations {
35324 s32 (*read_mac_addr)(struct e1000_hw *);
35325 s32 (*set_vfta)(struct e1000_hw *, u16, bool);
35326 };
35327+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
35328
35329 struct e1000_mac_info {
35330- struct e1000_mac_operations ops;
35331+ e1000_mac_operations_no_const ops;
35332 u8 addr[6];
35333 u8 perm_addr[6];
35334
35335@@ -213,6 +214,7 @@ struct e1000_mbx_operations {
35336 s32 (*check_for_ack)(struct e1000_hw *);
35337 s32 (*check_for_rst)(struct e1000_hw *);
35338 };
35339+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
35340
35341 struct e1000_mbx_stats {
35342 u32 msgs_tx;
35343@@ -224,7 +226,7 @@ struct e1000_mbx_stats {
35344 };
35345
35346 struct e1000_mbx_info {
35347- struct e1000_mbx_operations ops;
35348+ e1000_mbx_operations_no_const ops;
35349 struct e1000_mbx_stats stats;
35350 u32 timeout;
35351 u32 usec_delay;
35352diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35353index 9b95bef..7e254ee 100644
35354--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35355+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35356@@ -2708,6 +2708,7 @@ struct ixgbe_eeprom_operations {
35357 s32 (*update_checksum)(struct ixgbe_hw *);
35358 u16 (*calc_checksum)(struct ixgbe_hw *);
35359 };
35360+typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
35361
35362 struct ixgbe_mac_operations {
35363 s32 (*init_hw)(struct ixgbe_hw *);
35364@@ -2769,6 +2770,7 @@ struct ixgbe_mac_operations {
35365 /* Manageability interface */
35366 s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
35367 };
35368+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
35369
35370 struct ixgbe_phy_operations {
35371 s32 (*identify)(struct ixgbe_hw *);
35372@@ -2788,9 +2790,10 @@ struct ixgbe_phy_operations {
35373 s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
35374 s32 (*check_overtemp)(struct ixgbe_hw *);
35375 };
35376+typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
35377
35378 struct ixgbe_eeprom_info {
35379- struct ixgbe_eeprom_operations ops;
35380+ ixgbe_eeprom_operations_no_const ops;
35381 enum ixgbe_eeprom_type type;
35382 u32 semaphore_delay;
35383 u16 word_size;
35384@@ -2800,7 +2803,7 @@ struct ixgbe_eeprom_info {
35385
35386 #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED 0x01
35387 struct ixgbe_mac_info {
35388- struct ixgbe_mac_operations ops;
35389+ ixgbe_mac_operations_no_const ops;
35390 enum ixgbe_mac_type type;
35391 u8 addr[ETH_ALEN];
35392 u8 perm_addr[ETH_ALEN];
35393@@ -2828,7 +2831,7 @@ struct ixgbe_mac_info {
35394 };
35395
35396 struct ixgbe_phy_info {
35397- struct ixgbe_phy_operations ops;
35398+ ixgbe_phy_operations_no_const ops;
35399 struct mdio_if_info mdio;
35400 enum ixgbe_phy_type type;
35401 u32 id;
35402@@ -2856,6 +2859,7 @@ struct ixgbe_mbx_operations {
35403 s32 (*check_for_ack)(struct ixgbe_hw *, u16);
35404 s32 (*check_for_rst)(struct ixgbe_hw *, u16);
35405 };
35406+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
35407
35408 struct ixgbe_mbx_stats {
35409 u32 msgs_tx;
35410@@ -2867,7 +2871,7 @@ struct ixgbe_mbx_stats {
35411 };
35412
35413 struct ixgbe_mbx_info {
35414- struct ixgbe_mbx_operations ops;
35415+ ixgbe_mbx_operations_no_const ops;
35416 struct ixgbe_mbx_stats stats;
35417 u32 timeout;
35418 u32 usec_delay;
35419diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
35420index 25c951d..cc7cf33 100644
35421--- a/drivers/net/ethernet/intel/ixgbevf/vf.h
35422+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
35423@@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
35424 s32 (*clear_vfta)(struct ixgbe_hw *);
35425 s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
35426 };
35427+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
35428
35429 enum ixgbe_mac_type {
35430 ixgbe_mac_unknown = 0,
35431@@ -79,7 +80,7 @@ enum ixgbe_mac_type {
35432 };
35433
35434 struct ixgbe_mac_info {
35435- struct ixgbe_mac_operations ops;
35436+ ixgbe_mac_operations_no_const ops;
35437 u8 addr[6];
35438 u8 perm_addr[6];
35439
35440@@ -103,6 +104,7 @@ struct ixgbe_mbx_operations {
35441 s32 (*check_for_ack)(struct ixgbe_hw *);
35442 s32 (*check_for_rst)(struct ixgbe_hw *);
35443 };
35444+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
35445
35446 struct ixgbe_mbx_stats {
35447 u32 msgs_tx;
35448@@ -114,7 +116,7 @@ struct ixgbe_mbx_stats {
35449 };
35450
35451 struct ixgbe_mbx_info {
35452- struct ixgbe_mbx_operations ops;
35453+ ixgbe_mbx_operations_no_const ops;
35454 struct ixgbe_mbx_stats stats;
35455 u32 timeout;
35456 u32 udelay;
35457diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
35458index 8bf22b6..7f5baaa 100644
35459--- a/drivers/net/ethernet/mellanox/mlx4/main.c
35460+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
35461@@ -41,6 +41,7 @@
35462 #include <linux/slab.h>
35463 #include <linux/io-mapping.h>
35464 #include <linux/delay.h>
35465+#include <linux/sched.h>
35466
35467 #include <linux/mlx4/device.h>
35468 #include <linux/mlx4/doorbell.h>
35469diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35470index 5046a64..71ca936 100644
35471--- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
35472+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35473@@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
35474 void (*link_down)(struct __vxge_hw_device *devh);
35475 void (*crit_err)(struct __vxge_hw_device *devh,
35476 enum vxge_hw_event type, u64 ext_data);
35477-};
35478+} __no_const;
35479
35480 /*
35481 * struct __vxge_hw_blockpool_entry - Block private data structure
35482diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35483index 4a518a3..936b334 100644
35484--- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35485+++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35486@@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
35487 struct vxge_hw_mempool_dma *dma_object,
35488 u32 index,
35489 u32 is_last);
35490-};
35491+} __no_const;
35492
35493 #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \
35494 ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
35495diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
35496index bbacb37..d60887d 100644
35497--- a/drivers/net/ethernet/realtek/r8169.c
35498+++ b/drivers/net/ethernet/realtek/r8169.c
35499@@ -695,17 +695,17 @@ struct rtl8169_private {
35500 struct mdio_ops {
35501 void (*write)(void __iomem *, int, int);
35502 int (*read)(void __iomem *, int);
35503- } mdio_ops;
35504+ } __no_const mdio_ops;
35505
35506 struct pll_power_ops {
35507 void (*down)(struct rtl8169_private *);
35508 void (*up)(struct rtl8169_private *);
35509- } pll_power_ops;
35510+ } __no_const pll_power_ops;
35511
35512 struct jumbo_ops {
35513 void (*enable)(struct rtl8169_private *);
35514 void (*disable)(struct rtl8169_private *);
35515- } jumbo_ops;
35516+ } __no_const jumbo_ops;
35517
35518 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
35519 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
35520diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
35521index 5b118cd..858b523 100644
35522--- a/drivers/net/ethernet/sis/sis190.c
35523+++ b/drivers/net/ethernet/sis/sis190.c
35524@@ -1622,7 +1622,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
35525 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
35526 struct net_device *dev)
35527 {
35528- static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
35529+ static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
35530 struct sis190_private *tp = netdev_priv(dev);
35531 struct pci_dev *isa_bridge;
35532 u8 reg, tmp8;
35533diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35534index c07cfe9..81cbf7e 100644
35535--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35536+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35537@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
35538
35539 writel(value, ioaddr + MMC_CNTRL);
35540
35541- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35542- MMC_CNTRL, value);
35543+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35544+// MMC_CNTRL, value);
35545 }
35546
35547 /* To mask all all interrupts.*/
35548diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
35549index dec5836..6d4db7d 100644
35550--- a/drivers/net/hyperv/hyperv_net.h
35551+++ b/drivers/net/hyperv/hyperv_net.h
35552@@ -97,7 +97,7 @@ struct rndis_device {
35553
35554 enum rndis_device_state state;
35555 bool link_state;
35556- atomic_t new_req_id;
35557+ atomic_unchecked_t new_req_id;
35558
35559 spinlock_t request_lock;
35560 struct list_head req_list;
35561diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
35562index 133b7fb..d58c559 100644
35563--- a/drivers/net/hyperv/rndis_filter.c
35564+++ b/drivers/net/hyperv/rndis_filter.c
35565@@ -96,7 +96,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
35566 * template
35567 */
35568 set = &rndis_msg->msg.set_req;
35569- set->req_id = atomic_inc_return(&dev->new_req_id);
35570+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
35571
35572 /* Add to the request list */
35573 spin_lock_irqsave(&dev->request_lock, flags);
35574@@ -627,7 +627,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
35575
35576 /* Setup the rndis set */
35577 halt = &request->request_msg.msg.halt_req;
35578- halt->req_id = atomic_inc_return(&dev->new_req_id);
35579+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
35580
35581 /* Ignore return since this msg is optional. */
35582 rndis_filter_send_request(dev, request);
35583diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
35584index 58dc117..f140c77 100644
35585--- a/drivers/net/macvtap.c
35586+++ b/drivers/net/macvtap.c
35587@@ -526,6 +526,8 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
35588 }
35589 base = (unsigned long)from->iov_base + offset1;
35590 size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;
35591+ if (i + size >= MAX_SKB_FRAGS)
35592+ return -EFAULT;
35593 num_pages = get_user_pages_fast(base, size, 0, &page[i]);
35594 if ((num_pages != size) ||
35595 (num_pages > MAX_SKB_FRAGS - skb_shinfo(skb)->nr_frags))
35596diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
35597index 3ed983c..a1bb418 100644
35598--- a/drivers/net/ppp/ppp_generic.c
35599+++ b/drivers/net/ppp/ppp_generic.c
35600@@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35601 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
35602 struct ppp_stats stats;
35603 struct ppp_comp_stats cstats;
35604- char *vers;
35605
35606 switch (cmd) {
35607 case SIOCGPPPSTATS:
35608@@ -1008,8 +1007,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35609 break;
35610
35611 case SIOCGPPPVER:
35612- vers = PPP_VERSION;
35613- if (copy_to_user(addr, vers, strlen(vers) + 1))
35614+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
35615 break;
35616 err = 0;
35617 break;
35618diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
35619index 515f122..41dd273 100644
35620--- a/drivers/net/tokenring/abyss.c
35621+++ b/drivers/net/tokenring/abyss.c
35622@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = {
35623
35624 static int __init abyss_init (void)
35625 {
35626- abyss_netdev_ops = tms380tr_netdev_ops;
35627+ pax_open_kernel();
35628+ memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35629
35630- abyss_netdev_ops.ndo_open = abyss_open;
35631- abyss_netdev_ops.ndo_stop = abyss_close;
35632+ *(void **)&abyss_netdev_ops.ndo_open = abyss_open;
35633+ *(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
35634+ pax_close_kernel();
35635
35636 return pci_register_driver(&abyss_driver);
35637 }
35638diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
35639index 6153cfd..cf69c1c 100644
35640--- a/drivers/net/tokenring/madgemc.c
35641+++ b/drivers/net/tokenring/madgemc.c
35642@@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver = {
35643
35644 static int __init madgemc_init (void)
35645 {
35646- madgemc_netdev_ops = tms380tr_netdev_ops;
35647- madgemc_netdev_ops.ndo_open = madgemc_open;
35648- madgemc_netdev_ops.ndo_stop = madgemc_close;
35649+ pax_open_kernel();
35650+ memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35651+ *(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
35652+ *(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
35653+ pax_close_kernel();
35654
35655 return mca_register_driver (&madgemc_driver);
35656 }
35657diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
35658index 8d362e6..f91cc52 100644
35659--- a/drivers/net/tokenring/proteon.c
35660+++ b/drivers/net/tokenring/proteon.c
35661@@ -353,9 +353,11 @@ static int __init proteon_init(void)
35662 struct platform_device *pdev;
35663 int i, num = 0, err = 0;
35664
35665- proteon_netdev_ops = tms380tr_netdev_ops;
35666- proteon_netdev_ops.ndo_open = proteon_open;
35667- proteon_netdev_ops.ndo_stop = tms380tr_close;
35668+ pax_open_kernel();
35669+ memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35670+ *(void **)&proteon_netdev_ops.ndo_open = proteon_open;
35671+ *(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
35672+ pax_close_kernel();
35673
35674 err = platform_driver_register(&proteon_driver);
35675 if (err)
35676diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
35677index 46db5c5..37c1536 100644
35678--- a/drivers/net/tokenring/skisa.c
35679+++ b/drivers/net/tokenring/skisa.c
35680@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
35681 struct platform_device *pdev;
35682 int i, num = 0, err = 0;
35683
35684- sk_isa_netdev_ops = tms380tr_netdev_ops;
35685- sk_isa_netdev_ops.ndo_open = sk_isa_open;
35686- sk_isa_netdev_ops.ndo_stop = tms380tr_close;
35687+ pax_open_kernel();
35688+ memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35689+ *(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
35690+ *(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
35691+ pax_close_kernel();
35692
35693 err = platform_driver_register(&sk_isa_driver);
35694 if (err)
35695diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
35696index e1324b4..e1b0041 100644
35697--- a/drivers/net/usb/hso.c
35698+++ b/drivers/net/usb/hso.c
35699@@ -71,7 +71,7 @@
35700 #include <asm/byteorder.h>
35701 #include <linux/serial_core.h>
35702 #include <linux/serial.h>
35703-
35704+#include <asm/local.h>
35705
35706 #define MOD_AUTHOR "Option Wireless"
35707 #define MOD_DESCRIPTION "USB High Speed Option driver"
35708@@ -257,7 +257,7 @@ struct hso_serial {
35709
35710 /* from usb_serial_port */
35711 struct tty_struct *tty;
35712- int open_count;
35713+ local_t open_count;
35714 spinlock_t serial_lock;
35715
35716 int (*write_data) (struct hso_serial *serial);
35717@@ -1190,7 +1190,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
35718 struct urb *urb;
35719
35720 urb = serial->rx_urb[0];
35721- if (serial->open_count > 0) {
35722+ if (local_read(&serial->open_count) > 0) {
35723 count = put_rxbuf_data(urb, serial);
35724 if (count == -1)
35725 return;
35726@@ -1226,7 +1226,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
35727 DUMP1(urb->transfer_buffer, urb->actual_length);
35728
35729 /* Anyone listening? */
35730- if (serial->open_count == 0)
35731+ if (local_read(&serial->open_count) == 0)
35732 return;
35733
35734 if (status == 0) {
35735@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35736 spin_unlock_irq(&serial->serial_lock);
35737
35738 /* check for port already opened, if not set the termios */
35739- serial->open_count++;
35740- if (serial->open_count == 1) {
35741+ if (local_inc_return(&serial->open_count) == 1) {
35742 serial->rx_state = RX_IDLE;
35743 /* Force default termio settings */
35744 _hso_serial_set_termios(tty, NULL);
35745@@ -1324,7 +1323,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35746 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
35747 if (result) {
35748 hso_stop_serial_device(serial->parent);
35749- serial->open_count--;
35750+ local_dec(&serial->open_count);
35751 kref_put(&serial->parent->ref, hso_serial_ref_free);
35752 }
35753 } else {
35754@@ -1361,10 +1360,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
35755
35756 /* reset the rts and dtr */
35757 /* do the actual close */
35758- serial->open_count--;
35759+ local_dec(&serial->open_count);
35760
35761- if (serial->open_count <= 0) {
35762- serial->open_count = 0;
35763+ if (local_read(&serial->open_count) <= 0) {
35764+ local_set(&serial->open_count, 0);
35765 spin_lock_irq(&serial->serial_lock);
35766 if (serial->tty == tty) {
35767 serial->tty->driver_data = NULL;
35768@@ -1446,7 +1445,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
35769
35770 /* the actual setup */
35771 spin_lock_irqsave(&serial->serial_lock, flags);
35772- if (serial->open_count)
35773+ if (local_read(&serial->open_count))
35774 _hso_serial_set_termios(tty, old);
35775 else
35776 tty->termios = old;
35777@@ -1905,7 +1904,7 @@ static void intr_callback(struct urb *urb)
35778 D1("Pending read interrupt on port %d\n", i);
35779 spin_lock(&serial->serial_lock);
35780 if (serial->rx_state == RX_IDLE &&
35781- serial->open_count > 0) {
35782+ local_read(&serial->open_count) > 0) {
35783 /* Setup and send a ctrl req read on
35784 * port i */
35785 if (!serial->rx_urb_filled[0]) {
35786@@ -3098,7 +3097,7 @@ static int hso_resume(struct usb_interface *iface)
35787 /* Start all serial ports */
35788 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
35789 if (serial_table[i] && (serial_table[i]->interface == iface)) {
35790- if (dev2ser(serial_table[i])->open_count) {
35791+ if (local_read(&dev2ser(serial_table[i])->open_count)) {
35792 result =
35793 hso_start_serial_device(serial_table[i], GFP_NOIO);
35794 hso_kick_transmit(dev2ser(serial_table[i]));
35795diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
35796index efc0111..79c8f5b 100644
35797--- a/drivers/net/wireless/ath/ath.h
35798+++ b/drivers/net/wireless/ath/ath.h
35799@@ -119,6 +119,7 @@ struct ath_ops {
35800 void (*write_flush) (void *);
35801 u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
35802 };
35803+typedef struct ath_ops __no_const ath_ops_no_const;
35804
35805 struct ath_common;
35806 struct ath_bus_ops;
35807diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
35808index 8c5ce8b..abf101b 100644
35809--- a/drivers/net/wireless/ath/ath5k/debug.c
35810+++ b/drivers/net/wireless/ath/ath5k/debug.c
35811@@ -343,6 +343,9 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
35812
35813 static ssize_t write_file_debug(struct file *file,
35814 const char __user *userbuf,
35815+ size_t count, loff_t *ppos) __size_overflow(3);
35816+static ssize_t write_file_debug(struct file *file,
35817+ const char __user *userbuf,
35818 size_t count, loff_t *ppos)
35819 {
35820 struct ath5k_hw *ah = file->private_data;
35821diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35822index 7b6417b..ab5db98 100644
35823--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35824+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35825@@ -183,8 +183,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35826 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
35827 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
35828
35829- ACCESS_ONCE(ads->ds_link) = i->link;
35830- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
35831+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
35832+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
35833
35834 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
35835 ctl6 = SM(i->keytype, AR_EncrType);
35836@@ -198,26 +198,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35837
35838 if ((i->is_first || i->is_last) &&
35839 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
35840- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
35841+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
35842 | set11nTries(i->rates, 1)
35843 | set11nTries(i->rates, 2)
35844 | set11nTries(i->rates, 3)
35845 | (i->dur_update ? AR_DurUpdateEna : 0)
35846 | SM(0, AR_BurstDur);
35847
35848- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
35849+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
35850 | set11nRate(i->rates, 1)
35851 | set11nRate(i->rates, 2)
35852 | set11nRate(i->rates, 3);
35853 } else {
35854- ACCESS_ONCE(ads->ds_ctl2) = 0;
35855- ACCESS_ONCE(ads->ds_ctl3) = 0;
35856+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
35857+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
35858 }
35859
35860 if (!i->is_first) {
35861- ACCESS_ONCE(ads->ds_ctl0) = 0;
35862- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35863- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35864+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
35865+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35866+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35867 return;
35868 }
35869
35870@@ -242,7 +242,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35871 break;
35872 }
35873
35874- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35875+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35876 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
35877 | SM(i->txpower, AR_XmitPower)
35878 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
35879@@ -252,19 +252,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35880 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
35881 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
35882
35883- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35884- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35885+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35886+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35887
35888 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
35889 return;
35890
35891- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35892+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35893 | set11nPktDurRTSCTS(i->rates, 1);
35894
35895- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35896+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35897 | set11nPktDurRTSCTS(i->rates, 3);
35898
35899- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35900+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35901 | set11nRateFlags(i->rates, 1)
35902 | set11nRateFlags(i->rates, 2)
35903 | set11nRateFlags(i->rates, 3)
35904diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35905index 09b8c9d..905339e 100644
35906--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35907+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35908@@ -35,47 +35,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35909 (i->qcu << AR_TxQcuNum_S) | 0x17;
35910
35911 checksum += val;
35912- ACCESS_ONCE(ads->info) = val;
35913+ ACCESS_ONCE_RW(ads->info) = val;
35914
35915 checksum += i->link;
35916- ACCESS_ONCE(ads->link) = i->link;
35917+ ACCESS_ONCE_RW(ads->link) = i->link;
35918
35919 checksum += i->buf_addr[0];
35920- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
35921+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
35922 checksum += i->buf_addr[1];
35923- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
35924+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
35925 checksum += i->buf_addr[2];
35926- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
35927+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
35928 checksum += i->buf_addr[3];
35929- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
35930+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
35931
35932 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
35933- ACCESS_ONCE(ads->ctl3) = val;
35934+ ACCESS_ONCE_RW(ads->ctl3) = val;
35935 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
35936- ACCESS_ONCE(ads->ctl5) = val;
35937+ ACCESS_ONCE_RW(ads->ctl5) = val;
35938 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
35939- ACCESS_ONCE(ads->ctl7) = val;
35940+ ACCESS_ONCE_RW(ads->ctl7) = val;
35941 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
35942- ACCESS_ONCE(ads->ctl9) = val;
35943+ ACCESS_ONCE_RW(ads->ctl9) = val;
35944
35945 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
35946- ACCESS_ONCE(ads->ctl10) = checksum;
35947+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
35948
35949 if (i->is_first || i->is_last) {
35950- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
35951+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
35952 | set11nTries(i->rates, 1)
35953 | set11nTries(i->rates, 2)
35954 | set11nTries(i->rates, 3)
35955 | (i->dur_update ? AR_DurUpdateEna : 0)
35956 | SM(0, AR_BurstDur);
35957
35958- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
35959+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
35960 | set11nRate(i->rates, 1)
35961 | set11nRate(i->rates, 2)
35962 | set11nRate(i->rates, 3);
35963 } else {
35964- ACCESS_ONCE(ads->ctl13) = 0;
35965- ACCESS_ONCE(ads->ctl14) = 0;
35966+ ACCESS_ONCE_RW(ads->ctl13) = 0;
35967+ ACCESS_ONCE_RW(ads->ctl14) = 0;
35968 }
35969
35970 ads->ctl20 = 0;
35971@@ -84,17 +84,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35972
35973 ctl17 = SM(i->keytype, AR_EncrType);
35974 if (!i->is_first) {
35975- ACCESS_ONCE(ads->ctl11) = 0;
35976- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
35977- ACCESS_ONCE(ads->ctl15) = 0;
35978- ACCESS_ONCE(ads->ctl16) = 0;
35979- ACCESS_ONCE(ads->ctl17) = ctl17;
35980- ACCESS_ONCE(ads->ctl18) = 0;
35981- ACCESS_ONCE(ads->ctl19) = 0;
35982+ ACCESS_ONCE_RW(ads->ctl11) = 0;
35983+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
35984+ ACCESS_ONCE_RW(ads->ctl15) = 0;
35985+ ACCESS_ONCE_RW(ads->ctl16) = 0;
35986+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
35987+ ACCESS_ONCE_RW(ads->ctl18) = 0;
35988+ ACCESS_ONCE_RW(ads->ctl19) = 0;
35989 return;
35990 }
35991
35992- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
35993+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
35994 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
35995 | SM(i->txpower, AR_XmitPower)
35996 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
35997@@ -130,22 +130,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35998 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
35999 ctl12 |= SM(val, AR_PAPRDChainMask);
36000
36001- ACCESS_ONCE(ads->ctl12) = ctl12;
36002- ACCESS_ONCE(ads->ctl17) = ctl17;
36003+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
36004+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
36005
36006- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
36007+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
36008 | set11nPktDurRTSCTS(i->rates, 1);
36009
36010- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
36011+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
36012 | set11nPktDurRTSCTS(i->rates, 3);
36013
36014- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
36015+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
36016 | set11nRateFlags(i->rates, 1)
36017 | set11nRateFlags(i->rates, 2)
36018 | set11nRateFlags(i->rates, 3)
36019 | SM(i->rtscts_rate, AR_RTSCTSRate);
36020
36021- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
36022+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
36023 }
36024
36025 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
36026diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
36027index 68d972b..1d9205b 100644
36028--- a/drivers/net/wireless/ath/ath9k/debug.c
36029+++ b/drivers/net/wireless/ath/ath9k/debug.c
36030@@ -60,6 +60,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
36031 }
36032
36033 static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
36034+ size_t count, loff_t *ppos) __size_overflow(3);
36035+static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
36036 size_t count, loff_t *ppos)
36037 {
36038 struct ath_softc *sc = file->private_data;
36039diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
36040index d3ff33c..c98bcda 100644
36041--- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
36042+++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
36043@@ -464,6 +464,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
36044 }
36045
36046 static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
36047+ size_t count, loff_t *ppos) __size_overflow(3);
36048+static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
36049 size_t count, loff_t *ppos)
36050 {
36051 struct ath9k_htc_priv *priv = file->private_data;
36052diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
36053index c8261d4..8d88929 100644
36054--- a/drivers/net/wireless/ath/ath9k/hw.h
36055+++ b/drivers/net/wireless/ath/ath9k/hw.h
36056@@ -773,7 +773,7 @@ struct ath_hw_private_ops {
36057
36058 /* ANI */
36059 void (*ani_cache_ini_regs)(struct ath_hw *ah);
36060-};
36061+} __no_const;
36062
36063 /**
36064 * struct ath_hw_ops - callbacks used by hardware code and driver code
36065@@ -803,7 +803,7 @@ struct ath_hw_ops {
36066 void (*antdiv_comb_conf_set)(struct ath_hw *ah,
36067 struct ath_hw_antcomb_conf *antconf);
36068
36069-};
36070+} __no_const;
36071
36072 struct ath_nf_limits {
36073 s16 max;
36074@@ -823,7 +823,7 @@ enum ath_cal_list {
36075 #define AH_FASTCC 0x4
36076
36077 struct ath_hw {
36078- struct ath_ops reg_ops;
36079+ ath_ops_no_const reg_ops;
36080
36081 struct ieee80211_hw *hw;
36082 struct ath_common common;
36083diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
36084index af00e2c..ab04d34 100644
36085--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
36086+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
36087@@ -545,7 +545,7 @@ struct phy_func_ptr {
36088 void (*carrsuppr)(struct brcms_phy *);
36089 s32 (*rxsigpwr)(struct brcms_phy *, s32);
36090 void (*detach)(struct brcms_phy *);
36091-};
36092+} __no_const;
36093
36094 struct brcms_phy {
36095 struct brcms_phy_pub pubpi_ro;
36096diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
36097index a2ec369..36fdf14 100644
36098--- a/drivers/net/wireless/iwlegacy/3945-mac.c
36099+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
36100@@ -3646,7 +3646,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
36101 */
36102 if (il3945_mod_params.disable_hw_scan) {
36103 D_INFO("Disabling hw_scan\n");
36104- il3945_hw_ops.hw_scan = NULL;
36105+ pax_open_kernel();
36106+ *(void **)&il3945_hw_ops.hw_scan = NULL;
36107+ pax_close_kernel();
36108 }
36109
36110 D_INFO("*** LOAD DRIVER ***\n");
36111diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
36112index f8fc239..8cade22 100644
36113--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
36114+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
36115@@ -86,8 +86,8 @@ do { \
36116 } while (0)
36117
36118 #else
36119-#define IWL_DEBUG(m, level, fmt, args...)
36120-#define IWL_DEBUG_LIMIT(m, level, fmt, args...)
36121+#define IWL_DEBUG(m, level, fmt, args...) do {} while (0)
36122+#define IWL_DEBUG_LIMIT(m, level, fmt, args...) do {} while (0)
36123 #define iwl_print_hex_dump(m, level, p, len)
36124 #define IWL_DEBUG_QUIET_RFKILL(p, fmt, args...) \
36125 do { \
36126diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
36127index 4b9e730..7603659 100644
36128--- a/drivers/net/wireless/mac80211_hwsim.c
36129+++ b/drivers/net/wireless/mac80211_hwsim.c
36130@@ -1677,9 +1677,11 @@ static int __init init_mac80211_hwsim(void)
36131 return -EINVAL;
36132
36133 if (fake_hw_scan) {
36134- mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
36135- mac80211_hwsim_ops.sw_scan_start = NULL;
36136- mac80211_hwsim_ops.sw_scan_complete = NULL;
36137+ pax_open_kernel();
36138+ *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
36139+ *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
36140+ *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
36141+ pax_close_kernel();
36142 }
36143
36144 spin_lock_init(&hwsim_radio_lock);
36145diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
36146index 3186aa4..b35b09f 100644
36147--- a/drivers/net/wireless/mwifiex/main.h
36148+++ b/drivers/net/wireless/mwifiex/main.h
36149@@ -536,7 +536,7 @@ struct mwifiex_if_ops {
36150 void (*cleanup_mpa_buf) (struct mwifiex_adapter *);
36151 int (*cmdrsp_complete) (struct mwifiex_adapter *, struct sk_buff *);
36152 int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);
36153-};
36154+} __no_const;
36155
36156 struct mwifiex_adapter {
36157 u8 iface_type;
36158diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
36159index a330c69..a81540f 100644
36160--- a/drivers/net/wireless/rndis_wlan.c
36161+++ b/drivers/net/wireless/rndis_wlan.c
36162@@ -1278,7 +1278,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
36163
36164 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
36165
36166- if (rts_threshold < 0 || rts_threshold > 2347)
36167+ if (rts_threshold > 2347)
36168 rts_threshold = 2347;
36169
36170 tmp = cpu_to_le32(rts_threshold);
36171diff --git a/drivers/net/wireless/wl1251/wl1251.h b/drivers/net/wireless/wl1251/wl1251.h
36172index a77f1bb..c608b2b 100644
36173--- a/drivers/net/wireless/wl1251/wl1251.h
36174+++ b/drivers/net/wireless/wl1251/wl1251.h
36175@@ -266,7 +266,7 @@ struct wl1251_if_operations {
36176 void (*reset)(struct wl1251 *wl);
36177 void (*enable_irq)(struct wl1251 *wl);
36178 void (*disable_irq)(struct wl1251 *wl);
36179-};
36180+} __no_const;
36181
36182 struct wl1251 {
36183 struct ieee80211_hw *hw;
36184diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
36185index f34b5b2..b5abb9f 100644
36186--- a/drivers/oprofile/buffer_sync.c
36187+++ b/drivers/oprofile/buffer_sync.c
36188@@ -343,7 +343,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
36189 if (cookie == NO_COOKIE)
36190 offset = pc;
36191 if (cookie == INVALID_COOKIE) {
36192- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
36193+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
36194 offset = pc;
36195 }
36196 if (cookie != last_cookie) {
36197@@ -387,14 +387,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
36198 /* add userspace sample */
36199
36200 if (!mm) {
36201- atomic_inc(&oprofile_stats.sample_lost_no_mm);
36202+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
36203 return 0;
36204 }
36205
36206 cookie = lookup_dcookie(mm, s->eip, &offset);
36207
36208 if (cookie == INVALID_COOKIE) {
36209- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
36210+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
36211 return 0;
36212 }
36213
36214@@ -563,7 +563,7 @@ void sync_buffer(int cpu)
36215 /* ignore backtraces if failed to add a sample */
36216 if (state == sb_bt_start) {
36217 state = sb_bt_ignore;
36218- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
36219+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
36220 }
36221 }
36222 release_mm(mm);
36223diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
36224index c0cc4e7..44d4e54 100644
36225--- a/drivers/oprofile/event_buffer.c
36226+++ b/drivers/oprofile/event_buffer.c
36227@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
36228 }
36229
36230 if (buffer_pos == buffer_size) {
36231- atomic_inc(&oprofile_stats.event_lost_overflow);
36232+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
36233 return;
36234 }
36235
36236diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
36237index ed2c3ec..deda85a 100644
36238--- a/drivers/oprofile/oprof.c
36239+++ b/drivers/oprofile/oprof.c
36240@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
36241 if (oprofile_ops.switch_events())
36242 return;
36243
36244- atomic_inc(&oprofile_stats.multiplex_counter);
36245+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
36246 start_switch_worker();
36247 }
36248
36249diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
36250index 84a208d..f07d177 100644
36251--- a/drivers/oprofile/oprofile_files.c
36252+++ b/drivers/oprofile/oprofile_files.c
36253@@ -36,6 +36,8 @@ static ssize_t timeout_read(struct file *file, char __user *buf,
36254
36255
36256 static ssize_t timeout_write(struct file *file, char const __user *buf,
36257+ size_t count, loff_t *offset) __size_overflow(3);
36258+static ssize_t timeout_write(struct file *file, char const __user *buf,
36259 size_t count, loff_t *offset)
36260 {
36261 unsigned long val;
36262@@ -72,6 +74,7 @@ static ssize_t depth_read(struct file *file, char __user *buf, size_t count, lof
36263 }
36264
36265
36266+static ssize_t depth_write(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
36267 static ssize_t depth_write(struct file *file, char const __user *buf, size_t count, loff_t *offset)
36268 {
36269 unsigned long val;
36270@@ -126,12 +129,14 @@ static const struct file_operations cpu_type_fops = {
36271 };
36272
36273
36274+static ssize_t enable_read(struct file *file, char __user *buf, size_t count, loff_t *offset) __size_overflow(3);
36275 static ssize_t enable_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
36276 {
36277 return oprofilefs_ulong_to_user(oprofile_started, buf, count, offset);
36278 }
36279
36280
36281+static ssize_t enable_write(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
36282 static ssize_t enable_write(struct file *file, char const __user *buf, size_t count, loff_t *offset)
36283 {
36284 unsigned long val;
36285diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
36286index 917d28e..d62d981 100644
36287--- a/drivers/oprofile/oprofile_stats.c
36288+++ b/drivers/oprofile/oprofile_stats.c
36289@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
36290 cpu_buf->sample_invalid_eip = 0;
36291 }
36292
36293- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
36294- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
36295- atomic_set(&oprofile_stats.event_lost_overflow, 0);
36296- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
36297- atomic_set(&oprofile_stats.multiplex_counter, 0);
36298+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
36299+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
36300+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
36301+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
36302+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
36303 }
36304
36305
36306diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
36307index 38b6fc0..b5cbfce 100644
36308--- a/drivers/oprofile/oprofile_stats.h
36309+++ b/drivers/oprofile/oprofile_stats.h
36310@@ -13,11 +13,11 @@
36311 #include <linux/atomic.h>
36312
36313 struct oprofile_stat_struct {
36314- atomic_t sample_lost_no_mm;
36315- atomic_t sample_lost_no_mapping;
36316- atomic_t bt_lost_no_mapping;
36317- atomic_t event_lost_overflow;
36318- atomic_t multiplex_counter;
36319+ atomic_unchecked_t sample_lost_no_mm;
36320+ atomic_unchecked_t sample_lost_no_mapping;
36321+ atomic_unchecked_t bt_lost_no_mapping;
36322+ atomic_unchecked_t event_lost_overflow;
36323+ atomic_unchecked_t multiplex_counter;
36324 };
36325
36326 extern struct oprofile_stat_struct oprofile_stats;
36327diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
36328index 2f0aa0f..d5246c3 100644
36329--- a/drivers/oprofile/oprofilefs.c
36330+++ b/drivers/oprofile/oprofilefs.c
36331@@ -97,6 +97,7 @@ static ssize_t ulong_read_file(struct file *file, char __user *buf, size_t count
36332 }
36333
36334
36335+static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
36336 static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_t count, loff_t *offset)
36337 {
36338 unsigned long value;
36339@@ -193,7 +194,7 @@ static const struct file_operations atomic_ro_fops = {
36340
36341
36342 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
36343- char const *name, atomic_t *val)
36344+ char const *name, atomic_unchecked_t *val)
36345 {
36346 return __oprofilefs_create_file(sb, root, name,
36347 &atomic_ro_fops, 0444, val);
36348diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
36349index 3f56bc0..707d642 100644
36350--- a/drivers/parport/procfs.c
36351+++ b/drivers/parport/procfs.c
36352@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
36353
36354 *ppos += len;
36355
36356- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
36357+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
36358 }
36359
36360 #ifdef CONFIG_PARPORT_1284
36361@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
36362
36363 *ppos += len;
36364
36365- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
36366+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
36367 }
36368 #endif /* IEEE1284.3 support. */
36369
36370diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h
36371index 9fff878..ad0ad53 100644
36372--- a/drivers/pci/hotplug/cpci_hotplug.h
36373+++ b/drivers/pci/hotplug/cpci_hotplug.h
36374@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
36375 int (*hardware_test) (struct slot* slot, u32 value);
36376 u8 (*get_power) (struct slot* slot);
36377 int (*set_power) (struct slot* slot, int value);
36378-};
36379+} __no_const;
36380
36381 struct cpci_hp_controller {
36382 unsigned int irq;
36383diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
36384index 76ba8a1..20ca857 100644
36385--- a/drivers/pci/hotplug/cpqphp_nvram.c
36386+++ b/drivers/pci/hotplug/cpqphp_nvram.c
36387@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
36388
36389 void compaq_nvram_init (void __iomem *rom_start)
36390 {
36391+
36392+#ifndef CONFIG_PAX_KERNEXEC
36393 if (rom_start) {
36394 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
36395 }
36396+#endif
36397+
36398 dbg("int15 entry = %p\n", compaq_int15_entry_point);
36399
36400 /* initialize our int15 lock */
36401diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
36402index 2275162..95f1a92 100644
36403--- a/drivers/pci/pcie/aspm.c
36404+++ b/drivers/pci/pcie/aspm.c
36405@@ -27,9 +27,9 @@
36406 #define MODULE_PARAM_PREFIX "pcie_aspm."
36407
36408 /* Note: those are not register definitions */
36409-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
36410-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
36411-#define ASPM_STATE_L1 (4) /* L1 state */
36412+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
36413+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
36414+#define ASPM_STATE_L1 (4U) /* L1 state */
36415 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
36416 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
36417
36418diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
36419index 71eac9c..2de27ef 100644
36420--- a/drivers/pci/probe.c
36421+++ b/drivers/pci/probe.c
36422@@ -136,7 +136,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
36423 u32 l, sz, mask;
36424 u16 orig_cmd;
36425
36426- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
36427+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
36428
36429 if (!dev->mmio_always_on) {
36430 pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
36431diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
36432index 27911b5..5b6db88 100644
36433--- a/drivers/pci/proc.c
36434+++ b/drivers/pci/proc.c
36435@@ -476,7 +476,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
36436 static int __init pci_proc_init(void)
36437 {
36438 struct pci_dev *dev = NULL;
36439+
36440+#ifdef CONFIG_GRKERNSEC_PROC_ADD
36441+#ifdef CONFIG_GRKERNSEC_PROC_USER
36442+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
36443+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
36444+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
36445+#endif
36446+#else
36447 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
36448+#endif
36449 proc_create("devices", 0, proc_bus_pci_dir,
36450 &proc_bus_pci_dev_operations);
36451 proc_initialized = 1;
36452diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
36453index 6f966d6..68e18ed 100644
36454--- a/drivers/platform/x86/asus_acpi.c
36455+++ b/drivers/platform/x86/asus_acpi.c
36456@@ -887,6 +887,8 @@ static int lcd_proc_open(struct inode *inode, struct file *file)
36457 }
36458
36459 static ssize_t lcd_proc_write(struct file *file, const char __user *buffer,
36460+ size_t count, loff_t *pos) __size_overflow(3);
36461+static ssize_t lcd_proc_write(struct file *file, const char __user *buffer,
36462 size_t count, loff_t *pos)
36463 {
36464 int rv, value;
36465diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
36466index ea0c607..58c4628 100644
36467--- a/drivers/platform/x86/thinkpad_acpi.c
36468+++ b/drivers/platform/x86/thinkpad_acpi.c
36469@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
36470 return 0;
36471 }
36472
36473-void static hotkey_mask_warn_incomplete_mask(void)
36474+static void hotkey_mask_warn_incomplete_mask(void)
36475 {
36476 /* log only what the user can fix... */
36477 const u32 wantedmask = hotkey_driver_mask &
36478@@ -2325,11 +2325,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
36479 }
36480 }
36481
36482-static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36483- struct tp_nvram_state *newn,
36484- const u32 event_mask)
36485-{
36486-
36487 #define TPACPI_COMPARE_KEY(__scancode, __member) \
36488 do { \
36489 if ((event_mask & (1 << __scancode)) && \
36490@@ -2343,36 +2338,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36491 tpacpi_hotkey_send_key(__scancode); \
36492 } while (0)
36493
36494- void issue_volchange(const unsigned int oldvol,
36495- const unsigned int newvol)
36496- {
36497- unsigned int i = oldvol;
36498+static void issue_volchange(const unsigned int oldvol,
36499+ const unsigned int newvol,
36500+ const u32 event_mask)
36501+{
36502+ unsigned int i = oldvol;
36503
36504- while (i > newvol) {
36505- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
36506- i--;
36507- }
36508- while (i < newvol) {
36509- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36510- i++;
36511- }
36512+ while (i > newvol) {
36513+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
36514+ i--;
36515 }
36516+ while (i < newvol) {
36517+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36518+ i++;
36519+ }
36520+}
36521
36522- void issue_brightnesschange(const unsigned int oldbrt,
36523- const unsigned int newbrt)
36524- {
36525- unsigned int i = oldbrt;
36526+static void issue_brightnesschange(const unsigned int oldbrt,
36527+ const unsigned int newbrt,
36528+ const u32 event_mask)
36529+{
36530+ unsigned int i = oldbrt;
36531
36532- while (i > newbrt) {
36533- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
36534- i--;
36535- }
36536- while (i < newbrt) {
36537- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36538- i++;
36539- }
36540+ while (i > newbrt) {
36541+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
36542+ i--;
36543+ }
36544+ while (i < newbrt) {
36545+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36546+ i++;
36547 }
36548+}
36549
36550+static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36551+ struct tp_nvram_state *newn,
36552+ const u32 event_mask)
36553+{
36554 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
36555 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
36556 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
36557@@ -2406,7 +2407,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36558 oldn->volume_level != newn->volume_level) {
36559 /* recently muted, or repeated mute keypress, or
36560 * multiple presses ending in mute */
36561- issue_volchange(oldn->volume_level, newn->volume_level);
36562+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
36563 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
36564 }
36565 } else {
36566@@ -2416,7 +2417,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36567 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36568 }
36569 if (oldn->volume_level != newn->volume_level) {
36570- issue_volchange(oldn->volume_level, newn->volume_level);
36571+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
36572 } else if (oldn->volume_toggle != newn->volume_toggle) {
36573 /* repeated vol up/down keypress at end of scale ? */
36574 if (newn->volume_level == 0)
36575@@ -2429,7 +2430,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36576 /* handle brightness */
36577 if (oldn->brightness_level != newn->brightness_level) {
36578 issue_brightnesschange(oldn->brightness_level,
36579- newn->brightness_level);
36580+ newn->brightness_level,
36581+ event_mask);
36582 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
36583 /* repeated key presses that didn't change state */
36584 if (newn->brightness_level == 0)
36585@@ -2438,10 +2440,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36586 && !tp_features.bright_unkfw)
36587 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36588 }
36589+}
36590
36591 #undef TPACPI_COMPARE_KEY
36592 #undef TPACPI_MAY_SEND_KEY
36593-}
36594
36595 /*
36596 * Polling driver
36597diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
36598index dcdc1f4..85cee16 100644
36599--- a/drivers/platform/x86/toshiba_acpi.c
36600+++ b/drivers/platform/x86/toshiba_acpi.c
36601@@ -517,6 +517,8 @@ static int set_lcd_status(struct backlight_device *bd)
36602 }
36603
36604 static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
36605+ size_t count, loff_t *pos) __size_overflow(3);
36606+static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
36607 size_t count, loff_t *pos)
36608 {
36609 struct toshiba_acpi_dev *dev = PDE(file->f_path.dentry->d_inode)->data;
36610diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
36611index b859d16..5cc6b1a 100644
36612--- a/drivers/pnp/pnpbios/bioscalls.c
36613+++ b/drivers/pnp/pnpbios/bioscalls.c
36614@@ -59,7 +59,7 @@ do { \
36615 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
36616 } while(0)
36617
36618-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
36619+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
36620 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
36621
36622 /*
36623@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36624
36625 cpu = get_cpu();
36626 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
36627+
36628+ pax_open_kernel();
36629 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
36630+ pax_close_kernel();
36631
36632 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
36633 spin_lock_irqsave(&pnp_bios_lock, flags);
36634@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36635 :"memory");
36636 spin_unlock_irqrestore(&pnp_bios_lock, flags);
36637
36638+ pax_open_kernel();
36639 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
36640+ pax_close_kernel();
36641+
36642 put_cpu();
36643
36644 /* If we get here and this is set then the PnP BIOS faulted on us. */
36645@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
36646 return status;
36647 }
36648
36649-void pnpbios_calls_init(union pnp_bios_install_struct *header)
36650+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
36651 {
36652 int i;
36653
36654@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36655 pnp_bios_callpoint.offset = header->fields.pm16offset;
36656 pnp_bios_callpoint.segment = PNP_CS16;
36657
36658+ pax_open_kernel();
36659+
36660 for_each_possible_cpu(i) {
36661 struct desc_struct *gdt = get_cpu_gdt_table(i);
36662 if (!gdt)
36663@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36664 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
36665 (unsigned long)__va(header->fields.pm16dseg));
36666 }
36667+
36668+ pax_close_kernel();
36669 }
36670diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
36671index b0ecacb..7c9da2e 100644
36672--- a/drivers/pnp/resource.c
36673+++ b/drivers/pnp/resource.c
36674@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
36675 return 1;
36676
36677 /* check if the resource is valid */
36678- if (*irq < 0 || *irq > 15)
36679+ if (*irq > 15)
36680 return 0;
36681
36682 /* check if the resource is reserved */
36683@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
36684 return 1;
36685
36686 /* check if the resource is valid */
36687- if (*dma < 0 || *dma == 4 || *dma > 7)
36688+ if (*dma == 4 || *dma > 7)
36689 return 0;
36690
36691 /* check if the resource is reserved */
36692diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
36693index 1ed6ea0..77c0bd2 100644
36694--- a/drivers/power/bq27x00_battery.c
36695+++ b/drivers/power/bq27x00_battery.c
36696@@ -72,7 +72,7 @@
36697 struct bq27x00_device_info;
36698 struct bq27x00_access_methods {
36699 int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
36700-};
36701+} __no_const;
36702
36703 enum bq27x00_chip { BQ27000, BQ27500 };
36704
36705diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
36706index a838e66..a9e1665 100644
36707--- a/drivers/regulator/max8660.c
36708+++ b/drivers/regulator/max8660.c
36709@@ -383,8 +383,10 @@ static int __devinit max8660_probe(struct i2c_client *client,
36710 max8660->shadow_regs[MAX8660_OVER1] = 5;
36711 } else {
36712 /* Otherwise devices can be toggled via software */
36713- max8660_dcdc_ops.enable = max8660_dcdc_enable;
36714- max8660_dcdc_ops.disable = max8660_dcdc_disable;
36715+ pax_open_kernel();
36716+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
36717+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
36718+ pax_close_kernel();
36719 }
36720
36721 /*
36722diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
36723index e8cfc99..072aee2 100644
36724--- a/drivers/regulator/mc13892-regulator.c
36725+++ b/drivers/regulator/mc13892-regulator.c
36726@@ -574,10 +574,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
36727 }
36728 mc13xxx_unlock(mc13892);
36729
36730- mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36731+ pax_open_kernel();
36732+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36733 = mc13892_vcam_set_mode;
36734- mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36735+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36736 = mc13892_vcam_get_mode;
36737+ pax_close_kernel();
36738
36739 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
36740 ARRAY_SIZE(mc13892_regulators));
36741diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
36742index cace6d3..f623fda 100644
36743--- a/drivers/rtc/rtc-dev.c
36744+++ b/drivers/rtc/rtc-dev.c
36745@@ -14,6 +14,7 @@
36746 #include <linux/module.h>
36747 #include <linux/rtc.h>
36748 #include <linux/sched.h>
36749+#include <linux/grsecurity.h>
36750 #include "rtc-core.h"
36751
36752 static dev_t rtc_devt;
36753@@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *file,
36754 if (copy_from_user(&tm, uarg, sizeof(tm)))
36755 return -EFAULT;
36756
36757+ gr_log_timechange();
36758+
36759 return rtc_set_time(rtc, &tm);
36760
36761 case RTC_PIE_ON:
36762diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
36763index ffb5878..e6d785c 100644
36764--- a/drivers/scsi/aacraid/aacraid.h
36765+++ b/drivers/scsi/aacraid/aacraid.h
36766@@ -492,7 +492,7 @@ struct adapter_ops
36767 int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
36768 /* Administrative operations */
36769 int (*adapter_comm)(struct aac_dev * dev, int comm);
36770-};
36771+} __no_const;
36772
36773 /*
36774 * Define which interrupt handler needs to be installed
36775diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
36776index 705e13e..91c873c 100644
36777--- a/drivers/scsi/aacraid/linit.c
36778+++ b/drivers/scsi/aacraid/linit.c
36779@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
36780 #elif defined(__devinitconst)
36781 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36782 #else
36783-static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
36784+static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36785 #endif
36786 { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
36787 { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
36788diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
36789index d5ff142..49c0ebb 100644
36790--- a/drivers/scsi/aic94xx/aic94xx_init.c
36791+++ b/drivers/scsi/aic94xx/aic94xx_init.c
36792@@ -1012,7 +1012,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
36793 .lldd_control_phy = asd_control_phy,
36794 };
36795
36796-static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
36797+static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
36798 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
36799 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
36800 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
36801diff --git a/drivers/scsi/bfa/bfa.h b/drivers/scsi/bfa/bfa.h
36802index a796de9..1ef20e1 100644
36803--- a/drivers/scsi/bfa/bfa.h
36804+++ b/drivers/scsi/bfa/bfa.h
36805@@ -196,7 +196,7 @@ struct bfa_hwif_s {
36806 u32 *end);
36807 int cpe_vec_q0;
36808 int rme_vec_q0;
36809-};
36810+} __no_const;
36811 typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
36812
36813 struct bfa_faa_cbfn_s {
36814diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c
36815index f0f80e2..8ec946b 100644
36816--- a/drivers/scsi/bfa/bfa_fcpim.c
36817+++ b/drivers/scsi/bfa/bfa_fcpim.c
36818@@ -3715,7 +3715,7 @@ bfa_fcp_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,
36819
36820 bfa_iotag_attach(fcp);
36821
36822- fcp->itn_arr = (struct bfa_itn_s *) bfa_mem_kva_curp(fcp);
36823+ fcp->itn_arr = (bfa_itn_s_no_const *) bfa_mem_kva_curp(fcp);
36824 bfa_mem_kva_curp(fcp) = (u8 *)fcp->itn_arr +
36825 (fcp->num_itns * sizeof(struct bfa_itn_s));
36826 memset(fcp->itn_arr, 0,
36827@@ -3773,7 +3773,7 @@ bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36828 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
36829 {
36830 struct bfa_fcp_mod_s *fcp = BFA_FCP_MOD(bfa);
36831- struct bfa_itn_s *itn;
36832+ bfa_itn_s_no_const *itn;
36833
36834 itn = BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
36835 itn->isr = isr;
36836diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
36837index 36f26da..38a34a8 100644
36838--- a/drivers/scsi/bfa/bfa_fcpim.h
36839+++ b/drivers/scsi/bfa/bfa_fcpim.h
36840@@ -37,6 +37,7 @@ struct bfa_iotag_s {
36841 struct bfa_itn_s {
36842 bfa_isr_func_t isr;
36843 };
36844+typedef struct bfa_itn_s __no_const bfa_itn_s_no_const;
36845
36846 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36847 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
36848@@ -147,7 +148,7 @@ struct bfa_fcp_mod_s {
36849 struct list_head iotag_tio_free_q; /* free IO resources */
36850 struct list_head iotag_unused_q; /* unused IO resources*/
36851 struct bfa_iotag_s *iotag_arr;
36852- struct bfa_itn_s *itn_arr;
36853+ bfa_itn_s_no_const *itn_arr;
36854 int num_ioim_reqs;
36855 int num_fwtio_reqs;
36856 int num_itns;
36857diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
36858index 546d46b..642fa5b 100644
36859--- a/drivers/scsi/bfa/bfa_ioc.h
36860+++ b/drivers/scsi/bfa/bfa_ioc.h
36861@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
36862 bfa_ioc_disable_cbfn_t disable_cbfn;
36863 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
36864 bfa_ioc_reset_cbfn_t reset_cbfn;
36865-};
36866+} __no_const;
36867
36868 /*
36869 * IOC event notification mechanism.
36870@@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
36871 void (*ioc_sync_ack) (struct bfa_ioc_s *ioc);
36872 bfa_boolean_t (*ioc_sync_complete) (struct bfa_ioc_s *ioc);
36873 bfa_boolean_t (*ioc_lpu_read_stat) (struct bfa_ioc_s *ioc);
36874-};
36875+} __no_const;
36876
36877 /*
36878 * Queue element to wait for room in request queue. FIFO order is
36879diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
36880index 351dc0b..951dc32 100644
36881--- a/drivers/scsi/hosts.c
36882+++ b/drivers/scsi/hosts.c
36883@@ -42,7 +42,7 @@
36884 #include "scsi_logging.h"
36885
36886
36887-static atomic_t scsi_host_next_hn; /* host_no for next new host */
36888+static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
36889
36890
36891 static void scsi_host_cls_release(struct device *dev)
36892@@ -357,7 +357,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
36893 * subtract one because we increment first then return, but we need to
36894 * know what the next host number was before increment
36895 */
36896- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
36897+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
36898 shost->dma_channel = 0xff;
36899
36900 /* These three are default values which can be overridden */
36901diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
36902index b96962c..0c82ec2 100644
36903--- a/drivers/scsi/hpsa.c
36904+++ b/drivers/scsi/hpsa.c
36905@@ -507,7 +507,7 @@ static inline u32 next_command(struct ctlr_info *h)
36906 u32 a;
36907
36908 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
36909- return h->access.command_completed(h);
36910+ return h->access->command_completed(h);
36911
36912 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
36913 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
36914@@ -2991,7 +2991,7 @@ static void start_io(struct ctlr_info *h)
36915 while (!list_empty(&h->reqQ)) {
36916 c = list_entry(h->reqQ.next, struct CommandList, list);
36917 /* can't do anything if fifo is full */
36918- if ((h->access.fifo_full(h))) {
36919+ if ((h->access->fifo_full(h))) {
36920 dev_warn(&h->pdev->dev, "fifo full\n");
36921 break;
36922 }
36923@@ -3001,7 +3001,7 @@ static void start_io(struct ctlr_info *h)
36924 h->Qdepth--;
36925
36926 /* Tell the controller execute command */
36927- h->access.submit_command(h, c);
36928+ h->access->submit_command(h, c);
36929
36930 /* Put job onto the completed Q */
36931 addQ(&h->cmpQ, c);
36932@@ -3010,17 +3010,17 @@ static void start_io(struct ctlr_info *h)
36933
36934 static inline unsigned long get_next_completion(struct ctlr_info *h)
36935 {
36936- return h->access.command_completed(h);
36937+ return h->access->command_completed(h);
36938 }
36939
36940 static inline bool interrupt_pending(struct ctlr_info *h)
36941 {
36942- return h->access.intr_pending(h);
36943+ return h->access->intr_pending(h);
36944 }
36945
36946 static inline long interrupt_not_for_us(struct ctlr_info *h)
36947 {
36948- return (h->access.intr_pending(h) == 0) ||
36949+ return (h->access->intr_pending(h) == 0) ||
36950 (h->interrupts_enabled == 0);
36951 }
36952
36953@@ -3919,7 +3919,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
36954 if (prod_index < 0)
36955 return -ENODEV;
36956 h->product_name = products[prod_index].product_name;
36957- h->access = *(products[prod_index].access);
36958+ h->access = products[prod_index].access;
36959
36960 if (hpsa_board_disabled(h->pdev)) {
36961 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
36962@@ -4164,7 +4164,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
36963
36964 assert_spin_locked(&lockup_detector_lock);
36965 remove_ctlr_from_lockup_detector_list(h);
36966- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36967+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36968 spin_lock_irqsave(&h->lock, flags);
36969 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
36970 spin_unlock_irqrestore(&h->lock, flags);
36971@@ -4344,7 +4344,7 @@ reinit_after_soft_reset:
36972 }
36973
36974 /* make sure the board interrupts are off */
36975- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36976+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36977
36978 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
36979 goto clean2;
36980@@ -4378,7 +4378,7 @@ reinit_after_soft_reset:
36981 * fake ones to scoop up any residual completions.
36982 */
36983 spin_lock_irqsave(&h->lock, flags);
36984- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36985+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36986 spin_unlock_irqrestore(&h->lock, flags);
36987 free_irq(h->intr[h->intr_mode], h);
36988 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
36989@@ -4397,9 +4397,9 @@ reinit_after_soft_reset:
36990 dev_info(&h->pdev->dev, "Board READY.\n");
36991 dev_info(&h->pdev->dev,
36992 "Waiting for stale completions to drain.\n");
36993- h->access.set_intr_mask(h, HPSA_INTR_ON);
36994+ h->access->set_intr_mask(h, HPSA_INTR_ON);
36995 msleep(10000);
36996- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36997+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36998
36999 rc = controller_reset_failed(h->cfgtable);
37000 if (rc)
37001@@ -4420,7 +4420,7 @@ reinit_after_soft_reset:
37002 }
37003
37004 /* Turn the interrupts on so we can service requests */
37005- h->access.set_intr_mask(h, HPSA_INTR_ON);
37006+ h->access->set_intr_mask(h, HPSA_INTR_ON);
37007
37008 hpsa_hba_inquiry(h);
37009 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
37010@@ -4472,7 +4472,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
37011 * To write all data in the battery backed cache to disks
37012 */
37013 hpsa_flush_cache(h);
37014- h->access.set_intr_mask(h, HPSA_INTR_OFF);
37015+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
37016 free_irq(h->intr[h->intr_mode], h);
37017 #ifdef CONFIG_PCI_MSI
37018 if (h->msix_vector)
37019@@ -4636,7 +4636,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
37020 return;
37021 }
37022 /* Change the access methods to the performant access methods */
37023- h->access = SA5_performant_access;
37024+ h->access = &SA5_performant_access;
37025 h->transMethod = CFGTBL_Trans_Performant;
37026 }
37027
37028diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
37029index 91edafb..a9b88ec 100644
37030--- a/drivers/scsi/hpsa.h
37031+++ b/drivers/scsi/hpsa.h
37032@@ -73,7 +73,7 @@ struct ctlr_info {
37033 unsigned int msix_vector;
37034 unsigned int msi_vector;
37035 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
37036- struct access_method access;
37037+ struct access_method *access;
37038
37039 /* queue and queue Info */
37040 struct list_head reqQ;
37041diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
37042index f2df059..a3a9930 100644
37043--- a/drivers/scsi/ips.h
37044+++ b/drivers/scsi/ips.h
37045@@ -1027,7 +1027,7 @@ typedef struct {
37046 int (*intr)(struct ips_ha *);
37047 void (*enableint)(struct ips_ha *);
37048 uint32_t (*statupd)(struct ips_ha *);
37049-} ips_hw_func_t;
37050+} __no_const ips_hw_func_t;
37051
37052 typedef struct ips_ha {
37053 uint8_t ha_id[IPS_MAX_CHANNELS+1];
37054diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
37055index 4d70d96..84d0573 100644
37056--- a/drivers/scsi/libfc/fc_exch.c
37057+++ b/drivers/scsi/libfc/fc_exch.c
37058@@ -105,12 +105,12 @@ struct fc_exch_mgr {
37059 * all together if not used XXX
37060 */
37061 struct {
37062- atomic_t no_free_exch;
37063- atomic_t no_free_exch_xid;
37064- atomic_t xid_not_found;
37065- atomic_t xid_busy;
37066- atomic_t seq_not_found;
37067- atomic_t non_bls_resp;
37068+ atomic_unchecked_t no_free_exch;
37069+ atomic_unchecked_t no_free_exch_xid;
37070+ atomic_unchecked_t xid_not_found;
37071+ atomic_unchecked_t xid_busy;
37072+ atomic_unchecked_t seq_not_found;
37073+ atomic_unchecked_t non_bls_resp;
37074 } stats;
37075 };
37076
37077@@ -719,7 +719,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
37078 /* allocate memory for exchange */
37079 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
37080 if (!ep) {
37081- atomic_inc(&mp->stats.no_free_exch);
37082+ atomic_inc_unchecked(&mp->stats.no_free_exch);
37083 goto out;
37084 }
37085 memset(ep, 0, sizeof(*ep));
37086@@ -780,7 +780,7 @@ out:
37087 return ep;
37088 err:
37089 spin_unlock_bh(&pool->lock);
37090- atomic_inc(&mp->stats.no_free_exch_xid);
37091+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
37092 mempool_free(ep, mp->ep_pool);
37093 return NULL;
37094 }
37095@@ -923,7 +923,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
37096 xid = ntohs(fh->fh_ox_id); /* we originated exch */
37097 ep = fc_exch_find(mp, xid);
37098 if (!ep) {
37099- atomic_inc(&mp->stats.xid_not_found);
37100+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37101 reject = FC_RJT_OX_ID;
37102 goto out;
37103 }
37104@@ -953,7 +953,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
37105 ep = fc_exch_find(mp, xid);
37106 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
37107 if (ep) {
37108- atomic_inc(&mp->stats.xid_busy);
37109+ atomic_inc_unchecked(&mp->stats.xid_busy);
37110 reject = FC_RJT_RX_ID;
37111 goto rel;
37112 }
37113@@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
37114 }
37115 xid = ep->xid; /* get our XID */
37116 } else if (!ep) {
37117- atomic_inc(&mp->stats.xid_not_found);
37118+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37119 reject = FC_RJT_RX_ID; /* XID not found */
37120 goto out;
37121 }
37122@@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
37123 } else {
37124 sp = &ep->seq;
37125 if (sp->id != fh->fh_seq_id) {
37126- atomic_inc(&mp->stats.seq_not_found);
37127+ atomic_inc_unchecked(&mp->stats.seq_not_found);
37128 if (f_ctl & FC_FC_END_SEQ) {
37129 /*
37130 * Update sequence_id based on incoming last
37131@@ -1431,22 +1431,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
37132
37133 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
37134 if (!ep) {
37135- atomic_inc(&mp->stats.xid_not_found);
37136+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37137 goto out;
37138 }
37139 if (ep->esb_stat & ESB_ST_COMPLETE) {
37140- atomic_inc(&mp->stats.xid_not_found);
37141+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37142 goto rel;
37143 }
37144 if (ep->rxid == FC_XID_UNKNOWN)
37145 ep->rxid = ntohs(fh->fh_rx_id);
37146 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
37147- atomic_inc(&mp->stats.xid_not_found);
37148+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37149 goto rel;
37150 }
37151 if (ep->did != ntoh24(fh->fh_s_id) &&
37152 ep->did != FC_FID_FLOGI) {
37153- atomic_inc(&mp->stats.xid_not_found);
37154+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37155 goto rel;
37156 }
37157 sof = fr_sof(fp);
37158@@ -1455,7 +1455,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
37159 sp->ssb_stat |= SSB_ST_RESP;
37160 sp->id = fh->fh_seq_id;
37161 } else if (sp->id != fh->fh_seq_id) {
37162- atomic_inc(&mp->stats.seq_not_found);
37163+ atomic_inc_unchecked(&mp->stats.seq_not_found);
37164 goto rel;
37165 }
37166
37167@@ -1519,9 +1519,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
37168 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
37169
37170 if (!sp)
37171- atomic_inc(&mp->stats.xid_not_found);
37172+ atomic_inc_unchecked(&mp->stats.xid_not_found);
37173 else
37174- atomic_inc(&mp->stats.non_bls_resp);
37175+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
37176
37177 fc_frame_free(fp);
37178 }
37179diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
37180index db9238f..4378ed2 100644
37181--- a/drivers/scsi/libsas/sas_ata.c
37182+++ b/drivers/scsi/libsas/sas_ata.c
37183@@ -368,7 +368,7 @@ static struct ata_port_operations sas_sata_ops = {
37184 .postreset = ata_std_postreset,
37185 .error_handler = ata_std_error_handler,
37186 .post_internal_cmd = sas_ata_post_internal,
37187- .qc_defer = ata_std_qc_defer,
37188+ .qc_defer = ata_std_qc_defer,
37189 .qc_prep = ata_noop_qc_prep,
37190 .qc_issue = sas_ata_qc_issue,
37191 .qc_fill_rtf = sas_ata_qc_fill_rtf,
37192diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
37193index 825f930..ce42672 100644
37194--- a/drivers/scsi/lpfc/lpfc.h
37195+++ b/drivers/scsi/lpfc/lpfc.h
37196@@ -413,7 +413,7 @@ struct lpfc_vport {
37197 struct dentry *debug_nodelist;
37198 struct dentry *vport_debugfs_root;
37199 struct lpfc_debugfs_trc *disc_trc;
37200- atomic_t disc_trc_cnt;
37201+ atomic_unchecked_t disc_trc_cnt;
37202 #endif
37203 uint8_t stat_data_enabled;
37204 uint8_t stat_data_blocked;
37205@@ -821,8 +821,8 @@ struct lpfc_hba {
37206 struct timer_list fabric_block_timer;
37207 unsigned long bit_flags;
37208 #define FABRIC_COMANDS_BLOCKED 0
37209- atomic_t num_rsrc_err;
37210- atomic_t num_cmd_success;
37211+ atomic_unchecked_t num_rsrc_err;
37212+ atomic_unchecked_t num_cmd_success;
37213 unsigned long last_rsrc_error_time;
37214 unsigned long last_ramp_down_time;
37215 unsigned long last_ramp_up_time;
37216@@ -852,7 +852,7 @@ struct lpfc_hba {
37217
37218 struct dentry *debug_slow_ring_trc;
37219 struct lpfc_debugfs_trc *slow_ring_trc;
37220- atomic_t slow_ring_trc_cnt;
37221+ atomic_unchecked_t slow_ring_trc_cnt;
37222 /* iDiag debugfs sub-directory */
37223 struct dentry *idiag_root;
37224 struct dentry *idiag_pci_cfg;
37225diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
37226index 3587a3f..d45b81b 100644
37227--- a/drivers/scsi/lpfc/lpfc_debugfs.c
37228+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
37229@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
37230
37231 #include <linux/debugfs.h>
37232
37233-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
37234+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
37235 static unsigned long lpfc_debugfs_start_time = 0L;
37236
37237 /* iDiag */
37238@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
37239 lpfc_debugfs_enable = 0;
37240
37241 len = 0;
37242- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
37243+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
37244 (lpfc_debugfs_max_disc_trc - 1);
37245 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
37246 dtp = vport->disc_trc + i;
37247@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
37248 lpfc_debugfs_enable = 0;
37249
37250 len = 0;
37251- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
37252+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
37253 (lpfc_debugfs_max_slow_ring_trc - 1);
37254 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
37255 dtp = phba->slow_ring_trc + i;
37256@@ -636,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
37257 !vport || !vport->disc_trc)
37258 return;
37259
37260- index = atomic_inc_return(&vport->disc_trc_cnt) &
37261+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
37262 (lpfc_debugfs_max_disc_trc - 1);
37263 dtp = vport->disc_trc + index;
37264 dtp->fmt = fmt;
37265 dtp->data1 = data1;
37266 dtp->data2 = data2;
37267 dtp->data3 = data3;
37268- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
37269+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
37270 dtp->jif = jiffies;
37271 #endif
37272 return;
37273@@ -674,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
37274 !phba || !phba->slow_ring_trc)
37275 return;
37276
37277- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
37278+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
37279 (lpfc_debugfs_max_slow_ring_trc - 1);
37280 dtp = phba->slow_ring_trc + index;
37281 dtp->fmt = fmt;
37282 dtp->data1 = data1;
37283 dtp->data2 = data2;
37284 dtp->data3 = data3;
37285- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
37286+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
37287 dtp->jif = jiffies;
37288 #endif
37289 return;
37290@@ -4040,7 +4040,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
37291 "slow_ring buffer\n");
37292 goto debug_failed;
37293 }
37294- atomic_set(&phba->slow_ring_trc_cnt, 0);
37295+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
37296 memset(phba->slow_ring_trc, 0,
37297 (sizeof(struct lpfc_debugfs_trc) *
37298 lpfc_debugfs_max_slow_ring_trc));
37299@@ -4086,7 +4086,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
37300 "buffer\n");
37301 goto debug_failed;
37302 }
37303- atomic_set(&vport->disc_trc_cnt, 0);
37304+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
37305
37306 snprintf(name, sizeof(name), "discovery_trace");
37307 vport->debug_disc_trc =
37308diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
37309index dfea2da..8e17227 100644
37310--- a/drivers/scsi/lpfc/lpfc_init.c
37311+++ b/drivers/scsi/lpfc/lpfc_init.c
37312@@ -10145,8 +10145,10 @@ lpfc_init(void)
37313 printk(LPFC_COPYRIGHT "\n");
37314
37315 if (lpfc_enable_npiv) {
37316- lpfc_transport_functions.vport_create = lpfc_vport_create;
37317- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
37318+ pax_open_kernel();
37319+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
37320+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
37321+ pax_close_kernel();
37322 }
37323 lpfc_transport_template =
37324 fc_attach_transport(&lpfc_transport_functions);
37325diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
37326index c60f5d0..751535c 100644
37327--- a/drivers/scsi/lpfc/lpfc_scsi.c
37328+++ b/drivers/scsi/lpfc/lpfc_scsi.c
37329@@ -305,7 +305,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
37330 uint32_t evt_posted;
37331
37332 spin_lock_irqsave(&phba->hbalock, flags);
37333- atomic_inc(&phba->num_rsrc_err);
37334+ atomic_inc_unchecked(&phba->num_rsrc_err);
37335 phba->last_rsrc_error_time = jiffies;
37336
37337 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
37338@@ -346,7 +346,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
37339 unsigned long flags;
37340 struct lpfc_hba *phba = vport->phba;
37341 uint32_t evt_posted;
37342- atomic_inc(&phba->num_cmd_success);
37343+ atomic_inc_unchecked(&phba->num_cmd_success);
37344
37345 if (vport->cfg_lun_queue_depth <= queue_depth)
37346 return;
37347@@ -390,8 +390,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
37348 unsigned long num_rsrc_err, num_cmd_success;
37349 int i;
37350
37351- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
37352- num_cmd_success = atomic_read(&phba->num_cmd_success);
37353+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
37354+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
37355
37356 vports = lpfc_create_vport_work_array(phba);
37357 if (vports != NULL)
37358@@ -411,8 +411,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
37359 }
37360 }
37361 lpfc_destroy_vport_work_array(phba, vports);
37362- atomic_set(&phba->num_rsrc_err, 0);
37363- atomic_set(&phba->num_cmd_success, 0);
37364+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
37365+ atomic_set_unchecked(&phba->num_cmd_success, 0);
37366 }
37367
37368 /**
37369@@ -446,8 +446,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
37370 }
37371 }
37372 lpfc_destroy_vport_work_array(phba, vports);
37373- atomic_set(&phba->num_rsrc_err, 0);
37374- atomic_set(&phba->num_cmd_success, 0);
37375+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
37376+ atomic_set_unchecked(&phba->num_cmd_success, 0);
37377 }
37378
37379 /**
37380diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
37381index ea8a0b4..812a124 100644
37382--- a/drivers/scsi/pmcraid.c
37383+++ b/drivers/scsi/pmcraid.c
37384@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
37385 res->scsi_dev = scsi_dev;
37386 scsi_dev->hostdata = res;
37387 res->change_detected = 0;
37388- atomic_set(&res->read_failures, 0);
37389- atomic_set(&res->write_failures, 0);
37390+ atomic_set_unchecked(&res->read_failures, 0);
37391+ atomic_set_unchecked(&res->write_failures, 0);
37392 rc = 0;
37393 }
37394 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
37395@@ -2676,9 +2676,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
37396
37397 /* If this was a SCSI read/write command keep count of errors */
37398 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
37399- atomic_inc(&res->read_failures);
37400+ atomic_inc_unchecked(&res->read_failures);
37401 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
37402- atomic_inc(&res->write_failures);
37403+ atomic_inc_unchecked(&res->write_failures);
37404
37405 if (!RES_IS_GSCSI(res->cfg_entry) &&
37406 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
37407@@ -3534,7 +3534,7 @@ static int pmcraid_queuecommand_lck(
37408 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
37409 * hrrq_id assigned here in queuecommand
37410 */
37411- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
37412+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
37413 pinstance->num_hrrq;
37414 cmd->cmd_done = pmcraid_io_done;
37415
37416@@ -3859,7 +3859,7 @@ static long pmcraid_ioctl_passthrough(
37417 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
37418 * hrrq_id assigned here in queuecommand
37419 */
37420- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
37421+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
37422 pinstance->num_hrrq;
37423
37424 if (request_size) {
37425@@ -4497,7 +4497,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
37426
37427 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
37428 /* add resources only after host is added into system */
37429- if (!atomic_read(&pinstance->expose_resources))
37430+ if (!atomic_read_unchecked(&pinstance->expose_resources))
37431 return;
37432
37433 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
37434@@ -5331,8 +5331,8 @@ static int __devinit pmcraid_init_instance(
37435 init_waitqueue_head(&pinstance->reset_wait_q);
37436
37437 atomic_set(&pinstance->outstanding_cmds, 0);
37438- atomic_set(&pinstance->last_message_id, 0);
37439- atomic_set(&pinstance->expose_resources, 0);
37440+ atomic_set_unchecked(&pinstance->last_message_id, 0);
37441+ atomic_set_unchecked(&pinstance->expose_resources, 0);
37442
37443 INIT_LIST_HEAD(&pinstance->free_res_q);
37444 INIT_LIST_HEAD(&pinstance->used_res_q);
37445@@ -6047,7 +6047,7 @@ static int __devinit pmcraid_probe(
37446 /* Schedule worker thread to handle CCN and take care of adding and
37447 * removing devices to OS
37448 */
37449- atomic_set(&pinstance->expose_resources, 1);
37450+ atomic_set_unchecked(&pinstance->expose_resources, 1);
37451 schedule_work(&pinstance->worker_q);
37452 return rc;
37453
37454diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
37455index ca496c7..9c791d5 100644
37456--- a/drivers/scsi/pmcraid.h
37457+++ b/drivers/scsi/pmcraid.h
37458@@ -748,7 +748,7 @@ struct pmcraid_instance {
37459 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
37460
37461 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
37462- atomic_t last_message_id;
37463+ atomic_unchecked_t last_message_id;
37464
37465 /* configuration table */
37466 struct pmcraid_config_table *cfg_table;
37467@@ -777,7 +777,7 @@ struct pmcraid_instance {
37468 atomic_t outstanding_cmds;
37469
37470 /* should add/delete resources to mid-layer now ?*/
37471- atomic_t expose_resources;
37472+ atomic_unchecked_t expose_resources;
37473
37474
37475
37476@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
37477 struct pmcraid_config_table_entry_ext cfg_entry_ext;
37478 };
37479 struct scsi_device *scsi_dev; /* Link scsi_device structure */
37480- atomic_t read_failures; /* count of failed READ commands */
37481- atomic_t write_failures; /* count of failed WRITE commands */
37482+ atomic_unchecked_t read_failures; /* count of failed READ commands */
37483+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
37484
37485 /* To indicate add/delete/modify during CCN */
37486 u8 change_detected;
37487diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
37488index af1003f..be55a75 100644
37489--- a/drivers/scsi/qla2xxx/qla_def.h
37490+++ b/drivers/scsi/qla2xxx/qla_def.h
37491@@ -2247,7 +2247,7 @@ struct isp_operations {
37492 int (*start_scsi) (srb_t *);
37493 int (*abort_isp) (struct scsi_qla_host *);
37494 int (*iospace_config)(struct qla_hw_data*);
37495-};
37496+} __no_const;
37497
37498 /* MSI-X Support *************************************************************/
37499
37500diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
37501index bfe6854..ceac088 100644
37502--- a/drivers/scsi/qla4xxx/ql4_def.h
37503+++ b/drivers/scsi/qla4xxx/ql4_def.h
37504@@ -261,7 +261,7 @@ struct ddb_entry {
37505 * (4000 only) */
37506 atomic_t relogin_timer; /* Max Time to wait for
37507 * relogin to complete */
37508- atomic_t relogin_retry_count; /* Num of times relogin has been
37509+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
37510 * retried */
37511 uint32_t default_time2wait; /* Default Min time between
37512 * relogins (+aens) */
37513diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
37514index ce6d3b7..73fac54 100644
37515--- a/drivers/scsi/qla4xxx/ql4_os.c
37516+++ b/drivers/scsi/qla4xxx/ql4_os.c
37517@@ -2178,12 +2178,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
37518 */
37519 if (!iscsi_is_session_online(cls_sess)) {
37520 /* Reset retry relogin timer */
37521- atomic_inc(&ddb_entry->relogin_retry_count);
37522+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
37523 DEBUG2(ql4_printk(KERN_INFO, ha,
37524 "%s: index[%d] relogin timed out-retrying"
37525 " relogin (%d), retry (%d)\n", __func__,
37526 ddb_entry->fw_ddb_index,
37527- atomic_read(&ddb_entry->relogin_retry_count),
37528+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
37529 ddb_entry->default_time2wait + 4));
37530 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
37531 atomic_set(&ddb_entry->retry_relogin_timer,
37532@@ -3953,7 +3953,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
37533
37534 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
37535 atomic_set(&ddb_entry->relogin_timer, 0);
37536- atomic_set(&ddb_entry->relogin_retry_count, 0);
37537+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
37538 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
37539 ddb_entry->default_relogin_timeout =
37540 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
37541diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
37542index 2aeb2e9..46e3925 100644
37543--- a/drivers/scsi/scsi.c
37544+++ b/drivers/scsi/scsi.c
37545@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
37546 unsigned long timeout;
37547 int rtn = 0;
37548
37549- atomic_inc(&cmd->device->iorequest_cnt);
37550+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37551
37552 /* check if the device is still usable */
37553 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
37554diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
37555index b2c95db..227d74e 100644
37556--- a/drivers/scsi/scsi_lib.c
37557+++ b/drivers/scsi/scsi_lib.c
37558@@ -1411,7 +1411,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
37559 shost = sdev->host;
37560 scsi_init_cmd_errh(cmd);
37561 cmd->result = DID_NO_CONNECT << 16;
37562- atomic_inc(&cmd->device->iorequest_cnt);
37563+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37564
37565 /*
37566 * SCSI request completion path will do scsi_device_unbusy(),
37567@@ -1437,9 +1437,9 @@ static void scsi_softirq_done(struct request *rq)
37568
37569 INIT_LIST_HEAD(&cmd->eh_entry);
37570
37571- atomic_inc(&cmd->device->iodone_cnt);
37572+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
37573 if (cmd->result)
37574- atomic_inc(&cmd->device->ioerr_cnt);
37575+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
37576
37577 disposition = scsi_decide_disposition(cmd);
37578 if (disposition != SUCCESS &&
37579diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
37580index 04c2a27..9d8bd66 100644
37581--- a/drivers/scsi/scsi_sysfs.c
37582+++ b/drivers/scsi/scsi_sysfs.c
37583@@ -660,7 +660,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
37584 char *buf) \
37585 { \
37586 struct scsi_device *sdev = to_scsi_device(dev); \
37587- unsigned long long count = atomic_read(&sdev->field); \
37588+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
37589 return snprintf(buf, 20, "0x%llx\n", count); \
37590 } \
37591 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
37592diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
37593index 84a1fdf..693b0d6 100644
37594--- a/drivers/scsi/scsi_tgt_lib.c
37595+++ b/drivers/scsi/scsi_tgt_lib.c
37596@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
37597 int err;
37598
37599 dprintk("%lx %u\n", uaddr, len);
37600- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
37601+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
37602 if (err) {
37603 /*
37604 * TODO: need to fixup sg_tablesize, max_segment_size,
37605diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
37606index f59d4a0..1d89407 100644
37607--- a/drivers/scsi/scsi_transport_fc.c
37608+++ b/drivers/scsi/scsi_transport_fc.c
37609@@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
37610 * Netlink Infrastructure
37611 */
37612
37613-static atomic_t fc_event_seq;
37614+static atomic_unchecked_t fc_event_seq;
37615
37616 /**
37617 * fc_get_event_number - Obtain the next sequential FC event number
37618@@ -497,7 +497,7 @@ static atomic_t fc_event_seq;
37619 u32
37620 fc_get_event_number(void)
37621 {
37622- return atomic_add_return(1, &fc_event_seq);
37623+ return atomic_add_return_unchecked(1, &fc_event_seq);
37624 }
37625 EXPORT_SYMBOL(fc_get_event_number);
37626
37627@@ -645,7 +645,7 @@ static __init int fc_transport_init(void)
37628 {
37629 int error;
37630
37631- atomic_set(&fc_event_seq, 0);
37632+ atomic_set_unchecked(&fc_event_seq, 0);
37633
37634 error = transport_class_register(&fc_host_class);
37635 if (error)
37636@@ -835,7 +835,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
37637 char *cp;
37638
37639 *val = simple_strtoul(buf, &cp, 0);
37640- if ((*cp && (*cp != '\n')) || (*val < 0))
37641+ if (*cp && (*cp != '\n'))
37642 return -EINVAL;
37643 /*
37644 * Check for overflow; dev_loss_tmo is u32
37645diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
37646index e3e3c7d..ebdab62 100644
37647--- a/drivers/scsi/scsi_transport_iscsi.c
37648+++ b/drivers/scsi/scsi_transport_iscsi.c
37649@@ -79,7 +79,7 @@ struct iscsi_internal {
37650 struct transport_container session_cont;
37651 };
37652
37653-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
37654+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
37655 static struct workqueue_struct *iscsi_eh_timer_workq;
37656
37657 static DEFINE_IDA(iscsi_sess_ida);
37658@@ -1063,7 +1063,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
37659 int err;
37660
37661 ihost = shost->shost_data;
37662- session->sid = atomic_add_return(1, &iscsi_session_nr);
37663+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
37664
37665 if (target_id == ISCSI_MAX_TARGET) {
37666 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
37667@@ -2680,7 +2680,7 @@ static __init int iscsi_transport_init(void)
37668 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
37669 ISCSI_TRANSPORT_VERSION);
37670
37671- atomic_set(&iscsi_session_nr, 0);
37672+ atomic_set_unchecked(&iscsi_session_nr, 0);
37673
37674 err = class_register(&iscsi_transport_class);
37675 if (err)
37676diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
37677index 21a045e..ec89e03 100644
37678--- a/drivers/scsi/scsi_transport_srp.c
37679+++ b/drivers/scsi/scsi_transport_srp.c
37680@@ -33,7 +33,7 @@
37681 #include "scsi_transport_srp_internal.h"
37682
37683 struct srp_host_attrs {
37684- atomic_t next_port_id;
37685+ atomic_unchecked_t next_port_id;
37686 };
37687 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
37688
37689@@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
37690 struct Scsi_Host *shost = dev_to_shost(dev);
37691 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
37692
37693- atomic_set(&srp_host->next_port_id, 0);
37694+ atomic_set_unchecked(&srp_host->next_port_id, 0);
37695 return 0;
37696 }
37697
37698@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
37699 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
37700 rport->roles = ids->roles;
37701
37702- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
37703+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
37704 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
37705
37706 transport_setup_device(&rport->dev);
37707diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
37708index eacd46b..e3f4d62 100644
37709--- a/drivers/scsi/sg.c
37710+++ b/drivers/scsi/sg.c
37711@@ -1077,7 +1077,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
37712 sdp->disk->disk_name,
37713 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
37714 NULL,
37715- (char *)arg);
37716+ (char __user *)arg);
37717 case BLKTRACESTART:
37718 return blk_trace_startstop(sdp->device->request_queue, 1);
37719 case BLKTRACESTOP:
37720@@ -2312,7 +2312,7 @@ struct sg_proc_leaf {
37721 const struct file_operations * fops;
37722 };
37723
37724-static struct sg_proc_leaf sg_proc_leaf_arr[] = {
37725+static const struct sg_proc_leaf sg_proc_leaf_arr[] = {
37726 {"allow_dio", &adio_fops},
37727 {"debug", &debug_fops},
37728 {"def_reserved_size", &dressz_fops},
37729@@ -2332,7 +2332,7 @@ sg_proc_init(void)
37730 if (!sg_proc_sgp)
37731 return 1;
37732 for (k = 0; k < num_leaves; ++k) {
37733- struct sg_proc_leaf *leaf = &sg_proc_leaf_arr[k];
37734+ const struct sg_proc_leaf *leaf = &sg_proc_leaf_arr[k];
37735 umode_t mask = leaf->fops->write ? S_IRUGO | S_IWUSR : S_IRUGO;
37736 proc_create(leaf->name, mask, sg_proc_sgp, leaf->fops);
37737 }
37738diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
37739index f64250e..1ee3049 100644
37740--- a/drivers/spi/spi-dw-pci.c
37741+++ b/drivers/spi/spi-dw-pci.c
37742@@ -149,7 +149,7 @@ static int spi_resume(struct pci_dev *pdev)
37743 #define spi_resume NULL
37744 #endif
37745
37746-static const struct pci_device_id pci_ids[] __devinitdata = {
37747+static const struct pci_device_id pci_ids[] __devinitconst = {
37748 /* Intel MID platform SPI controller 0 */
37749 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
37750 {},
37751diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
37752index b2ccdea..84cde75 100644
37753--- a/drivers/spi/spi.c
37754+++ b/drivers/spi/spi.c
37755@@ -1024,7 +1024,7 @@ int spi_bus_unlock(struct spi_master *master)
37756 EXPORT_SYMBOL_GPL(spi_bus_unlock);
37757
37758 /* portable code must never pass more than 32 bytes */
37759-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
37760+#define SPI_BUFSIZ max(32UL,SMP_CACHE_BYTES)
37761
37762 static u8 *buf;
37763
37764diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
37765index 400df8c..065d4f4 100644
37766--- a/drivers/staging/octeon/ethernet-rx.c
37767+++ b/drivers/staging/octeon/ethernet-rx.c
37768@@ -420,11 +420,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37769 /* Increment RX stats for virtual ports */
37770 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
37771 #ifdef CONFIG_64BIT
37772- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
37773- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
37774+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
37775+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
37776 #else
37777- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
37778- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
37779+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
37780+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
37781 #endif
37782 }
37783 netif_receive_skb(skb);
37784@@ -436,9 +436,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37785 dev->name);
37786 */
37787 #ifdef CONFIG_64BIT
37788- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
37789+ atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37790 #else
37791- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
37792+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
37793 #endif
37794 dev_kfree_skb_irq(skb);
37795 }
37796diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
37797index 9112cd8..92f8d51 100644
37798--- a/drivers/staging/octeon/ethernet.c
37799+++ b/drivers/staging/octeon/ethernet.c
37800@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
37801 * since the RX tasklet also increments it.
37802 */
37803 #ifdef CONFIG_64BIT
37804- atomic64_add(rx_status.dropped_packets,
37805- (atomic64_t *)&priv->stats.rx_dropped);
37806+ atomic64_add_unchecked(rx_status.dropped_packets,
37807+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37808 #else
37809- atomic_add(rx_status.dropped_packets,
37810- (atomic_t *)&priv->stats.rx_dropped);
37811+ atomic_add_unchecked(rx_status.dropped_packets,
37812+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
37813 #endif
37814 }
37815
37816diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
37817index f9dae95..ff48901 100644
37818--- a/drivers/staging/rtl8192e/rtllib_module.c
37819+++ b/drivers/staging/rtl8192e/rtllib_module.c
37820@@ -215,6 +215,8 @@ static int show_debug_level(char *page, char **start, off_t offset,
37821 }
37822
37823 static int store_debug_level(struct file *file, const char __user *buffer,
37824+ unsigned long count, void *data) __size_overflow(3);
37825+static int store_debug_level(struct file *file, const char __user *buffer,
37826 unsigned long count, void *data)
37827 {
37828 char buf[] = "0x00000000";
37829diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37830index e3d47bc..85f4d0d 100644
37831--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37832+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37833@@ -250,6 +250,8 @@ static int show_debug_level(char *page, char **start, off_t offset,
37834 }
37835
37836 static int store_debug_level(struct file *file, const char *buffer,
37837+ unsigned long count, void *data) __size_overflow(3);
37838+static int store_debug_level(struct file *file, const char *buffer,
37839 unsigned long count, void *data)
37840 {
37841 char buf[] = "0x00000000";
37842diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
37843index 86308a0..feaa925 100644
37844--- a/drivers/staging/rtl8712/rtl871x_io.h
37845+++ b/drivers/staging/rtl8712/rtl871x_io.h
37846@@ -108,7 +108,7 @@ struct _io_ops {
37847 u8 *pmem);
37848 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
37849 u8 *pmem);
37850-};
37851+} __no_const;
37852
37853 struct io_req {
37854 struct list_head list;
37855diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
37856index c7b5e8b..783d6cb 100644
37857--- a/drivers/staging/sbe-2t3e3/netdev.c
37858+++ b/drivers/staging/sbe-2t3e3/netdev.c
37859@@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
37860 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
37861
37862 if (rlen)
37863- if (copy_to_user(data, &resp, rlen))
37864+ if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
37865 return -EFAULT;
37866
37867 return 0;
37868diff --git a/drivers/staging/speakup/speakup_soft.c b/drivers/staging/speakup/speakup_soft.c
37869index 42cdafe..2769103 100644
37870--- a/drivers/staging/speakup/speakup_soft.c
37871+++ b/drivers/staging/speakup/speakup_soft.c
37872@@ -241,11 +241,11 @@ static ssize_t softsynth_read(struct file *fp, char *buf, size_t count,
37873 break;
37874 } else if (!initialized) {
37875 if (*init) {
37876- ch = *init;
37877 init++;
37878 } else {
37879 initialized = 1;
37880 }
37881+ ch = *init;
37882 } else {
37883 ch = synth_buffer_getc();
37884 }
37885diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
37886index b8f8c48..1fc5025 100644
37887--- a/drivers/staging/usbip/usbip_common.h
37888+++ b/drivers/staging/usbip/usbip_common.h
37889@@ -289,7 +289,7 @@ struct usbip_device {
37890 void (*shutdown)(struct usbip_device *);
37891 void (*reset)(struct usbip_device *);
37892 void (*unusable)(struct usbip_device *);
37893- } eh_ops;
37894+ } __no_const eh_ops;
37895 };
37896
37897 /* usbip_common.c */
37898diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
37899index 88b3298..3783eee 100644
37900--- a/drivers/staging/usbip/vhci.h
37901+++ b/drivers/staging/usbip/vhci.h
37902@@ -88,7 +88,7 @@ struct vhci_hcd {
37903 unsigned resuming:1;
37904 unsigned long re_timeout;
37905
37906- atomic_t seqnum;
37907+ atomic_unchecked_t seqnum;
37908
37909 /*
37910 * NOTE:
37911diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
37912index 2ee97e2..0420b86 100644
37913--- a/drivers/staging/usbip/vhci_hcd.c
37914+++ b/drivers/staging/usbip/vhci_hcd.c
37915@@ -527,7 +527,7 @@ static void vhci_tx_urb(struct urb *urb)
37916 return;
37917 }
37918
37919- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
37920+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
37921 if (priv->seqnum == 0xffff)
37922 dev_info(&urb->dev->dev, "seqnum max\n");
37923
37924@@ -779,7 +779,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
37925 return -ENOMEM;
37926 }
37927
37928- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
37929+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
37930 if (unlink->seqnum == 0xffff)
37931 pr_info("seqnum max\n");
37932
37933@@ -969,7 +969,7 @@ static int vhci_start(struct usb_hcd *hcd)
37934 vdev->rhport = rhport;
37935 }
37936
37937- atomic_set(&vhci->seqnum, 0);
37938+ atomic_set_unchecked(&vhci->seqnum, 0);
37939 spin_lock_init(&vhci->lock);
37940
37941 hcd->power_budget = 0; /* no limit */
37942diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
37943index 3f511b4..d3dbc1e 100644
37944--- a/drivers/staging/usbip/vhci_rx.c
37945+++ b/drivers/staging/usbip/vhci_rx.c
37946@@ -77,7 +77,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
37947 if (!urb) {
37948 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
37949 pr_info("max seqnum %d\n",
37950- atomic_read(&the_controller->seqnum));
37951+ atomic_read_unchecked(&the_controller->seqnum));
37952 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
37953 return;
37954 }
37955diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
37956index 7735027..30eed13 100644
37957--- a/drivers/staging/vt6655/hostap.c
37958+++ b/drivers/staging/vt6655/hostap.c
37959@@ -79,14 +79,13 @@ static int msglevel =MSG_LEVEL_INFO;
37960 *
37961 */
37962
37963+static net_device_ops_no_const apdev_netdev_ops;
37964+
37965 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37966 {
37967 PSDevice apdev_priv;
37968 struct net_device *dev = pDevice->dev;
37969 int ret;
37970- const struct net_device_ops apdev_netdev_ops = {
37971- .ndo_start_xmit = pDevice->tx_80211,
37972- };
37973
37974 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
37975
37976@@ -98,6 +97,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37977 *apdev_priv = *pDevice;
37978 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
37979
37980+ /* only half broken now */
37981+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
37982 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
37983
37984 pDevice->apdev->type = ARPHRD_IEEE80211;
37985diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
37986index 51b5adf..098e320 100644
37987--- a/drivers/staging/vt6656/hostap.c
37988+++ b/drivers/staging/vt6656/hostap.c
37989@@ -80,14 +80,13 @@ static int msglevel =MSG_LEVEL_INFO;
37990 *
37991 */
37992
37993+static net_device_ops_no_const apdev_netdev_ops;
37994+
37995 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37996 {
37997 PSDevice apdev_priv;
37998 struct net_device *dev = pDevice->dev;
37999 int ret;
38000- const struct net_device_ops apdev_netdev_ops = {
38001- .ndo_start_xmit = pDevice->tx_80211,
38002- };
38003
38004 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
38005
38006@@ -99,6 +98,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
38007 *apdev_priv = *pDevice;
38008 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
38009
38010+ /* only half broken now */
38011+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
38012 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
38013
38014 pDevice->apdev->type = ARPHRD_IEEE80211;
38015diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
38016index 7843dfd..3db105f 100644
38017--- a/drivers/staging/wlan-ng/hfa384x_usb.c
38018+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
38019@@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
38020
38021 struct usbctlx_completor {
38022 int (*complete) (struct usbctlx_completor *);
38023-};
38024+} __no_const;
38025
38026 static int
38027 hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
38028diff --git a/drivers/staging/zcache/tmem.c b/drivers/staging/zcache/tmem.c
38029index 1ca66ea..76f1343 100644
38030--- a/drivers/staging/zcache/tmem.c
38031+++ b/drivers/staging/zcache/tmem.c
38032@@ -39,7 +39,7 @@
38033 * A tmem host implementation must use this function to register callbacks
38034 * for memory allocation.
38035 */
38036-static struct tmem_hostops tmem_hostops;
38037+static tmem_hostops_no_const tmem_hostops;
38038
38039 static void tmem_objnode_tree_init(void);
38040
38041@@ -53,7 +53,7 @@ void tmem_register_hostops(struct tmem_hostops *m)
38042 * A tmem host implementation must use this function to register
38043 * callbacks for a page-accessible memory (PAM) implementation
38044 */
38045-static struct tmem_pamops tmem_pamops;
38046+static tmem_pamops_no_const tmem_pamops;
38047
38048 void tmem_register_pamops(struct tmem_pamops *m)
38049 {
38050diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h
38051index ed147c4..94fc3c6 100644
38052--- a/drivers/staging/zcache/tmem.h
38053+++ b/drivers/staging/zcache/tmem.h
38054@@ -180,6 +180,7 @@ struct tmem_pamops {
38055 void (*new_obj)(struct tmem_obj *);
38056 int (*replace_in_obj)(void *, struct tmem_obj *);
38057 };
38058+typedef struct tmem_pamops __no_const tmem_pamops_no_const;
38059 extern void tmem_register_pamops(struct tmem_pamops *m);
38060
38061 /* memory allocation methods provided by the host implementation */
38062@@ -189,6 +190,7 @@ struct tmem_hostops {
38063 struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
38064 void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
38065 };
38066+typedef struct tmem_hostops __no_const tmem_hostops_no_const;
38067 extern void tmem_register_hostops(struct tmem_hostops *m);
38068
38069 /* core tmem accessor functions */
38070diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
38071index 97c74ee..7f6d77d 100644
38072--- a/drivers/target/iscsi/iscsi_target.c
38073+++ b/drivers/target/iscsi/iscsi_target.c
38074@@ -1361,7 +1361,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf)
38075 * outstanding_r2ts reaches zero, go ahead and send the delayed
38076 * TASK_ABORTED status.
38077 */
38078- if (atomic_read(&se_cmd->t_transport_aborted) != 0) {
38079+ if (atomic_read_unchecked(&se_cmd->t_transport_aborted) != 0) {
38080 if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
38081 if (--cmd->outstanding_r2ts < 1) {
38082 iscsit_stop_dataout_timer(cmd);
38083diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
38084index dcb0618..97e3d85 100644
38085--- a/drivers/target/target_core_tmr.c
38086+++ b/drivers/target/target_core_tmr.c
38087@@ -260,7 +260,7 @@ static void core_tmr_drain_task_list(
38088 cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
38089 cmd->t_task_list_num,
38090 atomic_read(&cmd->t_task_cdbs_left),
38091- atomic_read(&cmd->t_task_cdbs_sent),
38092+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
38093 atomic_read(&cmd->t_transport_active),
38094 atomic_read(&cmd->t_transport_stop),
38095 atomic_read(&cmd->t_transport_sent));
38096@@ -291,7 +291,7 @@ static void core_tmr_drain_task_list(
38097 pr_debug("LUN_RESET: got t_transport_active = 1 for"
38098 " task: %p, t_fe_count: %d dev: %p\n", task,
38099 fe_count, dev);
38100- atomic_set(&cmd->t_transport_aborted, 1);
38101+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
38102 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
38103
38104 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
38105@@ -299,7 +299,7 @@ static void core_tmr_drain_task_list(
38106 }
38107 pr_debug("LUN_RESET: Got t_transport_active = 0 for task: %p,"
38108 " t_fe_count: %d dev: %p\n", task, fe_count, dev);
38109- atomic_set(&cmd->t_transport_aborted, 1);
38110+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
38111 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
38112
38113 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
38114diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
38115index cd5cd95..5249d30 100644
38116--- a/drivers/target/target_core_transport.c
38117+++ b/drivers/target/target_core_transport.c
38118@@ -1330,7 +1330,7 @@ struct se_device *transport_add_device_to_core_hba(
38119 spin_lock_init(&dev->se_port_lock);
38120 spin_lock_init(&dev->se_tmr_lock);
38121 spin_lock_init(&dev->qf_cmd_lock);
38122- atomic_set(&dev->dev_ordered_id, 0);
38123+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
38124
38125 se_dev_set_default_attribs(dev, dev_limits);
38126
38127@@ -1517,7 +1517,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
38128 * Used to determine when ORDERED commands should go from
38129 * Dormant to Active status.
38130 */
38131- cmd->se_ordered_id = atomic_inc_return(&cmd->se_dev->dev_ordered_id);
38132+ cmd->se_ordered_id = atomic_inc_return_unchecked(&cmd->se_dev->dev_ordered_id);
38133 smp_mb__after_atomic_inc();
38134 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
38135 cmd->se_ordered_id, cmd->sam_task_attr,
38136@@ -1862,7 +1862,7 @@ static void transport_generic_request_failure(struct se_cmd *cmd)
38137 " t_transport_active: %d t_transport_stop: %d"
38138 " t_transport_sent: %d\n", cmd->t_task_list_num,
38139 atomic_read(&cmd->t_task_cdbs_left),
38140- atomic_read(&cmd->t_task_cdbs_sent),
38141+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
38142 atomic_read(&cmd->t_task_cdbs_ex_left),
38143 atomic_read(&cmd->t_transport_active),
38144 atomic_read(&cmd->t_transport_stop),
38145@@ -2121,9 +2121,9 @@ check_depth:
38146 cmd = task->task_se_cmd;
38147 spin_lock_irqsave(&cmd->t_state_lock, flags);
38148 task->task_flags |= (TF_ACTIVE | TF_SENT);
38149- atomic_inc(&cmd->t_task_cdbs_sent);
38150+ atomic_inc_unchecked(&cmd->t_task_cdbs_sent);
38151
38152- if (atomic_read(&cmd->t_task_cdbs_sent) ==
38153+ if (atomic_read_unchecked(&cmd->t_task_cdbs_sent) ==
38154 cmd->t_task_list_num)
38155 atomic_set(&cmd->t_transport_sent, 1);
38156
38157@@ -4348,7 +4348,7 @@ bool transport_wait_for_tasks(struct se_cmd *cmd)
38158 atomic_set(&cmd->transport_lun_stop, 0);
38159 }
38160 if (!atomic_read(&cmd->t_transport_active) ||
38161- atomic_read(&cmd->t_transport_aborted)) {
38162+ atomic_read_unchecked(&cmd->t_transport_aborted)) {
38163 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
38164 return false;
38165 }
38166@@ -4597,7 +4597,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
38167 {
38168 int ret = 0;
38169
38170- if (atomic_read(&cmd->t_transport_aborted) != 0) {
38171+ if (atomic_read_unchecked(&cmd->t_transport_aborted) != 0) {
38172 if (!send_status ||
38173 (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
38174 return 1;
38175@@ -4634,7 +4634,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
38176 */
38177 if (cmd->data_direction == DMA_TO_DEVICE) {
38178 if (cmd->se_tfo->write_pending_status(cmd) != 0) {
38179- atomic_inc(&cmd->t_transport_aborted);
38180+ atomic_inc_unchecked(&cmd->t_transport_aborted);
38181 smp_mb__after_atomic_inc();
38182 }
38183 }
38184diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
38185index b9040be..e3f5aab 100644
38186--- a/drivers/tty/hvc/hvcs.c
38187+++ b/drivers/tty/hvc/hvcs.c
38188@@ -83,6 +83,7 @@
38189 #include <asm/hvcserver.h>
38190 #include <asm/uaccess.h>
38191 #include <asm/vio.h>
38192+#include <asm/local.h>
38193
38194 /*
38195 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
38196@@ -270,7 +271,7 @@ struct hvcs_struct {
38197 unsigned int index;
38198
38199 struct tty_struct *tty;
38200- int open_count;
38201+ local_t open_count;
38202
38203 /*
38204 * Used to tell the driver kernel_thread what operations need to take
38205@@ -422,7 +423,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
38206
38207 spin_lock_irqsave(&hvcsd->lock, flags);
38208
38209- if (hvcsd->open_count > 0) {
38210+ if (local_read(&hvcsd->open_count) > 0) {
38211 spin_unlock_irqrestore(&hvcsd->lock, flags);
38212 printk(KERN_INFO "HVCS: vterm state unchanged. "
38213 "The hvcs device node is still in use.\n");
38214@@ -1145,7 +1146,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
38215 if ((retval = hvcs_partner_connect(hvcsd)))
38216 goto error_release;
38217
38218- hvcsd->open_count = 1;
38219+ local_set(&hvcsd->open_count, 1);
38220 hvcsd->tty = tty;
38221 tty->driver_data = hvcsd;
38222
38223@@ -1179,7 +1180,7 @@ fast_open:
38224
38225 spin_lock_irqsave(&hvcsd->lock, flags);
38226 kref_get(&hvcsd->kref);
38227- hvcsd->open_count++;
38228+ local_inc(&hvcsd->open_count);
38229 hvcsd->todo_mask |= HVCS_SCHED_READ;
38230 spin_unlock_irqrestore(&hvcsd->lock, flags);
38231
38232@@ -1223,7 +1224,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
38233 hvcsd = tty->driver_data;
38234
38235 spin_lock_irqsave(&hvcsd->lock, flags);
38236- if (--hvcsd->open_count == 0) {
38237+ if (local_dec_and_test(&hvcsd->open_count)) {
38238
38239 vio_disable_interrupts(hvcsd->vdev);
38240
38241@@ -1249,10 +1250,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
38242 free_irq(irq, hvcsd);
38243 kref_put(&hvcsd->kref, destroy_hvcs_struct);
38244 return;
38245- } else if (hvcsd->open_count < 0) {
38246+ } else if (local_read(&hvcsd->open_count) < 0) {
38247 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
38248 " is missmanaged.\n",
38249- hvcsd->vdev->unit_address, hvcsd->open_count);
38250+ hvcsd->vdev->unit_address, local_read(&hvcsd->open_count));
38251 }
38252
38253 spin_unlock_irqrestore(&hvcsd->lock, flags);
38254@@ -1268,7 +1269,7 @@ static void hvcs_hangup(struct tty_struct * tty)
38255
38256 spin_lock_irqsave(&hvcsd->lock, flags);
38257 /* Preserve this so that we know how many kref refs to put */
38258- temp_open_count = hvcsd->open_count;
38259+ temp_open_count = local_read(&hvcsd->open_count);
38260
38261 /*
38262 * Don't kref put inside the spinlock because the destruction
38263@@ -1283,7 +1284,7 @@ static void hvcs_hangup(struct tty_struct * tty)
38264 hvcsd->tty->driver_data = NULL;
38265 hvcsd->tty = NULL;
38266
38267- hvcsd->open_count = 0;
38268+ local_set(&hvcsd->open_count, 0);
38269
38270 /* This will drop any buffered data on the floor which is OK in a hangup
38271 * scenario. */
38272@@ -1354,7 +1355,7 @@ static int hvcs_write(struct tty_struct *tty,
38273 * the middle of a write operation? This is a crummy place to do this
38274 * but we want to keep it all in the spinlock.
38275 */
38276- if (hvcsd->open_count <= 0) {
38277+ if (local_read(&hvcsd->open_count) <= 0) {
38278 spin_unlock_irqrestore(&hvcsd->lock, flags);
38279 return -ENODEV;
38280 }
38281@@ -1428,7 +1429,7 @@ static int hvcs_write_room(struct tty_struct *tty)
38282 {
38283 struct hvcs_struct *hvcsd = tty->driver_data;
38284
38285- if (!hvcsd || hvcsd->open_count <= 0)
38286+ if (!hvcsd || local_read(&hvcsd->open_count) <= 0)
38287 return 0;
38288
38289 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
38290diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
38291index ef92869..f4ebd88 100644
38292--- a/drivers/tty/ipwireless/tty.c
38293+++ b/drivers/tty/ipwireless/tty.c
38294@@ -29,6 +29,7 @@
38295 #include <linux/tty_driver.h>
38296 #include <linux/tty_flip.h>
38297 #include <linux/uaccess.h>
38298+#include <asm/local.h>
38299
38300 #include "tty.h"
38301 #include "network.h"
38302@@ -51,7 +52,7 @@ struct ipw_tty {
38303 int tty_type;
38304 struct ipw_network *network;
38305 struct tty_struct *linux_tty;
38306- int open_count;
38307+ local_t open_count;
38308 unsigned int control_lines;
38309 struct mutex ipw_tty_mutex;
38310 int tx_bytes_queued;
38311@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
38312 mutex_unlock(&tty->ipw_tty_mutex);
38313 return -ENODEV;
38314 }
38315- if (tty->open_count == 0)
38316+ if (local_read(&tty->open_count) == 0)
38317 tty->tx_bytes_queued = 0;
38318
38319- tty->open_count++;
38320+ local_inc(&tty->open_count);
38321
38322 tty->linux_tty = linux_tty;
38323 linux_tty->driver_data = tty;
38324@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
38325
38326 static void do_ipw_close(struct ipw_tty *tty)
38327 {
38328- tty->open_count--;
38329-
38330- if (tty->open_count == 0) {
38331+ if (local_dec_return(&tty->open_count) == 0) {
38332 struct tty_struct *linux_tty = tty->linux_tty;
38333
38334 if (linux_tty != NULL) {
38335@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
38336 return;
38337
38338 mutex_lock(&tty->ipw_tty_mutex);
38339- if (tty->open_count == 0) {
38340+ if (local_read(&tty->open_count) == 0) {
38341 mutex_unlock(&tty->ipw_tty_mutex);
38342 return;
38343 }
38344@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
38345 return;
38346 }
38347
38348- if (!tty->open_count) {
38349+ if (!local_read(&tty->open_count)) {
38350 mutex_unlock(&tty->ipw_tty_mutex);
38351 return;
38352 }
38353@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *linux_tty,
38354 return -ENODEV;
38355
38356 mutex_lock(&tty->ipw_tty_mutex);
38357- if (!tty->open_count) {
38358+ if (!local_read(&tty->open_count)) {
38359 mutex_unlock(&tty->ipw_tty_mutex);
38360 return -EINVAL;
38361 }
38362@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
38363 if (!tty)
38364 return -ENODEV;
38365
38366- if (!tty->open_count)
38367+ if (!local_read(&tty->open_count))
38368 return -EINVAL;
38369
38370 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
38371@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
38372 if (!tty)
38373 return 0;
38374
38375- if (!tty->open_count)
38376+ if (!local_read(&tty->open_count))
38377 return 0;
38378
38379 return tty->tx_bytes_queued;
38380@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
38381 if (!tty)
38382 return -ENODEV;
38383
38384- if (!tty->open_count)
38385+ if (!local_read(&tty->open_count))
38386 return -EINVAL;
38387
38388 return get_control_lines(tty);
38389@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
38390 if (!tty)
38391 return -ENODEV;
38392
38393- if (!tty->open_count)
38394+ if (!local_read(&tty->open_count))
38395 return -EINVAL;
38396
38397 return set_control_lines(tty, set, clear);
38398@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
38399 if (!tty)
38400 return -ENODEV;
38401
38402- if (!tty->open_count)
38403+ if (!local_read(&tty->open_count))
38404 return -EINVAL;
38405
38406 /* FIXME: Exactly how is the tty object locked here .. */
38407@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
38408 against a parallel ioctl etc */
38409 mutex_lock(&ttyj->ipw_tty_mutex);
38410 }
38411- while (ttyj->open_count)
38412+ while (local_read(&ttyj->open_count))
38413 do_ipw_close(ttyj);
38414 ipwireless_disassociate_network_ttys(network,
38415 ttyj->channel_idx);
38416diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
38417index fc7bbba..9527e93 100644
38418--- a/drivers/tty/n_gsm.c
38419+++ b/drivers/tty/n_gsm.c
38420@@ -1629,7 +1629,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
38421 kref_init(&dlci->ref);
38422 mutex_init(&dlci->mutex);
38423 dlci->fifo = &dlci->_fifo;
38424- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
38425+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
38426 kfree(dlci);
38427 return NULL;
38428 }
38429diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
38430index d2256d0..97476fa 100644
38431--- a/drivers/tty/n_tty.c
38432+++ b/drivers/tty/n_tty.c
38433@@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
38434 {
38435 *ops = tty_ldisc_N_TTY;
38436 ops->owner = NULL;
38437- ops->refcount = ops->flags = 0;
38438+ atomic_set(&ops->refcount, 0);
38439+ ops->flags = 0;
38440 }
38441 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
38442diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
38443index d8653ab..f8afd9d 100644
38444--- a/drivers/tty/pty.c
38445+++ b/drivers/tty/pty.c
38446@@ -765,8 +765,10 @@ static void __init unix98_pty_init(void)
38447 register_sysctl_table(pty_root_table);
38448
38449 /* Now create the /dev/ptmx special device */
38450+ pax_open_kernel();
38451 tty_default_fops(&ptmx_fops);
38452- ptmx_fops.open = ptmx_open;
38453+ *(void **)&ptmx_fops.open = ptmx_open;
38454+ pax_close_kernel();
38455
38456 cdev_init(&ptmx_cdev, &ptmx_fops);
38457 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
38458diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
38459index 2b42a01..32a2ed3 100644
38460--- a/drivers/tty/serial/kgdboc.c
38461+++ b/drivers/tty/serial/kgdboc.c
38462@@ -24,8 +24,9 @@
38463 #define MAX_CONFIG_LEN 40
38464
38465 static struct kgdb_io kgdboc_io_ops;
38466+static struct kgdb_io kgdboc_io_ops_console;
38467
38468-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
38469+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
38470 static int configured = -1;
38471
38472 static char config[MAX_CONFIG_LEN];
38473@@ -148,6 +149,8 @@ static void cleanup_kgdboc(void)
38474 kgdboc_unregister_kbd();
38475 if (configured == 1)
38476 kgdb_unregister_io_module(&kgdboc_io_ops);
38477+ else if (configured == 2)
38478+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
38479 }
38480
38481 static int configure_kgdboc(void)
38482@@ -157,13 +160,13 @@ static int configure_kgdboc(void)
38483 int err;
38484 char *cptr = config;
38485 struct console *cons;
38486+ int is_console = 0;
38487
38488 err = kgdboc_option_setup(config);
38489 if (err || !strlen(config) || isspace(config[0]))
38490 goto noconfig;
38491
38492 err = -ENODEV;
38493- kgdboc_io_ops.is_console = 0;
38494 kgdb_tty_driver = NULL;
38495
38496 kgdboc_use_kms = 0;
38497@@ -184,7 +187,7 @@ static int configure_kgdboc(void)
38498 int idx;
38499 if (cons->device && cons->device(cons, &idx) == p &&
38500 idx == tty_line) {
38501- kgdboc_io_ops.is_console = 1;
38502+ is_console = 1;
38503 break;
38504 }
38505 cons = cons->next;
38506@@ -194,12 +197,16 @@ static int configure_kgdboc(void)
38507 kgdb_tty_line = tty_line;
38508
38509 do_register:
38510- err = kgdb_register_io_module(&kgdboc_io_ops);
38511+ if (is_console) {
38512+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
38513+ configured = 2;
38514+ } else {
38515+ err = kgdb_register_io_module(&kgdboc_io_ops);
38516+ configured = 1;
38517+ }
38518 if (err)
38519 goto noconfig;
38520
38521- configured = 1;
38522-
38523 return 0;
38524
38525 noconfig:
38526@@ -213,7 +220,7 @@ noconfig:
38527 static int __init init_kgdboc(void)
38528 {
38529 /* Already configured? */
38530- if (configured == 1)
38531+ if (configured >= 1)
38532 return 0;
38533
38534 return configure_kgdboc();
38535@@ -262,7 +269,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
38536 if (config[len - 1] == '\n')
38537 config[len - 1] = '\0';
38538
38539- if (configured == 1)
38540+ if (configured >= 1)
38541 cleanup_kgdboc();
38542
38543 /* Go and configure with the new params. */
38544@@ -302,6 +309,15 @@ static struct kgdb_io kgdboc_io_ops = {
38545 .post_exception = kgdboc_post_exp_handler,
38546 };
38547
38548+static struct kgdb_io kgdboc_io_ops_console = {
38549+ .name = "kgdboc",
38550+ .read_char = kgdboc_get_char,
38551+ .write_char = kgdboc_put_char,
38552+ .pre_exception = kgdboc_pre_exp_handler,
38553+ .post_exception = kgdboc_post_exp_handler,
38554+ .is_console = 1
38555+};
38556+
38557 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
38558 /* This is only available if kgdboc is a built in for early debugging */
38559 static int __init kgdboc_early_init(char *opt)
38560diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
38561index 7867b7c..b3c119d 100644
38562--- a/drivers/tty/sysrq.c
38563+++ b/drivers/tty/sysrq.c
38564@@ -862,7 +862,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
38565 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
38566 size_t count, loff_t *ppos)
38567 {
38568- if (count) {
38569+ if (count && capable(CAP_SYS_ADMIN)) {
38570 char c;
38571
38572 if (get_user(c, buf))
38573diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
38574index e41b9bb..84002fb 100644
38575--- a/drivers/tty/tty_io.c
38576+++ b/drivers/tty/tty_io.c
38577@@ -3291,7 +3291,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
38578
38579 void tty_default_fops(struct file_operations *fops)
38580 {
38581- *fops = tty_fops;
38582+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
38583 }
38584
38585 /*
38586diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
38587index 24b95db..9c078d0 100644
38588--- a/drivers/tty/tty_ldisc.c
38589+++ b/drivers/tty/tty_ldisc.c
38590@@ -57,7 +57,7 @@ static void put_ldisc(struct tty_ldisc *ld)
38591 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
38592 struct tty_ldisc_ops *ldo = ld->ops;
38593
38594- ldo->refcount--;
38595+ atomic_dec(&ldo->refcount);
38596 module_put(ldo->owner);
38597 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38598
38599@@ -92,7 +92,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
38600 spin_lock_irqsave(&tty_ldisc_lock, flags);
38601 tty_ldiscs[disc] = new_ldisc;
38602 new_ldisc->num = disc;
38603- new_ldisc->refcount = 0;
38604+ atomic_set(&new_ldisc->refcount, 0);
38605 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38606
38607 return ret;
38608@@ -120,7 +120,7 @@ int tty_unregister_ldisc(int disc)
38609 return -EINVAL;
38610
38611 spin_lock_irqsave(&tty_ldisc_lock, flags);
38612- if (tty_ldiscs[disc]->refcount)
38613+ if (atomic_read(&tty_ldiscs[disc]->refcount))
38614 ret = -EBUSY;
38615 else
38616 tty_ldiscs[disc] = NULL;
38617@@ -141,7 +141,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
38618 if (ldops) {
38619 ret = ERR_PTR(-EAGAIN);
38620 if (try_module_get(ldops->owner)) {
38621- ldops->refcount++;
38622+ atomic_inc(&ldops->refcount);
38623 ret = ldops;
38624 }
38625 }
38626@@ -154,7 +154,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
38627 unsigned long flags;
38628
38629 spin_lock_irqsave(&tty_ldisc_lock, flags);
38630- ldops->refcount--;
38631+ atomic_dec(&ldops->refcount);
38632 module_put(ldops->owner);
38633 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38634 }
38635diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
38636index a605549..6bd3c96 100644
38637--- a/drivers/tty/vt/keyboard.c
38638+++ b/drivers/tty/vt/keyboard.c
38639@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
38640 kbd->kbdmode == VC_OFF) &&
38641 value != KVAL(K_SAK))
38642 return; /* SAK is allowed even in raw mode */
38643+
38644+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
38645+ {
38646+ void *func = fn_handler[value];
38647+ if (func == fn_show_state || func == fn_show_ptregs ||
38648+ func == fn_show_mem)
38649+ return;
38650+ }
38651+#endif
38652+
38653 fn_handler[value](vc);
38654 }
38655
38656diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
38657index 65447c5..0526f0a 100644
38658--- a/drivers/tty/vt/vt_ioctl.c
38659+++ b/drivers/tty/vt/vt_ioctl.c
38660@@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
38661 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
38662 return -EFAULT;
38663
38664- if (!capable(CAP_SYS_TTY_CONFIG))
38665- perm = 0;
38666-
38667 switch (cmd) {
38668 case KDGKBENT:
38669 key_map = key_maps[s];
38670@@ -221,6 +218,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
38671 val = (i ? K_HOLE : K_NOSUCHMAP);
38672 return put_user(val, &user_kbe->kb_value);
38673 case KDSKBENT:
38674+ if (!capable(CAP_SYS_TTY_CONFIG))
38675+ perm = 0;
38676+
38677 if (!perm)
38678 return -EPERM;
38679 if (!i && v == K_NOSUCHMAP) {
38680@@ -322,9 +322,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
38681 int i, j, k;
38682 int ret;
38683
38684- if (!capable(CAP_SYS_TTY_CONFIG))
38685- perm = 0;
38686-
38687 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
38688 if (!kbs) {
38689 ret = -ENOMEM;
38690@@ -358,6 +355,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
38691 kfree(kbs);
38692 return ((p && *p) ? -EOVERFLOW : 0);
38693 case KDSKBSENT:
38694+ if (!capable(CAP_SYS_TTY_CONFIG))
38695+ perm = 0;
38696+
38697 if (!perm) {
38698 ret = -EPERM;
38699 goto reterr;
38700diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
38701index a783d53..cb30d94 100644
38702--- a/drivers/uio/uio.c
38703+++ b/drivers/uio/uio.c
38704@@ -25,6 +25,7 @@
38705 #include <linux/kobject.h>
38706 #include <linux/cdev.h>
38707 #include <linux/uio_driver.h>
38708+#include <asm/local.h>
38709
38710 #define UIO_MAX_DEVICES (1U << MINORBITS)
38711
38712@@ -32,10 +33,10 @@ struct uio_device {
38713 struct module *owner;
38714 struct device *dev;
38715 int minor;
38716- atomic_t event;
38717+ atomic_unchecked_t event;
38718 struct fasync_struct *async_queue;
38719 wait_queue_head_t wait;
38720- int vma_count;
38721+ local_t vma_count;
38722 struct uio_info *info;
38723 struct kobject *map_dir;
38724 struct kobject *portio_dir;
38725@@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev,
38726 struct device_attribute *attr, char *buf)
38727 {
38728 struct uio_device *idev = dev_get_drvdata(dev);
38729- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
38730+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
38731 }
38732
38733 static struct device_attribute uio_class_attributes[] = {
38734@@ -408,7 +409,7 @@ void uio_event_notify(struct uio_info *info)
38735 {
38736 struct uio_device *idev = info->uio_dev;
38737
38738- atomic_inc(&idev->event);
38739+ atomic_inc_unchecked(&idev->event);
38740 wake_up_interruptible(&idev->wait);
38741 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
38742 }
38743@@ -461,7 +462,7 @@ static int uio_open(struct inode *inode, struct file *filep)
38744 }
38745
38746 listener->dev = idev;
38747- listener->event_count = atomic_read(&idev->event);
38748+ listener->event_count = atomic_read_unchecked(&idev->event);
38749 filep->private_data = listener;
38750
38751 if (idev->info->open) {
38752@@ -512,7 +513,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
38753 return -EIO;
38754
38755 poll_wait(filep, &idev->wait, wait);
38756- if (listener->event_count != atomic_read(&idev->event))
38757+ if (listener->event_count != atomic_read_unchecked(&idev->event))
38758 return POLLIN | POLLRDNORM;
38759 return 0;
38760 }
38761@@ -537,7 +538,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
38762 do {
38763 set_current_state(TASK_INTERRUPTIBLE);
38764
38765- event_count = atomic_read(&idev->event);
38766+ event_count = atomic_read_unchecked(&idev->event);
38767 if (event_count != listener->event_count) {
38768 if (copy_to_user(buf, &event_count, count))
38769 retval = -EFAULT;
38770@@ -606,13 +607,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
38771 static void uio_vma_open(struct vm_area_struct *vma)
38772 {
38773 struct uio_device *idev = vma->vm_private_data;
38774- idev->vma_count++;
38775+ local_inc(&idev->vma_count);
38776 }
38777
38778 static void uio_vma_close(struct vm_area_struct *vma)
38779 {
38780 struct uio_device *idev = vma->vm_private_data;
38781- idev->vma_count--;
38782+ local_dec(&idev->vma_count);
38783 }
38784
38785 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
38786@@ -821,7 +822,7 @@ int __uio_register_device(struct module *owner,
38787 idev->owner = owner;
38788 idev->info = info;
38789 init_waitqueue_head(&idev->wait);
38790- atomic_set(&idev->event, 0);
38791+ atomic_set_unchecked(&idev->event, 0);
38792
38793 ret = uio_get_minor(idev);
38794 if (ret)
38795diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
38796index 98b89fe..aff824e 100644
38797--- a/drivers/usb/atm/cxacru.c
38798+++ b/drivers/usb/atm/cxacru.c
38799@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
38800 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
38801 if (ret < 2)
38802 return -EINVAL;
38803- if (index < 0 || index > 0x7f)
38804+ if (index > 0x7f)
38805 return -EINVAL;
38806 pos += tmp;
38807
38808diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
38809index d3448ca..d2864ca 100644
38810--- a/drivers/usb/atm/usbatm.c
38811+++ b/drivers/usb/atm/usbatm.c
38812@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38813 if (printk_ratelimit())
38814 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
38815 __func__, vpi, vci);
38816- atomic_inc(&vcc->stats->rx_err);
38817+ atomic_inc_unchecked(&vcc->stats->rx_err);
38818 return;
38819 }
38820
38821@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38822 if (length > ATM_MAX_AAL5_PDU) {
38823 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
38824 __func__, length, vcc);
38825- atomic_inc(&vcc->stats->rx_err);
38826+ atomic_inc_unchecked(&vcc->stats->rx_err);
38827 goto out;
38828 }
38829
38830@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38831 if (sarb->len < pdu_length) {
38832 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
38833 __func__, pdu_length, sarb->len, vcc);
38834- atomic_inc(&vcc->stats->rx_err);
38835+ atomic_inc_unchecked(&vcc->stats->rx_err);
38836 goto out;
38837 }
38838
38839 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
38840 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
38841 __func__, vcc);
38842- atomic_inc(&vcc->stats->rx_err);
38843+ atomic_inc_unchecked(&vcc->stats->rx_err);
38844 goto out;
38845 }
38846
38847@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38848 if (printk_ratelimit())
38849 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
38850 __func__, length);
38851- atomic_inc(&vcc->stats->rx_drop);
38852+ atomic_inc_unchecked(&vcc->stats->rx_drop);
38853 goto out;
38854 }
38855
38856@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38857
38858 vcc->push(vcc, skb);
38859
38860- atomic_inc(&vcc->stats->rx);
38861+ atomic_inc_unchecked(&vcc->stats->rx);
38862 out:
38863 skb_trim(sarb, 0);
38864 }
38865@@ -615,7 +615,7 @@ static void usbatm_tx_process(unsigned long data)
38866 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
38867
38868 usbatm_pop(vcc, skb);
38869- atomic_inc(&vcc->stats->tx);
38870+ atomic_inc_unchecked(&vcc->stats->tx);
38871
38872 skb = skb_dequeue(&instance->sndqueue);
38873 }
38874@@ -773,11 +773,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
38875 if (!left--)
38876 return sprintf(page,
38877 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
38878- atomic_read(&atm_dev->stats.aal5.tx),
38879- atomic_read(&atm_dev->stats.aal5.tx_err),
38880- atomic_read(&atm_dev->stats.aal5.rx),
38881- atomic_read(&atm_dev->stats.aal5.rx_err),
38882- atomic_read(&atm_dev->stats.aal5.rx_drop));
38883+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
38884+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
38885+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
38886+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
38887+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
38888
38889 if (!left--) {
38890 if (instance->disconnected)
38891diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
38892index d956965..4179a77 100644
38893--- a/drivers/usb/core/devices.c
38894+++ b/drivers/usb/core/devices.c
38895@@ -126,7 +126,7 @@ static const char format_endpt[] =
38896 * time it gets called.
38897 */
38898 static struct device_connect_event {
38899- atomic_t count;
38900+ atomic_unchecked_t count;
38901 wait_queue_head_t wait;
38902 } device_event = {
38903 .count = ATOMIC_INIT(1),
38904@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
38905
38906 void usbfs_conn_disc_event(void)
38907 {
38908- atomic_add(2, &device_event.count);
38909+ atomic_add_unchecked(2, &device_event.count);
38910 wake_up(&device_event.wait);
38911 }
38912
38913@@ -648,7 +648,7 @@ static unsigned int usb_device_poll(struct file *file,
38914
38915 poll_wait(file, &device_event.wait, wait);
38916
38917- event_count = atomic_read(&device_event.count);
38918+ event_count = atomic_read_unchecked(&device_event.count);
38919 if (file->f_version != event_count) {
38920 file->f_version = event_count;
38921 return POLLIN | POLLRDNORM;
38922diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
38923index 1fc8f12..20647c1 100644
38924--- a/drivers/usb/early/ehci-dbgp.c
38925+++ b/drivers/usb/early/ehci-dbgp.c
38926@@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
38927
38928 #ifdef CONFIG_KGDB
38929 static struct kgdb_io kgdbdbgp_io_ops;
38930-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
38931+static struct kgdb_io kgdbdbgp_io_ops_console;
38932+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
38933 #else
38934 #define dbgp_kgdb_mode (0)
38935 #endif
38936@@ -1035,6 +1036,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
38937 .write_char = kgdbdbgp_write_char,
38938 };
38939
38940+static struct kgdb_io kgdbdbgp_io_ops_console = {
38941+ .name = "kgdbdbgp",
38942+ .read_char = kgdbdbgp_read_char,
38943+ .write_char = kgdbdbgp_write_char,
38944+ .is_console = 1
38945+};
38946+
38947 static int kgdbdbgp_wait_time;
38948
38949 static int __init kgdbdbgp_parse_config(char *str)
38950@@ -1050,8 +1058,10 @@ static int __init kgdbdbgp_parse_config(char *str)
38951 ptr++;
38952 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
38953 }
38954- kgdb_register_io_module(&kgdbdbgp_io_ops);
38955- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
38956+ if (early_dbgp_console.index != -1)
38957+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
38958+ else
38959+ kgdb_register_io_module(&kgdbdbgp_io_ops);
38960
38961 return 0;
38962 }
38963diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
38964index d6bea3e..60b250e 100644
38965--- a/drivers/usb/wusbcore/wa-hc.h
38966+++ b/drivers/usb/wusbcore/wa-hc.h
38967@@ -192,7 +192,7 @@ struct wahc {
38968 struct list_head xfer_delayed_list;
38969 spinlock_t xfer_list_lock;
38970 struct work_struct xfer_work;
38971- atomic_t xfer_id_count;
38972+ atomic_unchecked_t xfer_id_count;
38973 };
38974
38975
38976@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
38977 INIT_LIST_HEAD(&wa->xfer_delayed_list);
38978 spin_lock_init(&wa->xfer_list_lock);
38979 INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
38980- atomic_set(&wa->xfer_id_count, 1);
38981+ atomic_set_unchecked(&wa->xfer_id_count, 1);
38982 }
38983
38984 /**
38985diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
38986index 57c01ab..8a05959 100644
38987--- a/drivers/usb/wusbcore/wa-xfer.c
38988+++ b/drivers/usb/wusbcore/wa-xfer.c
38989@@ -296,7 +296,7 @@ out:
38990 */
38991 static void wa_xfer_id_init(struct wa_xfer *xfer)
38992 {
38993- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
38994+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
38995 }
38996
38997 /*
38998diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
38999index c14c42b..f955cc2 100644
39000--- a/drivers/vhost/vhost.c
39001+++ b/drivers/vhost/vhost.c
39002@@ -629,7 +629,7 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
39003 return 0;
39004 }
39005
39006-static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
39007+static long vhost_set_vring(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
39008 {
39009 struct file *eventfp, *filep = NULL,
39010 *pollstart = NULL, *pollstop = NULL;
39011diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
39012index b0b2ac3..89a4399 100644
39013--- a/drivers/video/aty/aty128fb.c
39014+++ b/drivers/video/aty/aty128fb.c
39015@@ -148,7 +148,7 @@ enum {
39016 };
39017
39018 /* Must match above enum */
39019-static const char *r128_family[] __devinitdata = {
39020+static const char *r128_family[] __devinitconst = {
39021 "AGP",
39022 "PCI",
39023 "PRO AGP",
39024diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
39025index 5c3960d..15cf8fc 100644
39026--- a/drivers/video/fbcmap.c
39027+++ b/drivers/video/fbcmap.c
39028@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
39029 rc = -ENODEV;
39030 goto out;
39031 }
39032- if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
39033- !info->fbops->fb_setcmap)) {
39034+ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
39035 rc = -EINVAL;
39036 goto out1;
39037 }
39038diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
39039index c6ce416..3b9b642 100644
39040--- a/drivers/video/fbmem.c
39041+++ b/drivers/video/fbmem.c
39042@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
39043 image->dx += image->width + 8;
39044 }
39045 } else if (rotate == FB_ROTATE_UD) {
39046- for (x = 0; x < num && image->dx >= 0; x++) {
39047+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
39048 info->fbops->fb_imageblit(info, image);
39049 image->dx -= image->width + 8;
39050 }
39051@@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
39052 image->dy += image->height + 8;
39053 }
39054 } else if (rotate == FB_ROTATE_CCW) {
39055- for (x = 0; x < num && image->dy >= 0; x++) {
39056+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
39057 info->fbops->fb_imageblit(info, image);
39058 image->dy -= image->height + 8;
39059 }
39060@@ -1157,7 +1157,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
39061 return -EFAULT;
39062 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
39063 return -EINVAL;
39064- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
39065+ if (con2fb.framebuffer >= FB_MAX)
39066 return -EINVAL;
39067 if (!registered_fb[con2fb.framebuffer])
39068 request_module("fb%d", con2fb.framebuffer);
39069diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
39070index 5a5d092..265c5ed 100644
39071--- a/drivers/video/geode/gx1fb_core.c
39072+++ b/drivers/video/geode/gx1fb_core.c
39073@@ -29,7 +29,7 @@ static int crt_option = 1;
39074 static char panel_option[32] = "";
39075
39076 /* Modes relevant to the GX1 (taken from modedb.c) */
39077-static const struct fb_videomode __devinitdata gx1_modedb[] = {
39078+static const struct fb_videomode __devinitconst gx1_modedb[] = {
39079 /* 640x480-60 VESA */
39080 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
39081 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
39082diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
39083index 0fad23f..0e9afa4 100644
39084--- a/drivers/video/gxt4500.c
39085+++ b/drivers/video/gxt4500.c
39086@@ -156,7 +156,7 @@ struct gxt4500_par {
39087 static char *mode_option;
39088
39089 /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
39090-static const struct fb_videomode defaultmode __devinitdata = {
39091+static const struct fb_videomode defaultmode __devinitconst = {
39092 .refresh = 60,
39093 .xres = 1280,
39094 .yres = 1024,
39095@@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
39096 return 0;
39097 }
39098
39099-static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
39100+static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
39101 .id = "IBM GXT4500P",
39102 .type = FB_TYPE_PACKED_PIXELS,
39103 .visual = FB_VISUAL_PSEUDOCOLOR,
39104diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
39105index 7672d2e..b56437f 100644
39106--- a/drivers/video/i810/i810_accel.c
39107+++ b/drivers/video/i810/i810_accel.c
39108@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
39109 }
39110 }
39111 printk("ringbuffer lockup!!!\n");
39112+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
39113 i810_report_error(mmio);
39114 par->dev_flags |= LOCKUP;
39115 info->pixmap.scan_align = 1;
39116diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
39117index b83f361..2b05a91 100644
39118--- a/drivers/video/i810/i810_main.c
39119+++ b/drivers/video/i810/i810_main.c
39120@@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
39121 static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
39122
39123 /* PCI */
39124-static const char *i810_pci_list[] __devinitdata = {
39125+static const char *i810_pci_list[] __devinitconst = {
39126 "Intel(R) 810 Framebuffer Device" ,
39127 "Intel(R) 810-DC100 Framebuffer Device" ,
39128 "Intel(R) 810E Framebuffer Device" ,
39129diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
39130index de36693..3c63fc2 100644
39131--- a/drivers/video/jz4740_fb.c
39132+++ b/drivers/video/jz4740_fb.c
39133@@ -136,7 +136,7 @@ struct jzfb {
39134 uint32_t pseudo_palette[16];
39135 };
39136
39137-static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
39138+static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
39139 .id = "JZ4740 FB",
39140 .type = FB_TYPE_PACKED_PIXELS,
39141 .visual = FB_VISUAL_TRUECOLOR,
39142diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
39143index 3c14e43..eafa544 100644
39144--- a/drivers/video/logo/logo_linux_clut224.ppm
39145+++ b/drivers/video/logo/logo_linux_clut224.ppm
39146@@ -1,1604 +1,1123 @@
39147 P3
39148-# Standard 224-color Linux logo
39149 80 80
39150 255
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 0 0 0
39154- 0 0 0 0 0 0 0 0 0 0 0 0
39155- 0 0 0 0 0 0 0 0 0 0 0 0
39156- 0 0 0 0 0 0 0 0 0 0 0 0
39157- 0 0 0 0 0 0 0 0 0 0 0 0
39158- 0 0 0 0 0 0 0 0 0 0 0 0
39159- 0 0 0 0 0 0 0 0 0 0 0 0
39160- 6 6 6 6 6 6 10 10 10 10 10 10
39161- 10 10 10 6 6 6 6 6 6 6 6 6
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 0 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 0 0 0
39174- 0 0 0 0 0 0 0 0 0 0 0 0
39175- 0 0 0 0 0 0 0 0 0 0 0 0
39176- 0 0 0 0 0 0 0 0 0 0 0 0
39177- 0 0 0 0 0 0 0 0 0 0 0 0
39178- 0 0 0 0 0 0 0 0 0 0 0 0
39179- 0 0 0 6 6 6 10 10 10 14 14 14
39180- 22 22 22 26 26 26 30 30 30 34 34 34
39181- 30 30 30 30 30 30 26 26 26 18 18 18
39182- 14 14 14 10 10 10 6 6 6 0 0 0
39183- 0 0 0 0 0 0 0 0 0 0 0 0
39184- 0 0 0 0 0 0 0 0 0 0 0 0
39185- 0 0 0 0 0 0 0 0 0 0 0 0
39186- 0 0 0 0 0 0 0 0 0 0 0 0
39187- 0 0 0 0 0 0 0 0 0 0 0 0
39188- 0 0 0 0 0 0 0 0 0 0 0 0
39189- 0 0 0 0 0 0 0 0 0 0 0 0
39190- 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 1 0 0 1 0 0 0
39193- 0 0 0 0 0 0 0 0 0 0 0 0
39194- 0 0 0 0 0 0 0 0 0 0 0 0
39195- 0 0 0 0 0 0 0 0 0 0 0 0
39196- 0 0 0 0 0 0 0 0 0 0 0 0
39197- 0 0 0 0 0 0 0 0 0 0 0 0
39198- 0 0 0 0 0 0 0 0 0 0 0 0
39199- 6 6 6 14 14 14 26 26 26 42 42 42
39200- 54 54 54 66 66 66 78 78 78 78 78 78
39201- 78 78 78 74 74 74 66 66 66 54 54 54
39202- 42 42 42 26 26 26 18 18 18 10 10 10
39203- 6 6 6 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 1 0 0 0 0 0 0 0 0 0
39213- 0 0 0 0 0 0 0 0 0 0 0 0
39214- 0 0 0 0 0 0 0 0 0 0 0 0
39215- 0 0 0 0 0 0 0 0 0 0 0 0
39216- 0 0 0 0 0 0 0 0 0 0 0 0
39217- 0 0 0 0 0 0 0 0 0 0 0 0
39218- 0 0 0 0 0 0 0 0 0 10 10 10
39219- 22 22 22 42 42 42 66 66 66 86 86 86
39220- 66 66 66 38 38 38 38 38 38 22 22 22
39221- 26 26 26 34 34 34 54 54 54 66 66 66
39222- 86 86 86 70 70 70 46 46 46 26 26 26
39223- 14 14 14 6 6 6 0 0 0 0 0 0
39224- 0 0 0 0 0 0 0 0 0 0 0 0
39225- 0 0 0 0 0 0 0 0 0 0 0 0
39226- 0 0 0 0 0 0 0 0 0 0 0 0
39227- 0 0 0 0 0 0 0 0 0 0 0 0
39228- 0 0 0 0 0 0 0 0 0 0 0 0
39229- 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 1 0 0 1 0 0 1 0 0 0
39233- 0 0 0 0 0 0 0 0 0 0 0 0
39234- 0 0 0 0 0 0 0 0 0 0 0 0
39235- 0 0 0 0 0 0 0 0 0 0 0 0
39236- 0 0 0 0 0 0 0 0 0 0 0 0
39237- 0 0 0 0 0 0 0 0 0 0 0 0
39238- 0 0 0 0 0 0 10 10 10 26 26 26
39239- 50 50 50 82 82 82 58 58 58 6 6 6
39240- 2 2 6 2 2 6 2 2 6 2 2 6
39241- 2 2 6 2 2 6 2 2 6 2 2 6
39242- 6 6 6 54 54 54 86 86 86 66 66 66
39243- 38 38 38 18 18 18 6 6 6 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 0 0 0
39254- 0 0 0 0 0 0 0 0 0 0 0 0
39255- 0 0 0 0 0 0 0 0 0 0 0 0
39256- 0 0 0 0 0 0 0 0 0 0 0 0
39257- 0 0 0 0 0 0 0 0 0 0 0 0
39258- 0 0 0 6 6 6 22 22 22 50 50 50
39259- 78 78 78 34 34 34 2 2 6 2 2 6
39260- 2 2 6 2 2 6 2 2 6 2 2 6
39261- 2 2 6 2 2 6 2 2 6 2 2 6
39262- 2 2 6 2 2 6 6 6 6 70 70 70
39263- 78 78 78 46 46 46 22 22 22 6 6 6
39264- 0 0 0 0 0 0 0 0 0 0 0 0
39265- 0 0 0 0 0 0 0 0 0 0 0 0
39266- 0 0 0 0 0 0 0 0 0 0 0 0
39267- 0 0 0 0 0 0 0 0 0 0 0 0
39268- 0 0 0 0 0 0 0 0 0 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 1 0 0 1 0 0 1 0 0 0
39273- 0 0 0 0 0 0 0 0 0 0 0 0
39274- 0 0 0 0 0 0 0 0 0 0 0 0
39275- 0 0 0 0 0 0 0 0 0 0 0 0
39276- 0 0 0 0 0 0 0 0 0 0 0 0
39277- 0 0 0 0 0 0 0 0 0 0 0 0
39278- 6 6 6 18 18 18 42 42 42 82 82 82
39279- 26 26 26 2 2 6 2 2 6 2 2 6
39280- 2 2 6 2 2 6 2 2 6 2 2 6
39281- 2 2 6 2 2 6 2 2 6 14 14 14
39282- 46 46 46 34 34 34 6 6 6 2 2 6
39283- 42 42 42 78 78 78 42 42 42 18 18 18
39284- 6 6 6 0 0 0 0 0 0 0 0 0
39285- 0 0 0 0 0 0 0 0 0 0 0 0
39286- 0 0 0 0 0 0 0 0 0 0 0 0
39287- 0 0 0 0 0 0 0 0 0 0 0 0
39288- 0 0 0 0 0 0 0 0 0 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 1 0 0 0 0 0 1 0 0 0
39293- 0 0 0 0 0 0 0 0 0 0 0 0
39294- 0 0 0 0 0 0 0 0 0 0 0 0
39295- 0 0 0 0 0 0 0 0 0 0 0 0
39296- 0 0 0 0 0 0 0 0 0 0 0 0
39297- 0 0 0 0 0 0 0 0 0 0 0 0
39298- 10 10 10 30 30 30 66 66 66 58 58 58
39299- 2 2 6 2 2 6 2 2 6 2 2 6
39300- 2 2 6 2 2 6 2 2 6 2 2 6
39301- 2 2 6 2 2 6 2 2 6 26 26 26
39302- 86 86 86 101 101 101 46 46 46 10 10 10
39303- 2 2 6 58 58 58 70 70 70 34 34 34
39304- 10 10 10 0 0 0 0 0 0 0 0 0
39305- 0 0 0 0 0 0 0 0 0 0 0 0
39306- 0 0 0 0 0 0 0 0 0 0 0 0
39307- 0 0 0 0 0 0 0 0 0 0 0 0
39308- 0 0 0 0 0 0 0 0 0 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 1 0 0 1 0 0 1 0 0 0
39313- 0 0 0 0 0 0 0 0 0 0 0 0
39314- 0 0 0 0 0 0 0 0 0 0 0 0
39315- 0 0 0 0 0 0 0 0 0 0 0 0
39316- 0 0 0 0 0 0 0 0 0 0 0 0
39317- 0 0 0 0 0 0 0 0 0 0 0 0
39318- 14 14 14 42 42 42 86 86 86 10 10 10
39319- 2 2 6 2 2 6 2 2 6 2 2 6
39320- 2 2 6 2 2 6 2 2 6 2 2 6
39321- 2 2 6 2 2 6 2 2 6 30 30 30
39322- 94 94 94 94 94 94 58 58 58 26 26 26
39323- 2 2 6 6 6 6 78 78 78 54 54 54
39324- 22 22 22 6 6 6 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 0 0 0
39334- 0 0 0 0 0 0 0 0 0 0 0 0
39335- 0 0 0 0 0 0 0 0 0 0 0 0
39336- 0 0 0 0 0 0 0 0 0 0 0 0
39337- 0 0 0 0 0 0 0 0 0 6 6 6
39338- 22 22 22 62 62 62 62 62 62 2 2 6
39339- 2 2 6 2 2 6 2 2 6 2 2 6
39340- 2 2 6 2 2 6 2 2 6 2 2 6
39341- 2 2 6 2 2 6 2 2 6 26 26 26
39342- 54 54 54 38 38 38 18 18 18 10 10 10
39343- 2 2 6 2 2 6 34 34 34 82 82 82
39344- 38 38 38 14 14 14 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 1 0 0 1 0 0 0
39353- 0 0 0 0 0 0 0 0 0 0 0 0
39354- 0 0 0 0 0 0 0 0 0 0 0 0
39355- 0 0 0 0 0 0 0 0 0 0 0 0
39356- 0 0 0 0 0 0 0 0 0 0 0 0
39357- 0 0 0 0 0 0 0 0 0 6 6 6
39358- 30 30 30 78 78 78 30 30 30 2 2 6
39359- 2 2 6 2 2 6 2 2 6 2 2 6
39360- 2 2 6 2 2 6 2 2 6 2 2 6
39361- 2 2 6 2 2 6 2 2 6 10 10 10
39362- 10 10 10 2 2 6 2 2 6 2 2 6
39363- 2 2 6 2 2 6 2 2 6 78 78 78
39364- 50 50 50 18 18 18 6 6 6 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 1 0 0 0 0 0 0 0 0 0
39373- 0 0 0 0 0 0 0 0 0 0 0 0
39374- 0 0 0 0 0 0 0 0 0 0 0 0
39375- 0 0 0 0 0 0 0 0 0 0 0 0
39376- 0 0 0 0 0 0 0 0 0 0 0 0
39377- 0 0 0 0 0 0 0 0 0 10 10 10
39378- 38 38 38 86 86 86 14 14 14 2 2 6
39379- 2 2 6 2 2 6 2 2 6 2 2 6
39380- 2 2 6 2 2 6 2 2 6 2 2 6
39381- 2 2 6 2 2 6 2 2 6 2 2 6
39382- 2 2 6 2 2 6 2 2 6 2 2 6
39383- 2 2 6 2 2 6 2 2 6 54 54 54
39384- 66 66 66 26 26 26 6 6 6 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 1 0 0 1 0 0 0
39393- 0 0 0 0 0 0 0 0 0 0 0 0
39394- 0 0 0 0 0 0 0 0 0 0 0 0
39395- 0 0 0 0 0 0 0 0 0 0 0 0
39396- 0 0 0 0 0 0 0 0 0 0 0 0
39397- 0 0 0 0 0 0 0 0 0 14 14 14
39398- 42 42 42 82 82 82 2 2 6 2 2 6
39399- 2 2 6 6 6 6 10 10 10 2 2 6
39400- 2 2 6 2 2 6 2 2 6 2 2 6
39401- 2 2 6 2 2 6 2 2 6 6 6 6
39402- 14 14 14 10 10 10 2 2 6 2 2 6
39403- 2 2 6 2 2 6 2 2 6 18 18 18
39404- 82 82 82 34 34 34 10 10 10 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 1 0 0 0 0 0 0 0 0 0
39413- 0 0 0 0 0 0 0 0 0 0 0 0
39414- 0 0 0 0 0 0 0 0 0 0 0 0
39415- 0 0 0 0 0 0 0 0 0 0 0 0
39416- 0 0 0 0 0 0 0 0 0 0 0 0
39417- 0 0 0 0 0 0 0 0 0 14 14 14
39418- 46 46 46 86 86 86 2 2 6 2 2 6
39419- 6 6 6 6 6 6 22 22 22 34 34 34
39420- 6 6 6 2 2 6 2 2 6 2 2 6
39421- 2 2 6 2 2 6 18 18 18 34 34 34
39422- 10 10 10 50 50 50 22 22 22 2 2 6
39423- 2 2 6 2 2 6 2 2 6 10 10 10
39424- 86 86 86 42 42 42 14 14 14 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 1 0 0 1 0 0 1 0 0 0
39433- 0 0 0 0 0 0 0 0 0 0 0 0
39434- 0 0 0 0 0 0 0 0 0 0 0 0
39435- 0 0 0 0 0 0 0 0 0 0 0 0
39436- 0 0 0 0 0 0 0 0 0 0 0 0
39437- 0 0 0 0 0 0 0 0 0 14 14 14
39438- 46 46 46 86 86 86 2 2 6 2 2 6
39439- 38 38 38 116 116 116 94 94 94 22 22 22
39440- 22 22 22 2 2 6 2 2 6 2 2 6
39441- 14 14 14 86 86 86 138 138 138 162 162 162
39442-154 154 154 38 38 38 26 26 26 6 6 6
39443- 2 2 6 2 2 6 2 2 6 2 2 6
39444- 86 86 86 46 46 46 14 14 14 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 0 0 0
39454- 0 0 0 0 0 0 0 0 0 0 0 0
39455- 0 0 0 0 0 0 0 0 0 0 0 0
39456- 0 0 0 0 0 0 0 0 0 0 0 0
39457- 0 0 0 0 0 0 0 0 0 14 14 14
39458- 46 46 46 86 86 86 2 2 6 14 14 14
39459-134 134 134 198 198 198 195 195 195 116 116 116
39460- 10 10 10 2 2 6 2 2 6 6 6 6
39461-101 98 89 187 187 187 210 210 210 218 218 218
39462-214 214 214 134 134 134 14 14 14 6 6 6
39463- 2 2 6 2 2 6 2 2 6 2 2 6
39464- 86 86 86 50 50 50 18 18 18 6 6 6
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 1 0 0 0
39472- 0 0 1 0 0 1 0 0 1 0 0 0
39473- 0 0 0 0 0 0 0 0 0 0 0 0
39474- 0 0 0 0 0 0 0 0 0 0 0 0
39475- 0 0 0 0 0 0 0 0 0 0 0 0
39476- 0 0 0 0 0 0 0 0 0 0 0 0
39477- 0 0 0 0 0 0 0 0 0 14 14 14
39478- 46 46 46 86 86 86 2 2 6 54 54 54
39479-218 218 218 195 195 195 226 226 226 246 246 246
39480- 58 58 58 2 2 6 2 2 6 30 30 30
39481-210 210 210 253 253 253 174 174 174 123 123 123
39482-221 221 221 234 234 234 74 74 74 2 2 6
39483- 2 2 6 2 2 6 2 2 6 2 2 6
39484- 70 70 70 58 58 58 22 22 22 6 6 6
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 0 0 0 0 0 0
39494- 0 0 0 0 0 0 0 0 0 0 0 0
39495- 0 0 0 0 0 0 0 0 0 0 0 0
39496- 0 0 0 0 0 0 0 0 0 0 0 0
39497- 0 0 0 0 0 0 0 0 0 14 14 14
39498- 46 46 46 82 82 82 2 2 6 106 106 106
39499-170 170 170 26 26 26 86 86 86 226 226 226
39500-123 123 123 10 10 10 14 14 14 46 46 46
39501-231 231 231 190 190 190 6 6 6 70 70 70
39502- 90 90 90 238 238 238 158 158 158 2 2 6
39503- 2 2 6 2 2 6 2 2 6 2 2 6
39504- 70 70 70 58 58 58 22 22 22 6 6 6
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 1 0 0 0
39512- 0 0 1 0 0 1 0 0 1 0 0 0
39513- 0 0 0 0 0 0 0 0 0 0 0 0
39514- 0 0 0 0 0 0 0 0 0 0 0 0
39515- 0 0 0 0 0 0 0 0 0 0 0 0
39516- 0 0 0 0 0 0 0 0 0 0 0 0
39517- 0 0 0 0 0 0 0 0 0 14 14 14
39518- 42 42 42 86 86 86 6 6 6 116 116 116
39519-106 106 106 6 6 6 70 70 70 149 149 149
39520-128 128 128 18 18 18 38 38 38 54 54 54
39521-221 221 221 106 106 106 2 2 6 14 14 14
39522- 46 46 46 190 190 190 198 198 198 2 2 6
39523- 2 2 6 2 2 6 2 2 6 2 2 6
39524- 74 74 74 62 62 62 22 22 22 6 6 6
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 1 0 0 0
39532- 0 0 1 0 0 0 0 0 1 0 0 0
39533- 0 0 0 0 0 0 0 0 0 0 0 0
39534- 0 0 0 0 0 0 0 0 0 0 0 0
39535- 0 0 0 0 0 0 0 0 0 0 0 0
39536- 0 0 0 0 0 0 0 0 0 0 0 0
39537- 0 0 0 0 0 0 0 0 0 14 14 14
39538- 42 42 42 94 94 94 14 14 14 101 101 101
39539-128 128 128 2 2 6 18 18 18 116 116 116
39540-118 98 46 121 92 8 121 92 8 98 78 10
39541-162 162 162 106 106 106 2 2 6 2 2 6
39542- 2 2 6 195 195 195 195 195 195 6 6 6
39543- 2 2 6 2 2 6 2 2 6 2 2 6
39544- 74 74 74 62 62 62 22 22 22 6 6 6
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 1 0 0 1
39552- 0 0 1 0 0 0 0 0 1 0 0 0
39553- 0 0 0 0 0 0 0 0 0 0 0 0
39554- 0 0 0 0 0 0 0 0 0 0 0 0
39555- 0 0 0 0 0 0 0 0 0 0 0 0
39556- 0 0 0 0 0 0 0 0 0 0 0 0
39557- 0 0 0 0 0 0 0 0 0 10 10 10
39558- 38 38 38 90 90 90 14 14 14 58 58 58
39559-210 210 210 26 26 26 54 38 6 154 114 10
39560-226 170 11 236 186 11 225 175 15 184 144 12
39561-215 174 15 175 146 61 37 26 9 2 2 6
39562- 70 70 70 246 246 246 138 138 138 2 2 6
39563- 2 2 6 2 2 6 2 2 6 2 2 6
39564- 70 70 70 66 66 66 26 26 26 6 6 6
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 0 0 0
39573- 0 0 0 0 0 0 0 0 0 0 0 0
39574- 0 0 0 0 0 0 0 0 0 0 0 0
39575- 0 0 0 0 0 0 0 0 0 0 0 0
39576- 0 0 0 0 0 0 0 0 0 0 0 0
39577- 0 0 0 0 0 0 0 0 0 10 10 10
39578- 38 38 38 86 86 86 14 14 14 10 10 10
39579-195 195 195 188 164 115 192 133 9 225 175 15
39580-239 182 13 234 190 10 232 195 16 232 200 30
39581-245 207 45 241 208 19 232 195 16 184 144 12
39582-218 194 134 211 206 186 42 42 42 2 2 6
39583- 2 2 6 2 2 6 2 2 6 2 2 6
39584- 50 50 50 74 74 74 30 30 30 6 6 6
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 0 0 0 0 0 0
39593- 0 0 0 0 0 0 0 0 0 0 0 0
39594- 0 0 0 0 0 0 0 0 0 0 0 0
39595- 0 0 0 0 0 0 0 0 0 0 0 0
39596- 0 0 0 0 0 0 0 0 0 0 0 0
39597- 0 0 0 0 0 0 0 0 0 10 10 10
39598- 34 34 34 86 86 86 14 14 14 2 2 6
39599-121 87 25 192 133 9 219 162 10 239 182 13
39600-236 186 11 232 195 16 241 208 19 244 214 54
39601-246 218 60 246 218 38 246 215 20 241 208 19
39602-241 208 19 226 184 13 121 87 25 2 2 6
39603- 2 2 6 2 2 6 2 2 6 2 2 6
39604- 50 50 50 82 82 82 34 34 34 10 10 10
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 0 0 0 0 0 0 0 0 0
39613- 0 0 0 0 0 0 0 0 0 0 0 0
39614- 0 0 0 0 0 0 0 0 0 0 0 0
39615- 0 0 0 0 0 0 0 0 0 0 0 0
39616- 0 0 0 0 0 0 0 0 0 0 0 0
39617- 0 0 0 0 0 0 0 0 0 10 10 10
39618- 34 34 34 82 82 82 30 30 30 61 42 6
39619-180 123 7 206 145 10 230 174 11 239 182 13
39620-234 190 10 238 202 15 241 208 19 246 218 74
39621-246 218 38 246 215 20 246 215 20 246 215 20
39622-226 184 13 215 174 15 184 144 12 6 6 6
39623- 2 2 6 2 2 6 2 2 6 2 2 6
39624- 26 26 26 94 94 94 42 42 42 14 14 14
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- 0 0 0 0 0 0 0 0 0 0 0 0
39633- 0 0 0 0 0 0 0 0 0 0 0 0
39634- 0 0 0 0 0 0 0 0 0 0 0 0
39635- 0 0 0 0 0 0 0 0 0 0 0 0
39636- 0 0 0 0 0 0 0 0 0 0 0 0
39637- 0 0 0 0 0 0 0 0 0 10 10 10
39638- 30 30 30 78 78 78 50 50 50 104 69 6
39639-192 133 9 216 158 10 236 178 12 236 186 11
39640-232 195 16 241 208 19 244 214 54 245 215 43
39641-246 215 20 246 215 20 241 208 19 198 155 10
39642-200 144 11 216 158 10 156 118 10 2 2 6
39643- 2 2 6 2 2 6 2 2 6 2 2 6
39644- 6 6 6 90 90 90 54 54 54 18 18 18
39645- 6 6 6 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- 0 0 0 0 0 0 0 0 0 0 0 0
39653- 0 0 0 0 0 0 0 0 0 0 0 0
39654- 0 0 0 0 0 0 0 0 0 0 0 0
39655- 0 0 0 0 0 0 0 0 0 0 0 0
39656- 0 0 0 0 0 0 0 0 0 0 0 0
39657- 0 0 0 0 0 0 0 0 0 10 10 10
39658- 30 30 30 78 78 78 46 46 46 22 22 22
39659-137 92 6 210 162 10 239 182 13 238 190 10
39660-238 202 15 241 208 19 246 215 20 246 215 20
39661-241 208 19 203 166 17 185 133 11 210 150 10
39662-216 158 10 210 150 10 102 78 10 2 2 6
39663- 6 6 6 54 54 54 14 14 14 2 2 6
39664- 2 2 6 62 62 62 74 74 74 30 30 30
39665- 10 10 10 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- 0 0 0 0 0 0 0 0 0 0 0 0
39673- 0 0 0 0 0 0 0 0 0 0 0 0
39674- 0 0 0 0 0 0 0 0 0 0 0 0
39675- 0 0 0 0 0 0 0 0 0 0 0 0
39676- 0 0 0 0 0 0 0 0 0 0 0 0
39677- 0 0 0 0 0 0 0 0 0 10 10 10
39678- 34 34 34 78 78 78 50 50 50 6 6 6
39679- 94 70 30 139 102 15 190 146 13 226 184 13
39680-232 200 30 232 195 16 215 174 15 190 146 13
39681-168 122 10 192 133 9 210 150 10 213 154 11
39682-202 150 34 182 157 106 101 98 89 2 2 6
39683- 2 2 6 78 78 78 116 116 116 58 58 58
39684- 2 2 6 22 22 22 90 90 90 46 46 46
39685- 18 18 18 6 6 6 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 0 0 0
39692- 0 0 0 0 0 0 0 0 0 0 0 0
39693- 0 0 0 0 0 0 0 0 0 0 0 0
39694- 0 0 0 0 0 0 0 0 0 0 0 0
39695- 0 0 0 0 0 0 0 0 0 0 0 0
39696- 0 0 0 0 0 0 0 0 0 0 0 0
39697- 0 0 0 0 0 0 0 0 0 10 10 10
39698- 38 38 38 86 86 86 50 50 50 6 6 6
39699-128 128 128 174 154 114 156 107 11 168 122 10
39700-198 155 10 184 144 12 197 138 11 200 144 11
39701-206 145 10 206 145 10 197 138 11 188 164 115
39702-195 195 195 198 198 198 174 174 174 14 14 14
39703- 2 2 6 22 22 22 116 116 116 116 116 116
39704- 22 22 22 2 2 6 74 74 74 70 70 70
39705- 30 30 30 10 10 10 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 0 0 0
39712- 0 0 0 0 0 0 0 0 0 0 0 0
39713- 0 0 0 0 0 0 0 0 0 0 0 0
39714- 0 0 0 0 0 0 0 0 0 0 0 0
39715- 0 0 0 0 0 0 0 0 0 0 0 0
39716- 0 0 0 0 0 0 0 0 0 0 0 0
39717- 0 0 0 0 0 0 6 6 6 18 18 18
39718- 50 50 50 101 101 101 26 26 26 10 10 10
39719-138 138 138 190 190 190 174 154 114 156 107 11
39720-197 138 11 200 144 11 197 138 11 192 133 9
39721-180 123 7 190 142 34 190 178 144 187 187 187
39722-202 202 202 221 221 221 214 214 214 66 66 66
39723- 2 2 6 2 2 6 50 50 50 62 62 62
39724- 6 6 6 2 2 6 10 10 10 90 90 90
39725- 50 50 50 18 18 18 6 6 6 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 0 0 0
39732- 0 0 0 0 0 0 0 0 0 0 0 0
39733- 0 0 0 0 0 0 0 0 0 0 0 0
39734- 0 0 0 0 0 0 0 0 0 0 0 0
39735- 0 0 0 0 0 0 0 0 0 0 0 0
39736- 0 0 0 0 0 0 0 0 0 0 0 0
39737- 0 0 0 0 0 0 10 10 10 34 34 34
39738- 74 74 74 74 74 74 2 2 6 6 6 6
39739-144 144 144 198 198 198 190 190 190 178 166 146
39740-154 121 60 156 107 11 156 107 11 168 124 44
39741-174 154 114 187 187 187 190 190 190 210 210 210
39742-246 246 246 253 253 253 253 253 253 182 182 182
39743- 6 6 6 2 2 6 2 2 6 2 2 6
39744- 2 2 6 2 2 6 2 2 6 62 62 62
39745- 74 74 74 34 34 34 14 14 14 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 0 0 0 0 0 0
39752- 0 0 0 0 0 0 0 0 0 0 0 0
39753- 0 0 0 0 0 0 0 0 0 0 0 0
39754- 0 0 0 0 0 0 0 0 0 0 0 0
39755- 0 0 0 0 0 0 0 0 0 0 0 0
39756- 0 0 0 0 0 0 0 0 0 0 0 0
39757- 0 0 0 10 10 10 22 22 22 54 54 54
39758- 94 94 94 18 18 18 2 2 6 46 46 46
39759-234 234 234 221 221 221 190 190 190 190 190 190
39760-190 190 190 187 187 187 187 187 187 190 190 190
39761-190 190 190 195 195 195 214 214 214 242 242 242
39762-253 253 253 253 253 253 253 253 253 253 253 253
39763- 82 82 82 2 2 6 2 2 6 2 2 6
39764- 2 2 6 2 2 6 2 2 6 14 14 14
39765- 86 86 86 54 54 54 22 22 22 6 6 6
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 0 0 0 0 0 0
39772- 0 0 0 0 0 0 0 0 0 0 0 0
39773- 0 0 0 0 0 0 0 0 0 0 0 0
39774- 0 0 0 0 0 0 0 0 0 0 0 0
39775- 0 0 0 0 0 0 0 0 0 0 0 0
39776- 0 0 0 0 0 0 0 0 0 0 0 0
39777- 6 6 6 18 18 18 46 46 46 90 90 90
39778- 46 46 46 18 18 18 6 6 6 182 182 182
39779-253 253 253 246 246 246 206 206 206 190 190 190
39780-190 190 190 190 190 190 190 190 190 190 190 190
39781-206 206 206 231 231 231 250 250 250 253 253 253
39782-253 253 253 253 253 253 253 253 253 253 253 253
39783-202 202 202 14 14 14 2 2 6 2 2 6
39784- 2 2 6 2 2 6 2 2 6 2 2 6
39785- 42 42 42 86 86 86 42 42 42 18 18 18
39786- 6 6 6 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 0 0 0 0 0 0 0 0 0
39792- 0 0 0 0 0 0 0 0 0 0 0 0
39793- 0 0 0 0 0 0 0 0 0 0 0 0
39794- 0 0 0 0 0 0 0 0 0 0 0 0
39795- 0 0 0 0 0 0 0 0 0 0 0 0
39796- 0 0 0 0 0 0 0 0 0 6 6 6
39797- 14 14 14 38 38 38 74 74 74 66 66 66
39798- 2 2 6 6 6 6 90 90 90 250 250 250
39799-253 253 253 253 253 253 238 238 238 198 198 198
39800-190 190 190 190 190 190 195 195 195 221 221 221
39801-246 246 246 253 253 253 253 253 253 253 253 253
39802-253 253 253 253 253 253 253 253 253 253 253 253
39803-253 253 253 82 82 82 2 2 6 2 2 6
39804- 2 2 6 2 2 6 2 2 6 2 2 6
39805- 2 2 6 78 78 78 70 70 70 34 34 34
39806- 14 14 14 6 6 6 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 0 0 0 0 0 0 0 0 0
39812- 0 0 0 0 0 0 0 0 0 0 0 0
39813- 0 0 0 0 0 0 0 0 0 0 0 0
39814- 0 0 0 0 0 0 0 0 0 0 0 0
39815- 0 0 0 0 0 0 0 0 0 0 0 0
39816- 0 0 0 0 0 0 0 0 0 14 14 14
39817- 34 34 34 66 66 66 78 78 78 6 6 6
39818- 2 2 6 18 18 18 218 218 218 253 253 253
39819-253 253 253 253 253 253 253 253 253 246 246 246
39820-226 226 226 231 231 231 246 246 246 253 253 253
39821-253 253 253 253 253 253 253 253 253 253 253 253
39822-253 253 253 253 253 253 253 253 253 253 253 253
39823-253 253 253 178 178 178 2 2 6 2 2 6
39824- 2 2 6 2 2 6 2 2 6 2 2 6
39825- 2 2 6 18 18 18 90 90 90 62 62 62
39826- 30 30 30 10 10 10 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- 0 0 0 0 0 0 0 0 0 0 0 0
39832- 0 0 0 0 0 0 0 0 0 0 0 0
39833- 0 0 0 0 0 0 0 0 0 0 0 0
39834- 0 0 0 0 0 0 0 0 0 0 0 0
39835- 0 0 0 0 0 0 0 0 0 0 0 0
39836- 0 0 0 0 0 0 10 10 10 26 26 26
39837- 58 58 58 90 90 90 18 18 18 2 2 6
39838- 2 2 6 110 110 110 253 253 253 253 253 253
39839-253 253 253 253 253 253 253 253 253 253 253 253
39840-250 250 250 253 253 253 253 253 253 253 253 253
39841-253 253 253 253 253 253 253 253 253 253 253 253
39842-253 253 253 253 253 253 253 253 253 253 253 253
39843-253 253 253 231 231 231 18 18 18 2 2 6
39844- 2 2 6 2 2 6 2 2 6 2 2 6
39845- 2 2 6 2 2 6 18 18 18 94 94 94
39846- 54 54 54 26 26 26 10 10 10 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- 0 0 0 0 0 0 0 0 0 0 0 0
39852- 0 0 0 0 0 0 0 0 0 0 0 0
39853- 0 0 0 0 0 0 0 0 0 0 0 0
39854- 0 0 0 0 0 0 0 0 0 0 0 0
39855- 0 0 0 0 0 0 0 0 0 0 0 0
39856- 0 0 0 6 6 6 22 22 22 50 50 50
39857- 90 90 90 26 26 26 2 2 6 2 2 6
39858- 14 14 14 195 195 195 250 250 250 253 253 253
39859-253 253 253 253 253 253 253 253 253 253 253 253
39860-253 253 253 253 253 253 253 253 253 253 253 253
39861-253 253 253 253 253 253 253 253 253 253 253 253
39862-253 253 253 253 253 253 253 253 253 253 253 253
39863-250 250 250 242 242 242 54 54 54 2 2 6
39864- 2 2 6 2 2 6 2 2 6 2 2 6
39865- 2 2 6 2 2 6 2 2 6 38 38 38
39866- 86 86 86 50 50 50 22 22 22 6 6 6
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 0 0 0
39871- 0 0 0 0 0 0 0 0 0 0 0 0
39872- 0 0 0 0 0 0 0 0 0 0 0 0
39873- 0 0 0 0 0 0 0 0 0 0 0 0
39874- 0 0 0 0 0 0 0 0 0 0 0 0
39875- 0 0 0 0 0 0 0 0 0 0 0 0
39876- 6 6 6 14 14 14 38 38 38 82 82 82
39877- 34 34 34 2 2 6 2 2 6 2 2 6
39878- 42 42 42 195 195 195 246 246 246 253 253 253
39879-253 253 253 253 253 253 253 253 253 250 250 250
39880-242 242 242 242 242 242 250 250 250 253 253 253
39881-253 253 253 253 253 253 253 253 253 253 253 253
39882-253 253 253 250 250 250 246 246 246 238 238 238
39883-226 226 226 231 231 231 101 101 101 6 6 6
39884- 2 2 6 2 2 6 2 2 6 2 2 6
39885- 2 2 6 2 2 6 2 2 6 2 2 6
39886- 38 38 38 82 82 82 42 42 42 14 14 14
39887- 6 6 6 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 0 0 0
39891- 0 0 0 0 0 0 0 0 0 0 0 0
39892- 0 0 0 0 0 0 0 0 0 0 0 0
39893- 0 0 0 0 0 0 0 0 0 0 0 0
39894- 0 0 0 0 0 0 0 0 0 0 0 0
39895- 0 0 0 0 0 0 0 0 0 0 0 0
39896- 10 10 10 26 26 26 62 62 62 66 66 66
39897- 2 2 6 2 2 6 2 2 6 6 6 6
39898- 70 70 70 170 170 170 206 206 206 234 234 234
39899-246 246 246 250 250 250 250 250 250 238 238 238
39900-226 226 226 231 231 231 238 238 238 250 250 250
39901-250 250 250 250 250 250 246 246 246 231 231 231
39902-214 214 214 206 206 206 202 202 202 202 202 202
39903-198 198 198 202 202 202 182 182 182 18 18 18
39904- 2 2 6 2 2 6 2 2 6 2 2 6
39905- 2 2 6 2 2 6 2 2 6 2 2 6
39906- 2 2 6 62 62 62 66 66 66 30 30 30
39907- 10 10 10 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 0 0 0
39911- 0 0 0 0 0 0 0 0 0 0 0 0
39912- 0 0 0 0 0 0 0 0 0 0 0 0
39913- 0 0 0 0 0 0 0 0 0 0 0 0
39914- 0 0 0 0 0 0 0 0 0 0 0 0
39915- 0 0 0 0 0 0 0 0 0 0 0 0
39916- 14 14 14 42 42 42 82 82 82 18 18 18
39917- 2 2 6 2 2 6 2 2 6 10 10 10
39918- 94 94 94 182 182 182 218 218 218 242 242 242
39919-250 250 250 253 253 253 253 253 253 250 250 250
39920-234 234 234 253 253 253 253 253 253 253 253 253
39921-253 253 253 253 253 253 253 253 253 246 246 246
39922-238 238 238 226 226 226 210 210 210 202 202 202
39923-195 195 195 195 195 195 210 210 210 158 158 158
39924- 6 6 6 14 14 14 50 50 50 14 14 14
39925- 2 2 6 2 2 6 2 2 6 2 2 6
39926- 2 2 6 6 6 6 86 86 86 46 46 46
39927- 18 18 18 6 6 6 0 0 0 0 0 0
39928- 0 0 0 0 0 0 0 0 0 0 0 0
39929- 0 0 0 0 0 0 0 0 0 0 0 0
39930- 0 0 0 0 0 0 0 0 0 0 0 0
39931- 0 0 0 0 0 0 0 0 0 0 0 0
39932- 0 0 0 0 0 0 0 0 0 0 0 0
39933- 0 0 0 0 0 0 0 0 0 0 0 0
39934- 0 0 0 0 0 0 0 0 0 0 0 0
39935- 0 0 0 0 0 0 0 0 0 6 6 6
39936- 22 22 22 54 54 54 70 70 70 2 2 6
39937- 2 2 6 10 10 10 2 2 6 22 22 22
39938-166 166 166 231 231 231 250 250 250 253 253 253
39939-253 253 253 253 253 253 253 253 253 250 250 250
39940-242 242 242 253 253 253 253 253 253 253 253 253
39941-253 253 253 253 253 253 253 253 253 253 253 253
39942-253 253 253 253 253 253 253 253 253 246 246 246
39943-231 231 231 206 206 206 198 198 198 226 226 226
39944- 94 94 94 2 2 6 6 6 6 38 38 38
39945- 30 30 30 2 2 6 2 2 6 2 2 6
39946- 2 2 6 2 2 6 62 62 62 66 66 66
39947- 26 26 26 10 10 10 0 0 0 0 0 0
39948- 0 0 0 0 0 0 0 0 0 0 0 0
39949- 0 0 0 0 0 0 0 0 0 0 0 0
39950- 0 0 0 0 0 0 0 0 0 0 0 0
39951- 0 0 0 0 0 0 0 0 0 0 0 0
39952- 0 0 0 0 0 0 0 0 0 0 0 0
39953- 0 0 0 0 0 0 0 0 0 0 0 0
39954- 0 0 0 0 0 0 0 0 0 0 0 0
39955- 0 0 0 0 0 0 0 0 0 10 10 10
39956- 30 30 30 74 74 74 50 50 50 2 2 6
39957- 26 26 26 26 26 26 2 2 6 106 106 106
39958-238 238 238 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 253 253 253 253 253 253
39961-253 253 253 253 253 253 253 253 253 253 253 253
39962-253 253 253 253 253 253 253 253 253 253 253 253
39963-253 253 253 246 246 246 218 218 218 202 202 202
39964-210 210 210 14 14 14 2 2 6 2 2 6
39965- 30 30 30 22 22 22 2 2 6 2 2 6
39966- 2 2 6 2 2 6 18 18 18 86 86 86
39967- 42 42 42 14 14 14 0 0 0 0 0 0
39968- 0 0 0 0 0 0 0 0 0 0 0 0
39969- 0 0 0 0 0 0 0 0 0 0 0 0
39970- 0 0 0 0 0 0 0 0 0 0 0 0
39971- 0 0 0 0 0 0 0 0 0 0 0 0
39972- 0 0 0 0 0 0 0 0 0 0 0 0
39973- 0 0 0 0 0 0 0 0 0 0 0 0
39974- 0 0 0 0 0 0 0 0 0 0 0 0
39975- 0 0 0 0 0 0 0 0 0 14 14 14
39976- 42 42 42 90 90 90 22 22 22 2 2 6
39977- 42 42 42 2 2 6 18 18 18 218 218 218
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 253 253 253 253 253 253
39981-253 253 253 253 253 253 253 253 253 253 253 253
39982-253 253 253 253 253 253 253 253 253 253 253 253
39983-253 253 253 253 253 253 250 250 250 221 221 221
39984-218 218 218 101 101 101 2 2 6 14 14 14
39985- 18 18 18 38 38 38 10 10 10 2 2 6
39986- 2 2 6 2 2 6 2 2 6 78 78 78
39987- 58 58 58 22 22 22 6 6 6 0 0 0
39988- 0 0 0 0 0 0 0 0 0 0 0 0
39989- 0 0 0 0 0 0 0 0 0 0 0 0
39990- 0 0 0 0 0 0 0 0 0 0 0 0
39991- 0 0 0 0 0 0 0 0 0 0 0 0
39992- 0 0 0 0 0 0 0 0 0 0 0 0
39993- 0 0 0 0 0 0 0 0 0 0 0 0
39994- 0 0 0 0 0 0 0 0 0 0 0 0
39995- 0 0 0 0 0 0 6 6 6 18 18 18
39996- 54 54 54 82 82 82 2 2 6 26 26 26
39997- 22 22 22 2 2 6 123 123 123 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 253 253 253 253 253 253
40001-253 253 253 253 253 253 253 253 253 253 253 253
40002-253 253 253 253 253 253 253 253 253 253 253 253
40003-253 253 253 253 253 253 253 253 253 250 250 250
40004-238 238 238 198 198 198 6 6 6 38 38 38
40005- 58 58 58 26 26 26 38 38 38 2 2 6
40006- 2 2 6 2 2 6 2 2 6 46 46 46
40007- 78 78 78 30 30 30 10 10 10 0 0 0
40008- 0 0 0 0 0 0 0 0 0 0 0 0
40009- 0 0 0 0 0 0 0 0 0 0 0 0
40010- 0 0 0 0 0 0 0 0 0 0 0 0
40011- 0 0 0 0 0 0 0 0 0 0 0 0
40012- 0 0 0 0 0 0 0 0 0 0 0 0
40013- 0 0 0 0 0 0 0 0 0 0 0 0
40014- 0 0 0 0 0 0 0 0 0 0 0 0
40015- 0 0 0 0 0 0 10 10 10 30 30 30
40016- 74 74 74 58 58 58 2 2 6 42 42 42
40017- 2 2 6 22 22 22 231 231 231 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 250 250 250
40020-253 253 253 253 253 253 253 253 253 253 253 253
40021-253 253 253 253 253 253 253 253 253 253 253 253
40022-253 253 253 253 253 253 253 253 253 253 253 253
40023-253 253 253 253 253 253 253 253 253 253 253 253
40024-253 253 253 246 246 246 46 46 46 38 38 38
40025- 42 42 42 14 14 14 38 38 38 14 14 14
40026- 2 2 6 2 2 6 2 2 6 6 6 6
40027- 86 86 86 46 46 46 14 14 14 0 0 0
40028- 0 0 0 0 0 0 0 0 0 0 0 0
40029- 0 0 0 0 0 0 0 0 0 0 0 0
40030- 0 0 0 0 0 0 0 0 0 0 0 0
40031- 0 0 0 0 0 0 0 0 0 0 0 0
40032- 0 0 0 0 0 0 0 0 0 0 0 0
40033- 0 0 0 0 0 0 0 0 0 0 0 0
40034- 0 0 0 0 0 0 0 0 0 0 0 0
40035- 0 0 0 6 6 6 14 14 14 42 42 42
40036- 90 90 90 18 18 18 18 18 18 26 26 26
40037- 2 2 6 116 116 116 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 250 250 250 238 238 238
40040-253 253 253 253 253 253 253 253 253 253 253 253
40041-253 253 253 253 253 253 253 253 253 253 253 253
40042-253 253 253 253 253 253 253 253 253 253 253 253
40043-253 253 253 253 253 253 253 253 253 253 253 253
40044-253 253 253 253 253 253 94 94 94 6 6 6
40045- 2 2 6 2 2 6 10 10 10 34 34 34
40046- 2 2 6 2 2 6 2 2 6 2 2 6
40047- 74 74 74 58 58 58 22 22 22 6 6 6
40048- 0 0 0 0 0 0 0 0 0 0 0 0
40049- 0 0 0 0 0 0 0 0 0 0 0 0
40050- 0 0 0 0 0 0 0 0 0 0 0 0
40051- 0 0 0 0 0 0 0 0 0 0 0 0
40052- 0 0 0 0 0 0 0 0 0 0 0 0
40053- 0 0 0 0 0 0 0 0 0 0 0 0
40054- 0 0 0 0 0 0 0 0 0 0 0 0
40055- 0 0 0 10 10 10 26 26 26 66 66 66
40056- 82 82 82 2 2 6 38 38 38 6 6 6
40057- 14 14 14 210 210 210 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 246 246 246 242 242 242
40060-253 253 253 253 253 253 253 253 253 253 253 253
40061-253 253 253 253 253 253 253 253 253 253 253 253
40062-253 253 253 253 253 253 253 253 253 253 253 253
40063-253 253 253 253 253 253 253 253 253 253 253 253
40064-253 253 253 253 253 253 144 144 144 2 2 6
40065- 2 2 6 2 2 6 2 2 6 46 46 46
40066- 2 2 6 2 2 6 2 2 6 2 2 6
40067- 42 42 42 74 74 74 30 30 30 10 10 10
40068- 0 0 0 0 0 0 0 0 0 0 0 0
40069- 0 0 0 0 0 0 0 0 0 0 0 0
40070- 0 0 0 0 0 0 0 0 0 0 0 0
40071- 0 0 0 0 0 0 0 0 0 0 0 0
40072- 0 0 0 0 0 0 0 0 0 0 0 0
40073- 0 0 0 0 0 0 0 0 0 0 0 0
40074- 0 0 0 0 0 0 0 0 0 0 0 0
40075- 6 6 6 14 14 14 42 42 42 90 90 90
40076- 26 26 26 6 6 6 42 42 42 2 2 6
40077- 74 74 74 250 250 250 253 253 253 253 253 253
40078-253 253 253 253 253 253 253 253 253 253 253 253
40079-253 253 253 253 253 253 242 242 242 242 242 242
40080-253 253 253 253 253 253 253 253 253 253 253 253
40081-253 253 253 253 253 253 253 253 253 253 253 253
40082-253 253 253 253 253 253 253 253 253 253 253 253
40083-253 253 253 253 253 253 253 253 253 253 253 253
40084-253 253 253 253 253 253 182 182 182 2 2 6
40085- 2 2 6 2 2 6 2 2 6 46 46 46
40086- 2 2 6 2 2 6 2 2 6 2 2 6
40087- 10 10 10 86 86 86 38 38 38 10 10 10
40088- 0 0 0 0 0 0 0 0 0 0 0 0
40089- 0 0 0 0 0 0 0 0 0 0 0 0
40090- 0 0 0 0 0 0 0 0 0 0 0 0
40091- 0 0 0 0 0 0 0 0 0 0 0 0
40092- 0 0 0 0 0 0 0 0 0 0 0 0
40093- 0 0 0 0 0 0 0 0 0 0 0 0
40094- 0 0 0 0 0 0 0 0 0 0 0 0
40095- 10 10 10 26 26 26 66 66 66 82 82 82
40096- 2 2 6 22 22 22 18 18 18 2 2 6
40097-149 149 149 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 253 253 253 234 234 234 242 242 242
40100-253 253 253 253 253 253 253 253 253 253 253 253
40101-253 253 253 253 253 253 253 253 253 253 253 253
40102-253 253 253 253 253 253 253 253 253 253 253 253
40103-253 253 253 253 253 253 253 253 253 253 253 253
40104-253 253 253 253 253 253 206 206 206 2 2 6
40105- 2 2 6 2 2 6 2 2 6 38 38 38
40106- 2 2 6 2 2 6 2 2 6 2 2 6
40107- 6 6 6 86 86 86 46 46 46 14 14 14
40108- 0 0 0 0 0 0 0 0 0 0 0 0
40109- 0 0 0 0 0 0 0 0 0 0 0 0
40110- 0 0 0 0 0 0 0 0 0 0 0 0
40111- 0 0 0 0 0 0 0 0 0 0 0 0
40112- 0 0 0 0 0 0 0 0 0 0 0 0
40113- 0 0 0 0 0 0 0 0 0 0 0 0
40114- 0 0 0 0 0 0 0 0 0 6 6 6
40115- 18 18 18 46 46 46 86 86 86 18 18 18
40116- 2 2 6 34 34 34 10 10 10 6 6 6
40117-210 210 210 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 253 253 253 234 234 234 242 242 242
40120-253 253 253 253 253 253 253 253 253 253 253 253
40121-253 253 253 253 253 253 253 253 253 253 253 253
40122-253 253 253 253 253 253 253 253 253 253 253 253
40123-253 253 253 253 253 253 253 253 253 253 253 253
40124-253 253 253 253 253 253 221 221 221 6 6 6
40125- 2 2 6 2 2 6 6 6 6 30 30 30
40126- 2 2 6 2 2 6 2 2 6 2 2 6
40127- 2 2 6 82 82 82 54 54 54 18 18 18
40128- 6 6 6 0 0 0 0 0 0 0 0 0
40129- 0 0 0 0 0 0 0 0 0 0 0 0
40130- 0 0 0 0 0 0 0 0 0 0 0 0
40131- 0 0 0 0 0 0 0 0 0 0 0 0
40132- 0 0 0 0 0 0 0 0 0 0 0 0
40133- 0 0 0 0 0 0 0 0 0 0 0 0
40134- 0 0 0 0 0 0 0 0 0 10 10 10
40135- 26 26 26 66 66 66 62 62 62 2 2 6
40136- 2 2 6 38 38 38 10 10 10 26 26 26
40137-238 238 238 253 253 253 253 253 253 253 253 253
40138-253 253 253 253 253 253 253 253 253 253 253 253
40139-253 253 253 253 253 253 231 231 231 238 238 238
40140-253 253 253 253 253 253 253 253 253 253 253 253
40141-253 253 253 253 253 253 253 253 253 253 253 253
40142-253 253 253 253 253 253 253 253 253 253 253 253
40143-253 253 253 253 253 253 253 253 253 253 253 253
40144-253 253 253 253 253 253 231 231 231 6 6 6
40145- 2 2 6 2 2 6 10 10 10 30 30 30
40146- 2 2 6 2 2 6 2 2 6 2 2 6
40147- 2 2 6 66 66 66 58 58 58 22 22 22
40148- 6 6 6 0 0 0 0 0 0 0 0 0
40149- 0 0 0 0 0 0 0 0 0 0 0 0
40150- 0 0 0 0 0 0 0 0 0 0 0 0
40151- 0 0 0 0 0 0 0 0 0 0 0 0
40152- 0 0 0 0 0 0 0 0 0 0 0 0
40153- 0 0 0 0 0 0 0 0 0 0 0 0
40154- 0 0 0 0 0 0 0 0 0 10 10 10
40155- 38 38 38 78 78 78 6 6 6 2 2 6
40156- 2 2 6 46 46 46 14 14 14 42 42 42
40157-246 246 246 253 253 253 253 253 253 253 253 253
40158-253 253 253 253 253 253 253 253 253 253 253 253
40159-253 253 253 253 253 253 231 231 231 242 242 242
40160-253 253 253 253 253 253 253 253 253 253 253 253
40161-253 253 253 253 253 253 253 253 253 253 253 253
40162-253 253 253 253 253 253 253 253 253 253 253 253
40163-253 253 253 253 253 253 253 253 253 253 253 253
40164-253 253 253 253 253 253 234 234 234 10 10 10
40165- 2 2 6 2 2 6 22 22 22 14 14 14
40166- 2 2 6 2 2 6 2 2 6 2 2 6
40167- 2 2 6 66 66 66 62 62 62 22 22 22
40168- 6 6 6 0 0 0 0 0 0 0 0 0
40169- 0 0 0 0 0 0 0 0 0 0 0 0
40170- 0 0 0 0 0 0 0 0 0 0 0 0
40171- 0 0 0 0 0 0 0 0 0 0 0 0
40172- 0 0 0 0 0 0 0 0 0 0 0 0
40173- 0 0 0 0 0 0 0 0 0 0 0 0
40174- 0 0 0 0 0 0 6 6 6 18 18 18
40175- 50 50 50 74 74 74 2 2 6 2 2 6
40176- 14 14 14 70 70 70 34 34 34 62 62 62
40177-250 250 250 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 253 253 253 231 231 231 246 246 246
40180-253 253 253 253 253 253 253 253 253 253 253 253
40181-253 253 253 253 253 253 253 253 253 253 253 253
40182-253 253 253 253 253 253 253 253 253 253 253 253
40183-253 253 253 253 253 253 253 253 253 253 253 253
40184-253 253 253 253 253 253 234 234 234 14 14 14
40185- 2 2 6 2 2 6 30 30 30 2 2 6
40186- 2 2 6 2 2 6 2 2 6 2 2 6
40187- 2 2 6 66 66 66 62 62 62 22 22 22
40188- 6 6 6 0 0 0 0 0 0 0 0 0
40189- 0 0 0 0 0 0 0 0 0 0 0 0
40190- 0 0 0 0 0 0 0 0 0 0 0 0
40191- 0 0 0 0 0 0 0 0 0 0 0 0
40192- 0 0 0 0 0 0 0 0 0 0 0 0
40193- 0 0 0 0 0 0 0 0 0 0 0 0
40194- 0 0 0 0 0 0 6 6 6 18 18 18
40195- 54 54 54 62 62 62 2 2 6 2 2 6
40196- 2 2 6 30 30 30 46 46 46 70 70 70
40197-250 250 250 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 253 253 253 231 231 231 246 246 246
40200-253 253 253 253 253 253 253 253 253 253 253 253
40201-253 253 253 253 253 253 253 253 253 253 253 253
40202-253 253 253 253 253 253 253 253 253 253 253 253
40203-253 253 253 253 253 253 253 253 253 253 253 253
40204-253 253 253 253 253 253 226 226 226 10 10 10
40205- 2 2 6 6 6 6 30 30 30 2 2 6
40206- 2 2 6 2 2 6 2 2 6 2 2 6
40207- 2 2 6 66 66 66 58 58 58 22 22 22
40208- 6 6 6 0 0 0 0 0 0 0 0 0
40209- 0 0 0 0 0 0 0 0 0 0 0 0
40210- 0 0 0 0 0 0 0 0 0 0 0 0
40211- 0 0 0 0 0 0 0 0 0 0 0 0
40212- 0 0 0 0 0 0 0 0 0 0 0 0
40213- 0 0 0 0 0 0 0 0 0 0 0 0
40214- 0 0 0 0 0 0 6 6 6 22 22 22
40215- 58 58 58 62 62 62 2 2 6 2 2 6
40216- 2 2 6 2 2 6 30 30 30 78 78 78
40217-250 250 250 253 253 253 253 253 253 253 253 253
40218-253 253 253 253 253 253 253 253 253 253 253 253
40219-253 253 253 253 253 253 231 231 231 246 246 246
40220-253 253 253 253 253 253 253 253 253 253 253 253
40221-253 253 253 253 253 253 253 253 253 253 253 253
40222-253 253 253 253 253 253 253 253 253 253 253 253
40223-253 253 253 253 253 253 253 253 253 253 253 253
40224-253 253 253 253 253 253 206 206 206 2 2 6
40225- 22 22 22 34 34 34 18 14 6 22 22 22
40226- 26 26 26 18 18 18 6 6 6 2 2 6
40227- 2 2 6 82 82 82 54 54 54 18 18 18
40228- 6 6 6 0 0 0 0 0 0 0 0 0
40229- 0 0 0 0 0 0 0 0 0 0 0 0
40230- 0 0 0 0 0 0 0 0 0 0 0 0
40231- 0 0 0 0 0 0 0 0 0 0 0 0
40232- 0 0 0 0 0 0 0 0 0 0 0 0
40233- 0 0 0 0 0 0 0 0 0 0 0 0
40234- 0 0 0 0 0 0 6 6 6 26 26 26
40235- 62 62 62 106 106 106 74 54 14 185 133 11
40236-210 162 10 121 92 8 6 6 6 62 62 62
40237-238 238 238 253 253 253 253 253 253 253 253 253
40238-253 253 253 253 253 253 253 253 253 253 253 253
40239-253 253 253 253 253 253 231 231 231 246 246 246
40240-253 253 253 253 253 253 253 253 253 253 253 253
40241-253 253 253 253 253 253 253 253 253 253 253 253
40242-253 253 253 253 253 253 253 253 253 253 253 253
40243-253 253 253 253 253 253 253 253 253 253 253 253
40244-253 253 253 253 253 253 158 158 158 18 18 18
40245- 14 14 14 2 2 6 2 2 6 2 2 6
40246- 6 6 6 18 18 18 66 66 66 38 38 38
40247- 6 6 6 94 94 94 50 50 50 18 18 18
40248- 6 6 6 0 0 0 0 0 0 0 0 0
40249- 0 0 0 0 0 0 0 0 0 0 0 0
40250- 0 0 0 0 0 0 0 0 0 0 0 0
40251- 0 0 0 0 0 0 0 0 0 0 0 0
40252- 0 0 0 0 0 0 0 0 0 0 0 0
40253- 0 0 0 0 0 0 0 0 0 6 6 6
40254- 10 10 10 10 10 10 18 18 18 38 38 38
40255- 78 78 78 142 134 106 216 158 10 242 186 14
40256-246 190 14 246 190 14 156 118 10 10 10 10
40257- 90 90 90 238 238 238 253 253 253 253 253 253
40258-253 253 253 253 253 253 253 253 253 253 253 253
40259-253 253 253 253 253 253 231 231 231 250 250 250
40260-253 253 253 253 253 253 253 253 253 253 253 253
40261-253 253 253 253 253 253 253 253 253 253 253 253
40262-253 253 253 253 253 253 253 253 253 253 253 253
40263-253 253 253 253 253 253 253 253 253 246 230 190
40264-238 204 91 238 204 91 181 142 44 37 26 9
40265- 2 2 6 2 2 6 2 2 6 2 2 6
40266- 2 2 6 2 2 6 38 38 38 46 46 46
40267- 26 26 26 106 106 106 54 54 54 18 18 18
40268- 6 6 6 0 0 0 0 0 0 0 0 0
40269- 0 0 0 0 0 0 0 0 0 0 0 0
40270- 0 0 0 0 0 0 0 0 0 0 0 0
40271- 0 0 0 0 0 0 0 0 0 0 0 0
40272- 0 0 0 0 0 0 0 0 0 0 0 0
40273- 0 0 0 6 6 6 14 14 14 22 22 22
40274- 30 30 30 38 38 38 50 50 50 70 70 70
40275-106 106 106 190 142 34 226 170 11 242 186 14
40276-246 190 14 246 190 14 246 190 14 154 114 10
40277- 6 6 6 74 74 74 226 226 226 253 253 253
40278-253 253 253 253 253 253 253 253 253 253 253 253
40279-253 253 253 253 253 253 231 231 231 250 250 250
40280-253 253 253 253 253 253 253 253 253 253 253 253
40281-253 253 253 253 253 253 253 253 253 253 253 253
40282-253 253 253 253 253 253 253 253 253 253 253 253
40283-253 253 253 253 253 253 253 253 253 228 184 62
40284-241 196 14 241 208 19 232 195 16 38 30 10
40285- 2 2 6 2 2 6 2 2 6 2 2 6
40286- 2 2 6 6 6 6 30 30 30 26 26 26
40287-203 166 17 154 142 90 66 66 66 26 26 26
40288- 6 6 6 0 0 0 0 0 0 0 0 0
40289- 0 0 0 0 0 0 0 0 0 0 0 0
40290- 0 0 0 0 0 0 0 0 0 0 0 0
40291- 0 0 0 0 0 0 0 0 0 0 0 0
40292- 0 0 0 0 0 0 0 0 0 0 0 0
40293- 6 6 6 18 18 18 38 38 38 58 58 58
40294- 78 78 78 86 86 86 101 101 101 123 123 123
40295-175 146 61 210 150 10 234 174 13 246 186 14
40296-246 190 14 246 190 14 246 190 14 238 190 10
40297-102 78 10 2 2 6 46 46 46 198 198 198
40298-253 253 253 253 253 253 253 253 253 253 253 253
40299-253 253 253 253 253 253 234 234 234 242 242 242
40300-253 253 253 253 253 253 253 253 253 253 253 253
40301-253 253 253 253 253 253 253 253 253 253 253 253
40302-253 253 253 253 253 253 253 253 253 253 253 253
40303-253 253 253 253 253 253 253 253 253 224 178 62
40304-242 186 14 241 196 14 210 166 10 22 18 6
40305- 2 2 6 2 2 6 2 2 6 2 2 6
40306- 2 2 6 2 2 6 6 6 6 121 92 8
40307-238 202 15 232 195 16 82 82 82 34 34 34
40308- 10 10 10 0 0 0 0 0 0 0 0 0
40309- 0 0 0 0 0 0 0 0 0 0 0 0
40310- 0 0 0 0 0 0 0 0 0 0 0 0
40311- 0 0 0 0 0 0 0 0 0 0 0 0
40312- 0 0 0 0 0 0 0 0 0 0 0 0
40313- 14 14 14 38 38 38 70 70 70 154 122 46
40314-190 142 34 200 144 11 197 138 11 197 138 11
40315-213 154 11 226 170 11 242 186 14 246 190 14
40316-246 190 14 246 190 14 246 190 14 246 190 14
40317-225 175 15 46 32 6 2 2 6 22 22 22
40318-158 158 158 250 250 250 253 253 253 253 253 253
40319-253 253 253 253 253 253 253 253 253 253 253 253
40320-253 253 253 253 253 253 253 253 253 253 253 253
40321-253 253 253 253 253 253 253 253 253 253 253 253
40322-253 253 253 253 253 253 253 253 253 253 253 253
40323-253 253 253 250 250 250 242 242 242 224 178 62
40324-239 182 13 236 186 11 213 154 11 46 32 6
40325- 2 2 6 2 2 6 2 2 6 2 2 6
40326- 2 2 6 2 2 6 61 42 6 225 175 15
40327-238 190 10 236 186 11 112 100 78 42 42 42
40328- 14 14 14 0 0 0 0 0 0 0 0 0
40329- 0 0 0 0 0 0 0 0 0 0 0 0
40330- 0 0 0 0 0 0 0 0 0 0 0 0
40331- 0 0 0 0 0 0 0 0 0 0 0 0
40332- 0 0 0 0 0 0 0 0 0 6 6 6
40333- 22 22 22 54 54 54 154 122 46 213 154 11
40334-226 170 11 230 174 11 226 170 11 226 170 11
40335-236 178 12 242 186 14 246 190 14 246 190 14
40336-246 190 14 246 190 14 246 190 14 246 190 14
40337-241 196 14 184 144 12 10 10 10 2 2 6
40338- 6 6 6 116 116 116 242 242 242 253 253 253
40339-253 253 253 253 253 253 253 253 253 253 253 253
40340-253 253 253 253 253 253 253 253 253 253 253 253
40341-253 253 253 253 253 253 253 253 253 253 253 253
40342-253 253 253 253 253 253 253 253 253 253 253 253
40343-253 253 253 231 231 231 198 198 198 214 170 54
40344-236 178 12 236 178 12 210 150 10 137 92 6
40345- 18 14 6 2 2 6 2 2 6 2 2 6
40346- 6 6 6 70 47 6 200 144 11 236 178 12
40347-239 182 13 239 182 13 124 112 88 58 58 58
40348- 22 22 22 6 6 6 0 0 0 0 0 0
40349- 0 0 0 0 0 0 0 0 0 0 0 0
40350- 0 0 0 0 0 0 0 0 0 0 0 0
40351- 0 0 0 0 0 0 0 0 0 0 0 0
40352- 0 0 0 0 0 0 0 0 0 10 10 10
40353- 30 30 30 70 70 70 180 133 36 226 170 11
40354-239 182 13 242 186 14 242 186 14 246 186 14
40355-246 190 14 246 190 14 246 190 14 246 190 14
40356-246 190 14 246 190 14 246 190 14 246 190 14
40357-246 190 14 232 195 16 98 70 6 2 2 6
40358- 2 2 6 2 2 6 66 66 66 221 221 221
40359-253 253 253 253 253 253 253 253 253 253 253 253
40360-253 253 253 253 253 253 253 253 253 253 253 253
40361-253 253 253 253 253 253 253 253 253 253 253 253
40362-253 253 253 253 253 253 253 253 253 253 253 253
40363-253 253 253 206 206 206 198 198 198 214 166 58
40364-230 174 11 230 174 11 216 158 10 192 133 9
40365-163 110 8 116 81 8 102 78 10 116 81 8
40366-167 114 7 197 138 11 226 170 11 239 182 13
40367-242 186 14 242 186 14 162 146 94 78 78 78
40368- 34 34 34 14 14 14 6 6 6 0 0 0
40369- 0 0 0 0 0 0 0 0 0 0 0 0
40370- 0 0 0 0 0 0 0 0 0 0 0 0
40371- 0 0 0 0 0 0 0 0 0 0 0 0
40372- 0 0 0 0 0 0 0 0 0 6 6 6
40373- 30 30 30 78 78 78 190 142 34 226 170 11
40374-239 182 13 246 190 14 246 190 14 246 190 14
40375-246 190 14 246 190 14 246 190 14 246 190 14
40376-246 190 14 246 190 14 246 190 14 246 190 14
40377-246 190 14 241 196 14 203 166 17 22 18 6
40378- 2 2 6 2 2 6 2 2 6 38 38 38
40379-218 218 218 253 253 253 253 253 253 253 253 253
40380-253 253 253 253 253 253 253 253 253 253 253 253
40381-253 253 253 253 253 253 253 253 253 253 253 253
40382-253 253 253 253 253 253 253 253 253 253 253 253
40383-250 250 250 206 206 206 198 198 198 202 162 69
40384-226 170 11 236 178 12 224 166 10 210 150 10
40385-200 144 11 197 138 11 192 133 9 197 138 11
40386-210 150 10 226 170 11 242 186 14 246 190 14
40387-246 190 14 246 186 14 225 175 15 124 112 88
40388- 62 62 62 30 30 30 14 14 14 6 6 6
40389- 0 0 0 0 0 0 0 0 0 0 0 0
40390- 0 0 0 0 0 0 0 0 0 0 0 0
40391- 0 0 0 0 0 0 0 0 0 0 0 0
40392- 0 0 0 0 0 0 0 0 0 10 10 10
40393- 30 30 30 78 78 78 174 135 50 224 166 10
40394-239 182 13 246 190 14 246 190 14 246 190 14
40395-246 190 14 246 190 14 246 190 14 246 190 14
40396-246 190 14 246 190 14 246 190 14 246 190 14
40397-246 190 14 246 190 14 241 196 14 139 102 15
40398- 2 2 6 2 2 6 2 2 6 2 2 6
40399- 78 78 78 250 250 250 253 253 253 253 253 253
40400-253 253 253 253 253 253 253 253 253 253 253 253
40401-253 253 253 253 253 253 253 253 253 253 253 253
40402-253 253 253 253 253 253 253 253 253 253 253 253
40403-250 250 250 214 214 214 198 198 198 190 150 46
40404-219 162 10 236 178 12 234 174 13 224 166 10
40405-216 158 10 213 154 11 213 154 11 216 158 10
40406-226 170 11 239 182 13 246 190 14 246 190 14
40407-246 190 14 246 190 14 242 186 14 206 162 42
40408-101 101 101 58 58 58 30 30 30 14 14 14
40409- 6 6 6 0 0 0 0 0 0 0 0 0
40410- 0 0 0 0 0 0 0 0 0 0 0 0
40411- 0 0 0 0 0 0 0 0 0 0 0 0
40412- 0 0 0 0 0 0 0 0 0 10 10 10
40413- 30 30 30 74 74 74 174 135 50 216 158 10
40414-236 178 12 246 190 14 246 190 14 246 190 14
40415-246 190 14 246 190 14 246 190 14 246 190 14
40416-246 190 14 246 190 14 246 190 14 246 190 14
40417-246 190 14 246 190 14 241 196 14 226 184 13
40418- 61 42 6 2 2 6 2 2 6 2 2 6
40419- 22 22 22 238 238 238 253 253 253 253 253 253
40420-253 253 253 253 253 253 253 253 253 253 253 253
40421-253 253 253 253 253 253 253 253 253 253 253 253
40422-253 253 253 253 253 253 253 253 253 253 253 253
40423-253 253 253 226 226 226 187 187 187 180 133 36
40424-216 158 10 236 178 12 239 182 13 236 178 12
40425-230 174 11 226 170 11 226 170 11 230 174 11
40426-236 178 12 242 186 14 246 190 14 246 190 14
40427-246 190 14 246 190 14 246 186 14 239 182 13
40428-206 162 42 106 106 106 66 66 66 34 34 34
40429- 14 14 14 6 6 6 0 0 0 0 0 0
40430- 0 0 0 0 0 0 0 0 0 0 0 0
40431- 0 0 0 0 0 0 0 0 0 0 0 0
40432- 0 0 0 0 0 0 0 0 0 6 6 6
40433- 26 26 26 70 70 70 163 133 67 213 154 11
40434-236 178 12 246 190 14 246 190 14 246 190 14
40435-246 190 14 246 190 14 246 190 14 246 190 14
40436-246 190 14 246 190 14 246 190 14 246 190 14
40437-246 190 14 246 190 14 246 190 14 241 196 14
40438-190 146 13 18 14 6 2 2 6 2 2 6
40439- 46 46 46 246 246 246 253 253 253 253 253 253
40440-253 253 253 253 253 253 253 253 253 253 253 253
40441-253 253 253 253 253 253 253 253 253 253 253 253
40442-253 253 253 253 253 253 253 253 253 253 253 253
40443-253 253 253 221 221 221 86 86 86 156 107 11
40444-216 158 10 236 178 12 242 186 14 246 186 14
40445-242 186 14 239 182 13 239 182 13 242 186 14
40446-242 186 14 246 186 14 246 190 14 246 190 14
40447-246 190 14 246 190 14 246 190 14 246 190 14
40448-242 186 14 225 175 15 142 122 72 66 66 66
40449- 30 30 30 10 10 10 0 0 0 0 0 0
40450- 0 0 0 0 0 0 0 0 0 0 0 0
40451- 0 0 0 0 0 0 0 0 0 0 0 0
40452- 0 0 0 0 0 0 0 0 0 6 6 6
40453- 26 26 26 70 70 70 163 133 67 210 150 10
40454-236 178 12 246 190 14 246 190 14 246 190 14
40455-246 190 14 246 190 14 246 190 14 246 190 14
40456-246 190 14 246 190 14 246 190 14 246 190 14
40457-246 190 14 246 190 14 246 190 14 246 190 14
40458-232 195 16 121 92 8 34 34 34 106 106 106
40459-221 221 221 253 253 253 253 253 253 253 253 253
40460-253 253 253 253 253 253 253 253 253 253 253 253
40461-253 253 253 253 253 253 253 253 253 253 253 253
40462-253 253 253 253 253 253 253 253 253 253 253 253
40463-242 242 242 82 82 82 18 14 6 163 110 8
40464-216 158 10 236 178 12 242 186 14 246 190 14
40465-246 190 14 246 190 14 246 190 14 246 190 14
40466-246 190 14 246 190 14 246 190 14 246 190 14
40467-246 190 14 246 190 14 246 190 14 246 190 14
40468-246 190 14 246 190 14 242 186 14 163 133 67
40469- 46 46 46 18 18 18 6 6 6 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- 0 0 0 0 0 0 0 0 0 10 10 10
40473- 30 30 30 78 78 78 163 133 67 210 150 10
40474-236 178 12 246 186 14 246 190 14 246 190 14
40475-246 190 14 246 190 14 246 190 14 246 190 14
40476-246 190 14 246 190 14 246 190 14 246 190 14
40477-246 190 14 246 190 14 246 190 14 246 190 14
40478-241 196 14 215 174 15 190 178 144 253 253 253
40479-253 253 253 253 253 253 253 253 253 253 253 253
40480-253 253 253 253 253 253 253 253 253 253 253 253
40481-253 253 253 253 253 253 253 253 253 253 253 253
40482-253 253 253 253 253 253 253 253 253 218 218 218
40483- 58 58 58 2 2 6 22 18 6 167 114 7
40484-216 158 10 236 178 12 246 186 14 246 190 14
40485-246 190 14 246 190 14 246 190 14 246 190 14
40486-246 190 14 246 190 14 246 190 14 246 190 14
40487-246 190 14 246 190 14 246 190 14 246 190 14
40488-246 190 14 246 186 14 242 186 14 190 150 46
40489- 54 54 54 22 22 22 6 6 6 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 14 14 14
40493- 38 38 38 86 86 86 180 133 36 213 154 11
40494-236 178 12 246 186 14 246 190 14 246 190 14
40495-246 190 14 246 190 14 246 190 14 246 190 14
40496-246 190 14 246 190 14 246 190 14 246 190 14
40497-246 190 14 246 190 14 246 190 14 246 190 14
40498-246 190 14 232 195 16 190 146 13 214 214 214
40499-253 253 253 253 253 253 253 253 253 253 253 253
40500-253 253 253 253 253 253 253 253 253 253 253 253
40501-253 253 253 253 253 253 253 253 253 253 253 253
40502-253 253 253 250 250 250 170 170 170 26 26 26
40503- 2 2 6 2 2 6 37 26 9 163 110 8
40504-219 162 10 239 182 13 246 186 14 246 190 14
40505-246 190 14 246 190 14 246 190 14 246 190 14
40506-246 190 14 246 190 14 246 190 14 246 190 14
40507-246 190 14 246 190 14 246 190 14 246 190 14
40508-246 186 14 236 178 12 224 166 10 142 122 72
40509- 46 46 46 18 18 18 6 6 6 0 0 0
40510- 0 0 0 0 0 0 0 0 0 0 0 0
40511- 0 0 0 0 0 0 0 0 0 0 0 0
40512- 0 0 0 0 0 0 6 6 6 18 18 18
40513- 50 50 50 109 106 95 192 133 9 224 166 10
40514-242 186 14 246 190 14 246 190 14 246 190 14
40515-246 190 14 246 190 14 246 190 14 246 190 14
40516-246 190 14 246 190 14 246 190 14 246 190 14
40517-246 190 14 246 190 14 246 190 14 246 190 14
40518-242 186 14 226 184 13 210 162 10 142 110 46
40519-226 226 226 253 253 253 253 253 253 253 253 253
40520-253 253 253 253 253 253 253 253 253 253 253 253
40521-253 253 253 253 253 253 253 253 253 253 253 253
40522-198 198 198 66 66 66 2 2 6 2 2 6
40523- 2 2 6 2 2 6 50 34 6 156 107 11
40524-219 162 10 239 182 13 246 186 14 246 190 14
40525-246 190 14 246 190 14 246 190 14 246 190 14
40526-246 190 14 246 190 14 246 190 14 246 190 14
40527-246 190 14 246 190 14 246 190 14 242 186 14
40528-234 174 13 213 154 11 154 122 46 66 66 66
40529- 30 30 30 10 10 10 0 0 0 0 0 0
40530- 0 0 0 0 0 0 0 0 0 0 0 0
40531- 0 0 0 0 0 0 0 0 0 0 0 0
40532- 0 0 0 0 0 0 6 6 6 22 22 22
40533- 58 58 58 154 121 60 206 145 10 234 174 13
40534-242 186 14 246 186 14 246 190 14 246 190 14
40535-246 190 14 246 190 14 246 190 14 246 190 14
40536-246 190 14 246 190 14 246 190 14 246 190 14
40537-246 190 14 246 190 14 246 190 14 246 190 14
40538-246 186 14 236 178 12 210 162 10 163 110 8
40539- 61 42 6 138 138 138 218 218 218 250 250 250
40540-253 253 253 253 253 253 253 253 253 250 250 250
40541-242 242 242 210 210 210 144 144 144 66 66 66
40542- 6 6 6 2 2 6 2 2 6 2 2 6
40543- 2 2 6 2 2 6 61 42 6 163 110 8
40544-216 158 10 236 178 12 246 190 14 246 190 14
40545-246 190 14 246 190 14 246 190 14 246 190 14
40546-246 190 14 246 190 14 246 190 14 246 190 14
40547-246 190 14 239 182 13 230 174 11 216 158 10
40548-190 142 34 124 112 88 70 70 70 38 38 38
40549- 18 18 18 6 6 6 0 0 0 0 0 0
40550- 0 0 0 0 0 0 0 0 0 0 0 0
40551- 0 0 0 0 0 0 0 0 0 0 0 0
40552- 0 0 0 0 0 0 6 6 6 22 22 22
40553- 62 62 62 168 124 44 206 145 10 224 166 10
40554-236 178 12 239 182 13 242 186 14 242 186 14
40555-246 186 14 246 190 14 246 190 14 246 190 14
40556-246 190 14 246 190 14 246 190 14 246 190 14
40557-246 190 14 246 190 14 246 190 14 246 190 14
40558-246 190 14 236 178 12 216 158 10 175 118 6
40559- 80 54 7 2 2 6 6 6 6 30 30 30
40560- 54 54 54 62 62 62 50 50 50 38 38 38
40561- 14 14 14 2 2 6 2 2 6 2 2 6
40562- 2 2 6 2 2 6 2 2 6 2 2 6
40563- 2 2 6 6 6 6 80 54 7 167 114 7
40564-213 154 11 236 178 12 246 190 14 246 190 14
40565-246 190 14 246 190 14 246 190 14 246 190 14
40566-246 190 14 242 186 14 239 182 13 239 182 13
40567-230 174 11 210 150 10 174 135 50 124 112 88
40568- 82 82 82 54 54 54 34 34 34 18 18 18
40569- 6 6 6 0 0 0 0 0 0 0 0 0
40570- 0 0 0 0 0 0 0 0 0 0 0 0
40571- 0 0 0 0 0 0 0 0 0 0 0 0
40572- 0 0 0 0 0 0 6 6 6 18 18 18
40573- 50 50 50 158 118 36 192 133 9 200 144 11
40574-216 158 10 219 162 10 224 166 10 226 170 11
40575-230 174 11 236 178 12 239 182 13 239 182 13
40576-242 186 14 246 186 14 246 190 14 246 190 14
40577-246 190 14 246 190 14 246 190 14 246 190 14
40578-246 186 14 230 174 11 210 150 10 163 110 8
40579-104 69 6 10 10 10 2 2 6 2 2 6
40580- 2 2 6 2 2 6 2 2 6 2 2 6
40581- 2 2 6 2 2 6 2 2 6 2 2 6
40582- 2 2 6 2 2 6 2 2 6 2 2 6
40583- 2 2 6 6 6 6 91 60 6 167 114 7
40584-206 145 10 230 174 11 242 186 14 246 190 14
40585-246 190 14 246 190 14 246 186 14 242 186 14
40586-239 182 13 230 174 11 224 166 10 213 154 11
40587-180 133 36 124 112 88 86 86 86 58 58 58
40588- 38 38 38 22 22 22 10 10 10 6 6 6
40589- 0 0 0 0 0 0 0 0 0 0 0 0
40590- 0 0 0 0 0 0 0 0 0 0 0 0
40591- 0 0 0 0 0 0 0 0 0 0 0 0
40592- 0 0 0 0 0 0 0 0 0 14 14 14
40593- 34 34 34 70 70 70 138 110 50 158 118 36
40594-167 114 7 180 123 7 192 133 9 197 138 11
40595-200 144 11 206 145 10 213 154 11 219 162 10
40596-224 166 10 230 174 11 239 182 13 242 186 14
40597-246 186 14 246 186 14 246 186 14 246 186 14
40598-239 182 13 216 158 10 185 133 11 152 99 6
40599-104 69 6 18 14 6 2 2 6 2 2 6
40600- 2 2 6 2 2 6 2 2 6 2 2 6
40601- 2 2 6 2 2 6 2 2 6 2 2 6
40602- 2 2 6 2 2 6 2 2 6 2 2 6
40603- 2 2 6 6 6 6 80 54 7 152 99 6
40604-192 133 9 219 162 10 236 178 12 239 182 13
40605-246 186 14 242 186 14 239 182 13 236 178 12
40606-224 166 10 206 145 10 192 133 9 154 121 60
40607- 94 94 94 62 62 62 42 42 42 22 22 22
40608- 14 14 14 6 6 6 0 0 0 0 0 0
40609- 0 0 0 0 0 0 0 0 0 0 0 0
40610- 0 0 0 0 0 0 0 0 0 0 0 0
40611- 0 0 0 0 0 0 0 0 0 0 0 0
40612- 0 0 0 0 0 0 0 0 0 6 6 6
40613- 18 18 18 34 34 34 58 58 58 78 78 78
40614-101 98 89 124 112 88 142 110 46 156 107 11
40615-163 110 8 167 114 7 175 118 6 180 123 7
40616-185 133 11 197 138 11 210 150 10 219 162 10
40617-226 170 11 236 178 12 236 178 12 234 174 13
40618-219 162 10 197 138 11 163 110 8 130 83 6
40619- 91 60 6 10 10 10 2 2 6 2 2 6
40620- 18 18 18 38 38 38 38 38 38 38 38 38
40621- 38 38 38 38 38 38 38 38 38 38 38 38
40622- 38 38 38 38 38 38 26 26 26 2 2 6
40623- 2 2 6 6 6 6 70 47 6 137 92 6
40624-175 118 6 200 144 11 219 162 10 230 174 11
40625-234 174 13 230 174 11 219 162 10 210 150 10
40626-192 133 9 163 110 8 124 112 88 82 82 82
40627- 50 50 50 30 30 30 14 14 14 6 6 6
40628- 0 0 0 0 0 0 0 0 0 0 0 0
40629- 0 0 0 0 0 0 0 0 0 0 0 0
40630- 0 0 0 0 0 0 0 0 0 0 0 0
40631- 0 0 0 0 0 0 0 0 0 0 0 0
40632- 0 0 0 0 0 0 0 0 0 0 0 0
40633- 6 6 6 14 14 14 22 22 22 34 34 34
40634- 42 42 42 58 58 58 74 74 74 86 86 86
40635-101 98 89 122 102 70 130 98 46 121 87 25
40636-137 92 6 152 99 6 163 110 8 180 123 7
40637-185 133 11 197 138 11 206 145 10 200 144 11
40638-180 123 7 156 107 11 130 83 6 104 69 6
40639- 50 34 6 54 54 54 110 110 110 101 98 89
40640- 86 86 86 82 82 82 78 78 78 78 78 78
40641- 78 78 78 78 78 78 78 78 78 78 78 78
40642- 78 78 78 82 82 82 86 86 86 94 94 94
40643-106 106 106 101 101 101 86 66 34 124 80 6
40644-156 107 11 180 123 7 192 133 9 200 144 11
40645-206 145 10 200 144 11 192 133 9 175 118 6
40646-139 102 15 109 106 95 70 70 70 42 42 42
40647- 22 22 22 10 10 10 0 0 0 0 0 0
40648- 0 0 0 0 0 0 0 0 0 0 0 0
40649- 0 0 0 0 0 0 0 0 0 0 0 0
40650- 0 0 0 0 0 0 0 0 0 0 0 0
40651- 0 0 0 0 0 0 0 0 0 0 0 0
40652- 0 0 0 0 0 0 0 0 0 0 0 0
40653- 0 0 0 0 0 0 6 6 6 10 10 10
40654- 14 14 14 22 22 22 30 30 30 38 38 38
40655- 50 50 50 62 62 62 74 74 74 90 90 90
40656-101 98 89 112 100 78 121 87 25 124 80 6
40657-137 92 6 152 99 6 152 99 6 152 99 6
40658-138 86 6 124 80 6 98 70 6 86 66 30
40659-101 98 89 82 82 82 58 58 58 46 46 46
40660- 38 38 38 34 34 34 34 34 34 34 34 34
40661- 34 34 34 34 34 34 34 34 34 34 34 34
40662- 34 34 34 34 34 34 38 38 38 42 42 42
40663- 54 54 54 82 82 82 94 86 76 91 60 6
40664-134 86 6 156 107 11 167 114 7 175 118 6
40665-175 118 6 167 114 7 152 99 6 121 87 25
40666-101 98 89 62 62 62 34 34 34 18 18 18
40667- 6 6 6 0 0 0 0 0 0 0 0 0
40668- 0 0 0 0 0 0 0 0 0 0 0 0
40669- 0 0 0 0 0 0 0 0 0 0 0 0
40670- 0 0 0 0 0 0 0 0 0 0 0 0
40671- 0 0 0 0 0 0 0 0 0 0 0 0
40672- 0 0 0 0 0 0 0 0 0 0 0 0
40673- 0 0 0 0 0 0 0 0 0 0 0 0
40674- 0 0 0 6 6 6 6 6 6 10 10 10
40675- 18 18 18 22 22 22 30 30 30 42 42 42
40676- 50 50 50 66 66 66 86 86 86 101 98 89
40677-106 86 58 98 70 6 104 69 6 104 69 6
40678-104 69 6 91 60 6 82 62 34 90 90 90
40679- 62 62 62 38 38 38 22 22 22 14 14 14
40680- 10 10 10 10 10 10 10 10 10 10 10 10
40681- 10 10 10 10 10 10 6 6 6 10 10 10
40682- 10 10 10 10 10 10 10 10 10 14 14 14
40683- 22 22 22 42 42 42 70 70 70 89 81 66
40684- 80 54 7 104 69 6 124 80 6 137 92 6
40685-134 86 6 116 81 8 100 82 52 86 86 86
40686- 58 58 58 30 30 30 14 14 14 6 6 6
40687- 0 0 0 0 0 0 0 0 0 0 0 0
40688- 0 0 0 0 0 0 0 0 0 0 0 0
40689- 0 0 0 0 0 0 0 0 0 0 0 0
40690- 0 0 0 0 0 0 0 0 0 0 0 0
40691- 0 0 0 0 0 0 0 0 0 0 0 0
40692- 0 0 0 0 0 0 0 0 0 0 0 0
40693- 0 0 0 0 0 0 0 0 0 0 0 0
40694- 0 0 0 0 0 0 0 0 0 0 0 0
40695- 0 0 0 6 6 6 10 10 10 14 14 14
40696- 18 18 18 26 26 26 38 38 38 54 54 54
40697- 70 70 70 86 86 86 94 86 76 89 81 66
40698- 89 81 66 86 86 86 74 74 74 50 50 50
40699- 30 30 30 14 14 14 6 6 6 0 0 0
40700- 0 0 0 0 0 0 0 0 0 0 0 0
40701- 0 0 0 0 0 0 0 0 0 0 0 0
40702- 0 0 0 0 0 0 0 0 0 0 0 0
40703- 6 6 6 18 18 18 34 34 34 58 58 58
40704- 82 82 82 89 81 66 89 81 66 89 81 66
40705- 94 86 66 94 86 76 74 74 74 50 50 50
40706- 26 26 26 14 14 14 6 6 6 0 0 0
40707- 0 0 0 0 0 0 0 0 0 0 0 0
40708- 0 0 0 0 0 0 0 0 0 0 0 0
40709- 0 0 0 0 0 0 0 0 0 0 0 0
40710- 0 0 0 0 0 0 0 0 0 0 0 0
40711- 0 0 0 0 0 0 0 0 0 0 0 0
40712- 0 0 0 0 0 0 0 0 0 0 0 0
40713- 0 0 0 0 0 0 0 0 0 0 0 0
40714- 0 0 0 0 0 0 0 0 0 0 0 0
40715- 0 0 0 0 0 0 0 0 0 0 0 0
40716- 6 6 6 6 6 6 14 14 14 18 18 18
40717- 30 30 30 38 38 38 46 46 46 54 54 54
40718- 50 50 50 42 42 42 30 30 30 18 18 18
40719- 10 10 10 0 0 0 0 0 0 0 0 0
40720- 0 0 0 0 0 0 0 0 0 0 0 0
40721- 0 0 0 0 0 0 0 0 0 0 0 0
40722- 0 0 0 0 0 0 0 0 0 0 0 0
40723- 0 0 0 6 6 6 14 14 14 26 26 26
40724- 38 38 38 50 50 50 58 58 58 58 58 58
40725- 54 54 54 42 42 42 30 30 30 18 18 18
40726- 10 10 10 0 0 0 0 0 0 0 0 0
40727- 0 0 0 0 0 0 0 0 0 0 0 0
40728- 0 0 0 0 0 0 0 0 0 0 0 0
40729- 0 0 0 0 0 0 0 0 0 0 0 0
40730- 0 0 0 0 0 0 0 0 0 0 0 0
40731- 0 0 0 0 0 0 0 0 0 0 0 0
40732- 0 0 0 0 0 0 0 0 0 0 0 0
40733- 0 0 0 0 0 0 0 0 0 0 0 0
40734- 0 0 0 0 0 0 0 0 0 0 0 0
40735- 0 0 0 0 0 0 0 0 0 0 0 0
40736- 0 0 0 0 0 0 0 0 0 6 6 6
40737- 6 6 6 10 10 10 14 14 14 18 18 18
40738- 18 18 18 14 14 14 10 10 10 6 6 6
40739- 0 0 0 0 0 0 0 0 0 0 0 0
40740- 0 0 0 0 0 0 0 0 0 0 0 0
40741- 0 0 0 0 0 0 0 0 0 0 0 0
40742- 0 0 0 0 0 0 0 0 0 0 0 0
40743- 0 0 0 0 0 0 0 0 0 6 6 6
40744- 14 14 14 18 18 18 22 22 22 22 22 22
40745- 18 18 18 14 14 14 10 10 10 6 6 6
40746- 0 0 0 0 0 0 0 0 0 0 0 0
40747- 0 0 0 0 0 0 0 0 0 0 0 0
40748- 0 0 0 0 0 0 0 0 0 0 0 0
40749- 0 0 0 0 0 0 0 0 0 0 0 0
40750- 0 0 0 0 0 0 0 0 0 0 0 0
40751+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40752+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40754+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40755+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40756+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40757+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40758+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40759+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40760+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40761+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40762+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40763+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40764+4 4 4 4 4 4
40765+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40766+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40767+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40768+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40769+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40770+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40771+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40772+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40773+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40774+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40775+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40776+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40777+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40778+4 4 4 4 4 4
40779+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40780+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40781+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40782+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40783+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40784+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40785+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40786+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40787+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40788+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40789+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40790+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40791+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40792+4 4 4 4 4 4
40793+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40794+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40795+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40796+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40797+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40798+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40799+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40800+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40801+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40802+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40803+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40804+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40805+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40806+4 4 4 4 4 4
40807+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40808+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40809+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40810+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40811+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40812+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40813+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40814+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40815+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40816+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40817+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40818+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40819+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40820+4 4 4 4 4 4
40821+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40822+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40823+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40824+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40825+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40826+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40827+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40828+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40829+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40830+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40831+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40832+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40833+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40834+4 4 4 4 4 4
40835+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40836+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40837+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40838+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40839+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
40840+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
40841+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40842+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40843+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40844+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
40845+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40846+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
40847+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40848+4 4 4 4 4 4
40849+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40850+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40851+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40852+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40853+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
40854+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
40855+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40856+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40857+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40858+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
40859+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
40860+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
40861+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40862+4 4 4 4 4 4
40863+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40864+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40865+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40866+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40867+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
40868+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
40869+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40870+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40871+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40872+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
40873+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
40874+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
40875+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
40876+4 4 4 4 4 4
40877+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40878+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40879+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40880+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
40881+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
40882+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
40883+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
40884+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40885+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
40886+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
40887+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
40888+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
40889+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
40890+4 4 4 4 4 4
40891+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40892+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40893+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40894+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
40895+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
40896+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
40897+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
40898+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
40899+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
40900+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
40901+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
40902+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
40903+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
40904+4 4 4 4 4 4
40905+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40906+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40907+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
40908+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
40909+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
40910+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
40911+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
40912+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
40913+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
40914+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
40915+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
40916+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
40917+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
40918+4 4 4 4 4 4
40919+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40920+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40921+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
40922+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
40923+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
40924+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
40925+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
40926+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
40927+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
40928+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
40929+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
40930+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
40931+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
40932+4 4 4 4 4 4
40933+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40934+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40935+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
40936+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
40937+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
40938+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
40939+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
40940+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
40941+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
40942+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
40943+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
40944+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
40945+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
40946+4 4 4 4 4 4
40947+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40948+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40949+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
40950+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
40951+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
40952+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
40953+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
40954+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
40955+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
40956+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
40957+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
40958+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
40959+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40960+4 4 4 4 4 4
40961+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40962+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40963+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
40964+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
40965+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
40966+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
40967+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
40968+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
40969+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
40970+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
40971+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
40972+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
40973+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
40974+4 4 4 4 4 4
40975+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40976+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
40977+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
40978+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
40979+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
40980+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
40981+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
40982+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
40983+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
40984+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
40985+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
40986+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
40987+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
40988+4 4 4 4 4 4
40989+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40990+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
40991+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
40992+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
40993+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
40994+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
40995+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
40996+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
40997+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
40998+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
40999+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
41000+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
41001+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
41002+0 0 0 4 4 4
41003+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
41004+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
41005+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
41006+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
41007+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
41008+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
41009+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
41010+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
41011+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
41012+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
41013+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
41014+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
41015+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
41016+2 0 0 0 0 0
41017+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
41018+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
41019+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
41020+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
41021+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
41022+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
41023+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
41024+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
41025+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
41026+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
41027+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
41028+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
41029+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
41030+37 38 37 0 0 0
41031+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
41032+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
41033+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
41034+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
41035+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
41036+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
41037+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
41038+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
41039+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
41040+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
41041+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
41042+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
41043+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
41044+85 115 134 4 0 0
41045+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
41046+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
41047+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
41048+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
41049+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
41050+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
41051+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
41052+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
41053+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
41054+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
41055+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
41056+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
41057+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
41058+60 73 81 4 0 0
41059+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
41060+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
41061+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
41062+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
41063+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
41064+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
41065+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
41066+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
41067+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
41068+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
41069+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
41070+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
41071+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
41072+16 19 21 4 0 0
41073+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
41074+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
41075+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
41076+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
41077+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
41078+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
41079+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
41080+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
41081+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
41082+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
41083+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
41084+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
41085+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
41086+4 0 0 4 3 3
41087+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
41088+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
41089+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
41090+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
41091+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
41092+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
41093+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
41094+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
41095+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
41096+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
41097+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
41098+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
41099+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
41100+3 2 2 4 4 4
41101+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
41102+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
41103+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
41104+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
41105+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
41106+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
41107+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
41108+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
41109+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
41110+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
41111+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
41112+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
41113+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
41114+4 4 4 4 4 4
41115+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
41116+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
41117+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
41118+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
41119+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
41120+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
41121+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
41122+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
41123+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
41124+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
41125+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
41126+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
41127+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
41128+4 4 4 4 4 4
41129+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
41130+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
41131+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
41132+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
41133+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
41134+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
41135+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
41136+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
41137+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
41138+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
41139+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
41140+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
41141+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
41142+5 5 5 5 5 5
41143+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
41144+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
41145+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
41146+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
41147+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
41148+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41149+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
41150+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
41151+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
41152+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
41153+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
41154+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
41155+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
41156+5 5 5 4 4 4
41157+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
41158+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
41159+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
41160+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
41161+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41162+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
41163+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
41164+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
41165+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
41166+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
41167+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
41168+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
41169+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41170+4 4 4 4 4 4
41171+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
41172+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
41173+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
41174+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
41175+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
41176+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41177+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41178+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
41179+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
41180+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
41181+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
41182+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
41183+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41184+4 4 4 4 4 4
41185+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
41186+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
41187+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
41188+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
41189+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41190+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
41191+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
41192+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
41193+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
41194+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
41195+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
41196+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41197+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41198+4 4 4 4 4 4
41199+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
41200+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
41201+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
41202+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
41203+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41204+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41205+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41206+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
41207+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
41208+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
41209+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
41210+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41211+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41212+4 4 4 4 4 4
41213+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
41214+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
41215+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
41216+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
41217+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41218+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
41219+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
41220+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
41221+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
41222+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
41223+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41224+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41225+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41226+4 4 4 4 4 4
41227+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
41228+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
41229+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
41230+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
41231+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41232+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
41233+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
41234+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
41235+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
41236+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
41237+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
41238+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41239+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41240+4 4 4 4 4 4
41241+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
41242+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
41243+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
41244+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
41245+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41246+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
41247+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
41248+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
41249+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
41250+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
41251+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
41252+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41253+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41254+4 4 4 4 4 4
41255+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
41256+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
41257+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
41258+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
41259+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
41260+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
41261+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
41262+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
41263+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
41264+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
41265+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41266+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41267+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41268+4 4 4 4 4 4
41269+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
41270+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
41271+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
41272+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
41273+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41274+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
41275+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
41276+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
41277+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
41278+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
41279+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41280+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41281+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41282+4 4 4 4 4 4
41283+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
41284+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
41285+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
41286+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
41287+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41288+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
41289+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
41290+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
41291+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
41292+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
41293+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41294+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41295+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41296+4 4 4 4 4 4
41297+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
41298+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
41299+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
41300+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
41301+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41302+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
41303+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
41304+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
41305+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
41306+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41307+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41308+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41309+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41310+4 4 4 4 4 4
41311+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
41312+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
41313+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
41314+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
41315+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
41316+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
41317+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
41318+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
41319+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41320+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41321+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41322+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41323+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41324+4 4 4 4 4 4
41325+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
41326+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
41327+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
41328+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
41329+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41330+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
41331+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
41332+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
41333+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41334+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41335+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41336+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41337+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41338+4 4 4 4 4 4
41339+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
41340+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
41341+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41342+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
41343+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
41344+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
41345+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
41346+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
41347+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41348+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41349+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41350+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41351+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41352+4 4 4 4 4 4
41353+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
41354+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
41355+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41356+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
41357+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
41358+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
41359+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
41360+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
41361+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
41362+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41363+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41364+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41365+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41366+4 4 4 4 4 4
41367+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41368+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
41369+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41370+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
41371+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
41372+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
41373+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
41374+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
41375+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41376+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41377+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41378+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41379+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41380+4 4 4 4 4 4
41381+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
41382+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
41383+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41384+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
41385+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
41386+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
41387+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
41388+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
41389+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
41390+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41391+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41392+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41393+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41394+4 4 4 4 4 4
41395+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41396+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
41397+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
41398+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
41399+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
41400+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
41401+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
41402+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
41403+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41404+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41405+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41406+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41407+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41408+4 4 4 4 4 4
41409+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41410+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
41411+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41412+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
41413+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
41414+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
41415+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
41416+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
41417+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41418+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41419+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41420+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41421+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41422+4 4 4 4 4 4
41423+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41424+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
41425+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
41426+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
41427+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
41428+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
41429+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41430+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
41431+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41432+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41433+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41434+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41436+4 4 4 4 4 4
41437+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41438+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
41439+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
41440+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41441+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
41442+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
41443+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41444+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
41445+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41446+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41447+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41450+4 4 4 4 4 4
41451+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41452+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
41453+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
41454+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
41455+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
41456+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
41457+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
41458+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
41459+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
41460+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41461+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41464+4 4 4 4 4 4
41465+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41466+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
41467+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
41468+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
41469+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
41470+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
41471+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
41472+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
41473+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
41474+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41475+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41478+4 4 4 4 4 4
41479+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
41480+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
41481+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
41482+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
41483+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41484+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
41485+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
41486+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
41487+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
41488+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41489+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41490+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41492+4 4 4 4 4 4
41493+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41494+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
41495+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
41496+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
41497+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
41498+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
41499+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
41500+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
41501+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
41502+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41503+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41504+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41506+4 4 4 4 4 4
41507+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
41508+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
41509+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
41510+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
41511+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
41512+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
41513+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
41514+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
41515+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
41516+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
41517+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41520+4 4 4 4 4 4
41521+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
41522+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41523+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
41524+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
41525+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
41526+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
41527+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
41528+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
41529+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
41530+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
41531+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41534+4 4 4 4 4 4
41535+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
41536+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41537+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
41538+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
41539+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
41540+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
41541+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41542+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
41543+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
41544+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
41545+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41546+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41547+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41548+4 4 4 4 4 4
41549+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
41550+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
41551+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
41552+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
41553+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
41554+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
41555+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
41556+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
41557+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
41558+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
41559+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41561+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41562+4 4 4 4 4 4
41563+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
41564+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
41565+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41566+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
41567+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
41568+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
41569+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
41570+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
41571+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
41572+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
41573+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41574+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41575+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41576+4 4 4 4 4 4
41577+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41578+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
41579+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
41580+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
41581+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
41582+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
41583+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
41584+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
41585+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
41586+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41587+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41588+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41589+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41590+4 4 4 4 4 4
41591+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
41592+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
41593+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
41594+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
41595+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
41596+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
41597+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
41598+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
41599+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
41600+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
41601+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41602+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41603+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41604+4 4 4 4 4 4
41605+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
41606+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
41607+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
41608+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
41609+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
41610+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
41611+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
41612+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
41613+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
41614+4 3 3 5 5 5 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 4 4 4 4 4 4
41618+4 4 4 4 4 4
41619+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
41620+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41621+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
41622+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41623+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
41624+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
41625+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
41626+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
41627+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
41628+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41629+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41630+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41631+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41632+4 4 4 4 4 4
41633+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
41634+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
41635+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
41636+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
41637+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
41638+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
41639+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
41640+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
41641+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
41642+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41643+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41644+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41645+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41646+4 4 4 4 4 4
41647+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
41648+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
41649+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
41650+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
41651+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
41652+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
41653+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
41654+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
41655+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41656+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41657+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41658+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41659+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41660+4 4 4 4 4 4
41661+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
41662+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
41663+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
41664+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
41665+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
41666+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
41667+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
41668+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
41669+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41670+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41671+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41672+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41673+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41674+4 4 4 4 4 4
41675+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
41676+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
41677+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
41678+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
41679+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
41680+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
41681+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
41682+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41683+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41684+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41685+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41686+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41687+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41688+4 4 4 4 4 4
41689+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41690+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
41691+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41692+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
41693+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
41694+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
41695+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
41696+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
41697+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41698+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41699+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41700+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41701+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41702+4 4 4 4 4 4
41703+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41704+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
41705+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
41706+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
41707+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
41708+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
41709+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
41710+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
41711+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41712+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41713+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41714+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41715+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41716+4 4 4 4 4 4
41717+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41718+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
41719+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
41720+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
41721+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
41722+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
41723+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
41724+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41725+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41726+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41727+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41728+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41729+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41730+4 4 4 4 4 4
41731+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41732+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41733+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
41734+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
41735+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
41736+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
41737+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
41738+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41739+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41740+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41741+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41742+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41743+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41744+4 4 4 4 4 4
41745+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41746+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41747+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41748+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41749+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
41750+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
41751+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
41752+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41754+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41755+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41756+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41757+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41758+4 4 4 4 4 4
41759+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41760+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41761+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41762+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
41763+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
41764+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
41765+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
41766+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41767+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41768+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41769+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41770+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41771+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41772+4 4 4 4 4 4
41773+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41774+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41775+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41776+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
41777+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41778+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
41779+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
41780+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41781+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41782+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41783+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41784+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41785+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41786+4 4 4 4 4 4
41787+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41788+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41789+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41790+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
41791+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
41792+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
41793+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
41794+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41795+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41796+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41797+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41798+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41799+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41800+4 4 4 4 4 4
41801+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41802+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41803+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41804+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41805+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
41806+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41807+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41808+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41809+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41810+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41811+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41812+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41813+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41814+4 4 4 4 4 4
41815+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41816+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41817+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41818+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41819+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
41820+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
41821+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
41822+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41823+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41824+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41825+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41826+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41827+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41828+4 4 4 4 4 4
41829+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41830+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41831+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41832+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41833+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
41834+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
41835+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41836+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41837+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41838+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41839+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41840+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41841+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41842+4 4 4 4 4 4
41843+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41844+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41845+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41846+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41847+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
41848+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
41849+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41850+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41851+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41852+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41853+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41854+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41855+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41856+4 4 4 4 4 4
41857+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41858+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41859+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41860+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41861+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
41862+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
41863+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41864+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41865+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41866+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41867+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41868+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41869+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41870+4 4 4 4 4 4
41871diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
41872index a40c05e..785c583 100644
41873--- a/drivers/video/udlfb.c
41874+++ b/drivers/video/udlfb.c
41875@@ -619,11 +619,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
41876 dlfb_urb_completion(urb);
41877
41878 error:
41879- atomic_add(bytes_sent, &dev->bytes_sent);
41880- atomic_add(bytes_identical, &dev->bytes_identical);
41881- atomic_add(width*height*2, &dev->bytes_rendered);
41882+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
41883+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
41884+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
41885 end_cycles = get_cycles();
41886- atomic_add(((unsigned int) ((end_cycles - start_cycles)
41887+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
41888 >> 10)), /* Kcycles */
41889 &dev->cpu_kcycles_used);
41890
41891@@ -744,11 +744,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
41892 dlfb_urb_completion(urb);
41893
41894 error:
41895- atomic_add(bytes_sent, &dev->bytes_sent);
41896- atomic_add(bytes_identical, &dev->bytes_identical);
41897- atomic_add(bytes_rendered, &dev->bytes_rendered);
41898+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
41899+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
41900+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
41901 end_cycles = get_cycles();
41902- atomic_add(((unsigned int) ((end_cycles - start_cycles)
41903+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
41904 >> 10)), /* Kcycles */
41905 &dev->cpu_kcycles_used);
41906 }
41907@@ -1368,7 +1368,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
41908 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41909 struct dlfb_data *dev = fb_info->par;
41910 return snprintf(buf, PAGE_SIZE, "%u\n",
41911- atomic_read(&dev->bytes_rendered));
41912+ atomic_read_unchecked(&dev->bytes_rendered));
41913 }
41914
41915 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
41916@@ -1376,7 +1376,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
41917 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41918 struct dlfb_data *dev = fb_info->par;
41919 return snprintf(buf, PAGE_SIZE, "%u\n",
41920- atomic_read(&dev->bytes_identical));
41921+ atomic_read_unchecked(&dev->bytes_identical));
41922 }
41923
41924 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
41925@@ -1384,7 +1384,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
41926 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41927 struct dlfb_data *dev = fb_info->par;
41928 return snprintf(buf, PAGE_SIZE, "%u\n",
41929- atomic_read(&dev->bytes_sent));
41930+ atomic_read_unchecked(&dev->bytes_sent));
41931 }
41932
41933 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
41934@@ -1392,7 +1392,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
41935 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41936 struct dlfb_data *dev = fb_info->par;
41937 return snprintf(buf, PAGE_SIZE, "%u\n",
41938- atomic_read(&dev->cpu_kcycles_used));
41939+ atomic_read_unchecked(&dev->cpu_kcycles_used));
41940 }
41941
41942 static ssize_t edid_show(
41943@@ -1449,10 +1449,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
41944 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41945 struct dlfb_data *dev = fb_info->par;
41946
41947- atomic_set(&dev->bytes_rendered, 0);
41948- atomic_set(&dev->bytes_identical, 0);
41949- atomic_set(&dev->bytes_sent, 0);
41950- atomic_set(&dev->cpu_kcycles_used, 0);
41951+ atomic_set_unchecked(&dev->bytes_rendered, 0);
41952+ atomic_set_unchecked(&dev->bytes_identical, 0);
41953+ atomic_set_unchecked(&dev->bytes_sent, 0);
41954+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
41955
41956 return count;
41957 }
41958diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
41959index 8408543..357841c 100644
41960--- a/drivers/video/uvesafb.c
41961+++ b/drivers/video/uvesafb.c
41962@@ -19,6 +19,7 @@
41963 #include <linux/io.h>
41964 #include <linux/mutex.h>
41965 #include <linux/slab.h>
41966+#include <linux/moduleloader.h>
41967 #include <video/edid.h>
41968 #include <video/uvesafb.h>
41969 #ifdef CONFIG_X86
41970@@ -121,7 +122,7 @@ static int uvesafb_helper_start(void)
41971 NULL,
41972 };
41973
41974- return call_usermodehelper(v86d_path, argv, envp, 1);
41975+ return call_usermodehelper(v86d_path, argv, envp, UMH_WAIT_PROC);
41976 }
41977
41978 /*
41979@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
41980 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
41981 par->pmi_setpal = par->ypan = 0;
41982 } else {
41983+
41984+#ifdef CONFIG_PAX_KERNEXEC
41985+#ifdef CONFIG_MODULES
41986+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
41987+#endif
41988+ if (!par->pmi_code) {
41989+ par->pmi_setpal = par->ypan = 0;
41990+ return 0;
41991+ }
41992+#endif
41993+
41994 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
41995 + task->t.regs.edi);
41996+
41997+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41998+ pax_open_kernel();
41999+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
42000+ pax_close_kernel();
42001+
42002+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
42003+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
42004+#else
42005 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
42006 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
42007+#endif
42008+
42009 printk(KERN_INFO "uvesafb: protected mode interface info at "
42010 "%04x:%04x\n",
42011 (u16)task->t.regs.es, (u16)task->t.regs.edi);
42012@@ -816,13 +839,14 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info)
42013 par->ypan = ypan;
42014
42015 if (par->pmi_setpal || par->ypan) {
42016+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
42017 if (__supported_pte_mask & _PAGE_NX) {
42018 par->pmi_setpal = par->ypan = 0;
42019 printk(KERN_WARNING "uvesafb: NX protection is actively."
42020 "We have better not to use the PMI.\n");
42021- } else {
42022+ } else
42023+#endif
42024 uvesafb_vbe_getpmi(task, par);
42025- }
42026 }
42027 #else
42028 /* The protected mode interface is not available on non-x86. */
42029@@ -1828,6 +1852,11 @@ out:
42030 if (par->vbe_modes)
42031 kfree(par->vbe_modes);
42032
42033+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42034+ if (par->pmi_code)
42035+ module_free_exec(NULL, par->pmi_code);
42036+#endif
42037+
42038 framebuffer_release(info);
42039 return err;
42040 }
42041@@ -1854,6 +1883,12 @@ static int uvesafb_remove(struct platform_device *dev)
42042 kfree(par->vbe_state_orig);
42043 if (par->vbe_state_saved)
42044 kfree(par->vbe_state_saved);
42045+
42046+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42047+ if (par->pmi_code)
42048+ module_free_exec(NULL, par->pmi_code);
42049+#endif
42050+
42051 }
42052
42053 framebuffer_release(info);
42054diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
42055index 501b340..86bd4cf 100644
42056--- a/drivers/video/vesafb.c
42057+++ b/drivers/video/vesafb.c
42058@@ -9,6 +9,7 @@
42059 */
42060
42061 #include <linux/module.h>
42062+#include <linux/moduleloader.h>
42063 #include <linux/kernel.h>
42064 #include <linux/errno.h>
42065 #include <linux/string.h>
42066@@ -52,8 +53,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */
42067 static int vram_total __initdata; /* Set total amount of memory */
42068 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
42069 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
42070-static void (*pmi_start)(void) __read_mostly;
42071-static void (*pmi_pal) (void) __read_mostly;
42072+static void (*pmi_start)(void) __read_only;
42073+static void (*pmi_pal) (void) __read_only;
42074 static int depth __read_mostly;
42075 static int vga_compat __read_mostly;
42076 /* --------------------------------------------------------------------- */
42077@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
42078 unsigned int size_vmode;
42079 unsigned int size_remap;
42080 unsigned int size_total;
42081+ void *pmi_code = NULL;
42082
42083 if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
42084 return -ENODEV;
42085@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
42086 size_remap = size_total;
42087 vesafb_fix.smem_len = size_remap;
42088
42089-#ifndef __i386__
42090- screen_info.vesapm_seg = 0;
42091-#endif
42092-
42093 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
42094 printk(KERN_WARNING
42095 "vesafb: cannot reserve video memory at 0x%lx\n",
42096@@ -307,9 +305,21 @@ static int __init vesafb_probe(struct platform_device *dev)
42097 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
42098 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
42099
42100+#ifdef __i386__
42101+
42102+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42103+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
42104+ if (!pmi_code)
42105+#elif !defined(CONFIG_PAX_KERNEXEC)
42106+ if (0)
42107+#endif
42108+
42109+#endif
42110+ screen_info.vesapm_seg = 0;
42111+
42112 if (screen_info.vesapm_seg) {
42113- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
42114- screen_info.vesapm_seg,screen_info.vesapm_off);
42115+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
42116+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
42117 }
42118
42119 if (screen_info.vesapm_seg < 0xc000)
42120@@ -317,9 +327,25 @@ static int __init vesafb_probe(struct platform_device *dev)
42121
42122 if (ypan || pmi_setpal) {
42123 unsigned short *pmi_base;
42124+
42125 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
42126- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
42127- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
42128+
42129+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42130+ pax_open_kernel();
42131+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
42132+#else
42133+ pmi_code = pmi_base;
42134+#endif
42135+
42136+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
42137+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
42138+
42139+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42140+ pmi_start = ktva_ktla(pmi_start);
42141+ pmi_pal = ktva_ktla(pmi_pal);
42142+ pax_close_kernel();
42143+#endif
42144+
42145 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
42146 if (pmi_base[3]) {
42147 printk(KERN_INFO "vesafb: pmi: ports = ");
42148@@ -488,6 +514,11 @@ static int __init vesafb_probe(struct platform_device *dev)
42149 info->node, info->fix.id);
42150 return 0;
42151 err:
42152+
42153+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42154+ module_free_exec(NULL, pmi_code);
42155+#endif
42156+
42157 if (info->screen_base)
42158 iounmap(info->screen_base);
42159 framebuffer_release(info);
42160diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
42161index 88714ae..16c2e11 100644
42162--- a/drivers/video/via/via_clock.h
42163+++ b/drivers/video/via/via_clock.h
42164@@ -56,7 +56,7 @@ struct via_clock {
42165
42166 void (*set_engine_pll_state)(u8 state);
42167 void (*set_engine_pll)(struct via_pll_config config);
42168-};
42169+} __no_const;
42170
42171
42172 static inline u32 get_pll_internal_frequency(u32 ref_freq,
42173diff --git a/drivers/xen/xen-pciback/conf_space.h b/drivers/xen/xen-pciback/conf_space.h
42174index e56c934..fc22f4b 100644
42175--- a/drivers/xen/xen-pciback/conf_space.h
42176+++ b/drivers/xen/xen-pciback/conf_space.h
42177@@ -44,15 +44,15 @@ struct config_field {
42178 struct {
42179 conf_dword_write write;
42180 conf_dword_read read;
42181- } dw;
42182+ } __no_const dw;
42183 struct {
42184 conf_word_write write;
42185 conf_word_read read;
42186- } w;
42187+ } __no_const w;
42188 struct {
42189 conf_byte_write write;
42190 conf_byte_read read;
42191- } b;
42192+ } __no_const b;
42193 } u;
42194 struct list_head list;
42195 };
42196diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
42197index 014c8dd..6f3dfe6 100644
42198--- a/fs/9p/vfs_inode.c
42199+++ b/fs/9p/vfs_inode.c
42200@@ -1303,7 +1303,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
42201 void
42202 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
42203 {
42204- char *s = nd_get_link(nd);
42205+ const char *s = nd_get_link(nd);
42206
42207 p9_debug(P9_DEBUG_VFS, " %s %s\n",
42208 dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
42209diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
42210index e95d1b6..3454244 100644
42211--- a/fs/Kconfig.binfmt
42212+++ b/fs/Kconfig.binfmt
42213@@ -89,7 +89,7 @@ config HAVE_AOUT
42214
42215 config BINFMT_AOUT
42216 tristate "Kernel support for a.out and ECOFF binaries"
42217- depends on HAVE_AOUT
42218+ depends on HAVE_AOUT && BROKEN
42219 ---help---
42220 A.out (Assembler.OUTput) is a set of formats for libraries and
42221 executables used in the earliest versions of UNIX. Linux used
42222diff --git a/fs/aio.c b/fs/aio.c
42223index b9d64d8..86cb1d5 100644
42224--- a/fs/aio.c
42225+++ b/fs/aio.c
42226@@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx *ctx)
42227 size += sizeof(struct io_event) * nr_events;
42228 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
42229
42230- if (nr_pages < 0)
42231+ if (nr_pages <= 0)
42232 return -EINVAL;
42233
42234 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
42235@@ -1461,22 +1461,27 @@ static ssize_t aio_fsync(struct kiocb *iocb)
42236 static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
42237 {
42238 ssize_t ret;
42239+ struct iovec iovstack;
42240
42241 #ifdef CONFIG_COMPAT
42242 if (compat)
42243 ret = compat_rw_copy_check_uvector(type,
42244 (struct compat_iovec __user *)kiocb->ki_buf,
42245- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
42246+ kiocb->ki_nbytes, 1, &iovstack,
42247 &kiocb->ki_iovec, 1);
42248 else
42249 #endif
42250 ret = rw_copy_check_uvector(type,
42251 (struct iovec __user *)kiocb->ki_buf,
42252- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
42253+ kiocb->ki_nbytes, 1, &iovstack,
42254 &kiocb->ki_iovec, 1);
42255 if (ret < 0)
42256 goto out;
42257
42258+ if (kiocb->ki_iovec == &iovstack) {
42259+ kiocb->ki_inline_vec = iovstack;
42260+ kiocb->ki_iovec = &kiocb->ki_inline_vec;
42261+ }
42262 kiocb->ki_nr_segs = kiocb->ki_nbytes;
42263 kiocb->ki_cur_seg = 0;
42264 /* ki_nbytes/left now reflect bytes instead of segs */
42265diff --git a/fs/attr.c b/fs/attr.c
42266index 95053ad..2cc93ca 100644
42267--- a/fs/attr.c
42268+++ b/fs/attr.c
42269@@ -99,6 +99,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
42270 unsigned long limit;
42271
42272 limit = rlimit(RLIMIT_FSIZE);
42273+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
42274 if (limit != RLIM_INFINITY && offset > limit)
42275 goto out_sig;
42276 if (offset > inode->i_sb->s_maxbytes)
42277diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
42278index f624cd0..3d9a559 100644
42279--- a/fs/autofs4/waitq.c
42280+++ b/fs/autofs4/waitq.c
42281@@ -61,7 +61,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
42282 {
42283 unsigned long sigpipe, flags;
42284 mm_segment_t fs;
42285- const char *data = (const char *)addr;
42286+ const char __user *data = (const char __force_user *)addr;
42287 ssize_t wr = 0;
42288
42289 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
42290diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
42291index 6e6d536..457113a 100644
42292--- a/fs/befs/linuxvfs.c
42293+++ b/fs/befs/linuxvfs.c
42294@@ -502,7 +502,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
42295 {
42296 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
42297 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
42298- char *link = nd_get_link(nd);
42299+ const char *link = nd_get_link(nd);
42300 if (!IS_ERR(link))
42301 kfree(link);
42302 }
42303diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
42304index 1ff9405..f1e376a 100644
42305--- a/fs/binfmt_aout.c
42306+++ b/fs/binfmt_aout.c
42307@@ -16,6 +16,7 @@
42308 #include <linux/string.h>
42309 #include <linux/fs.h>
42310 #include <linux/file.h>
42311+#include <linux/security.h>
42312 #include <linux/stat.h>
42313 #include <linux/fcntl.h>
42314 #include <linux/ptrace.h>
42315@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredump_params *cprm)
42316 #endif
42317 # define START_STACK(u) ((void __user *)u.start_stack)
42318
42319+ memset(&dump, 0, sizeof(dump));
42320+
42321 fs = get_fs();
42322 set_fs(KERNEL_DS);
42323 has_dumped = 1;
42324@@ -97,10 +100,12 @@ static int aout_core_dump(struct coredump_params *cprm)
42325
42326 /* If the size of the dump file exceeds the rlimit, then see what would happen
42327 if we wrote the stack, but not the data area. */
42328+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
42329 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
42330 dump.u_dsize = 0;
42331
42332 /* Make sure we have enough room to write the stack and data areas. */
42333+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
42334 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
42335 dump.u_ssize = 0;
42336
42337@@ -234,6 +239,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42338 rlim = rlimit(RLIMIT_DATA);
42339 if (rlim >= RLIM_INFINITY)
42340 rlim = ~0;
42341+
42342+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
42343 if (ex.a_data + ex.a_bss > rlim)
42344 return -ENOMEM;
42345
42346@@ -269,6 +276,27 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42347 install_exec_creds(bprm);
42348 current->flags &= ~PF_FORKNOEXEC;
42349
42350+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42351+ current->mm->pax_flags = 0UL;
42352+#endif
42353+
42354+#ifdef CONFIG_PAX_PAGEEXEC
42355+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
42356+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
42357+
42358+#ifdef CONFIG_PAX_EMUTRAMP
42359+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
42360+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
42361+#endif
42362+
42363+#ifdef CONFIG_PAX_MPROTECT
42364+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
42365+ current->mm->pax_flags |= MF_PAX_MPROTECT;
42366+#endif
42367+
42368+ }
42369+#endif
42370+
42371 if (N_MAGIC(ex) == OMAGIC) {
42372 unsigned long text_addr, map_size;
42373 loff_t pos;
42374@@ -341,7 +369,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42375
42376 down_write(&current->mm->mmap_sem);
42377 error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
42378- PROT_READ | PROT_WRITE | PROT_EXEC,
42379+ PROT_READ | PROT_WRITE,
42380 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
42381 fd_offset + ex.a_text);
42382 up_write(&current->mm->mmap_sem);
42383diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
42384index 07d096c..25762af 100644
42385--- a/fs/binfmt_elf.c
42386+++ b/fs/binfmt_elf.c
42387@@ -32,6 +32,7 @@
42388 #include <linux/elf.h>
42389 #include <linux/utsname.h>
42390 #include <linux/coredump.h>
42391+#include <linux/xattr.h>
42392 #include <asm/uaccess.h>
42393 #include <asm/param.h>
42394 #include <asm/page.h>
42395@@ -51,6 +52,10 @@ static int elf_core_dump(struct coredump_params *cprm);
42396 #define elf_core_dump NULL
42397 #endif
42398
42399+#ifdef CONFIG_PAX_MPROTECT
42400+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
42401+#endif
42402+
42403 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
42404 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
42405 #else
42406@@ -70,6 +75,11 @@ static struct linux_binfmt elf_format = {
42407 .load_binary = load_elf_binary,
42408 .load_shlib = load_elf_library,
42409 .core_dump = elf_core_dump,
42410+
42411+#ifdef CONFIG_PAX_MPROTECT
42412+ .handle_mprotect= elf_handle_mprotect,
42413+#endif
42414+
42415 .min_coredump = ELF_EXEC_PAGESIZE,
42416 };
42417
42418@@ -77,6 +87,8 @@ static struct linux_binfmt elf_format = {
42419
42420 static int set_brk(unsigned long start, unsigned long end)
42421 {
42422+ unsigned long e = end;
42423+
42424 start = ELF_PAGEALIGN(start);
42425 end = ELF_PAGEALIGN(end);
42426 if (end > start) {
42427@@ -87,7 +99,7 @@ static int set_brk(unsigned long start, unsigned long end)
42428 if (BAD_ADDR(addr))
42429 return addr;
42430 }
42431- current->mm->start_brk = current->mm->brk = end;
42432+ current->mm->start_brk = current->mm->brk = e;
42433 return 0;
42434 }
42435
42436@@ -148,12 +160,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42437 elf_addr_t __user *u_rand_bytes;
42438 const char *k_platform = ELF_PLATFORM;
42439 const char *k_base_platform = ELF_BASE_PLATFORM;
42440- unsigned char k_rand_bytes[16];
42441+ u32 k_rand_bytes[4];
42442 int items;
42443 elf_addr_t *elf_info;
42444 int ei_index = 0;
42445 const struct cred *cred = current_cred();
42446 struct vm_area_struct *vma;
42447+ unsigned long saved_auxv[AT_VECTOR_SIZE];
42448
42449 /*
42450 * In some cases (e.g. Hyper-Threading), we want to avoid L1
42451@@ -195,8 +208,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42452 * Generate 16 random bytes for userspace PRNG seeding.
42453 */
42454 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
42455- u_rand_bytes = (elf_addr_t __user *)
42456- STACK_ALLOC(p, sizeof(k_rand_bytes));
42457+ srandom32(k_rand_bytes[0] ^ random32());
42458+ srandom32(k_rand_bytes[1] ^ random32());
42459+ srandom32(k_rand_bytes[2] ^ random32());
42460+ srandom32(k_rand_bytes[3] ^ random32());
42461+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
42462+ u_rand_bytes = (elf_addr_t __user *) p;
42463 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
42464 return -EFAULT;
42465
42466@@ -308,9 +325,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42467 return -EFAULT;
42468 current->mm->env_end = p;
42469
42470+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
42471+
42472 /* Put the elf_info on the stack in the right place. */
42473 sp = (elf_addr_t __user *)envp + 1;
42474- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
42475+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
42476 return -EFAULT;
42477 return 0;
42478 }
42479@@ -381,10 +400,10 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42480 {
42481 struct elf_phdr *elf_phdata;
42482 struct elf_phdr *eppnt;
42483- unsigned long load_addr = 0;
42484+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
42485 int load_addr_set = 0;
42486 unsigned long last_bss = 0, elf_bss = 0;
42487- unsigned long error = ~0UL;
42488+ unsigned long error = -EINVAL;
42489 unsigned long total_size;
42490 int retval, i, size;
42491
42492@@ -430,6 +449,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42493 goto out_close;
42494 }
42495
42496+#ifdef CONFIG_PAX_SEGMEXEC
42497+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
42498+ pax_task_size = SEGMEXEC_TASK_SIZE;
42499+#endif
42500+
42501 eppnt = elf_phdata;
42502 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
42503 if (eppnt->p_type == PT_LOAD) {
42504@@ -473,8 +497,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42505 k = load_addr + eppnt->p_vaddr;
42506 if (BAD_ADDR(k) ||
42507 eppnt->p_filesz > eppnt->p_memsz ||
42508- eppnt->p_memsz > TASK_SIZE ||
42509- TASK_SIZE - eppnt->p_memsz < k) {
42510+ eppnt->p_memsz > pax_task_size ||
42511+ pax_task_size - eppnt->p_memsz < k) {
42512 error = -ENOMEM;
42513 goto out_close;
42514 }
42515@@ -528,6 +552,351 @@ out:
42516 return error;
42517 }
42518
42519+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
42520+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
42521+{
42522+ unsigned long pax_flags = 0UL;
42523+
42524+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42525+
42526+#ifdef CONFIG_PAX_PAGEEXEC
42527+ if (elf_phdata->p_flags & PF_PAGEEXEC)
42528+ pax_flags |= MF_PAX_PAGEEXEC;
42529+#endif
42530+
42531+#ifdef CONFIG_PAX_SEGMEXEC
42532+ if (elf_phdata->p_flags & PF_SEGMEXEC)
42533+ pax_flags |= MF_PAX_SEGMEXEC;
42534+#endif
42535+
42536+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42537+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42538+ if ((__supported_pte_mask & _PAGE_NX))
42539+ pax_flags &= ~MF_PAX_SEGMEXEC;
42540+ else
42541+ pax_flags &= ~MF_PAX_PAGEEXEC;
42542+ }
42543+#endif
42544+
42545+#ifdef CONFIG_PAX_EMUTRAMP
42546+ if (elf_phdata->p_flags & PF_EMUTRAMP)
42547+ pax_flags |= MF_PAX_EMUTRAMP;
42548+#endif
42549+
42550+#ifdef CONFIG_PAX_MPROTECT
42551+ if (elf_phdata->p_flags & PF_MPROTECT)
42552+ pax_flags |= MF_PAX_MPROTECT;
42553+#endif
42554+
42555+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42556+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
42557+ pax_flags |= MF_PAX_RANDMMAP;
42558+#endif
42559+
42560+#endif
42561+
42562+ return pax_flags;
42563+}
42564+
42565+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
42566+{
42567+ unsigned long pax_flags = 0UL;
42568+
42569+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42570+
42571+#ifdef CONFIG_PAX_PAGEEXEC
42572+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
42573+ pax_flags |= MF_PAX_PAGEEXEC;
42574+#endif
42575+
42576+#ifdef CONFIG_PAX_SEGMEXEC
42577+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
42578+ pax_flags |= MF_PAX_SEGMEXEC;
42579+#endif
42580+
42581+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42582+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42583+ if ((__supported_pte_mask & _PAGE_NX))
42584+ pax_flags &= ~MF_PAX_SEGMEXEC;
42585+ else
42586+ pax_flags &= ~MF_PAX_PAGEEXEC;
42587+ }
42588+#endif
42589+
42590+#ifdef CONFIG_PAX_EMUTRAMP
42591+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
42592+ pax_flags |= MF_PAX_EMUTRAMP;
42593+#endif
42594+
42595+#ifdef CONFIG_PAX_MPROTECT
42596+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
42597+ pax_flags |= MF_PAX_MPROTECT;
42598+#endif
42599+
42600+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42601+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
42602+ pax_flags |= MF_PAX_RANDMMAP;
42603+#endif
42604+
42605+#endif
42606+
42607+ return pax_flags;
42608+}
42609+
42610+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
42611+{
42612+ unsigned long pax_flags = 0UL;
42613+
42614+#ifdef CONFIG_PAX_EI_PAX
42615+
42616+#ifdef CONFIG_PAX_PAGEEXEC
42617+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
42618+ pax_flags |= MF_PAX_PAGEEXEC;
42619+#endif
42620+
42621+#ifdef CONFIG_PAX_SEGMEXEC
42622+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
42623+ pax_flags |= MF_PAX_SEGMEXEC;
42624+#endif
42625+
42626+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42627+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42628+ if ((__supported_pte_mask & _PAGE_NX))
42629+ pax_flags &= ~MF_PAX_SEGMEXEC;
42630+ else
42631+ pax_flags &= ~MF_PAX_PAGEEXEC;
42632+ }
42633+#endif
42634+
42635+#ifdef CONFIG_PAX_EMUTRAMP
42636+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
42637+ pax_flags |= MF_PAX_EMUTRAMP;
42638+#endif
42639+
42640+#ifdef CONFIG_PAX_MPROTECT
42641+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
42642+ pax_flags |= MF_PAX_MPROTECT;
42643+#endif
42644+
42645+#ifdef CONFIG_PAX_ASLR
42646+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
42647+ pax_flags |= MF_PAX_RANDMMAP;
42648+#endif
42649+
42650+#else
42651+
42652+#ifdef CONFIG_PAX_PAGEEXEC
42653+ pax_flags |= MF_PAX_PAGEEXEC;
42654+#endif
42655+
42656+#ifdef CONFIG_PAX_MPROTECT
42657+ pax_flags |= MF_PAX_MPROTECT;
42658+#endif
42659+
42660+#ifdef CONFIG_PAX_RANDMMAP
42661+ pax_flags |= MF_PAX_RANDMMAP;
42662+#endif
42663+
42664+#ifdef CONFIG_PAX_SEGMEXEC
42665+ if (!(pax_flags & MF_PAX_PAGEEXEC) || !(__supported_pte_mask & _PAGE_NX)) {
42666+ pax_flags &= ~MF_PAX_PAGEEXEC;
42667+ pax_flags |= MF_PAX_SEGMEXEC;
42668+ }
42669+#endif
42670+
42671+#endif
42672+
42673+ return pax_flags;
42674+}
42675+
42676+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
42677+{
42678+
42679+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42680+ unsigned long i;
42681+
42682+ for (i = 0UL; i < elf_ex->e_phnum; i++)
42683+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
42684+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
42685+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
42686+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
42687+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
42688+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
42689+ return ~0UL;
42690+
42691+#ifdef CONFIG_PAX_SOFTMODE
42692+ if (pax_softmode)
42693+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
42694+ else
42695+#endif
42696+
42697+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
42698+ break;
42699+ }
42700+#endif
42701+
42702+ return ~0UL;
42703+}
42704+
42705+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
42706+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
42707+{
42708+ unsigned long pax_flags = 0UL;
42709+
42710+#ifdef CONFIG_PAX_PAGEEXEC
42711+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
42712+ pax_flags |= MF_PAX_PAGEEXEC;
42713+#endif
42714+
42715+#ifdef CONFIG_PAX_SEGMEXEC
42716+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
42717+ pax_flags |= MF_PAX_SEGMEXEC;
42718+#endif
42719+
42720+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42721+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42722+ if ((__supported_pte_mask & _PAGE_NX))
42723+ pax_flags &= ~MF_PAX_SEGMEXEC;
42724+ else
42725+ pax_flags &= ~MF_PAX_PAGEEXEC;
42726+ }
42727+#endif
42728+
42729+#ifdef CONFIG_PAX_EMUTRAMP
42730+ if (pax_flags_softmode & MF_PAX_EMUTRAMP)
42731+ pax_flags |= MF_PAX_EMUTRAMP;
42732+#endif
42733+
42734+#ifdef CONFIG_PAX_MPROTECT
42735+ if (pax_flags_softmode & MF_PAX_MPROTECT)
42736+ pax_flags |= MF_PAX_MPROTECT;
42737+#endif
42738+
42739+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42740+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
42741+ pax_flags |= MF_PAX_RANDMMAP;
42742+#endif
42743+
42744+ return pax_flags;
42745+}
42746+
42747+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
42748+{
42749+ unsigned long pax_flags = 0UL;
42750+
42751+#ifdef CONFIG_PAX_PAGEEXEC
42752+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
42753+ pax_flags |= MF_PAX_PAGEEXEC;
42754+#endif
42755+
42756+#ifdef CONFIG_PAX_SEGMEXEC
42757+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
42758+ pax_flags |= MF_PAX_SEGMEXEC;
42759+#endif
42760+
42761+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42762+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42763+ if ((__supported_pte_mask & _PAGE_NX))
42764+ pax_flags &= ~MF_PAX_SEGMEXEC;
42765+ else
42766+ pax_flags &= ~MF_PAX_PAGEEXEC;
42767+ }
42768+#endif
42769+
42770+#ifdef CONFIG_PAX_EMUTRAMP
42771+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
42772+ pax_flags |= MF_PAX_EMUTRAMP;
42773+#endif
42774+
42775+#ifdef CONFIG_PAX_MPROTECT
42776+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
42777+ pax_flags |= MF_PAX_MPROTECT;
42778+#endif
42779+
42780+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42781+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
42782+ pax_flags |= MF_PAX_RANDMMAP;
42783+#endif
42784+
42785+ return pax_flags;
42786+}
42787+#endif
42788+
42789+static unsigned long pax_parse_xattr_pax(struct file * const file)
42790+{
42791+
42792+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
42793+ ssize_t xattr_size, i;
42794+ unsigned char xattr_value[5];
42795+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
42796+
42797+ xattr_size = vfs_getxattr(file->f_path.dentry, XATTR_NAME_PAX_FLAGS, xattr_value, sizeof xattr_value);
42798+ if (xattr_size <= 0)
42799+ return ~0UL;
42800+
42801+ for (i = 0; i < xattr_size; i++)
42802+ switch (xattr_value[i]) {
42803+ default:
42804+ return ~0UL;
42805+
42806+#define parse_flag(option1, option2, flag) \
42807+ case option1: \
42808+ pax_flags_hardmode |= MF_PAX_##flag; \
42809+ break; \
42810+ case option2: \
42811+ pax_flags_softmode |= MF_PAX_##flag; \
42812+ break;
42813+
42814+ parse_flag('p', 'P', PAGEEXEC);
42815+ parse_flag('e', 'E', EMUTRAMP);
42816+ parse_flag('m', 'M', MPROTECT);
42817+ parse_flag('r', 'R', RANDMMAP);
42818+ parse_flag('s', 'S', SEGMEXEC);
42819+
42820+#undef parse_flag
42821+ }
42822+
42823+ if (pax_flags_hardmode & pax_flags_softmode)
42824+ return ~0UL;
42825+
42826+#ifdef CONFIG_PAX_SOFTMODE
42827+ if (pax_softmode)
42828+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
42829+ else
42830+#endif
42831+
42832+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
42833+#else
42834+ return ~0UL;
42835+#endif
42836+
42837+}
42838+
42839+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
42840+{
42841+ unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
42842+
42843+ pax_flags = pax_parse_ei_pax(elf_ex);
42844+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
42845+ xattr_pax_flags = pax_parse_xattr_pax(file);
42846+
42847+ if (pt_pax_flags == ~0UL)
42848+ pt_pax_flags = xattr_pax_flags;
42849+ else if (xattr_pax_flags == ~0UL)
42850+ xattr_pax_flags = pt_pax_flags;
42851+ if (pt_pax_flags != xattr_pax_flags)
42852+ return -EINVAL;
42853+ if (pt_pax_flags != ~0UL)
42854+ pax_flags = pt_pax_flags;
42855+
42856+ if (0 > pax_check_flags(&pax_flags))
42857+ return -EINVAL;
42858+
42859+ current->mm->pax_flags = pax_flags;
42860+ return 0;
42861+}
42862+#endif
42863+
42864 /*
42865 * These are the functions used to load ELF style executables and shared
42866 * libraries. There is no binary dependent code anywhere else.
42867@@ -544,6 +913,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
42868 {
42869 unsigned int random_variable = 0;
42870
42871+#ifdef CONFIG_PAX_RANDUSTACK
42872+ if (randomize_va_space)
42873+ return stack_top - current->mm->delta_stack;
42874+#endif
42875+
42876 if ((current->flags & PF_RANDOMIZE) &&
42877 !(current->personality & ADDR_NO_RANDOMIZE)) {
42878 random_variable = get_random_int() & STACK_RND_MASK;
42879@@ -562,7 +936,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42880 unsigned long load_addr = 0, load_bias = 0;
42881 int load_addr_set = 0;
42882 char * elf_interpreter = NULL;
42883- unsigned long error;
42884+ unsigned long error = 0;
42885 struct elf_phdr *elf_ppnt, *elf_phdata;
42886 unsigned long elf_bss, elf_brk;
42887 int retval, i;
42888@@ -572,11 +946,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42889 unsigned long start_code, end_code, start_data, end_data;
42890 unsigned long reloc_func_desc __maybe_unused = 0;
42891 int executable_stack = EXSTACK_DEFAULT;
42892- unsigned long def_flags = 0;
42893 struct {
42894 struct elfhdr elf_ex;
42895 struct elfhdr interp_elf_ex;
42896 } *loc;
42897+ unsigned long pax_task_size = TASK_SIZE;
42898
42899 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
42900 if (!loc) {
42901@@ -713,11 +1087,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42902
42903 /* OK, This is the point of no return */
42904 current->flags &= ~PF_FORKNOEXEC;
42905- current->mm->def_flags = def_flags;
42906+
42907+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42908+ current->mm->pax_flags = 0UL;
42909+#endif
42910+
42911+#ifdef CONFIG_PAX_DLRESOLVE
42912+ current->mm->call_dl_resolve = 0UL;
42913+#endif
42914+
42915+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
42916+ current->mm->call_syscall = 0UL;
42917+#endif
42918+
42919+#ifdef CONFIG_PAX_ASLR
42920+ current->mm->delta_mmap = 0UL;
42921+ current->mm->delta_stack = 0UL;
42922+#endif
42923+
42924+ current->mm->def_flags = 0;
42925+
42926+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
42927+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
42928+ send_sig(SIGKILL, current, 0);
42929+ goto out_free_dentry;
42930+ }
42931+#endif
42932+
42933+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
42934+ pax_set_initial_flags(bprm);
42935+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
42936+ if (pax_set_initial_flags_func)
42937+ (pax_set_initial_flags_func)(bprm);
42938+#endif
42939+
42940+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
42941+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
42942+ current->mm->context.user_cs_limit = PAGE_SIZE;
42943+ current->mm->def_flags |= VM_PAGEEXEC;
42944+ }
42945+#endif
42946+
42947+#ifdef CONFIG_PAX_SEGMEXEC
42948+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
42949+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
42950+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
42951+ pax_task_size = SEGMEXEC_TASK_SIZE;
42952+ current->mm->def_flags |= VM_NOHUGEPAGE;
42953+ }
42954+#endif
42955+
42956+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
42957+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42958+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
42959+ put_cpu();
42960+ }
42961+#endif
42962
42963 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
42964 may depend on the personality. */
42965 SET_PERSONALITY(loc->elf_ex);
42966+
42967+#ifdef CONFIG_PAX_ASLR
42968+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
42969+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
42970+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
42971+ }
42972+#endif
42973+
42974+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
42975+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42976+ executable_stack = EXSTACK_DISABLE_X;
42977+ current->personality &= ~READ_IMPLIES_EXEC;
42978+ } else
42979+#endif
42980+
42981 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
42982 current->personality |= READ_IMPLIES_EXEC;
42983
42984@@ -808,6 +1252,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42985 #else
42986 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
42987 #endif
42988+
42989+#ifdef CONFIG_PAX_RANDMMAP
42990+ /* PaX: randomize base address at the default exe base if requested */
42991+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
42992+#ifdef CONFIG_SPARC64
42993+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
42994+#else
42995+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
42996+#endif
42997+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
42998+ elf_flags |= MAP_FIXED;
42999+ }
43000+#endif
43001+
43002 }
43003
43004 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
43005@@ -840,9 +1298,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
43006 * allowed task size. Note that p_filesz must always be
43007 * <= p_memsz so it is only necessary to check p_memsz.
43008 */
43009- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
43010- elf_ppnt->p_memsz > TASK_SIZE ||
43011- TASK_SIZE - elf_ppnt->p_memsz < k) {
43012+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
43013+ elf_ppnt->p_memsz > pax_task_size ||
43014+ pax_task_size - elf_ppnt->p_memsz < k) {
43015 /* set_brk can never work. Avoid overflows. */
43016 send_sig(SIGKILL, current, 0);
43017 retval = -EINVAL;
43018@@ -881,11 +1339,40 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
43019 goto out_free_dentry;
43020 }
43021 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
43022- send_sig(SIGSEGV, current, 0);
43023- retval = -EFAULT; /* Nobody gets to see this, but.. */
43024- goto out_free_dentry;
43025+ /*
43026+ * This bss-zeroing can fail if the ELF
43027+ * file specifies odd protections. So
43028+ * we don't check the return value
43029+ */
43030 }
43031
43032+#ifdef CONFIG_PAX_RANDMMAP
43033+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
43034+ unsigned long start, size;
43035+
43036+ start = ELF_PAGEALIGN(elf_brk);
43037+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
43038+ down_write(&current->mm->mmap_sem);
43039+ retval = -ENOMEM;
43040+ if (!find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
43041+ unsigned long prot = PROT_NONE;
43042+
43043+ current->mm->brk_gap = PAGE_ALIGN(size) >> PAGE_SHIFT;
43044+// if (current->personality & ADDR_NO_RANDOMIZE)
43045+// prot = PROT_READ;
43046+ start = do_mmap(NULL, start, size, prot, MAP_ANONYMOUS | MAP_FIXED | MAP_PRIVATE, 0);
43047+ retval = IS_ERR_VALUE(start) ? start : 0;
43048+ }
43049+ up_write(&current->mm->mmap_sem);
43050+ if (retval == 0)
43051+ retval = set_brk(start + size, start + size + PAGE_SIZE);
43052+ if (retval < 0) {
43053+ send_sig(SIGKILL, current, 0);
43054+ goto out_free_dentry;
43055+ }
43056+ }
43057+#endif
43058+
43059 if (elf_interpreter) {
43060 unsigned long uninitialized_var(interp_map_addr);
43061
43062@@ -1098,7 +1585,7 @@ out:
43063 * Decide what to dump of a segment, part, all or none.
43064 */
43065 static unsigned long vma_dump_size(struct vm_area_struct *vma,
43066- unsigned long mm_flags)
43067+ unsigned long mm_flags, long signr)
43068 {
43069 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
43070
43071@@ -1132,7 +1619,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
43072 if (vma->vm_file == NULL)
43073 return 0;
43074
43075- if (FILTER(MAPPED_PRIVATE))
43076+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
43077 goto whole;
43078
43079 /*
43080@@ -1354,9 +1841,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
43081 {
43082 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
43083 int i = 0;
43084- do
43085+ do {
43086 i += 2;
43087- while (auxv[i - 2] != AT_NULL);
43088+ } while (auxv[i - 2] != AT_NULL);
43089 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
43090 }
43091
43092@@ -1862,14 +2349,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
43093 }
43094
43095 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
43096- unsigned long mm_flags)
43097+ struct coredump_params *cprm)
43098 {
43099 struct vm_area_struct *vma;
43100 size_t size = 0;
43101
43102 for (vma = first_vma(current, gate_vma); vma != NULL;
43103 vma = next_vma(vma, gate_vma))
43104- size += vma_dump_size(vma, mm_flags);
43105+ size += vma_dump_size(vma, cprm->mm_flags, cprm->signr);
43106 return size;
43107 }
43108
43109@@ -1963,7 +2450,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43110
43111 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
43112
43113- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
43114+ offset += elf_core_vma_data_size(gate_vma, cprm);
43115 offset += elf_core_extra_data_size();
43116 e_shoff = offset;
43117
43118@@ -1977,10 +2464,12 @@ static int elf_core_dump(struct coredump_params *cprm)
43119 offset = dataoff;
43120
43121 size += sizeof(*elf);
43122+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
43123 if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
43124 goto end_coredump;
43125
43126 size += sizeof(*phdr4note);
43127+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
43128 if (size > cprm->limit
43129 || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
43130 goto end_coredump;
43131@@ -1994,7 +2483,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43132 phdr.p_offset = offset;
43133 phdr.p_vaddr = vma->vm_start;
43134 phdr.p_paddr = 0;
43135- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
43136+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->signr);
43137 phdr.p_memsz = vma->vm_end - vma->vm_start;
43138 offset += phdr.p_filesz;
43139 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
43140@@ -2005,6 +2494,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43141 phdr.p_align = ELF_EXEC_PAGESIZE;
43142
43143 size += sizeof(phdr);
43144+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
43145 if (size > cprm->limit
43146 || !dump_write(cprm->file, &phdr, sizeof(phdr)))
43147 goto end_coredump;
43148@@ -2029,7 +2519,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43149 unsigned long addr;
43150 unsigned long end;
43151
43152- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
43153+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->signr);
43154
43155 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
43156 struct page *page;
43157@@ -2038,6 +2528,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43158 page = get_dump_page(addr);
43159 if (page) {
43160 void *kaddr = kmap(page);
43161+ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
43162 stop = ((size += PAGE_SIZE) > cprm->limit) ||
43163 !dump_write(cprm->file, kaddr,
43164 PAGE_SIZE);
43165@@ -2055,6 +2546,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43166
43167 if (e_phnum == PN_XNUM) {
43168 size += sizeof(*shdr4extnum);
43169+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
43170 if (size > cprm->limit
43171 || !dump_write(cprm->file, shdr4extnum,
43172 sizeof(*shdr4extnum)))
43173@@ -2075,6 +2567,97 @@ out:
43174
43175 #endif /* CONFIG_ELF_CORE */
43176
43177+#ifdef CONFIG_PAX_MPROTECT
43178+/* PaX: non-PIC ELF libraries need relocations on their executable segments
43179+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
43180+ * we'll remove VM_MAYWRITE for good on RELRO segments.
43181+ *
43182+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
43183+ * basis because we want to allow the common case and not the special ones.
43184+ */
43185+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
43186+{
43187+ struct elfhdr elf_h;
43188+ struct elf_phdr elf_p;
43189+ unsigned long i;
43190+ unsigned long oldflags;
43191+ bool is_textrel_rw, is_textrel_rx, is_relro;
43192+
43193+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT))
43194+ return;
43195+
43196+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
43197+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
43198+
43199+#ifdef CONFIG_PAX_ELFRELOCS
43200+ /* possible TEXTREL */
43201+ is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
43202+ 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);
43203+#else
43204+ is_textrel_rw = false;
43205+ is_textrel_rx = false;
43206+#endif
43207+
43208+ /* possible RELRO */
43209+ is_relro = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
43210+
43211+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
43212+ return;
43213+
43214+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
43215+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
43216+
43217+#ifdef CONFIG_PAX_ETEXECRELOCS
43218+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
43219+#else
43220+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
43221+#endif
43222+
43223+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
43224+ !elf_check_arch(&elf_h) ||
43225+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
43226+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
43227+ return;
43228+
43229+ for (i = 0UL; i < elf_h.e_phnum; i++) {
43230+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
43231+ return;
43232+ switch (elf_p.p_type) {
43233+ case PT_DYNAMIC:
43234+ if (!is_textrel_rw && !is_textrel_rx)
43235+ continue;
43236+ i = 0UL;
43237+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
43238+ elf_dyn dyn;
43239+
43240+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
43241+ return;
43242+ if (dyn.d_tag == DT_NULL)
43243+ return;
43244+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
43245+ gr_log_textrel(vma);
43246+ if (is_textrel_rw)
43247+ vma->vm_flags |= VM_MAYWRITE;
43248+ else
43249+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
43250+ vma->vm_flags &= ~VM_MAYWRITE;
43251+ return;
43252+ }
43253+ i++;
43254+ }
43255+ return;
43256+
43257+ case PT_GNU_RELRO:
43258+ if (!is_relro)
43259+ continue;
43260+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
43261+ vma->vm_flags &= ~VM_MAYWRITE;
43262+ return;
43263+ }
43264+ }
43265+}
43266+#endif
43267+
43268 static int __init init_elf_binfmt(void)
43269 {
43270 return register_binfmt(&elf_format);
43271diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
43272index 1bffbe0..c8c283e 100644
43273--- a/fs/binfmt_flat.c
43274+++ b/fs/binfmt_flat.c
43275@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_binprm * bprm,
43276 realdatastart = (unsigned long) -ENOMEM;
43277 printk("Unable to allocate RAM for process data, errno %d\n",
43278 (int)-realdatastart);
43279+ down_write(&current->mm->mmap_sem);
43280 do_munmap(current->mm, textpos, text_len);
43281+ up_write(&current->mm->mmap_sem);
43282 ret = realdatastart;
43283 goto err;
43284 }
43285@@ -591,8 +593,10 @@ static int load_flat_file(struct linux_binprm * bprm,
43286 }
43287 if (IS_ERR_VALUE(result)) {
43288 printk("Unable to read data+bss, errno %d\n", (int)-result);
43289+ down_write(&current->mm->mmap_sem);
43290 do_munmap(current->mm, textpos, text_len);
43291 do_munmap(current->mm, realdatastart, len);
43292+ up_write(&current->mm->mmap_sem);
43293 ret = result;
43294 goto err;
43295 }
43296@@ -661,8 +665,10 @@ static int load_flat_file(struct linux_binprm * bprm,
43297 }
43298 if (IS_ERR_VALUE(result)) {
43299 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
43300+ down_write(&current->mm->mmap_sem);
43301 do_munmap(current->mm, textpos, text_len + data_len + extra +
43302 MAX_SHARED_LIBS * sizeof(unsigned long));
43303+ up_write(&current->mm->mmap_sem);
43304 ret = result;
43305 goto err;
43306 }
43307diff --git a/fs/bio.c b/fs/bio.c
43308index b980ecd..74800bf 100644
43309--- a/fs/bio.c
43310+++ b/fs/bio.c
43311@@ -833,7 +833,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
43312 /*
43313 * Overflow, abort
43314 */
43315- if (end < start)
43316+ if (end < start || end - start > INT_MAX - nr_pages)
43317 return ERR_PTR(-EINVAL);
43318
43319 nr_pages += end - start;
43320@@ -1229,7 +1229,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
43321 const int read = bio_data_dir(bio) == READ;
43322 struct bio_map_data *bmd = bio->bi_private;
43323 int i;
43324- char *p = bmd->sgvecs[0].iov_base;
43325+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
43326
43327 __bio_for_each_segment(bvec, bio, i, 0) {
43328 char *addr = page_address(bvec->bv_page);
43329diff --git a/fs/block_dev.c b/fs/block_dev.c
43330index 5e9f198..6bf9b1c 100644
43331--- a/fs/block_dev.c
43332+++ b/fs/block_dev.c
43333@@ -703,7 +703,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
43334 else if (bdev->bd_contains == bdev)
43335 return true; /* is a whole device which isn't held */
43336
43337- else if (whole->bd_holder == bd_may_claim)
43338+ else if (whole->bd_holder == (void *)bd_may_claim)
43339 return true; /* is a partition of a device that is being partitioned */
43340 else if (whole->bd_holder != NULL)
43341 return false; /* is a partition of a held device */
43342diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
43343index d986824..af1befd 100644
43344--- a/fs/btrfs/check-integrity.c
43345+++ b/fs/btrfs/check-integrity.c
43346@@ -157,7 +157,7 @@ struct btrfsic_block {
43347 union {
43348 bio_end_io_t *bio;
43349 bh_end_io_t *bh;
43350- } orig_bio_bh_end_io;
43351+ } __no_const orig_bio_bh_end_io;
43352 int submit_bio_bh_rw;
43353 u64 flush_gen; /* only valid if !never_written */
43354 };
43355diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
43356index 0639a55..7d9e07f 100644
43357--- a/fs/btrfs/ctree.c
43358+++ b/fs/btrfs/ctree.c
43359@@ -488,9 +488,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
43360 free_extent_buffer(buf);
43361 add_root_to_dirty_list(root);
43362 } else {
43363- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
43364- parent_start = parent->start;
43365- else
43366+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
43367+ if (parent)
43368+ parent_start = parent->start;
43369+ else
43370+ parent_start = 0;
43371+ } else
43372 parent_start = 0;
43373
43374 WARN_ON(trans->transid != btrfs_header_generation(parent));
43375diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
43376index 892b347..b3db246 100644
43377--- a/fs/btrfs/inode.c
43378+++ b/fs/btrfs/inode.c
43379@@ -6930,7 +6930,7 @@ fail:
43380 return -ENOMEM;
43381 }
43382
43383-static int btrfs_getattr(struct vfsmount *mnt,
43384+int btrfs_getattr(struct vfsmount *mnt,
43385 struct dentry *dentry, struct kstat *stat)
43386 {
43387 struct inode *inode = dentry->d_inode;
43388@@ -6944,6 +6944,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
43389 return 0;
43390 }
43391
43392+EXPORT_SYMBOL(btrfs_getattr);
43393+
43394+dev_t get_btrfs_dev_from_inode(struct inode *inode)
43395+{
43396+ return BTRFS_I(inode)->root->anon_dev;
43397+}
43398+EXPORT_SYMBOL(get_btrfs_dev_from_inode);
43399+
43400 /*
43401 * If a file is moved, it will inherit the cow and compression flags of the new
43402 * directory.
43403diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
43404index 1b36f19..5ac7360 100644
43405--- a/fs/btrfs/ioctl.c
43406+++ b/fs/btrfs/ioctl.c
43407@@ -2783,9 +2783,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
43408 for (i = 0; i < num_types; i++) {
43409 struct btrfs_space_info *tmp;
43410
43411+ /* Don't copy in more than we allocated */
43412 if (!slot_count)
43413 break;
43414
43415+ slot_count--;
43416+
43417 info = NULL;
43418 rcu_read_lock();
43419 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
43420@@ -2807,15 +2810,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
43421 memcpy(dest, &space, sizeof(space));
43422 dest++;
43423 space_args.total_spaces++;
43424- slot_count--;
43425 }
43426- if (!slot_count)
43427- break;
43428 }
43429 up_read(&info->groups_sem);
43430 }
43431
43432- user_dest = (struct btrfs_ioctl_space_info *)
43433+ user_dest = (struct btrfs_ioctl_space_info __user *)
43434 (arg + sizeof(struct btrfs_ioctl_space_args));
43435
43436 if (copy_to_user(user_dest, dest_orig, alloc_size))
43437diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
43438index 8c1aae2..1e46446 100644
43439--- a/fs/btrfs/relocation.c
43440+++ b/fs/btrfs/relocation.c
43441@@ -1244,7 +1244,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
43442 }
43443 spin_unlock(&rc->reloc_root_tree.lock);
43444
43445- BUG_ON((struct btrfs_root *)node->data != root);
43446+ BUG_ON(!node || (struct btrfs_root *)node->data != root);
43447
43448 if (!del) {
43449 spin_lock(&rc->reloc_root_tree.lock);
43450diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
43451index 622f469..e8d2d55 100644
43452--- a/fs/cachefiles/bind.c
43453+++ b/fs/cachefiles/bind.c
43454@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
43455 args);
43456
43457 /* start by checking things over */
43458- ASSERT(cache->fstop_percent >= 0 &&
43459- cache->fstop_percent < cache->fcull_percent &&
43460+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
43461 cache->fcull_percent < cache->frun_percent &&
43462 cache->frun_percent < 100);
43463
43464- ASSERT(cache->bstop_percent >= 0 &&
43465- cache->bstop_percent < cache->bcull_percent &&
43466+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
43467 cache->bcull_percent < cache->brun_percent &&
43468 cache->brun_percent < 100);
43469
43470diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
43471index 0a1467b..6a53245 100644
43472--- a/fs/cachefiles/daemon.c
43473+++ b/fs/cachefiles/daemon.c
43474@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
43475 if (n > buflen)
43476 return -EMSGSIZE;
43477
43478- if (copy_to_user(_buffer, buffer, n) != 0)
43479+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
43480 return -EFAULT;
43481
43482 return n;
43483@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
43484 if (test_bit(CACHEFILES_DEAD, &cache->flags))
43485 return -EIO;
43486
43487- if (datalen < 0 || datalen > PAGE_SIZE - 1)
43488+ if (datalen > PAGE_SIZE - 1)
43489 return -EOPNOTSUPP;
43490
43491 /* drag the command string into the kernel so we can parse it */
43492@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
43493 if (args[0] != '%' || args[1] != '\0')
43494 return -EINVAL;
43495
43496- if (fstop < 0 || fstop >= cache->fcull_percent)
43497+ if (fstop >= cache->fcull_percent)
43498 return cachefiles_daemon_range_error(cache, args);
43499
43500 cache->fstop_percent = fstop;
43501@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
43502 if (args[0] != '%' || args[1] != '\0')
43503 return -EINVAL;
43504
43505- if (bstop < 0 || bstop >= cache->bcull_percent)
43506+ if (bstop >= cache->bcull_percent)
43507 return cachefiles_daemon_range_error(cache, args);
43508
43509 cache->bstop_percent = bstop;
43510diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
43511index bd6bc1b..b627b53 100644
43512--- a/fs/cachefiles/internal.h
43513+++ b/fs/cachefiles/internal.h
43514@@ -57,7 +57,7 @@ struct cachefiles_cache {
43515 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
43516 struct rb_root active_nodes; /* active nodes (can't be culled) */
43517 rwlock_t active_lock; /* lock for active_nodes */
43518- atomic_t gravecounter; /* graveyard uniquifier */
43519+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
43520 unsigned frun_percent; /* when to stop culling (% files) */
43521 unsigned fcull_percent; /* when to start culling (% files) */
43522 unsigned fstop_percent; /* when to stop allocating (% files) */
43523@@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
43524 * proc.c
43525 */
43526 #ifdef CONFIG_CACHEFILES_HISTOGRAM
43527-extern atomic_t cachefiles_lookup_histogram[HZ];
43528-extern atomic_t cachefiles_mkdir_histogram[HZ];
43529-extern atomic_t cachefiles_create_histogram[HZ];
43530+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43531+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43532+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
43533
43534 extern int __init cachefiles_proc_init(void);
43535 extern void cachefiles_proc_cleanup(void);
43536 static inline
43537-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
43538+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
43539 {
43540 unsigned long jif = jiffies - start_jif;
43541 if (jif >= HZ)
43542 jif = HZ - 1;
43543- atomic_inc(&histogram[jif]);
43544+ atomic_inc_unchecked(&histogram[jif]);
43545 }
43546
43547 #else
43548diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
43549index a0358c2..d6137f2 100644
43550--- a/fs/cachefiles/namei.c
43551+++ b/fs/cachefiles/namei.c
43552@@ -318,7 +318,7 @@ try_again:
43553 /* first step is to make up a grave dentry in the graveyard */
43554 sprintf(nbuffer, "%08x%08x",
43555 (uint32_t) get_seconds(),
43556- (uint32_t) atomic_inc_return(&cache->gravecounter));
43557+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
43558
43559 /* do the multiway lock magic */
43560 trap = lock_rename(cache->graveyard, dir);
43561diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
43562index eccd339..4c1d995 100644
43563--- a/fs/cachefiles/proc.c
43564+++ b/fs/cachefiles/proc.c
43565@@ -14,9 +14,9 @@
43566 #include <linux/seq_file.h>
43567 #include "internal.h"
43568
43569-atomic_t cachefiles_lookup_histogram[HZ];
43570-atomic_t cachefiles_mkdir_histogram[HZ];
43571-atomic_t cachefiles_create_histogram[HZ];
43572+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43573+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43574+atomic_unchecked_t cachefiles_create_histogram[HZ];
43575
43576 /*
43577 * display the latency histogram
43578@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
43579 return 0;
43580 default:
43581 index = (unsigned long) v - 3;
43582- x = atomic_read(&cachefiles_lookup_histogram[index]);
43583- y = atomic_read(&cachefiles_mkdir_histogram[index]);
43584- z = atomic_read(&cachefiles_create_histogram[index]);
43585+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
43586+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
43587+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
43588 if (x == 0 && y == 0 && z == 0)
43589 return 0;
43590
43591diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
43592index 0e3c092..818480e 100644
43593--- a/fs/cachefiles/rdwr.c
43594+++ b/fs/cachefiles/rdwr.c
43595@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
43596 old_fs = get_fs();
43597 set_fs(KERNEL_DS);
43598 ret = file->f_op->write(
43599- file, (const void __user *) data, len, &pos);
43600+ file, (const void __force_user *) data, len, &pos);
43601 set_fs(old_fs);
43602 kunmap(page);
43603 if (ret != len)
43604diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
43605index 3e8094b..cb3ff3d 100644
43606--- a/fs/ceph/dir.c
43607+++ b/fs/ceph/dir.c
43608@@ -244,7 +244,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
43609 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
43610 struct ceph_mds_client *mdsc = fsc->mdsc;
43611 unsigned frag = fpos_frag(filp->f_pos);
43612- int off = fpos_off(filp->f_pos);
43613+ unsigned int off = fpos_off(filp->f_pos);
43614 int err;
43615 u32 ftype;
43616 struct ceph_mds_reply_info_parsed *rinfo;
43617@@ -598,7 +598,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
43618 if (nd &&
43619 (nd->flags & LOOKUP_OPEN) &&
43620 !(nd->intent.open.flags & O_CREAT)) {
43621- int mode = nd->intent.open.create_mode & ~current->fs->umask;
43622+ int mode = nd->intent.open.create_mode & ~current_umask();
43623 return ceph_lookup_open(dir, dentry, nd, mode, 1);
43624 }
43625
43626diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c
43627index cfd1ce3..6b13a74 100644
43628--- a/fs/cifs/asn1.c
43629+++ b/fs/cifs/asn1.c
43630@@ -416,6 +416,9 @@ asn1_subid_decode(struct asn1_ctx *ctx, unsigned long *subid)
43631
43632 static int
43633 asn1_oid_decode(struct asn1_ctx *ctx,
43634+ unsigned char *eoc, unsigned long **oid, unsigned int *len) __size_overflow(2);
43635+static int
43636+asn1_oid_decode(struct asn1_ctx *ctx,
43637 unsigned char *eoc, unsigned long **oid, unsigned int *len)
43638 {
43639 unsigned long subid;
43640diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
43641index 24b3dfc..3cd5454 100644
43642--- a/fs/cifs/cifs_debug.c
43643+++ b/fs/cifs/cifs_debug.c
43644@@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
43645
43646 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
43647 #ifdef CONFIG_CIFS_STATS2
43648- atomic_set(&totBufAllocCount, 0);
43649- atomic_set(&totSmBufAllocCount, 0);
43650+ atomic_set_unchecked(&totBufAllocCount, 0);
43651+ atomic_set_unchecked(&totSmBufAllocCount, 0);
43652 #endif /* CONFIG_CIFS_STATS2 */
43653 spin_lock(&cifs_tcp_ses_lock);
43654 list_for_each(tmp1, &cifs_tcp_ses_list) {
43655@@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(struct file *file,
43656 tcon = list_entry(tmp3,
43657 struct cifs_tcon,
43658 tcon_list);
43659- atomic_set(&tcon->num_smbs_sent, 0);
43660- atomic_set(&tcon->num_writes, 0);
43661- atomic_set(&tcon->num_reads, 0);
43662- atomic_set(&tcon->num_oplock_brks, 0);
43663- atomic_set(&tcon->num_opens, 0);
43664- atomic_set(&tcon->num_posixopens, 0);
43665- atomic_set(&tcon->num_posixmkdirs, 0);
43666- atomic_set(&tcon->num_closes, 0);
43667- atomic_set(&tcon->num_deletes, 0);
43668- atomic_set(&tcon->num_mkdirs, 0);
43669- atomic_set(&tcon->num_rmdirs, 0);
43670- atomic_set(&tcon->num_renames, 0);
43671- atomic_set(&tcon->num_t2renames, 0);
43672- atomic_set(&tcon->num_ffirst, 0);
43673- atomic_set(&tcon->num_fnext, 0);
43674- atomic_set(&tcon->num_fclose, 0);
43675- atomic_set(&tcon->num_hardlinks, 0);
43676- atomic_set(&tcon->num_symlinks, 0);
43677- atomic_set(&tcon->num_locks, 0);
43678+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
43679+ atomic_set_unchecked(&tcon->num_writes, 0);
43680+ atomic_set_unchecked(&tcon->num_reads, 0);
43681+ atomic_set_unchecked(&tcon->num_oplock_brks, 0);
43682+ atomic_set_unchecked(&tcon->num_opens, 0);
43683+ atomic_set_unchecked(&tcon->num_posixopens, 0);
43684+ atomic_set_unchecked(&tcon->num_posixmkdirs, 0);
43685+ atomic_set_unchecked(&tcon->num_closes, 0);
43686+ atomic_set_unchecked(&tcon->num_deletes, 0);
43687+ atomic_set_unchecked(&tcon->num_mkdirs, 0);
43688+ atomic_set_unchecked(&tcon->num_rmdirs, 0);
43689+ atomic_set_unchecked(&tcon->num_renames, 0);
43690+ atomic_set_unchecked(&tcon->num_t2renames, 0);
43691+ atomic_set_unchecked(&tcon->num_ffirst, 0);
43692+ atomic_set_unchecked(&tcon->num_fnext, 0);
43693+ atomic_set_unchecked(&tcon->num_fclose, 0);
43694+ atomic_set_unchecked(&tcon->num_hardlinks, 0);
43695+ atomic_set_unchecked(&tcon->num_symlinks, 0);
43696+ atomic_set_unchecked(&tcon->num_locks, 0);
43697 }
43698 }
43699 }
43700@@ -327,8 +327,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
43701 smBufAllocCount.counter, cifs_min_small);
43702 #ifdef CONFIG_CIFS_STATS2
43703 seq_printf(m, "Total Large %d Small %d Allocations\n",
43704- atomic_read(&totBufAllocCount),
43705- atomic_read(&totSmBufAllocCount));
43706+ atomic_read_unchecked(&totBufAllocCount),
43707+ atomic_read_unchecked(&totSmBufAllocCount));
43708 #endif /* CONFIG_CIFS_STATS2 */
43709
43710 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
43711@@ -357,41 +357,41 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
43712 if (tcon->need_reconnect)
43713 seq_puts(m, "\tDISCONNECTED ");
43714 seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
43715- atomic_read(&tcon->num_smbs_sent),
43716- atomic_read(&tcon->num_oplock_brks));
43717+ atomic_read_unchecked(&tcon->num_smbs_sent),
43718+ atomic_read_unchecked(&tcon->num_oplock_brks));
43719 seq_printf(m, "\nReads: %d Bytes: %lld",
43720- atomic_read(&tcon->num_reads),
43721+ atomic_read_unchecked(&tcon->num_reads),
43722 (long long)(tcon->bytes_read));
43723 seq_printf(m, "\nWrites: %d Bytes: %lld",
43724- atomic_read(&tcon->num_writes),
43725+ atomic_read_unchecked(&tcon->num_writes),
43726 (long long)(tcon->bytes_written));
43727 seq_printf(m, "\nFlushes: %d",
43728- atomic_read(&tcon->num_flushes));
43729+ atomic_read_unchecked(&tcon->num_flushes));
43730 seq_printf(m, "\nLocks: %d HardLinks: %d "
43731 "Symlinks: %d",
43732- atomic_read(&tcon->num_locks),
43733- atomic_read(&tcon->num_hardlinks),
43734- atomic_read(&tcon->num_symlinks));
43735+ atomic_read_unchecked(&tcon->num_locks),
43736+ atomic_read_unchecked(&tcon->num_hardlinks),
43737+ atomic_read_unchecked(&tcon->num_symlinks));
43738 seq_printf(m, "\nOpens: %d Closes: %d "
43739 "Deletes: %d",
43740- atomic_read(&tcon->num_opens),
43741- atomic_read(&tcon->num_closes),
43742- atomic_read(&tcon->num_deletes));
43743+ atomic_read_unchecked(&tcon->num_opens),
43744+ atomic_read_unchecked(&tcon->num_closes),
43745+ atomic_read_unchecked(&tcon->num_deletes));
43746 seq_printf(m, "\nPosix Opens: %d "
43747 "Posix Mkdirs: %d",
43748- atomic_read(&tcon->num_posixopens),
43749- atomic_read(&tcon->num_posixmkdirs));
43750+ atomic_read_unchecked(&tcon->num_posixopens),
43751+ atomic_read_unchecked(&tcon->num_posixmkdirs));
43752 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
43753- atomic_read(&tcon->num_mkdirs),
43754- atomic_read(&tcon->num_rmdirs));
43755+ atomic_read_unchecked(&tcon->num_mkdirs),
43756+ atomic_read_unchecked(&tcon->num_rmdirs));
43757 seq_printf(m, "\nRenames: %d T2 Renames %d",
43758- atomic_read(&tcon->num_renames),
43759- atomic_read(&tcon->num_t2renames));
43760+ atomic_read_unchecked(&tcon->num_renames),
43761+ atomic_read_unchecked(&tcon->num_t2renames));
43762 seq_printf(m, "\nFindFirst: %d FNext %d "
43763 "FClose %d",
43764- atomic_read(&tcon->num_ffirst),
43765- atomic_read(&tcon->num_fnext),
43766- atomic_read(&tcon->num_fclose));
43767+ atomic_read_unchecked(&tcon->num_ffirst),
43768+ atomic_read_unchecked(&tcon->num_fnext),
43769+ atomic_read_unchecked(&tcon->num_fclose));
43770 }
43771 }
43772 }
43773diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
43774index 6ee1cb4..8443157 100644
43775--- a/fs/cifs/cifsfs.c
43776+++ b/fs/cifs/cifsfs.c
43777@@ -989,7 +989,7 @@ cifs_init_request_bufs(void)
43778 cifs_req_cachep = kmem_cache_create("cifs_request",
43779 CIFSMaxBufSize +
43780 MAX_CIFS_HDR_SIZE, 0,
43781- SLAB_HWCACHE_ALIGN, NULL);
43782+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
43783 if (cifs_req_cachep == NULL)
43784 return -ENOMEM;
43785
43786@@ -1016,7 +1016,7 @@ cifs_init_request_bufs(void)
43787 efficient to alloc 1 per page off the slab compared to 17K (5page)
43788 alloc of large cifs buffers even when page debugging is on */
43789 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
43790- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
43791+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
43792 NULL);
43793 if (cifs_sm_req_cachep == NULL) {
43794 mempool_destroy(cifs_req_poolp);
43795@@ -1101,8 +1101,8 @@ init_cifs(void)
43796 atomic_set(&bufAllocCount, 0);
43797 atomic_set(&smBufAllocCount, 0);
43798 #ifdef CONFIG_CIFS_STATS2
43799- atomic_set(&totBufAllocCount, 0);
43800- atomic_set(&totSmBufAllocCount, 0);
43801+ atomic_set_unchecked(&totBufAllocCount, 0);
43802+ atomic_set_unchecked(&totSmBufAllocCount, 0);
43803 #endif /* CONFIG_CIFS_STATS2 */
43804
43805 atomic_set(&midCount, 0);
43806diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
43807index d47d20a..77e8b33 100644
43808--- a/fs/cifs/cifsglob.h
43809+++ b/fs/cifs/cifsglob.h
43810@@ -388,28 +388,28 @@ struct cifs_tcon {
43811 __u16 Flags; /* optional support bits */
43812 enum statusEnum tidStatus;
43813 #ifdef CONFIG_CIFS_STATS
43814- atomic_t num_smbs_sent;
43815- atomic_t num_writes;
43816- atomic_t num_reads;
43817- atomic_t num_flushes;
43818- atomic_t num_oplock_brks;
43819- atomic_t num_opens;
43820- atomic_t num_closes;
43821- atomic_t num_deletes;
43822- atomic_t num_mkdirs;
43823- atomic_t num_posixopens;
43824- atomic_t num_posixmkdirs;
43825- atomic_t num_rmdirs;
43826- atomic_t num_renames;
43827- atomic_t num_t2renames;
43828- atomic_t num_ffirst;
43829- atomic_t num_fnext;
43830- atomic_t num_fclose;
43831- atomic_t num_hardlinks;
43832- atomic_t num_symlinks;
43833- atomic_t num_locks;
43834- atomic_t num_acl_get;
43835- atomic_t num_acl_set;
43836+ atomic_unchecked_t num_smbs_sent;
43837+ atomic_unchecked_t num_writes;
43838+ atomic_unchecked_t num_reads;
43839+ atomic_unchecked_t num_flushes;
43840+ atomic_unchecked_t num_oplock_brks;
43841+ atomic_unchecked_t num_opens;
43842+ atomic_unchecked_t num_closes;
43843+ atomic_unchecked_t num_deletes;
43844+ atomic_unchecked_t num_mkdirs;
43845+ atomic_unchecked_t num_posixopens;
43846+ atomic_unchecked_t num_posixmkdirs;
43847+ atomic_unchecked_t num_rmdirs;
43848+ atomic_unchecked_t num_renames;
43849+ atomic_unchecked_t num_t2renames;
43850+ atomic_unchecked_t num_ffirst;
43851+ atomic_unchecked_t num_fnext;
43852+ atomic_unchecked_t num_fclose;
43853+ atomic_unchecked_t num_hardlinks;
43854+ atomic_unchecked_t num_symlinks;
43855+ atomic_unchecked_t num_locks;
43856+ atomic_unchecked_t num_acl_get;
43857+ atomic_unchecked_t num_acl_set;
43858 #ifdef CONFIG_CIFS_STATS2
43859 unsigned long long time_writes;
43860 unsigned long long time_reads;
43861@@ -624,7 +624,7 @@ convert_delimiter(char *path, char delim)
43862 }
43863
43864 #ifdef CONFIG_CIFS_STATS
43865-#define cifs_stats_inc atomic_inc
43866+#define cifs_stats_inc atomic_inc_unchecked
43867
43868 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
43869 unsigned int bytes)
43870@@ -983,8 +983,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
43871 /* Various Debug counters */
43872 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
43873 #ifdef CONFIG_CIFS_STATS2
43874-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
43875-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
43876+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
43877+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
43878 #endif
43879 GLOBAL_EXTERN atomic_t smBufAllocCount;
43880 GLOBAL_EXTERN atomic_t midCount;
43881diff --git a/fs/cifs/link.c b/fs/cifs/link.c
43882index 6b0e064..94e6c3c 100644
43883--- a/fs/cifs/link.c
43884+++ b/fs/cifs/link.c
43885@@ -600,7 +600,7 @@ symlink_exit:
43886
43887 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
43888 {
43889- char *p = nd_get_link(nd);
43890+ const char *p = nd_get_link(nd);
43891 if (!IS_ERR(p))
43892 kfree(p);
43893 }
43894diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
43895index 703ef5c..2a44ed5 100644
43896--- a/fs/cifs/misc.c
43897+++ b/fs/cifs/misc.c
43898@@ -156,7 +156,7 @@ cifs_buf_get(void)
43899 memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
43900 atomic_inc(&bufAllocCount);
43901 #ifdef CONFIG_CIFS_STATS2
43902- atomic_inc(&totBufAllocCount);
43903+ atomic_inc_unchecked(&totBufAllocCount);
43904 #endif /* CONFIG_CIFS_STATS2 */
43905 }
43906
43907@@ -191,7 +191,7 @@ cifs_small_buf_get(void)
43908 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
43909 atomic_inc(&smBufAllocCount);
43910 #ifdef CONFIG_CIFS_STATS2
43911- atomic_inc(&totSmBufAllocCount);
43912+ atomic_inc_unchecked(&totSmBufAllocCount);
43913 #endif /* CONFIG_CIFS_STATS2 */
43914
43915 }
43916diff --git a/fs/coda/cache.c b/fs/coda/cache.c
43917index 6901578..d402eb5 100644
43918--- a/fs/coda/cache.c
43919+++ b/fs/coda/cache.c
43920@@ -24,7 +24,7 @@
43921 #include "coda_linux.h"
43922 #include "coda_cache.h"
43923
43924-static atomic_t permission_epoch = ATOMIC_INIT(0);
43925+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
43926
43927 /* replace or extend an acl cache hit */
43928 void coda_cache_enter(struct inode *inode, int mask)
43929@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
43930 struct coda_inode_info *cii = ITOC(inode);
43931
43932 spin_lock(&cii->c_lock);
43933- cii->c_cached_epoch = atomic_read(&permission_epoch);
43934+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
43935 if (cii->c_uid != current_fsuid()) {
43936 cii->c_uid = current_fsuid();
43937 cii->c_cached_perm = mask;
43938@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
43939 {
43940 struct coda_inode_info *cii = ITOC(inode);
43941 spin_lock(&cii->c_lock);
43942- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
43943+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
43944 spin_unlock(&cii->c_lock);
43945 }
43946
43947 /* remove all acl caches */
43948 void coda_cache_clear_all(struct super_block *sb)
43949 {
43950- atomic_inc(&permission_epoch);
43951+ atomic_inc_unchecked(&permission_epoch);
43952 }
43953
43954
43955@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
43956 spin_lock(&cii->c_lock);
43957 hit = (mask & cii->c_cached_perm) == mask &&
43958 cii->c_uid == current_fsuid() &&
43959- cii->c_cached_epoch == atomic_read(&permission_epoch);
43960+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
43961 spin_unlock(&cii->c_lock);
43962
43963 return hit;
43964diff --git a/fs/compat.c b/fs/compat.c
43965index 07880ba..3fb2862 100644
43966--- a/fs/compat.c
43967+++ b/fs/compat.c
43968@@ -491,7 +491,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
43969
43970 set_fs(KERNEL_DS);
43971 /* The __user pointer cast is valid because of the set_fs() */
43972- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
43973+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
43974 set_fs(oldfs);
43975 /* truncating is ok because it's a user address */
43976 if (!ret)
43977@@ -549,7 +549,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
43978 goto out;
43979
43980 ret = -EINVAL;
43981- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
43982+ if (nr_segs > UIO_MAXIOV)
43983 goto out;
43984 if (nr_segs > fast_segs) {
43985 ret = -ENOMEM;
43986@@ -832,6 +832,7 @@ struct compat_old_linux_dirent {
43987
43988 struct compat_readdir_callback {
43989 struct compat_old_linux_dirent __user *dirent;
43990+ struct file * file;
43991 int result;
43992 };
43993
43994@@ -849,6 +850,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
43995 buf->result = -EOVERFLOW;
43996 return -EOVERFLOW;
43997 }
43998+
43999+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
44000+ return 0;
44001+
44002 buf->result++;
44003 dirent = buf->dirent;
44004 if (!access_ok(VERIFY_WRITE, dirent,
44005@@ -881,6 +886,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
44006
44007 buf.result = 0;
44008 buf.dirent = dirent;
44009+ buf.file = file;
44010
44011 error = vfs_readdir(file, compat_fillonedir, &buf);
44012 if (buf.result)
44013@@ -901,6 +907,7 @@ struct compat_linux_dirent {
44014 struct compat_getdents_callback {
44015 struct compat_linux_dirent __user *current_dir;
44016 struct compat_linux_dirent __user *previous;
44017+ struct file * file;
44018 int count;
44019 int error;
44020 };
44021@@ -922,6 +929,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
44022 buf->error = -EOVERFLOW;
44023 return -EOVERFLOW;
44024 }
44025+
44026+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
44027+ return 0;
44028+
44029 dirent = buf->previous;
44030 if (dirent) {
44031 if (__put_user(offset, &dirent->d_off))
44032@@ -969,6 +980,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
44033 buf.previous = NULL;
44034 buf.count = count;
44035 buf.error = 0;
44036+ buf.file = file;
44037
44038 error = vfs_readdir(file, compat_filldir, &buf);
44039 if (error >= 0)
44040@@ -990,6 +1002,7 @@ out:
44041 struct compat_getdents_callback64 {
44042 struct linux_dirent64 __user *current_dir;
44043 struct linux_dirent64 __user *previous;
44044+ struct file * file;
44045 int count;
44046 int error;
44047 };
44048@@ -1006,6 +1019,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
44049 buf->error = -EINVAL; /* only used if we fail.. */
44050 if (reclen > buf->count)
44051 return -EINVAL;
44052+
44053+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
44054+ return 0;
44055+
44056 dirent = buf->previous;
44057
44058 if (dirent) {
44059@@ -1057,13 +1074,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
44060 buf.previous = NULL;
44061 buf.count = count;
44062 buf.error = 0;
44063+ buf.file = file;
44064
44065 error = vfs_readdir(file, compat_filldir64, &buf);
44066 if (error >= 0)
44067 error = buf.error;
44068 lastdirent = buf.previous;
44069 if (lastdirent) {
44070- typeof(lastdirent->d_off) d_off = file->f_pos;
44071+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
44072 if (__put_user_unaligned(d_off, &lastdirent->d_off))
44073 error = -EFAULT;
44074 else
44075diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
44076index 112e45a..b59845b 100644
44077--- a/fs/compat_binfmt_elf.c
44078+++ b/fs/compat_binfmt_elf.c
44079@@ -30,11 +30,13 @@
44080 #undef elf_phdr
44081 #undef elf_shdr
44082 #undef elf_note
44083+#undef elf_dyn
44084 #undef elf_addr_t
44085 #define elfhdr elf32_hdr
44086 #define elf_phdr elf32_phdr
44087 #define elf_shdr elf32_shdr
44088 #define elf_note elf32_note
44089+#define elf_dyn Elf32_Dyn
44090 #define elf_addr_t Elf32_Addr
44091
44092 /*
44093diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
44094index a26bea1..ae23e72 100644
44095--- a/fs/compat_ioctl.c
44096+++ b/fs/compat_ioctl.c
44097@@ -211,6 +211,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd,
44098
44099 err = get_user(palp, &up->palette);
44100 err |= get_user(length, &up->length);
44101+ if (err)
44102+ return -EFAULT;
44103
44104 up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
44105 err = put_user(compat_ptr(palp), &up_native->palette);
44106@@ -622,7 +624,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
44107 return -EFAULT;
44108 if (__get_user(udata, &ss32->iomem_base))
44109 return -EFAULT;
44110- ss.iomem_base = compat_ptr(udata);
44111+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
44112 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
44113 __get_user(ss.port_high, &ss32->port_high))
44114 return -EFAULT;
44115@@ -797,7 +799,7 @@ static int compat_ioctl_preallocate(struct file *file,
44116 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
44117 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
44118 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
44119- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
44120+ copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
44121 return -EFAULT;
44122
44123 return ioctl_preallocate(file, p);
44124@@ -1611,8 +1613,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
44125 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
44126 {
44127 unsigned int a, b;
44128- a = *(unsigned int *)p;
44129- b = *(unsigned int *)q;
44130+ a = *(const unsigned int *)p;
44131+ b = *(const unsigned int *)q;
44132 if (a > b)
44133 return 1;
44134 if (a < b)
44135diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
44136index 5ddd7eb..c18bf04 100644
44137--- a/fs/configfs/dir.c
44138+++ b/fs/configfs/dir.c
44139@@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
44140 }
44141 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
44142 struct configfs_dirent *next;
44143- const char * name;
44144+ const unsigned char * name;
44145+ char d_name[sizeof(next->s_dentry->d_iname)];
44146 int len;
44147 struct inode *inode = NULL;
44148
44149@@ -1585,7 +1586,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
44150 continue;
44151
44152 name = configfs_get_name(next);
44153- len = strlen(name);
44154+ if (next->s_dentry && name == next->s_dentry->d_iname) {
44155+ len = next->s_dentry->d_name.len;
44156+ memcpy(d_name, name, len);
44157+ name = d_name;
44158+ } else
44159+ len = strlen(name);
44160
44161 /*
44162 * We'll have a dentry and an inode for
44163diff --git a/fs/configfs/file.c b/fs/configfs/file.c
44164index 2b6cb23..d76e879 100644
44165--- a/fs/configfs/file.c
44166+++ b/fs/configfs/file.c
44167@@ -135,6 +135,8 @@ out:
44168 */
44169
44170 static int
44171+fill_write_buffer(struct configfs_buffer * buffer, const char __user * buf, size_t count) __size_overflow(3);
44172+static int
44173 fill_write_buffer(struct configfs_buffer * buffer, const char __user * buf, size_t count)
44174 {
44175 int error;
44176diff --git a/fs/dcache.c b/fs/dcache.c
44177index 2576d14..0cec38d 100644
44178--- a/fs/dcache.c
44179+++ b/fs/dcache.c
44180@@ -105,10 +105,10 @@ static unsigned int d_hash_shift __read_mostly;
44181 static struct hlist_bl_head *dentry_hashtable __read_mostly;
44182
44183 static inline struct hlist_bl_head *d_hash(const struct dentry *parent,
44184- unsigned long hash)
44185+ unsigned int hash)
44186 {
44187- hash += ((unsigned long) parent ^ GOLDEN_RATIO_PRIME) / L1_CACHE_BYTES;
44188- hash = hash ^ ((hash ^ GOLDEN_RATIO_PRIME) >> D_HASHBITS);
44189+ hash += (unsigned long) parent / L1_CACHE_BYTES;
44190+ hash = hash + (hash >> D_HASHBITS);
44191 return dentry_hashtable + (hash & D_HASHMASK);
44192 }
44193
44194@@ -3067,7 +3067,7 @@ void __init vfs_caches_init(unsigned long mempages)
44195 mempages -= reserve;
44196
44197 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
44198- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
44199+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY, NULL);
44200
44201 dcache_init();
44202 inode_init();
44203diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
44204index 956d5dd..e755e04 100644
44205--- a/fs/debugfs/inode.c
44206+++ b/fs/debugfs/inode.c
44207@@ -261,7 +261,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
44208 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
44209 {
44210 return debugfs_create_file(name,
44211+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
44212+ S_IFDIR | S_IRWXU,
44213+#else
44214 S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
44215+#endif
44216 parent, NULL, NULL);
44217 }
44218 EXPORT_SYMBOL_GPL(debugfs_create_dir);
44219diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
44220index ab35b11..b30af66 100644
44221--- a/fs/ecryptfs/inode.c
44222+++ b/fs/ecryptfs/inode.c
44223@@ -672,7 +672,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
44224 old_fs = get_fs();
44225 set_fs(get_ds());
44226 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
44227- (char __user *)lower_buf,
44228+ (char __force_user *)lower_buf,
44229 lower_bufsiz);
44230 set_fs(old_fs);
44231 if (rc < 0)
44232@@ -718,7 +718,7 @@ static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd)
44233 }
44234 old_fs = get_fs();
44235 set_fs(get_ds());
44236- rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
44237+ rc = dentry->d_inode->i_op->readlink(dentry, (char __force_user *)buf, len);
44238 set_fs(old_fs);
44239 if (rc < 0) {
44240 kfree(buf);
44241@@ -733,7 +733,7 @@ out:
44242 static void
44243 ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
44244 {
44245- char *buf = nd_get_link(nd);
44246+ const char *buf = nd_get_link(nd);
44247 if (!IS_ERR(buf)) {
44248 /* Free the char* */
44249 kfree(buf);
44250diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
44251index 3a06f40..f7af544 100644
44252--- a/fs/ecryptfs/miscdev.c
44253+++ b/fs/ecryptfs/miscdev.c
44254@@ -345,7 +345,7 @@ check_list:
44255 goto out_unlock_msg_ctx;
44256 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
44257 if (msg_ctx->msg) {
44258- if (copy_to_user(&buf[i], packet_length, packet_length_size))
44259+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
44260 goto out_unlock_msg_ctx;
44261 i += packet_length_size;
44262 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
44263diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
44264index b2a34a1..162fa69 100644
44265--- a/fs/ecryptfs/read_write.c
44266+++ b/fs/ecryptfs/read_write.c
44267@@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,
44268 return -EIO;
44269 fs_save = get_fs();
44270 set_fs(get_ds());
44271- rc = vfs_write(lower_file, data, size, &offset);
44272+ rc = vfs_write(lower_file, (const char __force_user *)data, size, &offset);
44273 set_fs(fs_save);
44274 mark_inode_dirty_sync(ecryptfs_inode);
44275 return rc;
44276@@ -244,7 +244,7 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,
44277 return -EIO;
44278 fs_save = get_fs();
44279 set_fs(get_ds());
44280- rc = vfs_read(lower_file, data, size, &offset);
44281+ rc = vfs_read(lower_file, (char __force_user *)data, size, &offset);
44282 set_fs(fs_save);
44283 return rc;
44284 }
44285diff --git a/fs/exec.c b/fs/exec.c
44286index ae42277..32c9035 100644
44287--- a/fs/exec.c
44288+++ b/fs/exec.c
44289@@ -55,6 +55,13 @@
44290 #include <linux/pipe_fs_i.h>
44291 #include <linux/oom.h>
44292 #include <linux/compat.h>
44293+#include <linux/random.h>
44294+#include <linux/seq_file.h>
44295+
44296+#ifdef CONFIG_PAX_REFCOUNT
44297+#include <linux/kallsyms.h>
44298+#include <linux/kdebug.h>
44299+#endif
44300
44301 #include <asm/uaccess.h>
44302 #include <asm/mmu_context.h>
44303@@ -63,6 +70,15 @@
44304 #include <trace/events/task.h>
44305 #include "internal.h"
44306
44307+#ifndef CONFIG_PAX_HAVE_ACL_FLAGS
44308+void __weak pax_set_initial_flags(struct linux_binprm *bprm) {}
44309+#endif
44310+
44311+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
44312+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
44313+EXPORT_SYMBOL(pax_set_initial_flags_func);
44314+#endif
44315+
44316 int core_uses_pid;
44317 char core_pattern[CORENAME_MAX_SIZE] = "core";
44318 unsigned int core_pipe_limit;
44319@@ -72,7 +88,7 @@ struct core_name {
44320 char *corename;
44321 int used, size;
44322 };
44323-static atomic_t call_count = ATOMIC_INIT(1);
44324+static atomic_unchecked_t call_count = ATOMIC_INIT(1);
44325
44326 /* The maximal length of core_pattern is also specified in sysctl.c */
44327
44328@@ -190,18 +206,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
44329 int write)
44330 {
44331 struct page *page;
44332- int ret;
44333
44334-#ifdef CONFIG_STACK_GROWSUP
44335- if (write) {
44336- ret = expand_downwards(bprm->vma, pos);
44337- if (ret < 0)
44338- return NULL;
44339- }
44340-#endif
44341- ret = get_user_pages(current, bprm->mm, pos,
44342- 1, write, 1, &page, NULL);
44343- if (ret <= 0)
44344+ if (0 > expand_downwards(bprm->vma, pos))
44345+ return NULL;
44346+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
44347 return NULL;
44348
44349 if (write) {
44350@@ -217,6 +225,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
44351 if (size <= ARG_MAX)
44352 return page;
44353
44354+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44355+ // only allow 512KB for argv+env on suid/sgid binaries
44356+ // to prevent easy ASLR exhaustion
44357+ if (((bprm->cred->euid != current_euid()) ||
44358+ (bprm->cred->egid != current_egid())) &&
44359+ (size > (512 * 1024))) {
44360+ put_page(page);
44361+ return NULL;
44362+ }
44363+#endif
44364+
44365 /*
44366 * Limit to 1/4-th the stack size for the argv+env strings.
44367 * This ensures that:
44368@@ -276,6 +295,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
44369 vma->vm_end = STACK_TOP_MAX;
44370 vma->vm_start = vma->vm_end - PAGE_SIZE;
44371 vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
44372+
44373+#ifdef CONFIG_PAX_SEGMEXEC
44374+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
44375+#endif
44376+
44377 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
44378 INIT_LIST_HEAD(&vma->anon_vma_chain);
44379
44380@@ -290,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
44381 mm->stack_vm = mm->total_vm = 1;
44382 up_write(&mm->mmap_sem);
44383 bprm->p = vma->vm_end - sizeof(void *);
44384+
44385+#ifdef CONFIG_PAX_RANDUSTACK
44386+ if (randomize_va_space)
44387+ bprm->p ^= random32() & ~PAGE_MASK;
44388+#endif
44389+
44390 return 0;
44391 err:
44392 up_write(&mm->mmap_sem);
44393@@ -398,19 +428,7 @@ err:
44394 return err;
44395 }
44396
44397-struct user_arg_ptr {
44398-#ifdef CONFIG_COMPAT
44399- bool is_compat;
44400-#endif
44401- union {
44402- const char __user *const __user *native;
44403-#ifdef CONFIG_COMPAT
44404- compat_uptr_t __user *compat;
44405-#endif
44406- } ptr;
44407-};
44408-
44409-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44410+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44411 {
44412 const char __user *native;
44413
44414@@ -419,14 +437,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44415 compat_uptr_t compat;
44416
44417 if (get_user(compat, argv.ptr.compat + nr))
44418- return ERR_PTR(-EFAULT);
44419+ return (const char __force_user *)ERR_PTR(-EFAULT);
44420
44421 return compat_ptr(compat);
44422 }
44423 #endif
44424
44425 if (get_user(native, argv.ptr.native + nr))
44426- return ERR_PTR(-EFAULT);
44427+ return (const char __force_user *)ERR_PTR(-EFAULT);
44428
44429 return native;
44430 }
44431@@ -445,7 +463,7 @@ static int count(struct user_arg_ptr argv, int max)
44432 if (!p)
44433 break;
44434
44435- if (IS_ERR(p))
44436+ if (IS_ERR((const char __force_kernel *)p))
44437 return -EFAULT;
44438
44439 if (i++ >= max)
44440@@ -479,7 +497,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
44441
44442 ret = -EFAULT;
44443 str = get_user_arg_ptr(argv, argc);
44444- if (IS_ERR(str))
44445+ if (IS_ERR((const char __force_kernel *)str))
44446 goto out;
44447
44448 len = strnlen_user(str, MAX_ARG_STRLEN);
44449@@ -561,7 +579,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
44450 int r;
44451 mm_segment_t oldfs = get_fs();
44452 struct user_arg_ptr argv = {
44453- .ptr.native = (const char __user *const __user *)__argv,
44454+ .ptr.native = (const char __force_user *const __force_user *)__argv,
44455 };
44456
44457 set_fs(KERNEL_DS);
44458@@ -596,7 +614,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
44459 unsigned long new_end = old_end - shift;
44460 struct mmu_gather tlb;
44461
44462- BUG_ON(new_start > new_end);
44463+ if (new_start >= new_end || new_start < mmap_min_addr)
44464+ return -ENOMEM;
44465
44466 /*
44467 * ensure there are no vmas between where we want to go
44468@@ -605,6 +624,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
44469 if (vma != find_vma(mm, new_start))
44470 return -EFAULT;
44471
44472+#ifdef CONFIG_PAX_SEGMEXEC
44473+ BUG_ON(pax_find_mirror_vma(vma));
44474+#endif
44475+
44476 /*
44477 * cover the whole range: [new_start, old_end)
44478 */
44479@@ -685,10 +708,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
44480 stack_top = arch_align_stack(stack_top);
44481 stack_top = PAGE_ALIGN(stack_top);
44482
44483- if (unlikely(stack_top < mmap_min_addr) ||
44484- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
44485- return -ENOMEM;
44486-
44487 stack_shift = vma->vm_end - stack_top;
44488
44489 bprm->p -= stack_shift;
44490@@ -700,8 +719,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
44491 bprm->exec -= stack_shift;
44492
44493 down_write(&mm->mmap_sem);
44494+
44495+ /* Move stack pages down in memory. */
44496+ if (stack_shift) {
44497+ ret = shift_arg_pages(vma, stack_shift);
44498+ if (ret)
44499+ goto out_unlock;
44500+ }
44501+
44502 vm_flags = VM_STACK_FLAGS;
44503
44504+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44505+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
44506+ vm_flags &= ~VM_EXEC;
44507+
44508+#ifdef CONFIG_PAX_MPROTECT
44509+ if (mm->pax_flags & MF_PAX_MPROTECT)
44510+ vm_flags &= ~VM_MAYEXEC;
44511+#endif
44512+
44513+ }
44514+#endif
44515+
44516 /*
44517 * Adjust stack execute permissions; explicitly enable for
44518 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
44519@@ -720,13 +759,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
44520 goto out_unlock;
44521 BUG_ON(prev != vma);
44522
44523- /* Move stack pages down in memory. */
44524- if (stack_shift) {
44525- ret = shift_arg_pages(vma, stack_shift);
44526- if (ret)
44527- goto out_unlock;
44528- }
44529-
44530 /* mprotect_fixup is overkill to remove the temporary stack flags */
44531 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
44532
44533@@ -807,7 +839,7 @@ int kernel_read(struct file *file, loff_t offset,
44534 old_fs = get_fs();
44535 set_fs(get_ds());
44536 /* The cast to a user pointer is valid due to the set_fs() */
44537- result = vfs_read(file, (void __user *)addr, count, &pos);
44538+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
44539 set_fs(old_fs);
44540 return result;
44541 }
44542@@ -1255,7 +1287,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
44543 }
44544 rcu_read_unlock();
44545
44546- if (p->fs->users > n_fs) {
44547+ if (atomic_read(&p->fs->users) > n_fs) {
44548 bprm->unsafe |= LSM_UNSAFE_SHARE;
44549 } else {
44550 res = -EAGAIN;
44551@@ -1450,6 +1482,28 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
44552
44553 EXPORT_SYMBOL(search_binary_handler);
44554
44555+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44556+static DEFINE_PER_CPU(u64, exec_counter);
44557+static int __init init_exec_counters(void)
44558+{
44559+ unsigned int cpu;
44560+
44561+ for_each_possible_cpu(cpu) {
44562+ per_cpu(exec_counter, cpu) = (u64)cpu;
44563+ }
44564+
44565+ return 0;
44566+}
44567+early_initcall(init_exec_counters);
44568+static inline void increment_exec_counter(void)
44569+{
44570+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
44571+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
44572+}
44573+#else
44574+static inline void increment_exec_counter(void) {}
44575+#endif
44576+
44577 /*
44578 * sys_execve() executes a new program.
44579 */
44580@@ -1458,6 +1512,11 @@ static int do_execve_common(const char *filename,
44581 struct user_arg_ptr envp,
44582 struct pt_regs *regs)
44583 {
44584+#ifdef CONFIG_GRKERNSEC
44585+ struct file *old_exec_file;
44586+ struct acl_subject_label *old_acl;
44587+ struct rlimit old_rlim[RLIM_NLIMITS];
44588+#endif
44589 struct linux_binprm *bprm;
44590 struct file *file;
44591 struct files_struct *displaced;
44592@@ -1465,6 +1524,8 @@ static int do_execve_common(const char *filename,
44593 int retval;
44594 const struct cred *cred = current_cred();
44595
44596+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
44597+
44598 /*
44599 * We move the actual failure in case of RLIMIT_NPROC excess from
44600 * set*uid() to execve() because too many poorly written programs
44601@@ -1505,12 +1566,27 @@ static int do_execve_common(const char *filename,
44602 if (IS_ERR(file))
44603 goto out_unmark;
44604
44605+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
44606+ retval = -EPERM;
44607+ goto out_file;
44608+ }
44609+
44610 sched_exec();
44611
44612 bprm->file = file;
44613 bprm->filename = filename;
44614 bprm->interp = filename;
44615
44616+ if (gr_process_user_ban()) {
44617+ retval = -EPERM;
44618+ goto out_file;
44619+ }
44620+
44621+ if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
44622+ retval = -EACCES;
44623+ goto out_file;
44624+ }
44625+
44626 retval = bprm_mm_init(bprm);
44627 if (retval)
44628 goto out_file;
44629@@ -1527,24 +1603,65 @@ static int do_execve_common(const char *filename,
44630 if (retval < 0)
44631 goto out;
44632
44633+#ifdef CONFIG_GRKERNSEC
44634+ old_acl = current->acl;
44635+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
44636+ old_exec_file = current->exec_file;
44637+ get_file(file);
44638+ current->exec_file = file;
44639+#endif
44640+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44641+ /* limit suid stack to 8MB
44642+ we saved the old limits above and will restore them if this exec fails
44643+ */
44644+ if (((bprm->cred->euid != current_euid()) || (bprm->cred->egid != current_egid())) &&
44645+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
44646+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
44647+#endif
44648+
44649+ if (!gr_tpe_allow(file)) {
44650+ retval = -EACCES;
44651+ goto out_fail;
44652+ }
44653+
44654+ if (gr_check_crash_exec(file)) {
44655+ retval = -EACCES;
44656+ goto out_fail;
44657+ }
44658+
44659+ retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
44660+ bprm->unsafe);
44661+ if (retval < 0)
44662+ goto out_fail;
44663+
44664 retval = copy_strings_kernel(1, &bprm->filename, bprm);
44665 if (retval < 0)
44666- goto out;
44667+ goto out_fail;
44668
44669 bprm->exec = bprm->p;
44670 retval = copy_strings(bprm->envc, envp, bprm);
44671 if (retval < 0)
44672- goto out;
44673+ goto out_fail;
44674
44675 retval = copy_strings(bprm->argc, argv, bprm);
44676 if (retval < 0)
44677- goto out;
44678+ goto out_fail;
44679+
44680+ gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
44681+
44682+ gr_handle_exec_args(bprm, argv);
44683
44684 retval = search_binary_handler(bprm,regs);
44685 if (retval < 0)
44686- goto out;
44687+ goto out_fail;
44688+#ifdef CONFIG_GRKERNSEC
44689+ if (old_exec_file)
44690+ fput(old_exec_file);
44691+#endif
44692
44693 /* execve succeeded */
44694+
44695+ increment_exec_counter();
44696 current->fs->in_exec = 0;
44697 current->in_execve = 0;
44698 acct_update_integrals(current);
44699@@ -1553,6 +1670,14 @@ static int do_execve_common(const char *filename,
44700 put_files_struct(displaced);
44701 return retval;
44702
44703+out_fail:
44704+#ifdef CONFIG_GRKERNSEC
44705+ current->acl = old_acl;
44706+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
44707+ fput(current->exec_file);
44708+ current->exec_file = old_exec_file;
44709+#endif
44710+
44711 out:
44712 if (bprm->mm) {
44713 acct_arg_size(bprm, 0);
44714@@ -1626,7 +1751,7 @@ static int expand_corename(struct core_name *cn)
44715 {
44716 char *old_corename = cn->corename;
44717
44718- cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count);
44719+ cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count);
44720 cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
44721
44722 if (!cn->corename) {
44723@@ -1723,7 +1848,7 @@ static int format_corename(struct core_name *cn, long signr)
44724 int pid_in_pattern = 0;
44725 int err = 0;
44726
44727- cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count);
44728+ cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count);
44729 cn->corename = kmalloc(cn->size, GFP_KERNEL);
44730 cn->used = 0;
44731
44732@@ -1820,6 +1945,228 @@ out:
44733 return ispipe;
44734 }
44735
44736+int pax_check_flags(unsigned long *flags)
44737+{
44738+ int retval = 0;
44739+
44740+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
44741+ if (*flags & MF_PAX_SEGMEXEC)
44742+ {
44743+ *flags &= ~MF_PAX_SEGMEXEC;
44744+ retval = -EINVAL;
44745+ }
44746+#endif
44747+
44748+ if ((*flags & MF_PAX_PAGEEXEC)
44749+
44750+#ifdef CONFIG_PAX_PAGEEXEC
44751+ && (*flags & MF_PAX_SEGMEXEC)
44752+#endif
44753+
44754+ )
44755+ {
44756+ *flags &= ~MF_PAX_PAGEEXEC;
44757+ retval = -EINVAL;
44758+ }
44759+
44760+ if ((*flags & MF_PAX_MPROTECT)
44761+
44762+#ifdef CONFIG_PAX_MPROTECT
44763+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44764+#endif
44765+
44766+ )
44767+ {
44768+ *flags &= ~MF_PAX_MPROTECT;
44769+ retval = -EINVAL;
44770+ }
44771+
44772+ if ((*flags & MF_PAX_EMUTRAMP)
44773+
44774+#ifdef CONFIG_PAX_EMUTRAMP
44775+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44776+#endif
44777+
44778+ )
44779+ {
44780+ *flags &= ~MF_PAX_EMUTRAMP;
44781+ retval = -EINVAL;
44782+ }
44783+
44784+ return retval;
44785+}
44786+
44787+EXPORT_SYMBOL(pax_check_flags);
44788+
44789+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44790+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
44791+{
44792+ struct task_struct *tsk = current;
44793+ struct mm_struct *mm = current->mm;
44794+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
44795+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
44796+ char *path_exec = NULL;
44797+ char *path_fault = NULL;
44798+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
44799+
44800+ if (buffer_exec && buffer_fault) {
44801+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
44802+
44803+ down_read(&mm->mmap_sem);
44804+ vma = mm->mmap;
44805+ while (vma && (!vma_exec || !vma_fault)) {
44806+ if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
44807+ vma_exec = vma;
44808+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
44809+ vma_fault = vma;
44810+ vma = vma->vm_next;
44811+ }
44812+ if (vma_exec) {
44813+ path_exec = d_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
44814+ if (IS_ERR(path_exec))
44815+ path_exec = "<path too long>";
44816+ else {
44817+ path_exec = mangle_path(buffer_exec, path_exec, "\t\n\\");
44818+ if (path_exec) {
44819+ *path_exec = 0;
44820+ path_exec = buffer_exec;
44821+ } else
44822+ path_exec = "<path too long>";
44823+ }
44824+ }
44825+ if (vma_fault) {
44826+ start = vma_fault->vm_start;
44827+ end = vma_fault->vm_end;
44828+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
44829+ if (vma_fault->vm_file) {
44830+ path_fault = d_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
44831+ if (IS_ERR(path_fault))
44832+ path_fault = "<path too long>";
44833+ else {
44834+ path_fault = mangle_path(buffer_fault, path_fault, "\t\n\\");
44835+ if (path_fault) {
44836+ *path_fault = 0;
44837+ path_fault = buffer_fault;
44838+ } else
44839+ path_fault = "<path too long>";
44840+ }
44841+ } else
44842+ path_fault = "<anonymous mapping>";
44843+ }
44844+ up_read(&mm->mmap_sem);
44845+ }
44846+ if (tsk->signal->curr_ip)
44847+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
44848+ else
44849+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
44850+ printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
44851+ "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
44852+ task_uid(tsk), task_euid(tsk), pc, sp);
44853+ free_page((unsigned long)buffer_exec);
44854+ free_page((unsigned long)buffer_fault);
44855+ pax_report_insns(regs, pc, sp);
44856+ do_coredump(SIGKILL, SIGKILL, regs);
44857+}
44858+#endif
44859+
44860+#ifdef CONFIG_PAX_REFCOUNT
44861+void pax_report_refcount_overflow(struct pt_regs *regs)
44862+{
44863+ if (current->signal->curr_ip)
44864+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44865+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
44866+ else
44867+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44868+ current->comm, task_pid_nr(current), current_uid(), current_euid());
44869+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
44870+ show_regs(regs);
44871+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
44872+}
44873+#endif
44874+
44875+#ifdef CONFIG_PAX_USERCOPY
44876+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
44877+int object_is_on_stack(const void *obj, unsigned long len)
44878+{
44879+ const void * const stack = task_stack_page(current);
44880+ const void * const stackend = stack + THREAD_SIZE;
44881+
44882+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44883+ const void *frame = NULL;
44884+ const void *oldframe;
44885+#endif
44886+
44887+ if (obj + len < obj)
44888+ return -1;
44889+
44890+ if (obj + len <= stack || stackend <= obj)
44891+ return 0;
44892+
44893+ if (obj < stack || stackend < obj + len)
44894+ return -1;
44895+
44896+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44897+ oldframe = __builtin_frame_address(1);
44898+ if (oldframe)
44899+ frame = __builtin_frame_address(2);
44900+ /*
44901+ low ----------------------------------------------> high
44902+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
44903+ ^----------------^
44904+ allow copies only within here
44905+ */
44906+ while (stack <= frame && frame < stackend) {
44907+ /* if obj + len extends past the last frame, this
44908+ check won't pass and the next frame will be 0,
44909+ causing us to bail out and correctly report
44910+ the copy as invalid
44911+ */
44912+ if (obj + len <= frame)
44913+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
44914+ oldframe = frame;
44915+ frame = *(const void * const *)frame;
44916+ }
44917+ return -1;
44918+#else
44919+ return 1;
44920+#endif
44921+}
44922+
44923+__noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
44924+{
44925+ if (current->signal->curr_ip)
44926+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44927+ &current->signal->curr_ip, to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44928+ else
44929+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44930+ to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44931+ dump_stack();
44932+ gr_handle_kernel_exploit();
44933+ do_group_exit(SIGKILL);
44934+}
44935+#endif
44936+
44937+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
44938+void pax_track_stack(void)
44939+{
44940+ unsigned long sp = (unsigned long)&sp;
44941+ if (sp < current_thread_info()->lowest_stack &&
44942+ sp > (unsigned long)task_stack_page(current))
44943+ current_thread_info()->lowest_stack = sp;
44944+}
44945+EXPORT_SYMBOL(pax_track_stack);
44946+#endif
44947+
44948+#ifdef CONFIG_PAX_SIZE_OVERFLOW
44949+void report_size_overflow(const char *file, unsigned int line, const char *func)
44950+{
44951+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u\n", func, file, line);
44952+ dump_stack();
44953+ do_group_exit(SIGKILL);
44954+}
44955+EXPORT_SYMBOL(report_size_overflow);
44956+#endif
44957+
44958 static int zap_process(struct task_struct *start, int exit_code)
44959 {
44960 struct task_struct *t;
44961@@ -2017,17 +2364,17 @@ static void wait_for_dump_helpers(struct file *file)
44962 pipe = file->f_path.dentry->d_inode->i_pipe;
44963
44964 pipe_lock(pipe);
44965- pipe->readers++;
44966- pipe->writers--;
44967+ atomic_inc(&pipe->readers);
44968+ atomic_dec(&pipe->writers);
44969
44970- while ((pipe->readers > 1) && (!signal_pending(current))) {
44971+ while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
44972 wake_up_interruptible_sync(&pipe->wait);
44973 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
44974 pipe_wait(pipe);
44975 }
44976
44977- pipe->readers--;
44978- pipe->writers++;
44979+ atomic_dec(&pipe->readers);
44980+ atomic_inc(&pipe->writers);
44981 pipe_unlock(pipe);
44982
44983 }
44984@@ -2088,7 +2435,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44985 int retval = 0;
44986 int flag = 0;
44987 int ispipe;
44988- static atomic_t core_dump_count = ATOMIC_INIT(0);
44989+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
44990 struct coredump_params cprm = {
44991 .signr = signr,
44992 .regs = regs,
44993@@ -2103,6 +2450,9 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44994
44995 audit_core_dumps(signr);
44996
44997+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
44998+ gr_handle_brute_attach(current, cprm.mm_flags);
44999+
45000 binfmt = mm->binfmt;
45001 if (!binfmt || !binfmt->core_dump)
45002 goto fail;
45003@@ -2170,7 +2520,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
45004 }
45005 cprm.limit = RLIM_INFINITY;
45006
45007- dump_count = atomic_inc_return(&core_dump_count);
45008+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
45009 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
45010 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
45011 task_tgid_vnr(current), current->comm);
45012@@ -2197,6 +2547,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
45013 } else {
45014 struct inode *inode;
45015
45016+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
45017+
45018 if (cprm.limit < binfmt->min_coredump)
45019 goto fail_unlock;
45020
45021@@ -2240,7 +2592,7 @@ close_fail:
45022 filp_close(cprm.file, NULL);
45023 fail_dropcount:
45024 if (ispipe)
45025- atomic_dec(&core_dump_count);
45026+ atomic_dec_unchecked(&core_dump_count);
45027 fail_unlock:
45028 kfree(cn.corename);
45029 fail_corename:
45030@@ -2259,7 +2611,7 @@ fail:
45031 */
45032 int dump_write(struct file *file, const void *addr, int nr)
45033 {
45034- return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;
45035+ return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
45036 }
45037 EXPORT_SYMBOL(dump_write);
45038
45039diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
45040index a8cbe1b..fed04cb 100644
45041--- a/fs/ext2/balloc.c
45042+++ b/fs/ext2/balloc.c
45043@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
45044
45045 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
45046 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
45047- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
45048+ if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
45049 sbi->s_resuid != current_fsuid() &&
45050 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
45051 return 0;
45052diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
45053index a203892..4e64db5 100644
45054--- a/fs/ext3/balloc.c
45055+++ b/fs/ext3/balloc.c
45056@@ -1446,9 +1446,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
45057
45058 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
45059 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
45060- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
45061+ if (free_blocks < root_blocks + 1 &&
45062 !use_reservation && sbi->s_resuid != current_fsuid() &&
45063- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
45064+ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)) &&
45065+ !capable_nolog(CAP_SYS_RESOURCE)) {
45066 return 0;
45067 }
45068 return 1;
45069diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
45070index f9e2cd8..bfdc476 100644
45071--- a/fs/ext4/balloc.c
45072+++ b/fs/ext4/balloc.c
45073@@ -438,8 +438,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
45074 /* Hm, nope. Are (enough) root reserved clusters available? */
45075 if (sbi->s_resuid == current_fsuid() ||
45076 ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
45077- capable(CAP_SYS_RESOURCE) ||
45078- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
45079+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
45080+ capable_nolog(CAP_SYS_RESOURCE)) {
45081
45082 if (free_clusters >= (nclusters + dirty_clusters))
45083 return 1;
45084diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
45085index 9983ba8..2a5272c 100644
45086--- a/fs/ext4/ext4.h
45087+++ b/fs/ext4/ext4.h
45088@@ -1217,19 +1217,19 @@ struct ext4_sb_info {
45089 unsigned long s_mb_last_start;
45090
45091 /* stats for buddy allocator */
45092- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
45093- atomic_t s_bal_success; /* we found long enough chunks */
45094- atomic_t s_bal_allocated; /* in blocks */
45095- atomic_t s_bal_ex_scanned; /* total extents scanned */
45096- atomic_t s_bal_goals; /* goal hits */
45097- atomic_t s_bal_breaks; /* too long searches */
45098- atomic_t s_bal_2orders; /* 2^order hits */
45099+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
45100+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
45101+ atomic_unchecked_t s_bal_allocated; /* in blocks */
45102+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
45103+ atomic_unchecked_t s_bal_goals; /* goal hits */
45104+ atomic_unchecked_t s_bal_breaks; /* too long searches */
45105+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
45106 spinlock_t s_bal_lock;
45107 unsigned long s_mb_buddies_generated;
45108 unsigned long long s_mb_generation_time;
45109- atomic_t s_mb_lost_chunks;
45110- atomic_t s_mb_preallocated;
45111- atomic_t s_mb_discarded;
45112+ atomic_unchecked_t s_mb_lost_chunks;
45113+ atomic_unchecked_t s_mb_preallocated;
45114+ atomic_unchecked_t s_mb_discarded;
45115 atomic_t s_lock_busy;
45116
45117 /* locality groups */
45118diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
45119index cb990b2..4820141 100644
45120--- a/fs/ext4/mballoc.c
45121+++ b/fs/ext4/mballoc.c
45122@@ -1794,7 +1794,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
45123 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
45124
45125 if (EXT4_SB(sb)->s_mb_stats)
45126- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
45127+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
45128
45129 break;
45130 }
45131@@ -2088,7 +2088,7 @@ repeat:
45132 ac->ac_status = AC_STATUS_CONTINUE;
45133 ac->ac_flags |= EXT4_MB_HINT_FIRST;
45134 cr = 3;
45135- atomic_inc(&sbi->s_mb_lost_chunks);
45136+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
45137 goto repeat;
45138 }
45139 }
45140@@ -2592,25 +2592,25 @@ int ext4_mb_release(struct super_block *sb)
45141 if (sbi->s_mb_stats) {
45142 ext4_msg(sb, KERN_INFO,
45143 "mballoc: %u blocks %u reqs (%u success)",
45144- atomic_read(&sbi->s_bal_allocated),
45145- atomic_read(&sbi->s_bal_reqs),
45146- atomic_read(&sbi->s_bal_success));
45147+ atomic_read_unchecked(&sbi->s_bal_allocated),
45148+ atomic_read_unchecked(&sbi->s_bal_reqs),
45149+ atomic_read_unchecked(&sbi->s_bal_success));
45150 ext4_msg(sb, KERN_INFO,
45151 "mballoc: %u extents scanned, %u goal hits, "
45152 "%u 2^N hits, %u breaks, %u lost",
45153- atomic_read(&sbi->s_bal_ex_scanned),
45154- atomic_read(&sbi->s_bal_goals),
45155- atomic_read(&sbi->s_bal_2orders),
45156- atomic_read(&sbi->s_bal_breaks),
45157- atomic_read(&sbi->s_mb_lost_chunks));
45158+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
45159+ atomic_read_unchecked(&sbi->s_bal_goals),
45160+ atomic_read_unchecked(&sbi->s_bal_2orders),
45161+ atomic_read_unchecked(&sbi->s_bal_breaks),
45162+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
45163 ext4_msg(sb, KERN_INFO,
45164 "mballoc: %lu generated and it took %Lu",
45165 sbi->s_mb_buddies_generated,
45166 sbi->s_mb_generation_time);
45167 ext4_msg(sb, KERN_INFO,
45168 "mballoc: %u preallocated, %u discarded",
45169- atomic_read(&sbi->s_mb_preallocated),
45170- atomic_read(&sbi->s_mb_discarded));
45171+ atomic_read_unchecked(&sbi->s_mb_preallocated),
45172+ atomic_read_unchecked(&sbi->s_mb_discarded));
45173 }
45174
45175 free_percpu(sbi->s_locality_groups);
45176@@ -3096,16 +3096,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
45177 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
45178
45179 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
45180- atomic_inc(&sbi->s_bal_reqs);
45181- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
45182+ atomic_inc_unchecked(&sbi->s_bal_reqs);
45183+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
45184 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
45185- atomic_inc(&sbi->s_bal_success);
45186- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
45187+ atomic_inc_unchecked(&sbi->s_bal_success);
45188+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
45189 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
45190 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
45191- atomic_inc(&sbi->s_bal_goals);
45192+ atomic_inc_unchecked(&sbi->s_bal_goals);
45193 if (ac->ac_found > sbi->s_mb_max_to_scan)
45194- atomic_inc(&sbi->s_bal_breaks);
45195+ atomic_inc_unchecked(&sbi->s_bal_breaks);
45196 }
45197
45198 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
45199@@ -3509,7 +3509,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
45200 trace_ext4_mb_new_inode_pa(ac, pa);
45201
45202 ext4_mb_use_inode_pa(ac, pa);
45203- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
45204+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
45205
45206 ei = EXT4_I(ac->ac_inode);
45207 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
45208@@ -3569,7 +3569,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
45209 trace_ext4_mb_new_group_pa(ac, pa);
45210
45211 ext4_mb_use_group_pa(ac, pa);
45212- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
45213+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
45214
45215 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
45216 lg = ac->ac_lg;
45217@@ -3658,7 +3658,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
45218 * from the bitmap and continue.
45219 */
45220 }
45221- atomic_add(free, &sbi->s_mb_discarded);
45222+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
45223
45224 return err;
45225 }
45226@@ -3676,7 +3676,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
45227 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
45228 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
45229 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
45230- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
45231+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
45232 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
45233
45234 return 0;
45235diff --git a/fs/fcntl.c b/fs/fcntl.c
45236index 22764c7..86372c9 100644
45237--- a/fs/fcntl.c
45238+++ b/fs/fcntl.c
45239@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
45240 if (err)
45241 return err;
45242
45243+ if (gr_handle_chroot_fowner(pid, type))
45244+ return -ENOENT;
45245+ if (gr_check_protected_task_fowner(pid, type))
45246+ return -EACCES;
45247+
45248 f_modown(filp, pid, type, force);
45249 return 0;
45250 }
45251@@ -266,7 +271,7 @@ pid_t f_getown(struct file *filp)
45252
45253 static int f_setown_ex(struct file *filp, unsigned long arg)
45254 {
45255- struct f_owner_ex * __user owner_p = (void * __user)arg;
45256+ struct f_owner_ex __user *owner_p = (void __user *)arg;
45257 struct f_owner_ex owner;
45258 struct pid *pid;
45259 int type;
45260@@ -306,7 +311,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
45261
45262 static int f_getown_ex(struct file *filp, unsigned long arg)
45263 {
45264- struct f_owner_ex * __user owner_p = (void * __user)arg;
45265+ struct f_owner_ex __user *owner_p = (void __user *)arg;
45266 struct f_owner_ex owner;
45267 int ret = 0;
45268
45269@@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
45270 switch (cmd) {
45271 case F_DUPFD:
45272 case F_DUPFD_CLOEXEC:
45273+ gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
45274 if (arg >= rlimit(RLIMIT_NOFILE))
45275 break;
45276 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
45277diff --git a/fs/fifo.c b/fs/fifo.c
45278index b1a524d..4ee270e 100644
45279--- a/fs/fifo.c
45280+++ b/fs/fifo.c
45281@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
45282 */
45283 filp->f_op = &read_pipefifo_fops;
45284 pipe->r_counter++;
45285- if (pipe->readers++ == 0)
45286+ if (atomic_inc_return(&pipe->readers) == 1)
45287 wake_up_partner(inode);
45288
45289- if (!pipe->writers) {
45290+ if (!atomic_read(&pipe->writers)) {
45291 if ((filp->f_flags & O_NONBLOCK)) {
45292 /* suppress POLLHUP until we have
45293 * seen a writer */
45294@@ -81,15 +81,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
45295 * errno=ENXIO when there is no process reading the FIFO.
45296 */
45297 ret = -ENXIO;
45298- if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
45299+ if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
45300 goto err;
45301
45302 filp->f_op = &write_pipefifo_fops;
45303 pipe->w_counter++;
45304- if (!pipe->writers++)
45305+ if (atomic_inc_return(&pipe->writers) == 1)
45306 wake_up_partner(inode);
45307
45308- if (!pipe->readers) {
45309+ if (!atomic_read(&pipe->readers)) {
45310 wait_for_partner(inode, &pipe->r_counter);
45311 if (signal_pending(current))
45312 goto err_wr;
45313@@ -105,11 +105,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
45314 */
45315 filp->f_op = &rdwr_pipefifo_fops;
45316
45317- pipe->readers++;
45318- pipe->writers++;
45319+ atomic_inc(&pipe->readers);
45320+ atomic_inc(&pipe->writers);
45321 pipe->r_counter++;
45322 pipe->w_counter++;
45323- if (pipe->readers == 1 || pipe->writers == 1)
45324+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
45325 wake_up_partner(inode);
45326 break;
45327
45328@@ -123,19 +123,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
45329 return 0;
45330
45331 err_rd:
45332- if (!--pipe->readers)
45333+ if (atomic_dec_and_test(&pipe->readers))
45334 wake_up_interruptible(&pipe->wait);
45335 ret = -ERESTARTSYS;
45336 goto err;
45337
45338 err_wr:
45339- if (!--pipe->writers)
45340+ if (atomic_dec_and_test(&pipe->writers))
45341 wake_up_interruptible(&pipe->wait);
45342 ret = -ERESTARTSYS;
45343 goto err;
45344
45345 err:
45346- if (!pipe->readers && !pipe->writers)
45347+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
45348 free_pipe_info(inode);
45349
45350 err_nocleanup:
45351diff --git a/fs/file.c b/fs/file.c
45352index 4c6992d..104cdea 100644
45353--- a/fs/file.c
45354+++ b/fs/file.c
45355@@ -15,6 +15,7 @@
45356 #include <linux/slab.h>
45357 #include <linux/vmalloc.h>
45358 #include <linux/file.h>
45359+#include <linux/security.h>
45360 #include <linux/fdtable.h>
45361 #include <linux/bitops.h>
45362 #include <linux/interrupt.h>
45363@@ -254,6 +255,7 @@ int expand_files(struct files_struct *files, int nr)
45364 * N.B. For clone tasks sharing a files structure, this test
45365 * will limit the total number of files that can be opened.
45366 */
45367+ gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
45368 if (nr >= rlimit(RLIMIT_NOFILE))
45369 return -EMFILE;
45370
45371diff --git a/fs/filesystems.c b/fs/filesystems.c
45372index 96f2428..f5eeb8e 100644
45373--- a/fs/filesystems.c
45374+++ b/fs/filesystems.c
45375@@ -273,7 +273,12 @@ struct file_system_type *get_fs_type(const char *name)
45376 int len = dot ? dot - name : strlen(name);
45377
45378 fs = __get_fs_type(name, len);
45379+
45380+#ifdef CONFIG_GRKERNSEC_MODHARDEN
45381+ if (!fs && (___request_module(true, "grsec_modharden_fs", "%.*s", len, name) == 0))
45382+#else
45383 if (!fs && (request_module("%.*s", len, name) == 0))
45384+#endif
45385 fs = __get_fs_type(name, len);
45386
45387 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
45388diff --git a/fs/fs_struct.c b/fs/fs_struct.c
45389index 78b519c..a8b4979 100644
45390--- a/fs/fs_struct.c
45391+++ b/fs/fs_struct.c
45392@@ -4,6 +4,7 @@
45393 #include <linux/path.h>
45394 #include <linux/slab.h>
45395 #include <linux/fs_struct.h>
45396+#include <linux/grsecurity.h>
45397 #include "internal.h"
45398
45399 static inline void path_get_longterm(struct path *path)
45400@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
45401 old_root = fs->root;
45402 fs->root = *path;
45403 path_get_longterm(path);
45404+ gr_set_chroot_entries(current, path);
45405 write_seqcount_end(&fs->seq);
45406 spin_unlock(&fs->lock);
45407 if (old_root.dentry)
45408@@ -74,6 +76,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
45409 && fs->root.mnt == old_root->mnt) {
45410 path_get_longterm(new_root);
45411 fs->root = *new_root;
45412+ gr_set_chroot_entries(p, new_root);
45413 count++;
45414 }
45415 if (fs->pwd.dentry == old_root->dentry
45416@@ -109,7 +112,8 @@ void exit_fs(struct task_struct *tsk)
45417 spin_lock(&fs->lock);
45418 write_seqcount_begin(&fs->seq);
45419 tsk->fs = NULL;
45420- kill = !--fs->users;
45421+ gr_clear_chroot_entries(tsk);
45422+ kill = !atomic_dec_return(&fs->users);
45423 write_seqcount_end(&fs->seq);
45424 spin_unlock(&fs->lock);
45425 task_unlock(tsk);
45426@@ -123,7 +127,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
45427 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
45428 /* We don't need to lock fs - think why ;-) */
45429 if (fs) {
45430- fs->users = 1;
45431+ atomic_set(&fs->users, 1);
45432 fs->in_exec = 0;
45433 spin_lock_init(&fs->lock);
45434 seqcount_init(&fs->seq);
45435@@ -132,6 +136,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
45436 spin_lock(&old->lock);
45437 fs->root = old->root;
45438 path_get_longterm(&fs->root);
45439+ /* instead of calling gr_set_chroot_entries here,
45440+ we call it from every caller of this function
45441+ */
45442 fs->pwd = old->pwd;
45443 path_get_longterm(&fs->pwd);
45444 spin_unlock(&old->lock);
45445@@ -150,8 +157,9 @@ int unshare_fs_struct(void)
45446
45447 task_lock(current);
45448 spin_lock(&fs->lock);
45449- kill = !--fs->users;
45450+ kill = !atomic_dec_return(&fs->users);
45451 current->fs = new_fs;
45452+ gr_set_chroot_entries(current, &new_fs->root);
45453 spin_unlock(&fs->lock);
45454 task_unlock(current);
45455
45456@@ -164,13 +172,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
45457
45458 int current_umask(void)
45459 {
45460- return current->fs->umask;
45461+ return current->fs->umask | gr_acl_umask();
45462 }
45463 EXPORT_SYMBOL(current_umask);
45464
45465 /* to be mentioned only in INIT_TASK */
45466 struct fs_struct init_fs = {
45467- .users = 1,
45468+ .users = ATOMIC_INIT(1),
45469 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
45470 .seq = SEQCNT_ZERO,
45471 .umask = 0022,
45472@@ -186,12 +194,13 @@ void daemonize_fs_struct(void)
45473 task_lock(current);
45474
45475 spin_lock(&init_fs.lock);
45476- init_fs.users++;
45477+ atomic_inc(&init_fs.users);
45478 spin_unlock(&init_fs.lock);
45479
45480 spin_lock(&fs->lock);
45481 current->fs = &init_fs;
45482- kill = !--fs->users;
45483+ gr_set_chroot_entries(current, &current->fs->root);
45484+ kill = !atomic_dec_return(&fs->users);
45485 spin_unlock(&fs->lock);
45486
45487 task_unlock(current);
45488diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
45489index 9905350..02eaec4 100644
45490--- a/fs/fscache/cookie.c
45491+++ b/fs/fscache/cookie.c
45492@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
45493 parent ? (char *) parent->def->name : "<no-parent>",
45494 def->name, netfs_data);
45495
45496- fscache_stat(&fscache_n_acquires);
45497+ fscache_stat_unchecked(&fscache_n_acquires);
45498
45499 /* if there's no parent cookie, then we don't create one here either */
45500 if (!parent) {
45501- fscache_stat(&fscache_n_acquires_null);
45502+ fscache_stat_unchecked(&fscache_n_acquires_null);
45503 _leave(" [no parent]");
45504 return NULL;
45505 }
45506@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
45507 /* allocate and initialise a cookie */
45508 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
45509 if (!cookie) {
45510- fscache_stat(&fscache_n_acquires_oom);
45511+ fscache_stat_unchecked(&fscache_n_acquires_oom);
45512 _leave(" [ENOMEM]");
45513 return NULL;
45514 }
45515@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
45516
45517 switch (cookie->def->type) {
45518 case FSCACHE_COOKIE_TYPE_INDEX:
45519- fscache_stat(&fscache_n_cookie_index);
45520+ fscache_stat_unchecked(&fscache_n_cookie_index);
45521 break;
45522 case FSCACHE_COOKIE_TYPE_DATAFILE:
45523- fscache_stat(&fscache_n_cookie_data);
45524+ fscache_stat_unchecked(&fscache_n_cookie_data);
45525 break;
45526 default:
45527- fscache_stat(&fscache_n_cookie_special);
45528+ fscache_stat_unchecked(&fscache_n_cookie_special);
45529 break;
45530 }
45531
45532@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
45533 if (fscache_acquire_non_index_cookie(cookie) < 0) {
45534 atomic_dec(&parent->n_children);
45535 __fscache_cookie_put(cookie);
45536- fscache_stat(&fscache_n_acquires_nobufs);
45537+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
45538 _leave(" = NULL");
45539 return NULL;
45540 }
45541 }
45542
45543- fscache_stat(&fscache_n_acquires_ok);
45544+ fscache_stat_unchecked(&fscache_n_acquires_ok);
45545 _leave(" = %p", cookie);
45546 return cookie;
45547 }
45548@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
45549 cache = fscache_select_cache_for_object(cookie->parent);
45550 if (!cache) {
45551 up_read(&fscache_addremove_sem);
45552- fscache_stat(&fscache_n_acquires_no_cache);
45553+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
45554 _leave(" = -ENOMEDIUM [no cache]");
45555 return -ENOMEDIUM;
45556 }
45557@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct fscache_cache *cache,
45558 object = cache->ops->alloc_object(cache, cookie);
45559 fscache_stat_d(&fscache_n_cop_alloc_object);
45560 if (IS_ERR(object)) {
45561- fscache_stat(&fscache_n_object_no_alloc);
45562+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
45563 ret = PTR_ERR(object);
45564 goto error;
45565 }
45566
45567- fscache_stat(&fscache_n_object_alloc);
45568+ fscache_stat_unchecked(&fscache_n_object_alloc);
45569
45570 object->debug_id = atomic_inc_return(&fscache_object_debug_id);
45571
45572@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
45573 struct fscache_object *object;
45574 struct hlist_node *_p;
45575
45576- fscache_stat(&fscache_n_updates);
45577+ fscache_stat_unchecked(&fscache_n_updates);
45578
45579 if (!cookie) {
45580- fscache_stat(&fscache_n_updates_null);
45581+ fscache_stat_unchecked(&fscache_n_updates_null);
45582 _leave(" [no cookie]");
45583 return;
45584 }
45585@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
45586 struct fscache_object *object;
45587 unsigned long event;
45588
45589- fscache_stat(&fscache_n_relinquishes);
45590+ fscache_stat_unchecked(&fscache_n_relinquishes);
45591 if (retire)
45592- fscache_stat(&fscache_n_relinquishes_retire);
45593+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
45594
45595 if (!cookie) {
45596- fscache_stat(&fscache_n_relinquishes_null);
45597+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
45598 _leave(" [no cookie]");
45599 return;
45600 }
45601@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
45602
45603 /* wait for the cookie to finish being instantiated (or to fail) */
45604 if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
45605- fscache_stat(&fscache_n_relinquishes_waitcrt);
45606+ fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
45607 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
45608 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
45609 }
45610diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
45611index f6aad48..88dcf26 100644
45612--- a/fs/fscache/internal.h
45613+++ b/fs/fscache/internal.h
45614@@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
45615 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
45616 extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
45617
45618-extern atomic_t fscache_n_op_pend;
45619-extern atomic_t fscache_n_op_run;
45620-extern atomic_t fscache_n_op_enqueue;
45621-extern atomic_t fscache_n_op_deferred_release;
45622-extern atomic_t fscache_n_op_release;
45623-extern atomic_t fscache_n_op_gc;
45624-extern atomic_t fscache_n_op_cancelled;
45625-extern atomic_t fscache_n_op_rejected;
45626+extern atomic_unchecked_t fscache_n_op_pend;
45627+extern atomic_unchecked_t fscache_n_op_run;
45628+extern atomic_unchecked_t fscache_n_op_enqueue;
45629+extern atomic_unchecked_t fscache_n_op_deferred_release;
45630+extern atomic_unchecked_t fscache_n_op_release;
45631+extern atomic_unchecked_t fscache_n_op_gc;
45632+extern atomic_unchecked_t fscache_n_op_cancelled;
45633+extern atomic_unchecked_t fscache_n_op_rejected;
45634
45635-extern atomic_t fscache_n_attr_changed;
45636-extern atomic_t fscache_n_attr_changed_ok;
45637-extern atomic_t fscache_n_attr_changed_nobufs;
45638-extern atomic_t fscache_n_attr_changed_nomem;
45639-extern atomic_t fscache_n_attr_changed_calls;
45640+extern atomic_unchecked_t fscache_n_attr_changed;
45641+extern atomic_unchecked_t fscache_n_attr_changed_ok;
45642+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
45643+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
45644+extern atomic_unchecked_t fscache_n_attr_changed_calls;
45645
45646-extern atomic_t fscache_n_allocs;
45647-extern atomic_t fscache_n_allocs_ok;
45648-extern atomic_t fscache_n_allocs_wait;
45649-extern atomic_t fscache_n_allocs_nobufs;
45650-extern atomic_t fscache_n_allocs_intr;
45651-extern atomic_t fscache_n_allocs_object_dead;
45652-extern atomic_t fscache_n_alloc_ops;
45653-extern atomic_t fscache_n_alloc_op_waits;
45654+extern atomic_unchecked_t fscache_n_allocs;
45655+extern atomic_unchecked_t fscache_n_allocs_ok;
45656+extern atomic_unchecked_t fscache_n_allocs_wait;
45657+extern atomic_unchecked_t fscache_n_allocs_nobufs;
45658+extern atomic_unchecked_t fscache_n_allocs_intr;
45659+extern atomic_unchecked_t fscache_n_allocs_object_dead;
45660+extern atomic_unchecked_t fscache_n_alloc_ops;
45661+extern atomic_unchecked_t fscache_n_alloc_op_waits;
45662
45663-extern atomic_t fscache_n_retrievals;
45664-extern atomic_t fscache_n_retrievals_ok;
45665-extern atomic_t fscache_n_retrievals_wait;
45666-extern atomic_t fscache_n_retrievals_nodata;
45667-extern atomic_t fscache_n_retrievals_nobufs;
45668-extern atomic_t fscache_n_retrievals_intr;
45669-extern atomic_t fscache_n_retrievals_nomem;
45670-extern atomic_t fscache_n_retrievals_object_dead;
45671-extern atomic_t fscache_n_retrieval_ops;
45672-extern atomic_t fscache_n_retrieval_op_waits;
45673+extern atomic_unchecked_t fscache_n_retrievals;
45674+extern atomic_unchecked_t fscache_n_retrievals_ok;
45675+extern atomic_unchecked_t fscache_n_retrievals_wait;
45676+extern atomic_unchecked_t fscache_n_retrievals_nodata;
45677+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
45678+extern atomic_unchecked_t fscache_n_retrievals_intr;
45679+extern atomic_unchecked_t fscache_n_retrievals_nomem;
45680+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
45681+extern atomic_unchecked_t fscache_n_retrieval_ops;
45682+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
45683
45684-extern atomic_t fscache_n_stores;
45685-extern atomic_t fscache_n_stores_ok;
45686-extern atomic_t fscache_n_stores_again;
45687-extern atomic_t fscache_n_stores_nobufs;
45688-extern atomic_t fscache_n_stores_oom;
45689-extern atomic_t fscache_n_store_ops;
45690-extern atomic_t fscache_n_store_calls;
45691-extern atomic_t fscache_n_store_pages;
45692-extern atomic_t fscache_n_store_radix_deletes;
45693-extern atomic_t fscache_n_store_pages_over_limit;
45694+extern atomic_unchecked_t fscache_n_stores;
45695+extern atomic_unchecked_t fscache_n_stores_ok;
45696+extern atomic_unchecked_t fscache_n_stores_again;
45697+extern atomic_unchecked_t fscache_n_stores_nobufs;
45698+extern atomic_unchecked_t fscache_n_stores_oom;
45699+extern atomic_unchecked_t fscache_n_store_ops;
45700+extern atomic_unchecked_t fscache_n_store_calls;
45701+extern atomic_unchecked_t fscache_n_store_pages;
45702+extern atomic_unchecked_t fscache_n_store_radix_deletes;
45703+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
45704
45705-extern atomic_t fscache_n_store_vmscan_not_storing;
45706-extern atomic_t fscache_n_store_vmscan_gone;
45707-extern atomic_t fscache_n_store_vmscan_busy;
45708-extern atomic_t fscache_n_store_vmscan_cancelled;
45709+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
45710+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
45711+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
45712+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
45713
45714-extern atomic_t fscache_n_marks;
45715-extern atomic_t fscache_n_uncaches;
45716+extern atomic_unchecked_t fscache_n_marks;
45717+extern atomic_unchecked_t fscache_n_uncaches;
45718
45719-extern atomic_t fscache_n_acquires;
45720-extern atomic_t fscache_n_acquires_null;
45721-extern atomic_t fscache_n_acquires_no_cache;
45722-extern atomic_t fscache_n_acquires_ok;
45723-extern atomic_t fscache_n_acquires_nobufs;
45724-extern atomic_t fscache_n_acquires_oom;
45725+extern atomic_unchecked_t fscache_n_acquires;
45726+extern atomic_unchecked_t fscache_n_acquires_null;
45727+extern atomic_unchecked_t fscache_n_acquires_no_cache;
45728+extern atomic_unchecked_t fscache_n_acquires_ok;
45729+extern atomic_unchecked_t fscache_n_acquires_nobufs;
45730+extern atomic_unchecked_t fscache_n_acquires_oom;
45731
45732-extern atomic_t fscache_n_updates;
45733-extern atomic_t fscache_n_updates_null;
45734-extern atomic_t fscache_n_updates_run;
45735+extern atomic_unchecked_t fscache_n_updates;
45736+extern atomic_unchecked_t fscache_n_updates_null;
45737+extern atomic_unchecked_t fscache_n_updates_run;
45738
45739-extern atomic_t fscache_n_relinquishes;
45740-extern atomic_t fscache_n_relinquishes_null;
45741-extern atomic_t fscache_n_relinquishes_waitcrt;
45742-extern atomic_t fscache_n_relinquishes_retire;
45743+extern atomic_unchecked_t fscache_n_relinquishes;
45744+extern atomic_unchecked_t fscache_n_relinquishes_null;
45745+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
45746+extern atomic_unchecked_t fscache_n_relinquishes_retire;
45747
45748-extern atomic_t fscache_n_cookie_index;
45749-extern atomic_t fscache_n_cookie_data;
45750-extern atomic_t fscache_n_cookie_special;
45751+extern atomic_unchecked_t fscache_n_cookie_index;
45752+extern atomic_unchecked_t fscache_n_cookie_data;
45753+extern atomic_unchecked_t fscache_n_cookie_special;
45754
45755-extern atomic_t fscache_n_object_alloc;
45756-extern atomic_t fscache_n_object_no_alloc;
45757-extern atomic_t fscache_n_object_lookups;
45758-extern atomic_t fscache_n_object_lookups_negative;
45759-extern atomic_t fscache_n_object_lookups_positive;
45760-extern atomic_t fscache_n_object_lookups_timed_out;
45761-extern atomic_t fscache_n_object_created;
45762-extern atomic_t fscache_n_object_avail;
45763-extern atomic_t fscache_n_object_dead;
45764+extern atomic_unchecked_t fscache_n_object_alloc;
45765+extern atomic_unchecked_t fscache_n_object_no_alloc;
45766+extern atomic_unchecked_t fscache_n_object_lookups;
45767+extern atomic_unchecked_t fscache_n_object_lookups_negative;
45768+extern atomic_unchecked_t fscache_n_object_lookups_positive;
45769+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
45770+extern atomic_unchecked_t fscache_n_object_created;
45771+extern atomic_unchecked_t fscache_n_object_avail;
45772+extern atomic_unchecked_t fscache_n_object_dead;
45773
45774-extern atomic_t fscache_n_checkaux_none;
45775-extern atomic_t fscache_n_checkaux_okay;
45776-extern atomic_t fscache_n_checkaux_update;
45777-extern atomic_t fscache_n_checkaux_obsolete;
45778+extern atomic_unchecked_t fscache_n_checkaux_none;
45779+extern atomic_unchecked_t fscache_n_checkaux_okay;
45780+extern atomic_unchecked_t fscache_n_checkaux_update;
45781+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
45782
45783 extern atomic_t fscache_n_cop_alloc_object;
45784 extern atomic_t fscache_n_cop_lookup_object;
45785@@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t *stat)
45786 atomic_inc(stat);
45787 }
45788
45789+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
45790+{
45791+ atomic_inc_unchecked(stat);
45792+}
45793+
45794 static inline void fscache_stat_d(atomic_t *stat)
45795 {
45796 atomic_dec(stat);
45797@@ -267,6 +272,7 @@ extern const struct file_operations fscache_stats_fops;
45798
45799 #define __fscache_stat(stat) (NULL)
45800 #define fscache_stat(stat) do {} while (0)
45801+#define fscache_stat_unchecked(stat) do {} while (0)
45802 #define fscache_stat_d(stat) do {} while (0)
45803 #endif
45804
45805diff --git a/fs/fscache/object.c b/fs/fscache/object.c
45806index b6b897c..0ffff9c 100644
45807--- a/fs/fscache/object.c
45808+++ b/fs/fscache/object.c
45809@@ -128,7 +128,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45810 /* update the object metadata on disk */
45811 case FSCACHE_OBJECT_UPDATING:
45812 clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
45813- fscache_stat(&fscache_n_updates_run);
45814+ fscache_stat_unchecked(&fscache_n_updates_run);
45815 fscache_stat(&fscache_n_cop_update_object);
45816 object->cache->ops->update_object(object);
45817 fscache_stat_d(&fscache_n_cop_update_object);
45818@@ -217,7 +217,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45819 spin_lock(&object->lock);
45820 object->state = FSCACHE_OBJECT_DEAD;
45821 spin_unlock(&object->lock);
45822- fscache_stat(&fscache_n_object_dead);
45823+ fscache_stat_unchecked(&fscache_n_object_dead);
45824 goto terminal_transit;
45825
45826 /* handle the parent cache of this object being withdrawn from
45827@@ -232,7 +232,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45828 spin_lock(&object->lock);
45829 object->state = FSCACHE_OBJECT_DEAD;
45830 spin_unlock(&object->lock);
45831- fscache_stat(&fscache_n_object_dead);
45832+ fscache_stat_unchecked(&fscache_n_object_dead);
45833 goto terminal_transit;
45834
45835 /* complain about the object being woken up once it is
45836@@ -461,7 +461,7 @@ static void fscache_lookup_object(struct fscache_object *object)
45837 parent->cookie->def->name, cookie->def->name,
45838 object->cache->tag->name);
45839
45840- fscache_stat(&fscache_n_object_lookups);
45841+ fscache_stat_unchecked(&fscache_n_object_lookups);
45842 fscache_stat(&fscache_n_cop_lookup_object);
45843 ret = object->cache->ops->lookup_object(object);
45844 fscache_stat_d(&fscache_n_cop_lookup_object);
45845@@ -472,7 +472,7 @@ static void fscache_lookup_object(struct fscache_object *object)
45846 if (ret == -ETIMEDOUT) {
45847 /* probably stuck behind another object, so move this one to
45848 * the back of the queue */
45849- fscache_stat(&fscache_n_object_lookups_timed_out);
45850+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
45851 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45852 }
45853
45854@@ -495,7 +495,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
45855
45856 spin_lock(&object->lock);
45857 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45858- fscache_stat(&fscache_n_object_lookups_negative);
45859+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
45860
45861 /* transit here to allow write requests to begin stacking up
45862 * and read requests to begin returning ENODATA */
45863@@ -541,7 +541,7 @@ void fscache_obtained_object(struct fscache_object *object)
45864 * result, in which case there may be data available */
45865 spin_lock(&object->lock);
45866 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45867- fscache_stat(&fscache_n_object_lookups_positive);
45868+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
45869
45870 clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
45871
45872@@ -555,7 +555,7 @@ void fscache_obtained_object(struct fscache_object *object)
45873 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45874 } else {
45875 ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
45876- fscache_stat(&fscache_n_object_created);
45877+ fscache_stat_unchecked(&fscache_n_object_created);
45878
45879 object->state = FSCACHE_OBJECT_AVAILABLE;
45880 spin_unlock(&object->lock);
45881@@ -602,7 +602,7 @@ static void fscache_object_available(struct fscache_object *object)
45882 fscache_enqueue_dependents(object);
45883
45884 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
45885- fscache_stat(&fscache_n_object_avail);
45886+ fscache_stat_unchecked(&fscache_n_object_avail);
45887
45888 _leave("");
45889 }
45890@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
45891 enum fscache_checkaux result;
45892
45893 if (!object->cookie->def->check_aux) {
45894- fscache_stat(&fscache_n_checkaux_none);
45895+ fscache_stat_unchecked(&fscache_n_checkaux_none);
45896 return FSCACHE_CHECKAUX_OKAY;
45897 }
45898
45899@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
45900 switch (result) {
45901 /* entry okay as is */
45902 case FSCACHE_CHECKAUX_OKAY:
45903- fscache_stat(&fscache_n_checkaux_okay);
45904+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
45905 break;
45906
45907 /* entry requires update */
45908 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
45909- fscache_stat(&fscache_n_checkaux_update);
45910+ fscache_stat_unchecked(&fscache_n_checkaux_update);
45911 break;
45912
45913 /* entry requires deletion */
45914 case FSCACHE_CHECKAUX_OBSOLETE:
45915- fscache_stat(&fscache_n_checkaux_obsolete);
45916+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
45917 break;
45918
45919 default:
45920diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
45921index 30afdfa..2256596 100644
45922--- a/fs/fscache/operation.c
45923+++ b/fs/fscache/operation.c
45924@@ -17,7 +17,7 @@
45925 #include <linux/slab.h>
45926 #include "internal.h"
45927
45928-atomic_t fscache_op_debug_id;
45929+atomic_unchecked_t fscache_op_debug_id;
45930 EXPORT_SYMBOL(fscache_op_debug_id);
45931
45932 /**
45933@@ -38,7 +38,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
45934 ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
45935 ASSERTCMP(atomic_read(&op->usage), >, 0);
45936
45937- fscache_stat(&fscache_n_op_enqueue);
45938+ fscache_stat_unchecked(&fscache_n_op_enqueue);
45939 switch (op->flags & FSCACHE_OP_TYPE) {
45940 case FSCACHE_OP_ASYNC:
45941 _debug("queue async");
45942@@ -69,7 +69,7 @@ static void fscache_run_op(struct fscache_object *object,
45943 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
45944 if (op->processor)
45945 fscache_enqueue_operation(op);
45946- fscache_stat(&fscache_n_op_run);
45947+ fscache_stat_unchecked(&fscache_n_op_run);
45948 }
45949
45950 /*
45951@@ -98,11 +98,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
45952 if (object->n_ops > 1) {
45953 atomic_inc(&op->usage);
45954 list_add_tail(&op->pend_link, &object->pending_ops);
45955- fscache_stat(&fscache_n_op_pend);
45956+ fscache_stat_unchecked(&fscache_n_op_pend);
45957 } else if (!list_empty(&object->pending_ops)) {
45958 atomic_inc(&op->usage);
45959 list_add_tail(&op->pend_link, &object->pending_ops);
45960- fscache_stat(&fscache_n_op_pend);
45961+ fscache_stat_unchecked(&fscache_n_op_pend);
45962 fscache_start_operations(object);
45963 } else {
45964 ASSERTCMP(object->n_in_progress, ==, 0);
45965@@ -118,7 +118,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
45966 object->n_exclusive++; /* reads and writes must wait */
45967 atomic_inc(&op->usage);
45968 list_add_tail(&op->pend_link, &object->pending_ops);
45969- fscache_stat(&fscache_n_op_pend);
45970+ fscache_stat_unchecked(&fscache_n_op_pend);
45971 ret = 0;
45972 } else {
45973 /* not allowed to submit ops in any other state */
45974@@ -203,11 +203,11 @@ int fscache_submit_op(struct fscache_object *object,
45975 if (object->n_exclusive > 0) {
45976 atomic_inc(&op->usage);
45977 list_add_tail(&op->pend_link, &object->pending_ops);
45978- fscache_stat(&fscache_n_op_pend);
45979+ fscache_stat_unchecked(&fscache_n_op_pend);
45980 } else if (!list_empty(&object->pending_ops)) {
45981 atomic_inc(&op->usage);
45982 list_add_tail(&op->pend_link, &object->pending_ops);
45983- fscache_stat(&fscache_n_op_pend);
45984+ fscache_stat_unchecked(&fscache_n_op_pend);
45985 fscache_start_operations(object);
45986 } else {
45987 ASSERTCMP(object->n_exclusive, ==, 0);
45988@@ -219,12 +219,12 @@ int fscache_submit_op(struct fscache_object *object,
45989 object->n_ops++;
45990 atomic_inc(&op->usage);
45991 list_add_tail(&op->pend_link, &object->pending_ops);
45992- fscache_stat(&fscache_n_op_pend);
45993+ fscache_stat_unchecked(&fscache_n_op_pend);
45994 ret = 0;
45995 } else if (object->state == FSCACHE_OBJECT_DYING ||
45996 object->state == FSCACHE_OBJECT_LC_DYING ||
45997 object->state == FSCACHE_OBJECT_WITHDRAWING) {
45998- fscache_stat(&fscache_n_op_rejected);
45999+ fscache_stat_unchecked(&fscache_n_op_rejected);
46000 ret = -ENOBUFS;
46001 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
46002 fscache_report_unexpected_submission(object, op, ostate);
46003@@ -294,7 +294,7 @@ int fscache_cancel_op(struct fscache_operation *op)
46004
46005 ret = -EBUSY;
46006 if (!list_empty(&op->pend_link)) {
46007- fscache_stat(&fscache_n_op_cancelled);
46008+ fscache_stat_unchecked(&fscache_n_op_cancelled);
46009 list_del_init(&op->pend_link);
46010 object->n_ops--;
46011 if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
46012@@ -331,7 +331,7 @@ void fscache_put_operation(struct fscache_operation *op)
46013 if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
46014 BUG();
46015
46016- fscache_stat(&fscache_n_op_release);
46017+ fscache_stat_unchecked(&fscache_n_op_release);
46018
46019 if (op->release) {
46020 op->release(op);
46021@@ -348,7 +348,7 @@ void fscache_put_operation(struct fscache_operation *op)
46022 * lock, and defer it otherwise */
46023 if (!spin_trylock(&object->lock)) {
46024 _debug("defer put");
46025- fscache_stat(&fscache_n_op_deferred_release);
46026+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
46027
46028 cache = object->cache;
46029 spin_lock(&cache->op_gc_list_lock);
46030@@ -410,7 +410,7 @@ void fscache_operation_gc(struct work_struct *work)
46031
46032 _debug("GC DEFERRED REL OBJ%x OP%x",
46033 object->debug_id, op->debug_id);
46034- fscache_stat(&fscache_n_op_gc);
46035+ fscache_stat_unchecked(&fscache_n_op_gc);
46036
46037 ASSERTCMP(atomic_read(&op->usage), ==, 0);
46038
46039diff --git a/fs/fscache/page.c b/fs/fscache/page.c
46040index 3f7a59b..cf196cc 100644
46041--- a/fs/fscache/page.c
46042+++ b/fs/fscache/page.c
46043@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
46044 val = radix_tree_lookup(&cookie->stores, page->index);
46045 if (!val) {
46046 rcu_read_unlock();
46047- fscache_stat(&fscache_n_store_vmscan_not_storing);
46048+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
46049 __fscache_uncache_page(cookie, page);
46050 return true;
46051 }
46052@@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
46053 spin_unlock(&cookie->stores_lock);
46054
46055 if (xpage) {
46056- fscache_stat(&fscache_n_store_vmscan_cancelled);
46057- fscache_stat(&fscache_n_store_radix_deletes);
46058+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
46059+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
46060 ASSERTCMP(xpage, ==, page);
46061 } else {
46062- fscache_stat(&fscache_n_store_vmscan_gone);
46063+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
46064 }
46065
46066 wake_up_bit(&cookie->flags, 0);
46067@@ -107,7 +107,7 @@ page_busy:
46068 /* we might want to wait here, but that could deadlock the allocator as
46069 * the work threads writing to the cache may all end up sleeping
46070 * on memory allocation */
46071- fscache_stat(&fscache_n_store_vmscan_busy);
46072+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
46073 return false;
46074 }
46075 EXPORT_SYMBOL(__fscache_maybe_release_page);
46076@@ -131,7 +131,7 @@ static void fscache_end_page_write(struct fscache_object *object,
46077 FSCACHE_COOKIE_STORING_TAG);
46078 if (!radix_tree_tag_get(&cookie->stores, page->index,
46079 FSCACHE_COOKIE_PENDING_TAG)) {
46080- fscache_stat(&fscache_n_store_radix_deletes);
46081+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
46082 xpage = radix_tree_delete(&cookie->stores, page->index);
46083 }
46084 spin_unlock(&cookie->stores_lock);
46085@@ -152,7 +152,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
46086
46087 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
46088
46089- fscache_stat(&fscache_n_attr_changed_calls);
46090+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
46091
46092 if (fscache_object_is_active(object)) {
46093 fscache_stat(&fscache_n_cop_attr_changed);
46094@@ -177,11 +177,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
46095
46096 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46097
46098- fscache_stat(&fscache_n_attr_changed);
46099+ fscache_stat_unchecked(&fscache_n_attr_changed);
46100
46101 op = kzalloc(sizeof(*op), GFP_KERNEL);
46102 if (!op) {
46103- fscache_stat(&fscache_n_attr_changed_nomem);
46104+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
46105 _leave(" = -ENOMEM");
46106 return -ENOMEM;
46107 }
46108@@ -199,7 +199,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
46109 if (fscache_submit_exclusive_op(object, op) < 0)
46110 goto nobufs;
46111 spin_unlock(&cookie->lock);
46112- fscache_stat(&fscache_n_attr_changed_ok);
46113+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
46114 fscache_put_operation(op);
46115 _leave(" = 0");
46116 return 0;
46117@@ -207,7 +207,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
46118 nobufs:
46119 spin_unlock(&cookie->lock);
46120 kfree(op);
46121- fscache_stat(&fscache_n_attr_changed_nobufs);
46122+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
46123 _leave(" = %d", -ENOBUFS);
46124 return -ENOBUFS;
46125 }
46126@@ -243,7 +243,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
46127 /* allocate a retrieval operation and attempt to submit it */
46128 op = kzalloc(sizeof(*op), GFP_NOIO);
46129 if (!op) {
46130- fscache_stat(&fscache_n_retrievals_nomem);
46131+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
46132 return NULL;
46133 }
46134
46135@@ -271,13 +271,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
46136 return 0;
46137 }
46138
46139- fscache_stat(&fscache_n_retrievals_wait);
46140+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
46141
46142 jif = jiffies;
46143 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
46144 fscache_wait_bit_interruptible,
46145 TASK_INTERRUPTIBLE) != 0) {
46146- fscache_stat(&fscache_n_retrievals_intr);
46147+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
46148 _leave(" = -ERESTARTSYS");
46149 return -ERESTARTSYS;
46150 }
46151@@ -295,8 +295,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
46152 */
46153 static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
46154 struct fscache_retrieval *op,
46155- atomic_t *stat_op_waits,
46156- atomic_t *stat_object_dead)
46157+ atomic_unchecked_t *stat_op_waits,
46158+ atomic_unchecked_t *stat_object_dead)
46159 {
46160 int ret;
46161
46162@@ -304,7 +304,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
46163 goto check_if_dead;
46164
46165 _debug(">>> WT");
46166- fscache_stat(stat_op_waits);
46167+ fscache_stat_unchecked(stat_op_waits);
46168 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
46169 fscache_wait_bit_interruptible,
46170 TASK_INTERRUPTIBLE) < 0) {
46171@@ -321,7 +321,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
46172
46173 check_if_dead:
46174 if (unlikely(fscache_object_is_dead(object))) {
46175- fscache_stat(stat_object_dead);
46176+ fscache_stat_unchecked(stat_object_dead);
46177 return -ENOBUFS;
46178 }
46179 return 0;
46180@@ -348,7 +348,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
46181
46182 _enter("%p,%p,,,", cookie, page);
46183
46184- fscache_stat(&fscache_n_retrievals);
46185+ fscache_stat_unchecked(&fscache_n_retrievals);
46186
46187 if (hlist_empty(&cookie->backing_objects))
46188 goto nobufs;
46189@@ -381,7 +381,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
46190 goto nobufs_unlock;
46191 spin_unlock(&cookie->lock);
46192
46193- fscache_stat(&fscache_n_retrieval_ops);
46194+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
46195
46196 /* pin the netfs read context in case we need to do the actual netfs
46197 * read because we've encountered a cache read failure */
46198@@ -411,15 +411,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
46199
46200 error:
46201 if (ret == -ENOMEM)
46202- fscache_stat(&fscache_n_retrievals_nomem);
46203+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
46204 else if (ret == -ERESTARTSYS)
46205- fscache_stat(&fscache_n_retrievals_intr);
46206+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
46207 else if (ret == -ENODATA)
46208- fscache_stat(&fscache_n_retrievals_nodata);
46209+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
46210 else if (ret < 0)
46211- fscache_stat(&fscache_n_retrievals_nobufs);
46212+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46213 else
46214- fscache_stat(&fscache_n_retrievals_ok);
46215+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
46216
46217 fscache_put_retrieval(op);
46218 _leave(" = %d", ret);
46219@@ -429,7 +429,7 @@ nobufs_unlock:
46220 spin_unlock(&cookie->lock);
46221 kfree(op);
46222 nobufs:
46223- fscache_stat(&fscache_n_retrievals_nobufs);
46224+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46225 _leave(" = -ENOBUFS");
46226 return -ENOBUFS;
46227 }
46228@@ -467,7 +467,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
46229
46230 _enter("%p,,%d,,,", cookie, *nr_pages);
46231
46232- fscache_stat(&fscache_n_retrievals);
46233+ fscache_stat_unchecked(&fscache_n_retrievals);
46234
46235 if (hlist_empty(&cookie->backing_objects))
46236 goto nobufs;
46237@@ -497,7 +497,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
46238 goto nobufs_unlock;
46239 spin_unlock(&cookie->lock);
46240
46241- fscache_stat(&fscache_n_retrieval_ops);
46242+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
46243
46244 /* pin the netfs read context in case we need to do the actual netfs
46245 * read because we've encountered a cache read failure */
46246@@ -527,15 +527,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
46247
46248 error:
46249 if (ret == -ENOMEM)
46250- fscache_stat(&fscache_n_retrievals_nomem);
46251+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
46252 else if (ret == -ERESTARTSYS)
46253- fscache_stat(&fscache_n_retrievals_intr);
46254+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
46255 else if (ret == -ENODATA)
46256- fscache_stat(&fscache_n_retrievals_nodata);
46257+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
46258 else if (ret < 0)
46259- fscache_stat(&fscache_n_retrievals_nobufs);
46260+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46261 else
46262- fscache_stat(&fscache_n_retrievals_ok);
46263+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
46264
46265 fscache_put_retrieval(op);
46266 _leave(" = %d", ret);
46267@@ -545,7 +545,7 @@ nobufs_unlock:
46268 spin_unlock(&cookie->lock);
46269 kfree(op);
46270 nobufs:
46271- fscache_stat(&fscache_n_retrievals_nobufs);
46272+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46273 _leave(" = -ENOBUFS");
46274 return -ENOBUFS;
46275 }
46276@@ -569,7 +569,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46277
46278 _enter("%p,%p,,,", cookie, page);
46279
46280- fscache_stat(&fscache_n_allocs);
46281+ fscache_stat_unchecked(&fscache_n_allocs);
46282
46283 if (hlist_empty(&cookie->backing_objects))
46284 goto nobufs;
46285@@ -595,7 +595,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46286 goto nobufs_unlock;
46287 spin_unlock(&cookie->lock);
46288
46289- fscache_stat(&fscache_n_alloc_ops);
46290+ fscache_stat_unchecked(&fscache_n_alloc_ops);
46291
46292 ret = fscache_wait_for_retrieval_activation(
46293 object, op,
46294@@ -611,11 +611,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46295
46296 error:
46297 if (ret == -ERESTARTSYS)
46298- fscache_stat(&fscache_n_allocs_intr);
46299+ fscache_stat_unchecked(&fscache_n_allocs_intr);
46300 else if (ret < 0)
46301- fscache_stat(&fscache_n_allocs_nobufs);
46302+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
46303 else
46304- fscache_stat(&fscache_n_allocs_ok);
46305+ fscache_stat_unchecked(&fscache_n_allocs_ok);
46306
46307 fscache_put_retrieval(op);
46308 _leave(" = %d", ret);
46309@@ -625,7 +625,7 @@ nobufs_unlock:
46310 spin_unlock(&cookie->lock);
46311 kfree(op);
46312 nobufs:
46313- fscache_stat(&fscache_n_allocs_nobufs);
46314+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
46315 _leave(" = -ENOBUFS");
46316 return -ENOBUFS;
46317 }
46318@@ -666,7 +666,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46319
46320 spin_lock(&cookie->stores_lock);
46321
46322- fscache_stat(&fscache_n_store_calls);
46323+ fscache_stat_unchecked(&fscache_n_store_calls);
46324
46325 /* find a page to store */
46326 page = NULL;
46327@@ -677,7 +677,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46328 page = results[0];
46329 _debug("gang %d [%lx]", n, page->index);
46330 if (page->index > op->store_limit) {
46331- fscache_stat(&fscache_n_store_pages_over_limit);
46332+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
46333 goto superseded;
46334 }
46335
46336@@ -689,7 +689,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46337 spin_unlock(&cookie->stores_lock);
46338 spin_unlock(&object->lock);
46339
46340- fscache_stat(&fscache_n_store_pages);
46341+ fscache_stat_unchecked(&fscache_n_store_pages);
46342 fscache_stat(&fscache_n_cop_write_page);
46343 ret = object->cache->ops->write_page(op, page);
46344 fscache_stat_d(&fscache_n_cop_write_page);
46345@@ -757,7 +757,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46346 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46347 ASSERT(PageFsCache(page));
46348
46349- fscache_stat(&fscache_n_stores);
46350+ fscache_stat_unchecked(&fscache_n_stores);
46351
46352 op = kzalloc(sizeof(*op), GFP_NOIO);
46353 if (!op)
46354@@ -808,7 +808,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46355 spin_unlock(&cookie->stores_lock);
46356 spin_unlock(&object->lock);
46357
46358- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
46359+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
46360 op->store_limit = object->store_limit;
46361
46362 if (fscache_submit_op(object, &op->op) < 0)
46363@@ -816,8 +816,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46364
46365 spin_unlock(&cookie->lock);
46366 radix_tree_preload_end();
46367- fscache_stat(&fscache_n_store_ops);
46368- fscache_stat(&fscache_n_stores_ok);
46369+ fscache_stat_unchecked(&fscache_n_store_ops);
46370+ fscache_stat_unchecked(&fscache_n_stores_ok);
46371
46372 /* the work queue now carries its own ref on the object */
46373 fscache_put_operation(&op->op);
46374@@ -825,14 +825,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46375 return 0;
46376
46377 already_queued:
46378- fscache_stat(&fscache_n_stores_again);
46379+ fscache_stat_unchecked(&fscache_n_stores_again);
46380 already_pending:
46381 spin_unlock(&cookie->stores_lock);
46382 spin_unlock(&object->lock);
46383 spin_unlock(&cookie->lock);
46384 radix_tree_preload_end();
46385 kfree(op);
46386- fscache_stat(&fscache_n_stores_ok);
46387+ fscache_stat_unchecked(&fscache_n_stores_ok);
46388 _leave(" = 0");
46389 return 0;
46390
46391@@ -851,14 +851,14 @@ nobufs:
46392 spin_unlock(&cookie->lock);
46393 radix_tree_preload_end();
46394 kfree(op);
46395- fscache_stat(&fscache_n_stores_nobufs);
46396+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
46397 _leave(" = -ENOBUFS");
46398 return -ENOBUFS;
46399
46400 nomem_free:
46401 kfree(op);
46402 nomem:
46403- fscache_stat(&fscache_n_stores_oom);
46404+ fscache_stat_unchecked(&fscache_n_stores_oom);
46405 _leave(" = -ENOMEM");
46406 return -ENOMEM;
46407 }
46408@@ -876,7 +876,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
46409 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46410 ASSERTCMP(page, !=, NULL);
46411
46412- fscache_stat(&fscache_n_uncaches);
46413+ fscache_stat_unchecked(&fscache_n_uncaches);
46414
46415 /* cache withdrawal may beat us to it */
46416 if (!PageFsCache(page))
46417@@ -929,7 +929,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op,
46418 unsigned long loop;
46419
46420 #ifdef CONFIG_FSCACHE_STATS
46421- atomic_add(pagevec->nr, &fscache_n_marks);
46422+ atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
46423 #endif
46424
46425 for (loop = 0; loop < pagevec->nr; loop++) {
46426diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
46427index 4765190..2a067f2 100644
46428--- a/fs/fscache/stats.c
46429+++ b/fs/fscache/stats.c
46430@@ -18,95 +18,95 @@
46431 /*
46432 * operation counters
46433 */
46434-atomic_t fscache_n_op_pend;
46435-atomic_t fscache_n_op_run;
46436-atomic_t fscache_n_op_enqueue;
46437-atomic_t fscache_n_op_requeue;
46438-atomic_t fscache_n_op_deferred_release;
46439-atomic_t fscache_n_op_release;
46440-atomic_t fscache_n_op_gc;
46441-atomic_t fscache_n_op_cancelled;
46442-atomic_t fscache_n_op_rejected;
46443+atomic_unchecked_t fscache_n_op_pend;
46444+atomic_unchecked_t fscache_n_op_run;
46445+atomic_unchecked_t fscache_n_op_enqueue;
46446+atomic_unchecked_t fscache_n_op_requeue;
46447+atomic_unchecked_t fscache_n_op_deferred_release;
46448+atomic_unchecked_t fscache_n_op_release;
46449+atomic_unchecked_t fscache_n_op_gc;
46450+atomic_unchecked_t fscache_n_op_cancelled;
46451+atomic_unchecked_t fscache_n_op_rejected;
46452
46453-atomic_t fscache_n_attr_changed;
46454-atomic_t fscache_n_attr_changed_ok;
46455-atomic_t fscache_n_attr_changed_nobufs;
46456-atomic_t fscache_n_attr_changed_nomem;
46457-atomic_t fscache_n_attr_changed_calls;
46458+atomic_unchecked_t fscache_n_attr_changed;
46459+atomic_unchecked_t fscache_n_attr_changed_ok;
46460+atomic_unchecked_t fscache_n_attr_changed_nobufs;
46461+atomic_unchecked_t fscache_n_attr_changed_nomem;
46462+atomic_unchecked_t fscache_n_attr_changed_calls;
46463
46464-atomic_t fscache_n_allocs;
46465-atomic_t fscache_n_allocs_ok;
46466-atomic_t fscache_n_allocs_wait;
46467-atomic_t fscache_n_allocs_nobufs;
46468-atomic_t fscache_n_allocs_intr;
46469-atomic_t fscache_n_allocs_object_dead;
46470-atomic_t fscache_n_alloc_ops;
46471-atomic_t fscache_n_alloc_op_waits;
46472+atomic_unchecked_t fscache_n_allocs;
46473+atomic_unchecked_t fscache_n_allocs_ok;
46474+atomic_unchecked_t fscache_n_allocs_wait;
46475+atomic_unchecked_t fscache_n_allocs_nobufs;
46476+atomic_unchecked_t fscache_n_allocs_intr;
46477+atomic_unchecked_t fscache_n_allocs_object_dead;
46478+atomic_unchecked_t fscache_n_alloc_ops;
46479+atomic_unchecked_t fscache_n_alloc_op_waits;
46480
46481-atomic_t fscache_n_retrievals;
46482-atomic_t fscache_n_retrievals_ok;
46483-atomic_t fscache_n_retrievals_wait;
46484-atomic_t fscache_n_retrievals_nodata;
46485-atomic_t fscache_n_retrievals_nobufs;
46486-atomic_t fscache_n_retrievals_intr;
46487-atomic_t fscache_n_retrievals_nomem;
46488-atomic_t fscache_n_retrievals_object_dead;
46489-atomic_t fscache_n_retrieval_ops;
46490-atomic_t fscache_n_retrieval_op_waits;
46491+atomic_unchecked_t fscache_n_retrievals;
46492+atomic_unchecked_t fscache_n_retrievals_ok;
46493+atomic_unchecked_t fscache_n_retrievals_wait;
46494+atomic_unchecked_t fscache_n_retrievals_nodata;
46495+atomic_unchecked_t fscache_n_retrievals_nobufs;
46496+atomic_unchecked_t fscache_n_retrievals_intr;
46497+atomic_unchecked_t fscache_n_retrievals_nomem;
46498+atomic_unchecked_t fscache_n_retrievals_object_dead;
46499+atomic_unchecked_t fscache_n_retrieval_ops;
46500+atomic_unchecked_t fscache_n_retrieval_op_waits;
46501
46502-atomic_t fscache_n_stores;
46503-atomic_t fscache_n_stores_ok;
46504-atomic_t fscache_n_stores_again;
46505-atomic_t fscache_n_stores_nobufs;
46506-atomic_t fscache_n_stores_oom;
46507-atomic_t fscache_n_store_ops;
46508-atomic_t fscache_n_store_calls;
46509-atomic_t fscache_n_store_pages;
46510-atomic_t fscache_n_store_radix_deletes;
46511-atomic_t fscache_n_store_pages_over_limit;
46512+atomic_unchecked_t fscache_n_stores;
46513+atomic_unchecked_t fscache_n_stores_ok;
46514+atomic_unchecked_t fscache_n_stores_again;
46515+atomic_unchecked_t fscache_n_stores_nobufs;
46516+atomic_unchecked_t fscache_n_stores_oom;
46517+atomic_unchecked_t fscache_n_store_ops;
46518+atomic_unchecked_t fscache_n_store_calls;
46519+atomic_unchecked_t fscache_n_store_pages;
46520+atomic_unchecked_t fscache_n_store_radix_deletes;
46521+atomic_unchecked_t fscache_n_store_pages_over_limit;
46522
46523-atomic_t fscache_n_store_vmscan_not_storing;
46524-atomic_t fscache_n_store_vmscan_gone;
46525-atomic_t fscache_n_store_vmscan_busy;
46526-atomic_t fscache_n_store_vmscan_cancelled;
46527+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
46528+atomic_unchecked_t fscache_n_store_vmscan_gone;
46529+atomic_unchecked_t fscache_n_store_vmscan_busy;
46530+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
46531
46532-atomic_t fscache_n_marks;
46533-atomic_t fscache_n_uncaches;
46534+atomic_unchecked_t fscache_n_marks;
46535+atomic_unchecked_t fscache_n_uncaches;
46536
46537-atomic_t fscache_n_acquires;
46538-atomic_t fscache_n_acquires_null;
46539-atomic_t fscache_n_acquires_no_cache;
46540-atomic_t fscache_n_acquires_ok;
46541-atomic_t fscache_n_acquires_nobufs;
46542-atomic_t fscache_n_acquires_oom;
46543+atomic_unchecked_t fscache_n_acquires;
46544+atomic_unchecked_t fscache_n_acquires_null;
46545+atomic_unchecked_t fscache_n_acquires_no_cache;
46546+atomic_unchecked_t fscache_n_acquires_ok;
46547+atomic_unchecked_t fscache_n_acquires_nobufs;
46548+atomic_unchecked_t fscache_n_acquires_oom;
46549
46550-atomic_t fscache_n_updates;
46551-atomic_t fscache_n_updates_null;
46552-atomic_t fscache_n_updates_run;
46553+atomic_unchecked_t fscache_n_updates;
46554+atomic_unchecked_t fscache_n_updates_null;
46555+atomic_unchecked_t fscache_n_updates_run;
46556
46557-atomic_t fscache_n_relinquishes;
46558-atomic_t fscache_n_relinquishes_null;
46559-atomic_t fscache_n_relinquishes_waitcrt;
46560-atomic_t fscache_n_relinquishes_retire;
46561+atomic_unchecked_t fscache_n_relinquishes;
46562+atomic_unchecked_t fscache_n_relinquishes_null;
46563+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
46564+atomic_unchecked_t fscache_n_relinquishes_retire;
46565
46566-atomic_t fscache_n_cookie_index;
46567-atomic_t fscache_n_cookie_data;
46568-atomic_t fscache_n_cookie_special;
46569+atomic_unchecked_t fscache_n_cookie_index;
46570+atomic_unchecked_t fscache_n_cookie_data;
46571+atomic_unchecked_t fscache_n_cookie_special;
46572
46573-atomic_t fscache_n_object_alloc;
46574-atomic_t fscache_n_object_no_alloc;
46575-atomic_t fscache_n_object_lookups;
46576-atomic_t fscache_n_object_lookups_negative;
46577-atomic_t fscache_n_object_lookups_positive;
46578-atomic_t fscache_n_object_lookups_timed_out;
46579-atomic_t fscache_n_object_created;
46580-atomic_t fscache_n_object_avail;
46581-atomic_t fscache_n_object_dead;
46582+atomic_unchecked_t fscache_n_object_alloc;
46583+atomic_unchecked_t fscache_n_object_no_alloc;
46584+atomic_unchecked_t fscache_n_object_lookups;
46585+atomic_unchecked_t fscache_n_object_lookups_negative;
46586+atomic_unchecked_t fscache_n_object_lookups_positive;
46587+atomic_unchecked_t fscache_n_object_lookups_timed_out;
46588+atomic_unchecked_t fscache_n_object_created;
46589+atomic_unchecked_t fscache_n_object_avail;
46590+atomic_unchecked_t fscache_n_object_dead;
46591
46592-atomic_t fscache_n_checkaux_none;
46593-atomic_t fscache_n_checkaux_okay;
46594-atomic_t fscache_n_checkaux_update;
46595-atomic_t fscache_n_checkaux_obsolete;
46596+atomic_unchecked_t fscache_n_checkaux_none;
46597+atomic_unchecked_t fscache_n_checkaux_okay;
46598+atomic_unchecked_t fscache_n_checkaux_update;
46599+atomic_unchecked_t fscache_n_checkaux_obsolete;
46600
46601 atomic_t fscache_n_cop_alloc_object;
46602 atomic_t fscache_n_cop_lookup_object;
46603@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v)
46604 seq_puts(m, "FS-Cache statistics\n");
46605
46606 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
46607- atomic_read(&fscache_n_cookie_index),
46608- atomic_read(&fscache_n_cookie_data),
46609- atomic_read(&fscache_n_cookie_special));
46610+ atomic_read_unchecked(&fscache_n_cookie_index),
46611+ atomic_read_unchecked(&fscache_n_cookie_data),
46612+ atomic_read_unchecked(&fscache_n_cookie_special));
46613
46614 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
46615- atomic_read(&fscache_n_object_alloc),
46616- atomic_read(&fscache_n_object_no_alloc),
46617- atomic_read(&fscache_n_object_avail),
46618- atomic_read(&fscache_n_object_dead));
46619+ atomic_read_unchecked(&fscache_n_object_alloc),
46620+ atomic_read_unchecked(&fscache_n_object_no_alloc),
46621+ atomic_read_unchecked(&fscache_n_object_avail),
46622+ atomic_read_unchecked(&fscache_n_object_dead));
46623 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
46624- atomic_read(&fscache_n_checkaux_none),
46625- atomic_read(&fscache_n_checkaux_okay),
46626- atomic_read(&fscache_n_checkaux_update),
46627- atomic_read(&fscache_n_checkaux_obsolete));
46628+ atomic_read_unchecked(&fscache_n_checkaux_none),
46629+ atomic_read_unchecked(&fscache_n_checkaux_okay),
46630+ atomic_read_unchecked(&fscache_n_checkaux_update),
46631+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
46632
46633 seq_printf(m, "Pages : mrk=%u unc=%u\n",
46634- atomic_read(&fscache_n_marks),
46635- atomic_read(&fscache_n_uncaches));
46636+ atomic_read_unchecked(&fscache_n_marks),
46637+ atomic_read_unchecked(&fscache_n_uncaches));
46638
46639 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
46640 " oom=%u\n",
46641- atomic_read(&fscache_n_acquires),
46642- atomic_read(&fscache_n_acquires_null),
46643- atomic_read(&fscache_n_acquires_no_cache),
46644- atomic_read(&fscache_n_acquires_ok),
46645- atomic_read(&fscache_n_acquires_nobufs),
46646- atomic_read(&fscache_n_acquires_oom));
46647+ atomic_read_unchecked(&fscache_n_acquires),
46648+ atomic_read_unchecked(&fscache_n_acquires_null),
46649+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
46650+ atomic_read_unchecked(&fscache_n_acquires_ok),
46651+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
46652+ atomic_read_unchecked(&fscache_n_acquires_oom));
46653
46654 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
46655- atomic_read(&fscache_n_object_lookups),
46656- atomic_read(&fscache_n_object_lookups_negative),
46657- atomic_read(&fscache_n_object_lookups_positive),
46658- atomic_read(&fscache_n_object_created),
46659- atomic_read(&fscache_n_object_lookups_timed_out));
46660+ atomic_read_unchecked(&fscache_n_object_lookups),
46661+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
46662+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
46663+ atomic_read_unchecked(&fscache_n_object_created),
46664+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
46665
46666 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
46667- atomic_read(&fscache_n_updates),
46668- atomic_read(&fscache_n_updates_null),
46669- atomic_read(&fscache_n_updates_run));
46670+ atomic_read_unchecked(&fscache_n_updates),
46671+ atomic_read_unchecked(&fscache_n_updates_null),
46672+ atomic_read_unchecked(&fscache_n_updates_run));
46673
46674 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
46675- atomic_read(&fscache_n_relinquishes),
46676- atomic_read(&fscache_n_relinquishes_null),
46677- atomic_read(&fscache_n_relinquishes_waitcrt),
46678- atomic_read(&fscache_n_relinquishes_retire));
46679+ atomic_read_unchecked(&fscache_n_relinquishes),
46680+ atomic_read_unchecked(&fscache_n_relinquishes_null),
46681+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
46682+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
46683
46684 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
46685- atomic_read(&fscache_n_attr_changed),
46686- atomic_read(&fscache_n_attr_changed_ok),
46687- atomic_read(&fscache_n_attr_changed_nobufs),
46688- atomic_read(&fscache_n_attr_changed_nomem),
46689- atomic_read(&fscache_n_attr_changed_calls));
46690+ atomic_read_unchecked(&fscache_n_attr_changed),
46691+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
46692+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
46693+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
46694+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
46695
46696 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
46697- atomic_read(&fscache_n_allocs),
46698- atomic_read(&fscache_n_allocs_ok),
46699- atomic_read(&fscache_n_allocs_wait),
46700- atomic_read(&fscache_n_allocs_nobufs),
46701- atomic_read(&fscache_n_allocs_intr));
46702+ atomic_read_unchecked(&fscache_n_allocs),
46703+ atomic_read_unchecked(&fscache_n_allocs_ok),
46704+ atomic_read_unchecked(&fscache_n_allocs_wait),
46705+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
46706+ atomic_read_unchecked(&fscache_n_allocs_intr));
46707 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
46708- atomic_read(&fscache_n_alloc_ops),
46709- atomic_read(&fscache_n_alloc_op_waits),
46710- atomic_read(&fscache_n_allocs_object_dead));
46711+ atomic_read_unchecked(&fscache_n_alloc_ops),
46712+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
46713+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
46714
46715 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
46716 " int=%u oom=%u\n",
46717- atomic_read(&fscache_n_retrievals),
46718- atomic_read(&fscache_n_retrievals_ok),
46719- atomic_read(&fscache_n_retrievals_wait),
46720- atomic_read(&fscache_n_retrievals_nodata),
46721- atomic_read(&fscache_n_retrievals_nobufs),
46722- atomic_read(&fscache_n_retrievals_intr),
46723- atomic_read(&fscache_n_retrievals_nomem));
46724+ atomic_read_unchecked(&fscache_n_retrievals),
46725+ atomic_read_unchecked(&fscache_n_retrievals_ok),
46726+ atomic_read_unchecked(&fscache_n_retrievals_wait),
46727+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
46728+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
46729+ atomic_read_unchecked(&fscache_n_retrievals_intr),
46730+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
46731 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
46732- atomic_read(&fscache_n_retrieval_ops),
46733- atomic_read(&fscache_n_retrieval_op_waits),
46734- atomic_read(&fscache_n_retrievals_object_dead));
46735+ atomic_read_unchecked(&fscache_n_retrieval_ops),
46736+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
46737+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
46738
46739 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
46740- atomic_read(&fscache_n_stores),
46741- atomic_read(&fscache_n_stores_ok),
46742- atomic_read(&fscache_n_stores_again),
46743- atomic_read(&fscache_n_stores_nobufs),
46744- atomic_read(&fscache_n_stores_oom));
46745+ atomic_read_unchecked(&fscache_n_stores),
46746+ atomic_read_unchecked(&fscache_n_stores_ok),
46747+ atomic_read_unchecked(&fscache_n_stores_again),
46748+ atomic_read_unchecked(&fscache_n_stores_nobufs),
46749+ atomic_read_unchecked(&fscache_n_stores_oom));
46750 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
46751- atomic_read(&fscache_n_store_ops),
46752- atomic_read(&fscache_n_store_calls),
46753- atomic_read(&fscache_n_store_pages),
46754- atomic_read(&fscache_n_store_radix_deletes),
46755- atomic_read(&fscache_n_store_pages_over_limit));
46756+ atomic_read_unchecked(&fscache_n_store_ops),
46757+ atomic_read_unchecked(&fscache_n_store_calls),
46758+ atomic_read_unchecked(&fscache_n_store_pages),
46759+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
46760+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
46761
46762 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
46763- atomic_read(&fscache_n_store_vmscan_not_storing),
46764- atomic_read(&fscache_n_store_vmscan_gone),
46765- atomic_read(&fscache_n_store_vmscan_busy),
46766- atomic_read(&fscache_n_store_vmscan_cancelled));
46767+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
46768+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
46769+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
46770+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
46771
46772 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
46773- atomic_read(&fscache_n_op_pend),
46774- atomic_read(&fscache_n_op_run),
46775- atomic_read(&fscache_n_op_enqueue),
46776- atomic_read(&fscache_n_op_cancelled),
46777- atomic_read(&fscache_n_op_rejected));
46778+ atomic_read_unchecked(&fscache_n_op_pend),
46779+ atomic_read_unchecked(&fscache_n_op_run),
46780+ atomic_read_unchecked(&fscache_n_op_enqueue),
46781+ atomic_read_unchecked(&fscache_n_op_cancelled),
46782+ atomic_read_unchecked(&fscache_n_op_rejected));
46783 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
46784- atomic_read(&fscache_n_op_deferred_release),
46785- atomic_read(&fscache_n_op_release),
46786- atomic_read(&fscache_n_op_gc));
46787+ atomic_read_unchecked(&fscache_n_op_deferred_release),
46788+ atomic_read_unchecked(&fscache_n_op_release),
46789+ atomic_read_unchecked(&fscache_n_op_gc));
46790
46791 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
46792 atomic_read(&fscache_n_cop_alloc_object),
46793diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
46794index 3426521..3b75162 100644
46795--- a/fs/fuse/cuse.c
46796+++ b/fs/fuse/cuse.c
46797@@ -587,10 +587,12 @@ static int __init cuse_init(void)
46798 INIT_LIST_HEAD(&cuse_conntbl[i]);
46799
46800 /* inherit and extend fuse_dev_operations */
46801- cuse_channel_fops = fuse_dev_operations;
46802- cuse_channel_fops.owner = THIS_MODULE;
46803- cuse_channel_fops.open = cuse_channel_open;
46804- cuse_channel_fops.release = cuse_channel_release;
46805+ pax_open_kernel();
46806+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
46807+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
46808+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
46809+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
46810+ pax_close_kernel();
46811
46812 cuse_class = class_create(THIS_MODULE, "cuse");
46813 if (IS_ERR(cuse_class))
46814diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
46815index 5f3368a..8306426 100644
46816--- a/fs/fuse/dev.c
46817+++ b/fs/fuse/dev.c
46818@@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
46819 ret = 0;
46820 pipe_lock(pipe);
46821
46822- if (!pipe->readers) {
46823+ if (!atomic_read(&pipe->readers)) {
46824 send_sig(SIGPIPE, current, 0);
46825 if (!ret)
46826 ret = -EPIPE;
46827diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
46828index 2066328..f5add3b 100644
46829--- a/fs/fuse/dir.c
46830+++ b/fs/fuse/dir.c
46831@@ -1175,7 +1175,7 @@ static char *read_link(struct dentry *dentry)
46832 return link;
46833 }
46834
46835-static void free_link(char *link)
46836+static void free_link(const char *link)
46837 {
46838 if (!IS_ERR(link))
46839 free_page((unsigned long) link);
46840diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
46841index 5698746..6086012 100644
46842--- a/fs/gfs2/inode.c
46843+++ b/fs/gfs2/inode.c
46844@@ -1487,7 +1487,7 @@ out:
46845
46846 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
46847 {
46848- char *s = nd_get_link(nd);
46849+ const char *s = nd_get_link(nd);
46850 if (!IS_ERR(s))
46851 kfree(s);
46852 }
46853diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
46854index 3645cd3..786809c 100644
46855--- a/fs/hugetlbfs/inode.c
46856+++ b/fs/hugetlbfs/inode.c
46857@@ -914,7 +914,7 @@ static struct file_system_type hugetlbfs_fs_type = {
46858 .kill_sb = kill_litter_super,
46859 };
46860
46861-static struct vfsmount *hugetlbfs_vfsmount;
46862+struct vfsmount *hugetlbfs_vfsmount;
46863
46864 static int can_do_hugetlb_shm(void)
46865 {
46866diff --git a/fs/inode.c b/fs/inode.c
46867index 83ab215..8842101 100644
46868--- a/fs/inode.c
46869+++ b/fs/inode.c
46870@@ -870,8 +870,8 @@ unsigned int get_next_ino(void)
46871
46872 #ifdef CONFIG_SMP
46873 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
46874- static atomic_t shared_last_ino;
46875- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
46876+ static atomic_unchecked_t shared_last_ino;
46877+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
46878
46879 res = next - LAST_INO_BATCH;
46880 }
46881diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
46882index eafb8d3..f423d37 100644
46883--- a/fs/jffs2/erase.c
46884+++ b/fs/jffs2/erase.c
46885@@ -438,7 +438,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
46886 struct jffs2_unknown_node marker = {
46887 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
46888 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
46889- .totlen = cpu_to_je32(c->cleanmarker_size)
46890+ .totlen = cpu_to_je32(c->cleanmarker_size),
46891+ .hdr_crc = cpu_to_je32(0)
46892 };
46893
46894 jffs2_prealloc_raw_node_refs(c, jeb, 1);
46895diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
46896index 30e8f47..21f600c 100644
46897--- a/fs/jffs2/wbuf.c
46898+++ b/fs/jffs2/wbuf.c
46899@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
46900 {
46901 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
46902 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
46903- .totlen = constant_cpu_to_je32(8)
46904+ .totlen = constant_cpu_to_je32(8),
46905+ .hdr_crc = constant_cpu_to_je32(0)
46906 };
46907
46908 /*
46909diff --git a/fs/jfs/super.c b/fs/jfs/super.c
46910index 682bca6..86b8e6e 100644
46911--- a/fs/jfs/super.c
46912+++ b/fs/jfs/super.c
46913@@ -801,7 +801,7 @@ static int __init init_jfs_fs(void)
46914
46915 jfs_inode_cachep =
46916 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
46917- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
46918+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
46919 init_once);
46920 if (jfs_inode_cachep == NULL)
46921 return -ENOMEM;
46922diff --git a/fs/libfs.c b/fs/libfs.c
46923index 5b2dbb3..7442d54 100644
46924--- a/fs/libfs.c
46925+++ b/fs/libfs.c
46926@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
46927
46928 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
46929 struct dentry *next;
46930+ char d_name[sizeof(next->d_iname)];
46931+ const unsigned char *name;
46932+
46933 next = list_entry(p, struct dentry, d_u.d_child);
46934 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
46935 if (!simple_positive(next)) {
46936@@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
46937
46938 spin_unlock(&next->d_lock);
46939 spin_unlock(&dentry->d_lock);
46940- if (filldir(dirent, next->d_name.name,
46941+ name = next->d_name.name;
46942+ if (name == next->d_iname) {
46943+ memcpy(d_name, name, next->d_name.len);
46944+ name = d_name;
46945+ }
46946+ if (filldir(dirent, name,
46947 next->d_name.len, filp->f_pos,
46948 next->d_inode->i_ino,
46949 dt_type(next->d_inode)) < 0)
46950diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
46951index 8392cb8..80d6193 100644
46952--- a/fs/lockd/clntproc.c
46953+++ b/fs/lockd/clntproc.c
46954@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
46955 /*
46956 * Cookie counter for NLM requests
46957 */
46958-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
46959+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
46960
46961 void nlmclnt_next_cookie(struct nlm_cookie *c)
46962 {
46963- u32 cookie = atomic_inc_return(&nlm_cookie);
46964+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
46965
46966 memcpy(c->data, &cookie, 4);
46967 c->len=4;
46968diff --git a/fs/locks.c b/fs/locks.c
46969index 0d68f1f..f216b79 100644
46970--- a/fs/locks.c
46971+++ b/fs/locks.c
46972@@ -2075,16 +2075,16 @@ void locks_remove_flock(struct file *filp)
46973 return;
46974
46975 if (filp->f_op && filp->f_op->flock) {
46976- struct file_lock fl = {
46977+ struct file_lock flock = {
46978 .fl_pid = current->tgid,
46979 .fl_file = filp,
46980 .fl_flags = FL_FLOCK,
46981 .fl_type = F_UNLCK,
46982 .fl_end = OFFSET_MAX,
46983 };
46984- filp->f_op->flock(filp, F_SETLKW, &fl);
46985- if (fl.fl_ops && fl.fl_ops->fl_release_private)
46986- fl.fl_ops->fl_release_private(&fl);
46987+ filp->f_op->flock(filp, F_SETLKW, &flock);
46988+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
46989+ flock.fl_ops->fl_release_private(&flock);
46990 }
46991
46992 lock_flocks();
46993diff --git a/fs/namei.c b/fs/namei.c
46994index 46ea9cc..c7cf3a3 100644
46995--- a/fs/namei.c
46996+++ b/fs/namei.c
46997@@ -278,16 +278,32 @@ int generic_permission(struct inode *inode, int mask)
46998 if (ret != -EACCES)
46999 return ret;
47000
47001+#ifdef CONFIG_GRKERNSEC
47002+ /* we'll block if we have to log due to a denied capability use */
47003+ if (mask & MAY_NOT_BLOCK)
47004+ return -ECHILD;
47005+#endif
47006+
47007 if (S_ISDIR(inode->i_mode)) {
47008 /* DACs are overridable for directories */
47009- if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
47010- return 0;
47011 if (!(mask & MAY_WRITE))
47012- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
47013+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
47014+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
47015 return 0;
47016+ if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
47017+ return 0;
47018 return -EACCES;
47019 }
47020 /*
47021+ * Searching includes executable on directories, else just read.
47022+ */
47023+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
47024+ if (mask == MAY_READ)
47025+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
47026+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
47027+ return 0;
47028+
47029+ /*
47030 * Read/write DACs are always overridable.
47031 * Executable DACs are overridable when there is
47032 * at least one exec bit set.
47033@@ -296,14 +312,6 @@ int generic_permission(struct inode *inode, int mask)
47034 if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
47035 return 0;
47036
47037- /*
47038- * Searching includes executable on directories, else just read.
47039- */
47040- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
47041- if (mask == MAY_READ)
47042- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
47043- return 0;
47044-
47045 return -EACCES;
47046 }
47047
47048@@ -652,11 +660,19 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
47049 return error;
47050 }
47051
47052+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
47053+ dentry->d_inode, dentry, nd->path.mnt)) {
47054+ error = -EACCES;
47055+ *p = ERR_PTR(error); /* no ->put_link(), please */
47056+ path_put(&nd->path);
47057+ return error;
47058+ }
47059+
47060 nd->last_type = LAST_BIND;
47061 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
47062 error = PTR_ERR(*p);
47063 if (!IS_ERR(*p)) {
47064- char *s = nd_get_link(nd);
47065+ const char *s = nd_get_link(nd);
47066 error = 0;
47067 if (s)
47068 error = __vfs_follow_link(nd, s);
47069@@ -1650,6 +1666,21 @@ static int path_lookupat(int dfd, const char *name,
47070 if (!err)
47071 err = complete_walk(nd);
47072
47073+ if (!(nd->flags & LOOKUP_PARENT)) {
47074+#ifdef CONFIG_GRKERNSEC
47075+ if (flags & LOOKUP_RCU) {
47076+ if (!err)
47077+ path_put(&nd->path);
47078+ err = -ECHILD;
47079+ } else
47080+#endif
47081+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
47082+ if (!err)
47083+ path_put(&nd->path);
47084+ err = -ENOENT;
47085+ }
47086+ }
47087+
47088 if (!err && nd->flags & LOOKUP_DIRECTORY) {
47089 if (!nd->inode->i_op->lookup) {
47090 path_put(&nd->path);
47091@@ -1677,6 +1708,15 @@ static int do_path_lookup(int dfd, const char *name,
47092 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
47093
47094 if (likely(!retval)) {
47095+ if (*name != '/' && nd->path.dentry && nd->inode) {
47096+#ifdef CONFIG_GRKERNSEC
47097+ if (flags & LOOKUP_RCU)
47098+ return -ECHILD;
47099+#endif
47100+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
47101+ return -ENOENT;
47102+ }
47103+
47104 if (unlikely(!audit_dummy_context())) {
47105 if (nd->path.dentry && nd->inode)
47106 audit_inode(name, nd->path.dentry);
47107@@ -2071,6 +2111,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
47108 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
47109 return -EPERM;
47110
47111+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
47112+ return -EPERM;
47113+ if (gr_handle_rawio(inode))
47114+ return -EPERM;
47115+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
47116+ return -EACCES;
47117+
47118 return 0;
47119 }
47120
47121@@ -2132,6 +2179,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47122 error = complete_walk(nd);
47123 if (error)
47124 return ERR_PTR(error);
47125+#ifdef CONFIG_GRKERNSEC
47126+ if (nd->flags & LOOKUP_RCU) {
47127+ error = -ECHILD;
47128+ goto exit;
47129+ }
47130+#endif
47131+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
47132+ error = -ENOENT;
47133+ goto exit;
47134+ }
47135 audit_inode(pathname, nd->path.dentry);
47136 if (open_flag & O_CREAT) {
47137 error = -EISDIR;
47138@@ -2142,6 +2199,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47139 error = complete_walk(nd);
47140 if (error)
47141 return ERR_PTR(error);
47142+#ifdef CONFIG_GRKERNSEC
47143+ if (nd->flags & LOOKUP_RCU) {
47144+ error = -ECHILD;
47145+ goto exit;
47146+ }
47147+#endif
47148+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
47149+ error = -ENOENT;
47150+ goto exit;
47151+ }
47152 audit_inode(pathname, dir);
47153 goto ok;
47154 }
47155@@ -2163,6 +2230,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47156 error = complete_walk(nd);
47157 if (error)
47158 return ERR_PTR(error);
47159+#ifdef CONFIG_GRKERNSEC
47160+ if (nd->flags & LOOKUP_RCU) {
47161+ error = -ECHILD;
47162+ goto exit;
47163+ }
47164+#endif
47165+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
47166+ error = -ENOENT;
47167+ goto exit;
47168+ }
47169
47170 error = -ENOTDIR;
47171 if (nd->flags & LOOKUP_DIRECTORY) {
47172@@ -2203,6 +2280,12 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47173 /* Negative dentry, just create the file */
47174 if (!dentry->d_inode) {
47175 umode_t mode = op->mode;
47176+
47177+ if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, open_flag, acc_mode, mode)) {
47178+ error = -EACCES;
47179+ goto exit_mutex_unlock;
47180+ }
47181+
47182 if (!IS_POSIXACL(dir->d_inode))
47183 mode &= ~current_umask();
47184 /*
47185@@ -2226,6 +2309,8 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47186 error = vfs_create(dir->d_inode, dentry, mode, nd);
47187 if (error)
47188 goto exit_mutex_unlock;
47189+ else
47190+ gr_handle_create(path->dentry, path->mnt);
47191 mutex_unlock(&dir->d_inode->i_mutex);
47192 dput(nd->path.dentry);
47193 nd->path.dentry = dentry;
47194@@ -2235,6 +2320,19 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47195 /*
47196 * It already exists.
47197 */
47198+
47199+ if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
47200+ error = -ENOENT;
47201+ goto exit_mutex_unlock;
47202+ }
47203+
47204+ /* only check if O_CREAT is specified, all other checks need to go
47205+ into may_open */
47206+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
47207+ error = -EACCES;
47208+ goto exit_mutex_unlock;
47209+ }
47210+
47211 mutex_unlock(&dir->d_inode->i_mutex);
47212 audit_inode(pathname, path->dentry);
47213
47214@@ -2447,6 +2545,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path
47215 *path = nd.path;
47216 return dentry;
47217 eexist:
47218+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
47219+ dput(dentry);
47220+ dentry = ERR_PTR(-ENOENT);
47221+ goto fail;
47222+ }
47223 dput(dentry);
47224 dentry = ERR_PTR(-EEXIST);
47225 fail:
47226@@ -2469,6 +2572,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat
47227 }
47228 EXPORT_SYMBOL(user_path_create);
47229
47230+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, char **to, int is_dir)
47231+{
47232+ char *tmp = getname(pathname);
47233+ struct dentry *res;
47234+ if (IS_ERR(tmp))
47235+ return ERR_CAST(tmp);
47236+ res = kern_path_create(dfd, tmp, path, is_dir);
47237+ if (IS_ERR(res))
47238+ putname(tmp);
47239+ else
47240+ *to = tmp;
47241+ return res;
47242+}
47243+
47244 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
47245 {
47246 int error = may_create(dir, dentry);
47247@@ -2536,6 +2653,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
47248 error = mnt_want_write(path.mnt);
47249 if (error)
47250 goto out_dput;
47251+
47252+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
47253+ error = -EPERM;
47254+ goto out_drop_write;
47255+ }
47256+
47257+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
47258+ error = -EACCES;
47259+ goto out_drop_write;
47260+ }
47261+
47262 error = security_path_mknod(&path, dentry, mode, dev);
47263 if (error)
47264 goto out_drop_write;
47265@@ -2553,6 +2681,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
47266 }
47267 out_drop_write:
47268 mnt_drop_write(path.mnt);
47269+
47270+ if (!error)
47271+ gr_handle_create(dentry, path.mnt);
47272 out_dput:
47273 dput(dentry);
47274 mutex_unlock(&path.dentry->d_inode->i_mutex);
47275@@ -2602,12 +2733,21 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode)
47276 error = mnt_want_write(path.mnt);
47277 if (error)
47278 goto out_dput;
47279+
47280+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
47281+ error = -EACCES;
47282+ goto out_drop_write;
47283+ }
47284+
47285 error = security_path_mkdir(&path, dentry, mode);
47286 if (error)
47287 goto out_drop_write;
47288 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
47289 out_drop_write:
47290 mnt_drop_write(path.mnt);
47291+
47292+ if (!error)
47293+ gr_handle_create(dentry, path.mnt);
47294 out_dput:
47295 dput(dentry);
47296 mutex_unlock(&path.dentry->d_inode->i_mutex);
47297@@ -2687,6 +2827,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
47298 char * name;
47299 struct dentry *dentry;
47300 struct nameidata nd;
47301+ ino_t saved_ino = 0;
47302+ dev_t saved_dev = 0;
47303
47304 error = user_path_parent(dfd, pathname, &nd, &name);
47305 if (error)
47306@@ -2715,6 +2857,15 @@ static long do_rmdir(int dfd, const char __user *pathname)
47307 error = -ENOENT;
47308 goto exit3;
47309 }
47310+
47311+ saved_ino = dentry->d_inode->i_ino;
47312+ saved_dev = gr_get_dev_from_dentry(dentry);
47313+
47314+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
47315+ error = -EACCES;
47316+ goto exit3;
47317+ }
47318+
47319 error = mnt_want_write(nd.path.mnt);
47320 if (error)
47321 goto exit3;
47322@@ -2722,6 +2873,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
47323 if (error)
47324 goto exit4;
47325 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
47326+ if (!error && (saved_dev || saved_ino))
47327+ gr_handle_delete(saved_ino, saved_dev);
47328 exit4:
47329 mnt_drop_write(nd.path.mnt);
47330 exit3:
47331@@ -2784,6 +2937,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47332 struct dentry *dentry;
47333 struct nameidata nd;
47334 struct inode *inode = NULL;
47335+ ino_t saved_ino = 0;
47336+ dev_t saved_dev = 0;
47337
47338 error = user_path_parent(dfd, pathname, &nd, &name);
47339 if (error)
47340@@ -2806,6 +2961,16 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47341 if (!inode)
47342 goto slashes;
47343 ihold(inode);
47344+
47345+ if (inode->i_nlink <= 1) {
47346+ saved_ino = inode->i_ino;
47347+ saved_dev = gr_get_dev_from_dentry(dentry);
47348+ }
47349+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
47350+ error = -EACCES;
47351+ goto exit2;
47352+ }
47353+
47354 error = mnt_want_write(nd.path.mnt);
47355 if (error)
47356 goto exit2;
47357@@ -2813,6 +2978,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47358 if (error)
47359 goto exit3;
47360 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
47361+ if (!error && (saved_ino || saved_dev))
47362+ gr_handle_delete(saved_ino, saved_dev);
47363 exit3:
47364 mnt_drop_write(nd.path.mnt);
47365 exit2:
47366@@ -2888,10 +3055,18 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
47367 error = mnt_want_write(path.mnt);
47368 if (error)
47369 goto out_dput;
47370+
47371+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
47372+ error = -EACCES;
47373+ goto out_drop_write;
47374+ }
47375+
47376 error = security_path_symlink(&path, dentry, from);
47377 if (error)
47378 goto out_drop_write;
47379 error = vfs_symlink(path.dentry->d_inode, dentry, from);
47380+ if (!error)
47381+ gr_handle_create(dentry, path.mnt);
47382 out_drop_write:
47383 mnt_drop_write(path.mnt);
47384 out_dput:
47385@@ -2963,6 +3138,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47386 {
47387 struct dentry *new_dentry;
47388 struct path old_path, new_path;
47389+ char *to = NULL;
47390 int how = 0;
47391 int error;
47392
47393@@ -2986,7 +3162,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47394 if (error)
47395 return error;
47396
47397- new_dentry = user_path_create(newdfd, newname, &new_path, 0);
47398+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to, 0);
47399 error = PTR_ERR(new_dentry);
47400 if (IS_ERR(new_dentry))
47401 goto out;
47402@@ -2997,13 +3173,30 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47403 error = mnt_want_write(new_path.mnt);
47404 if (error)
47405 goto out_dput;
47406+
47407+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
47408+ old_path.dentry->d_inode,
47409+ old_path.dentry->d_inode->i_mode, to)) {
47410+ error = -EACCES;
47411+ goto out_drop_write;
47412+ }
47413+
47414+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
47415+ old_path.dentry, old_path.mnt, to)) {
47416+ error = -EACCES;
47417+ goto out_drop_write;
47418+ }
47419+
47420 error = security_path_link(old_path.dentry, &new_path, new_dentry);
47421 if (error)
47422 goto out_drop_write;
47423 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
47424+ if (!error)
47425+ gr_handle_create(new_dentry, new_path.mnt);
47426 out_drop_write:
47427 mnt_drop_write(new_path.mnt);
47428 out_dput:
47429+ putname(to);
47430 dput(new_dentry);
47431 mutex_unlock(&new_path.dentry->d_inode->i_mutex);
47432 path_put(&new_path);
47433@@ -3231,6 +3424,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
47434 if (new_dentry == trap)
47435 goto exit5;
47436
47437+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
47438+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
47439+ to);
47440+ if (error)
47441+ goto exit5;
47442+
47443 error = mnt_want_write(oldnd.path.mnt);
47444 if (error)
47445 goto exit5;
47446@@ -3240,6 +3439,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
47447 goto exit6;
47448 error = vfs_rename(old_dir->d_inode, old_dentry,
47449 new_dir->d_inode, new_dentry);
47450+ if (!error)
47451+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
47452+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
47453 exit6:
47454 mnt_drop_write(oldnd.path.mnt);
47455 exit5:
47456@@ -3265,6 +3467,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
47457
47458 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
47459 {
47460+ char tmpbuf[64];
47461+ const char *newlink;
47462 int len;
47463
47464 len = PTR_ERR(link);
47465@@ -3274,7 +3478,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
47466 len = strlen(link);
47467 if (len > (unsigned) buflen)
47468 len = buflen;
47469- if (copy_to_user(buffer, link, len))
47470+
47471+ if (len < sizeof(tmpbuf)) {
47472+ memcpy(tmpbuf, link, len);
47473+ newlink = tmpbuf;
47474+ } else
47475+ newlink = link;
47476+
47477+ if (copy_to_user(buffer, newlink, len))
47478 len = -EFAULT;
47479 out:
47480 return len;
47481diff --git a/fs/namespace.c b/fs/namespace.c
47482index e608199..9609cb9 100644
47483--- a/fs/namespace.c
47484+++ b/fs/namespace.c
47485@@ -1155,6 +1155,9 @@ static int do_umount(struct mount *mnt, int flags)
47486 if (!(sb->s_flags & MS_RDONLY))
47487 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
47488 up_write(&sb->s_umount);
47489+
47490+ gr_log_remount(mnt->mnt_devname, retval);
47491+
47492 return retval;
47493 }
47494
47495@@ -1174,6 +1177,9 @@ static int do_umount(struct mount *mnt, int flags)
47496 br_write_unlock(vfsmount_lock);
47497 up_write(&namespace_sem);
47498 release_mounts(&umount_list);
47499+
47500+ gr_log_unmount(mnt->mnt_devname, retval);
47501+
47502 return retval;
47503 }
47504
47505@@ -2175,6 +2181,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
47506 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
47507 MS_STRICTATIME);
47508
47509+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
47510+ retval = -EPERM;
47511+ goto dput_out;
47512+ }
47513+
47514+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
47515+ retval = -EPERM;
47516+ goto dput_out;
47517+ }
47518+
47519 if (flags & MS_REMOUNT)
47520 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
47521 data_page);
47522@@ -2189,6 +2205,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
47523 dev_name, data_page);
47524 dput_out:
47525 path_put(&path);
47526+
47527+ gr_log_mount(dev_name, dir_name, retval);
47528+
47529 return retval;
47530 }
47531
47532@@ -2470,6 +2489,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
47533 if (error)
47534 goto out2;
47535
47536+ if (gr_handle_chroot_pivot()) {
47537+ error = -EPERM;
47538+ goto out2;
47539+ }
47540+
47541 get_fs_root(current->fs, &root);
47542 error = lock_mount(&old);
47543 if (error)
47544diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h
47545index 32c0658..b1c2045e 100644
47546--- a/fs/ncpfs/ncplib_kernel.h
47547+++ b/fs/ncpfs/ncplib_kernel.h
47548@@ -130,7 +130,7 @@ static inline int ncp_is_nfs_extras(struct ncp_server* server, unsigned int voln
47549 int ncp__io2vol(struct ncp_server *, unsigned char *, unsigned int *,
47550 const unsigned char *, unsigned int, int);
47551 int ncp__vol2io(struct ncp_server *, unsigned char *, unsigned int *,
47552- const unsigned char *, unsigned int, int);
47553+ const unsigned char *, unsigned int, int) __size_overflow(5);
47554
47555 #define NCP_ESC ':'
47556 #define NCP_IO_TABLE(sb) (NCP_SBP(sb)->nls_io)
47557@@ -146,7 +146,7 @@ int ncp__vol2io(struct ncp_server *, unsigned char *, unsigned int *,
47558 int ncp__io2vol(unsigned char *, unsigned int *,
47559 const unsigned char *, unsigned int, int);
47560 int ncp__vol2io(unsigned char *, unsigned int *,
47561- const unsigned char *, unsigned int, int);
47562+ const unsigned char *, unsigned int, int) __size_overflow(5);
47563
47564 #define NCP_IO_TABLE(sb) NULL
47565 #define ncp_tolower(t, c) tolower(c)
47566diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
47567index f649fba..236bf92 100644
47568--- a/fs/nfs/inode.c
47569+++ b/fs/nfs/inode.c
47570@@ -151,7 +151,7 @@ static void nfs_zap_caches_locked(struct inode *inode)
47571 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
47572 nfsi->attrtimeo_timestamp = jiffies;
47573
47574- memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
47575+ memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_I(inode)->cookieverf));
47576 if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
47577 nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
47578 else
47579@@ -1003,16 +1003,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
47580 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
47581 }
47582
47583-static atomic_long_t nfs_attr_generation_counter;
47584+static atomic_long_unchecked_t nfs_attr_generation_counter;
47585
47586 static unsigned long nfs_read_attr_generation_counter(void)
47587 {
47588- return atomic_long_read(&nfs_attr_generation_counter);
47589+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
47590 }
47591
47592 unsigned long nfs_inc_attr_generation_counter(void)
47593 {
47594- return atomic_long_inc_return(&nfs_attr_generation_counter);
47595+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
47596 }
47597
47598 void nfs_fattr_init(struct nfs_fattr *fattr)
47599diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
47600index edf6d3e..bdd1da7 100644
47601--- a/fs/nfsd/vfs.c
47602+++ b/fs/nfsd/vfs.c
47603@@ -925,7 +925,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
47604 } else {
47605 oldfs = get_fs();
47606 set_fs(KERNEL_DS);
47607- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
47608+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
47609 set_fs(oldfs);
47610 }
47611
47612@@ -1029,7 +1029,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
47613
47614 /* Write the data. */
47615 oldfs = get_fs(); set_fs(KERNEL_DS);
47616- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
47617+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
47618 set_fs(oldfs);
47619 if (host_err < 0)
47620 goto out_nfserr;
47621@@ -1564,7 +1564,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
47622 */
47623
47624 oldfs = get_fs(); set_fs(KERNEL_DS);
47625- host_err = inode->i_op->readlink(dentry, buf, *lenp);
47626+ host_err = inode->i_op->readlink(dentry, (char __force_user *)buf, *lenp);
47627 set_fs(oldfs);
47628
47629 if (host_err < 0)
47630diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
47631index 3568c8a..e0240d8 100644
47632--- a/fs/notify/fanotify/fanotify_user.c
47633+++ b/fs/notify/fanotify/fanotify_user.c
47634@@ -278,7 +278,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
47635 goto out_close_fd;
47636
47637 ret = -EFAULT;
47638- if (copy_to_user(buf, &fanotify_event_metadata,
47639+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
47640+ copy_to_user(buf, &fanotify_event_metadata,
47641 fanotify_event_metadata.event_len))
47642 goto out_kill_access_response;
47643
47644diff --git a/fs/notify/notification.c b/fs/notify/notification.c
47645index ee18815..7aa5d01 100644
47646--- a/fs/notify/notification.c
47647+++ b/fs/notify/notification.c
47648@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
47649 * get set to 0 so it will never get 'freed'
47650 */
47651 static struct fsnotify_event *q_overflow_event;
47652-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47653+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47654
47655 /**
47656 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
47657@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47658 */
47659 u32 fsnotify_get_cookie(void)
47660 {
47661- return atomic_inc_return(&fsnotify_sync_cookie);
47662+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
47663 }
47664 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
47665
47666diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
47667index 99e3610..02c1068 100644
47668--- a/fs/ntfs/dir.c
47669+++ b/fs/ntfs/dir.c
47670@@ -1329,7 +1329,7 @@ find_next_index_buffer:
47671 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
47672 ~(s64)(ndir->itype.index.block_size - 1)));
47673 /* Bounds checks. */
47674- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47675+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47676 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
47677 "inode 0x%lx or driver bug.", vdir->i_ino);
47678 goto err_out;
47679diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
47680index c587e2d..3641eaa 100644
47681--- a/fs/ntfs/file.c
47682+++ b/fs/ntfs/file.c
47683@@ -2229,6 +2229,6 @@ const struct inode_operations ntfs_file_inode_ops = {
47684 #endif /* NTFS_RW */
47685 };
47686
47687-const struct file_operations ntfs_empty_file_ops = {};
47688+const struct file_operations ntfs_empty_file_ops __read_only;
47689
47690-const struct inode_operations ntfs_empty_inode_ops = {};
47691+const struct inode_operations ntfs_empty_inode_ops __read_only;
47692diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
47693index 210c352..a174f83 100644
47694--- a/fs/ocfs2/localalloc.c
47695+++ b/fs/ocfs2/localalloc.c
47696@@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
47697 goto bail;
47698 }
47699
47700- atomic_inc(&osb->alloc_stats.moves);
47701+ atomic_inc_unchecked(&osb->alloc_stats.moves);
47702
47703 bail:
47704 if (handle)
47705diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
47706index d355e6e..578d905 100644
47707--- a/fs/ocfs2/ocfs2.h
47708+++ b/fs/ocfs2/ocfs2.h
47709@@ -235,11 +235,11 @@ enum ocfs2_vol_state
47710
47711 struct ocfs2_alloc_stats
47712 {
47713- atomic_t moves;
47714- atomic_t local_data;
47715- atomic_t bitmap_data;
47716- atomic_t bg_allocs;
47717- atomic_t bg_extends;
47718+ atomic_unchecked_t moves;
47719+ atomic_unchecked_t local_data;
47720+ atomic_unchecked_t bitmap_data;
47721+ atomic_unchecked_t bg_allocs;
47722+ atomic_unchecked_t bg_extends;
47723 };
47724
47725 enum ocfs2_local_alloc_state
47726diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
47727index f169da4..9112253 100644
47728--- a/fs/ocfs2/suballoc.c
47729+++ b/fs/ocfs2/suballoc.c
47730@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
47731 mlog_errno(status);
47732 goto bail;
47733 }
47734- atomic_inc(&osb->alloc_stats.bg_extends);
47735+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
47736
47737 /* You should never ask for this much metadata */
47738 BUG_ON(bits_wanted >
47739@@ -2008,7 +2008,7 @@ int ocfs2_claim_metadata(handle_t *handle,
47740 mlog_errno(status);
47741 goto bail;
47742 }
47743- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47744+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47745
47746 *suballoc_loc = res.sr_bg_blkno;
47747 *suballoc_bit_start = res.sr_bit_offset;
47748@@ -2172,7 +2172,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
47749 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
47750 res->sr_bits);
47751
47752- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47753+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47754
47755 BUG_ON(res->sr_bits != 1);
47756
47757@@ -2214,7 +2214,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
47758 mlog_errno(status);
47759 goto bail;
47760 }
47761- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47762+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47763
47764 BUG_ON(res.sr_bits != 1);
47765
47766@@ -2318,7 +2318,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
47767 cluster_start,
47768 num_clusters);
47769 if (!status)
47770- atomic_inc(&osb->alloc_stats.local_data);
47771+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
47772 } else {
47773 if (min_clusters > (osb->bitmap_cpg - 1)) {
47774 /* The only paths asking for contiguousness
47775@@ -2344,7 +2344,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
47776 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
47777 res.sr_bg_blkno,
47778 res.sr_bit_offset);
47779- atomic_inc(&osb->alloc_stats.bitmap_data);
47780+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
47781 *num_clusters = res.sr_bits;
47782 }
47783 }
47784diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
47785index 604e12c..8426483 100644
47786--- a/fs/ocfs2/super.c
47787+++ b/fs/ocfs2/super.c
47788@@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
47789 "%10s => GlobalAllocs: %d LocalAllocs: %d "
47790 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
47791 "Stats",
47792- atomic_read(&osb->alloc_stats.bitmap_data),
47793- atomic_read(&osb->alloc_stats.local_data),
47794- atomic_read(&osb->alloc_stats.bg_allocs),
47795- atomic_read(&osb->alloc_stats.moves),
47796- atomic_read(&osb->alloc_stats.bg_extends));
47797+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
47798+ atomic_read_unchecked(&osb->alloc_stats.local_data),
47799+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
47800+ atomic_read_unchecked(&osb->alloc_stats.moves),
47801+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
47802
47803 out += snprintf(buf + out, len - out,
47804 "%10s => State: %u Descriptor: %llu Size: %u bits "
47805@@ -2117,11 +2117,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
47806 spin_lock_init(&osb->osb_xattr_lock);
47807 ocfs2_init_steal_slots(osb);
47808
47809- atomic_set(&osb->alloc_stats.moves, 0);
47810- atomic_set(&osb->alloc_stats.local_data, 0);
47811- atomic_set(&osb->alloc_stats.bitmap_data, 0);
47812- atomic_set(&osb->alloc_stats.bg_allocs, 0);
47813- atomic_set(&osb->alloc_stats.bg_extends, 0);
47814+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
47815+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
47816+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
47817+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
47818+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
47819
47820 /* Copy the blockcheck stats from the superblock probe */
47821 osb->osb_ecc_stats = *stats;
47822diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
47823index 5d22872..523db20 100644
47824--- a/fs/ocfs2/symlink.c
47825+++ b/fs/ocfs2/symlink.c
47826@@ -142,7 +142,7 @@ bail:
47827
47828 static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
47829 {
47830- char *link = nd_get_link(nd);
47831+ const char *link = nd_get_link(nd);
47832 if (!IS_ERR(link))
47833 kfree(link);
47834 }
47835diff --git a/fs/open.c b/fs/open.c
47836index 77becc0..aad7bd9 100644
47837--- a/fs/open.c
47838+++ b/fs/open.c
47839@@ -112,6 +112,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
47840 error = locks_verify_truncate(inode, NULL, length);
47841 if (!error)
47842 error = security_path_truncate(&path);
47843+
47844+ if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
47845+ error = -EACCES;
47846+
47847 if (!error)
47848 error = do_truncate(path.dentry, length, 0, NULL);
47849
47850@@ -358,6 +362,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
47851 if (__mnt_is_readonly(path.mnt))
47852 res = -EROFS;
47853
47854+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
47855+ res = -EACCES;
47856+
47857 out_path_release:
47858 path_put(&path);
47859 out:
47860@@ -384,6 +391,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
47861 if (error)
47862 goto dput_and_out;
47863
47864+ gr_log_chdir(path.dentry, path.mnt);
47865+
47866 set_fs_pwd(current->fs, &path);
47867
47868 dput_and_out:
47869@@ -410,6 +419,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
47870 goto out_putf;
47871
47872 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
47873+
47874+ if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
47875+ error = -EPERM;
47876+
47877+ if (!error)
47878+ gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
47879+
47880 if (!error)
47881 set_fs_pwd(current->fs, &file->f_path);
47882 out_putf:
47883@@ -438,7 +454,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
47884 if (error)
47885 goto dput_and_out;
47886
47887+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
47888+ goto dput_and_out;
47889+
47890 set_fs_root(current->fs, &path);
47891+
47892+ gr_handle_chroot_chdir(&path);
47893+
47894 error = 0;
47895 dput_and_out:
47896 path_put(&path);
47897@@ -456,6 +478,16 @@ static int chmod_common(struct path *path, umode_t mode)
47898 if (error)
47899 return error;
47900 mutex_lock(&inode->i_mutex);
47901+
47902+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
47903+ error = -EACCES;
47904+ goto out_unlock;
47905+ }
47906+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
47907+ error = -EACCES;
47908+ goto out_unlock;
47909+ }
47910+
47911 error = security_path_chmod(path, mode);
47912 if (error)
47913 goto out_unlock;
47914@@ -506,6 +538,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
47915 int error;
47916 struct iattr newattrs;
47917
47918+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
47919+ return -EACCES;
47920+
47921 newattrs.ia_valid = ATTR_CTIME;
47922 if (user != (uid_t) -1) {
47923 newattrs.ia_valid |= ATTR_UID;
47924diff --git a/fs/pipe.c b/fs/pipe.c
47925index 82e651b..8a68573 100644
47926--- a/fs/pipe.c
47927+++ b/fs/pipe.c
47928@@ -437,9 +437,9 @@ redo:
47929 }
47930 if (bufs) /* More to do? */
47931 continue;
47932- if (!pipe->writers)
47933+ if (!atomic_read(&pipe->writers))
47934 break;
47935- if (!pipe->waiting_writers) {
47936+ if (!atomic_read(&pipe->waiting_writers)) {
47937 /* syscall merging: Usually we must not sleep
47938 * if O_NONBLOCK is set, or if we got some data.
47939 * But if a writer sleeps in kernel space, then
47940@@ -503,7 +503,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
47941 mutex_lock(&inode->i_mutex);
47942 pipe = inode->i_pipe;
47943
47944- if (!pipe->readers) {
47945+ if (!atomic_read(&pipe->readers)) {
47946 send_sig(SIGPIPE, current, 0);
47947 ret = -EPIPE;
47948 goto out;
47949@@ -552,7 +552,7 @@ redo1:
47950 for (;;) {
47951 int bufs;
47952
47953- if (!pipe->readers) {
47954+ if (!atomic_read(&pipe->readers)) {
47955 send_sig(SIGPIPE, current, 0);
47956 if (!ret)
47957 ret = -EPIPE;
47958@@ -643,9 +643,9 @@ redo2:
47959 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
47960 do_wakeup = 0;
47961 }
47962- pipe->waiting_writers++;
47963+ atomic_inc(&pipe->waiting_writers);
47964 pipe_wait(pipe);
47965- pipe->waiting_writers--;
47966+ atomic_dec(&pipe->waiting_writers);
47967 }
47968 out:
47969 mutex_unlock(&inode->i_mutex);
47970@@ -712,7 +712,7 @@ pipe_poll(struct file *filp, poll_table *wait)
47971 mask = 0;
47972 if (filp->f_mode & FMODE_READ) {
47973 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
47974- if (!pipe->writers && filp->f_version != pipe->w_counter)
47975+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
47976 mask |= POLLHUP;
47977 }
47978
47979@@ -722,7 +722,7 @@ pipe_poll(struct file *filp, poll_table *wait)
47980 * Most Unices do not set POLLERR for FIFOs but on Linux they
47981 * behave exactly like pipes for poll().
47982 */
47983- if (!pipe->readers)
47984+ if (!atomic_read(&pipe->readers))
47985 mask |= POLLERR;
47986 }
47987
47988@@ -736,10 +736,10 @@ pipe_release(struct inode *inode, int decr, int decw)
47989
47990 mutex_lock(&inode->i_mutex);
47991 pipe = inode->i_pipe;
47992- pipe->readers -= decr;
47993- pipe->writers -= decw;
47994+ atomic_sub(decr, &pipe->readers);
47995+ atomic_sub(decw, &pipe->writers);
47996
47997- if (!pipe->readers && !pipe->writers) {
47998+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
47999 free_pipe_info(inode);
48000 } else {
48001 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
48002@@ -829,7 +829,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
48003
48004 if (inode->i_pipe) {
48005 ret = 0;
48006- inode->i_pipe->readers++;
48007+ atomic_inc(&inode->i_pipe->readers);
48008 }
48009
48010 mutex_unlock(&inode->i_mutex);
48011@@ -846,7 +846,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
48012
48013 if (inode->i_pipe) {
48014 ret = 0;
48015- inode->i_pipe->writers++;
48016+ atomic_inc(&inode->i_pipe->writers);
48017 }
48018
48019 mutex_unlock(&inode->i_mutex);
48020@@ -864,9 +864,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
48021 if (inode->i_pipe) {
48022 ret = 0;
48023 if (filp->f_mode & FMODE_READ)
48024- inode->i_pipe->readers++;
48025+ atomic_inc(&inode->i_pipe->readers);
48026 if (filp->f_mode & FMODE_WRITE)
48027- inode->i_pipe->writers++;
48028+ atomic_inc(&inode->i_pipe->writers);
48029 }
48030
48031 mutex_unlock(&inode->i_mutex);
48032@@ -958,7 +958,7 @@ void free_pipe_info(struct inode *inode)
48033 inode->i_pipe = NULL;
48034 }
48035
48036-static struct vfsmount *pipe_mnt __read_mostly;
48037+struct vfsmount *pipe_mnt __read_mostly;
48038
48039 /*
48040 * pipefs_dname() is called from d_path().
48041@@ -988,7 +988,8 @@ static struct inode * get_pipe_inode(void)
48042 goto fail_iput;
48043 inode->i_pipe = pipe;
48044
48045- pipe->readers = pipe->writers = 1;
48046+ atomic_set(&pipe->readers, 1);
48047+ atomic_set(&pipe->writers, 1);
48048 inode->i_fop = &rdwr_pipefifo_fops;
48049
48050 /*
48051diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
48052index 15af622..0e9f4467 100644
48053--- a/fs/proc/Kconfig
48054+++ b/fs/proc/Kconfig
48055@@ -30,12 +30,12 @@ config PROC_FS
48056
48057 config PROC_KCORE
48058 bool "/proc/kcore support" if !ARM
48059- depends on PROC_FS && MMU
48060+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
48061
48062 config PROC_VMCORE
48063 bool "/proc/vmcore support"
48064- depends on PROC_FS && CRASH_DUMP
48065- default y
48066+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
48067+ default n
48068 help
48069 Exports the dump image of crashed kernel in ELF format.
48070
48071@@ -59,8 +59,8 @@ config PROC_SYSCTL
48072 limited in memory.
48073
48074 config PROC_PAGE_MONITOR
48075- default y
48076- depends on PROC_FS && MMU
48077+ default n
48078+ depends on PROC_FS && MMU && !GRKERNSEC
48079 bool "Enable /proc page monitoring" if EXPERT
48080 help
48081 Various /proc files exist to monitor process memory utilization:
48082diff --git a/fs/proc/array.c b/fs/proc/array.c
48083index c602b8d..a7de642 100644
48084--- a/fs/proc/array.c
48085+++ b/fs/proc/array.c
48086@@ -60,6 +60,7 @@
48087 #include <linux/tty.h>
48088 #include <linux/string.h>
48089 #include <linux/mman.h>
48090+#include <linux/grsecurity.h>
48091 #include <linux/proc_fs.h>
48092 #include <linux/ioport.h>
48093 #include <linux/uaccess.h>
48094@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
48095 seq_putc(m, '\n');
48096 }
48097
48098+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
48099+static inline void task_pax(struct seq_file *m, struct task_struct *p)
48100+{
48101+ if (p->mm)
48102+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
48103+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
48104+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
48105+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
48106+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
48107+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
48108+ else
48109+ seq_printf(m, "PaX:\t-----\n");
48110+}
48111+#endif
48112+
48113 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
48114 struct pid *pid, struct task_struct *task)
48115 {
48116@@ -354,9 +370,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
48117 task_cpus_allowed(m, task);
48118 cpuset_task_status_allowed(m, task);
48119 task_context_switch_counts(m, task);
48120+
48121+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
48122+ task_pax(m, task);
48123+#endif
48124+
48125+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
48126+ task_grsec_rbac(m, task);
48127+#endif
48128+
48129 return 0;
48130 }
48131
48132+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48133+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
48134+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
48135+ _mm->pax_flags & MF_PAX_SEGMEXEC))
48136+#endif
48137+
48138 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48139 struct pid *pid, struct task_struct *task, int whole)
48140 {
48141@@ -378,6 +409,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48142 char tcomm[sizeof(task->comm)];
48143 unsigned long flags;
48144
48145+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48146+ if (current->exec_id != m->exec_id) {
48147+ gr_log_badprocpid("stat");
48148+ return 0;
48149+ }
48150+#endif
48151+
48152 state = *get_task_state(task);
48153 vsize = eip = esp = 0;
48154 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
48155@@ -449,6 +487,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48156 gtime = task->gtime;
48157 }
48158
48159+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48160+ if (PAX_RAND_FLAGS(mm)) {
48161+ eip = 0;
48162+ esp = 0;
48163+ wchan = 0;
48164+ }
48165+#endif
48166+#ifdef CONFIG_GRKERNSEC_HIDESYM
48167+ wchan = 0;
48168+ eip =0;
48169+ esp =0;
48170+#endif
48171+
48172 /* scale priority and nice values from timeslices to -20..20 */
48173 /* to make it look like a "normal" Unix priority/nice value */
48174 priority = task_prio(task);
48175@@ -489,9 +540,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48176 vsize,
48177 mm ? get_mm_rss(mm) : 0,
48178 rsslim,
48179+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48180+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0),
48181+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0),
48182+ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
48183+#else
48184 mm ? (permitted ? mm->start_code : 1) : 0,
48185 mm ? (permitted ? mm->end_code : 1) : 0,
48186 (permitted && mm) ? mm->start_stack : 0,
48187+#endif
48188 esp,
48189 eip,
48190 /* The signal information here is obsolete.
48191@@ -536,8 +593,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48192 struct pid *pid, struct task_struct *task)
48193 {
48194 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
48195- struct mm_struct *mm = get_task_mm(task);
48196+ struct mm_struct *mm;
48197
48198+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48199+ if (current->exec_id != m->exec_id) {
48200+ gr_log_badprocpid("statm");
48201+ return 0;
48202+ }
48203+#endif
48204+ mm = get_task_mm(task);
48205 if (mm) {
48206 size = task_statm(mm, &shared, &text, &data, &resident);
48207 mmput(mm);
48208@@ -547,3 +611,18 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48209
48210 return 0;
48211 }
48212+
48213+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48214+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
48215+{
48216+ u32 curr_ip = 0;
48217+ unsigned long flags;
48218+
48219+ if (lock_task_sighand(task, &flags)) {
48220+ curr_ip = task->signal->curr_ip;
48221+ unlock_task_sighand(task, &flags);
48222+ }
48223+
48224+ return sprintf(buffer, "%pI4\n", &curr_ip);
48225+}
48226+#endif
48227diff --git a/fs/proc/base.c b/fs/proc/base.c
48228index d4548dd..d101f84 100644
48229--- a/fs/proc/base.c
48230+++ b/fs/proc/base.c
48231@@ -109,6 +109,14 @@ struct pid_entry {
48232 union proc_op op;
48233 };
48234
48235+struct getdents_callback {
48236+ struct linux_dirent __user * current_dir;
48237+ struct linux_dirent __user * previous;
48238+ struct file * file;
48239+ int count;
48240+ int error;
48241+};
48242+
48243 #define NOD(NAME, MODE, IOP, FOP, OP) { \
48244 .name = (NAME), \
48245 .len = sizeof(NAME) - 1, \
48246@@ -213,6 +221,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
48247 if (!mm->arg_end)
48248 goto out_mm; /* Shh! No looking before we're done */
48249
48250+ if (gr_acl_handle_procpidmem(task))
48251+ goto out_mm;
48252+
48253 len = mm->arg_end - mm->arg_start;
48254
48255 if (len > PAGE_SIZE)
48256@@ -240,12 +251,28 @@ out:
48257 return res;
48258 }
48259
48260+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48261+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
48262+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
48263+ _mm->pax_flags & MF_PAX_SEGMEXEC))
48264+#endif
48265+
48266 static int proc_pid_auxv(struct task_struct *task, char *buffer)
48267 {
48268 struct mm_struct *mm = mm_for_maps(task);
48269 int res = PTR_ERR(mm);
48270 if (mm && !IS_ERR(mm)) {
48271 unsigned int nwords = 0;
48272+
48273+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48274+ /* allow if we're currently ptracing this task */
48275+ if (PAX_RAND_FLAGS(mm) &&
48276+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
48277+ mmput(mm);
48278+ return 0;
48279+ }
48280+#endif
48281+
48282 do {
48283 nwords += 2;
48284 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
48285@@ -259,7 +286,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
48286 }
48287
48288
48289-#ifdef CONFIG_KALLSYMS
48290+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48291 /*
48292 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
48293 * Returns the resolved symbol. If that fails, simply return the address.
48294@@ -298,7 +325,7 @@ static void unlock_trace(struct task_struct *task)
48295 mutex_unlock(&task->signal->cred_guard_mutex);
48296 }
48297
48298-#ifdef CONFIG_STACKTRACE
48299+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48300
48301 #define MAX_STACK_TRACE_DEPTH 64
48302
48303@@ -489,7 +516,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
48304 return count;
48305 }
48306
48307-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48308+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48309 static int proc_pid_syscall(struct task_struct *task, char *buffer)
48310 {
48311 long nr;
48312@@ -518,7 +545,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
48313 /************************************************************************/
48314
48315 /* permission checks */
48316-static int proc_fd_access_allowed(struct inode *inode)
48317+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
48318 {
48319 struct task_struct *task;
48320 int allowed = 0;
48321@@ -528,7 +555,10 @@ static int proc_fd_access_allowed(struct inode *inode)
48322 */
48323 task = get_proc_task(inode);
48324 if (task) {
48325- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
48326+ if (log)
48327+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
48328+ else
48329+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
48330 put_task_struct(task);
48331 }
48332 return allowed;
48333@@ -566,10 +596,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
48334 struct task_struct *task,
48335 int hide_pid_min)
48336 {
48337+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48338+ return false;
48339+
48340+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48341+ rcu_read_lock();
48342+ {
48343+ const struct cred *tmpcred = current_cred();
48344+ const struct cred *cred = __task_cred(task);
48345+
48346+ if (!tmpcred->uid || (tmpcred->uid == cred->uid)
48347+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48348+ || in_group_p(CONFIG_GRKERNSEC_PROC_GID)
48349+#endif
48350+ ) {
48351+ rcu_read_unlock();
48352+ return true;
48353+ }
48354+ }
48355+ rcu_read_unlock();
48356+
48357+ if (!pid->hide_pid)
48358+ return false;
48359+#endif
48360+
48361 if (pid->hide_pid < hide_pid_min)
48362 return true;
48363 if (in_group_p(pid->pid_gid))
48364 return true;
48365+
48366 return ptrace_may_access(task, PTRACE_MODE_READ);
48367 }
48368
48369@@ -587,7 +642,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
48370 put_task_struct(task);
48371
48372 if (!has_perms) {
48373+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48374+ {
48375+#else
48376 if (pid->hide_pid == 2) {
48377+#endif
48378 /*
48379 * Let's make getdents(), stat(), and open()
48380 * consistent with each other. If a process
48381@@ -702,6 +761,10 @@ static int mem_open(struct inode* inode, struct file* file)
48382 file->f_mode |= FMODE_UNSIGNED_OFFSET;
48383 file->private_data = mm;
48384
48385+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48386+ file->f_version = current->exec_id;
48387+#endif
48388+
48389 return 0;
48390 }
48391
48392@@ -713,6 +776,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
48393 ssize_t copied;
48394 char *page;
48395
48396+#ifdef CONFIG_GRKERNSEC
48397+ if (write)
48398+ return -EPERM;
48399+#endif
48400+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48401+ if (file->f_version != current->exec_id) {
48402+ gr_log_badprocpid("mem");
48403+ return 0;
48404+ }
48405+#endif
48406+
48407 if (!mm)
48408 return 0;
48409
48410@@ -813,6 +887,9 @@ static ssize_t environ_read(struct file *file, char __user *buf,
48411 if (!task)
48412 goto out_no_task;
48413
48414+ if (gr_acl_handle_procpidmem(task))
48415+ goto out;
48416+
48417 ret = -ENOMEM;
48418 page = (char *)__get_free_page(GFP_TEMPORARY);
48419 if (!page)
48420@@ -1434,7 +1511,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
48421 path_put(&nd->path);
48422
48423 /* Are we allowed to snoop on the tasks file descriptors? */
48424- if (!proc_fd_access_allowed(inode))
48425+ if (!proc_fd_access_allowed(inode, 0))
48426 goto out;
48427
48428 error = PROC_I(inode)->op.proc_get_link(dentry, &nd->path);
48429@@ -1473,8 +1550,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
48430 struct path path;
48431
48432 /* Are we allowed to snoop on the tasks file descriptors? */
48433- if (!proc_fd_access_allowed(inode))
48434- goto out;
48435+ /* logging this is needed for learning on chromium to work properly,
48436+ but we don't want to flood the logs from 'ps' which does a readlink
48437+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
48438+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
48439+ */
48440+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
48441+ if (!proc_fd_access_allowed(inode,0))
48442+ goto out;
48443+ } else {
48444+ if (!proc_fd_access_allowed(inode,1))
48445+ goto out;
48446+ }
48447
48448 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
48449 if (error)
48450@@ -1539,7 +1626,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
48451 rcu_read_lock();
48452 cred = __task_cred(task);
48453 inode->i_uid = cred->euid;
48454+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48455+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48456+#else
48457 inode->i_gid = cred->egid;
48458+#endif
48459 rcu_read_unlock();
48460 }
48461 security_task_to_inode(task, inode);
48462@@ -1575,10 +1666,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
48463 return -ENOENT;
48464 }
48465 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48466+#ifdef CONFIG_GRKERNSEC_PROC_USER
48467+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48468+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48469+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48470+#endif
48471 task_dumpable(task)) {
48472 cred = __task_cred(task);
48473 stat->uid = cred->euid;
48474+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48475+ stat->gid = CONFIG_GRKERNSEC_PROC_GID;
48476+#else
48477 stat->gid = cred->egid;
48478+#endif
48479 }
48480 }
48481 rcu_read_unlock();
48482@@ -1616,11 +1716,20 @@ int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
48483
48484 if (task) {
48485 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48486+#ifdef CONFIG_GRKERNSEC_PROC_USER
48487+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48488+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48489+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48490+#endif
48491 task_dumpable(task)) {
48492 rcu_read_lock();
48493 cred = __task_cred(task);
48494 inode->i_uid = cred->euid;
48495+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48496+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48497+#else
48498 inode->i_gid = cred->egid;
48499+#endif
48500 rcu_read_unlock();
48501 } else {
48502 inode->i_uid = 0;
48503@@ -1738,7 +1847,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
48504 int fd = proc_fd(inode);
48505
48506 if (task) {
48507- files = get_files_struct(task);
48508+ if (!gr_acl_handle_procpidmem(task))
48509+ files = get_files_struct(task);
48510 put_task_struct(task);
48511 }
48512 if (files) {
48513@@ -2355,11 +2465,21 @@ static const struct file_operations proc_map_files_operations = {
48514 */
48515 static int proc_fd_permission(struct inode *inode, int mask)
48516 {
48517+ struct task_struct *task;
48518 int rv = generic_permission(inode, mask);
48519- if (rv == 0)
48520- return 0;
48521+
48522 if (task_pid(current) == proc_pid(inode))
48523 rv = 0;
48524+
48525+ task = get_proc_task(inode);
48526+ if (task == NULL)
48527+ return rv;
48528+
48529+ if (gr_acl_handle_procpidmem(task))
48530+ rv = -EACCES;
48531+
48532+ put_task_struct(task);
48533+
48534 return rv;
48535 }
48536
48537@@ -2469,6 +2589,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
48538 if (!task)
48539 goto out_no_task;
48540
48541+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48542+ goto out;
48543+
48544 /*
48545 * Yes, it does not scale. And it should not. Don't add
48546 * new entries into /proc/<tgid>/ without very good reasons.
48547@@ -2513,6 +2636,9 @@ static int proc_pident_readdir(struct file *filp,
48548 if (!task)
48549 goto out_no_task;
48550
48551+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48552+ goto out;
48553+
48554 ret = 0;
48555 i = filp->f_pos;
48556 switch (i) {
48557@@ -2783,7 +2909,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
48558 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
48559 void *cookie)
48560 {
48561- char *s = nd_get_link(nd);
48562+ const char *s = nd_get_link(nd);
48563 if (!IS_ERR(s))
48564 __putname(s);
48565 }
48566@@ -2984,7 +3110,7 @@ static const struct pid_entry tgid_base_stuff[] = {
48567 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
48568 #endif
48569 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
48570-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48571+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48572 INF("syscall", S_IRUGO, proc_pid_syscall),
48573 #endif
48574 INF("cmdline", S_IRUGO, proc_pid_cmdline),
48575@@ -3009,10 +3135,10 @@ static const struct pid_entry tgid_base_stuff[] = {
48576 #ifdef CONFIG_SECURITY
48577 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
48578 #endif
48579-#ifdef CONFIG_KALLSYMS
48580+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48581 INF("wchan", S_IRUGO, proc_pid_wchan),
48582 #endif
48583-#ifdef CONFIG_STACKTRACE
48584+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48585 ONE("stack", S_IRUGO, proc_pid_stack),
48586 #endif
48587 #ifdef CONFIG_SCHEDSTATS
48588@@ -3046,6 +3172,9 @@ static const struct pid_entry tgid_base_stuff[] = {
48589 #ifdef CONFIG_HARDWALL
48590 INF("hardwall", S_IRUGO, proc_pid_hardwall),
48591 #endif
48592+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48593+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
48594+#endif
48595 };
48596
48597 static int proc_tgid_base_readdir(struct file * filp,
48598@@ -3172,7 +3301,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
48599 if (!inode)
48600 goto out;
48601
48602+#ifdef CONFIG_GRKERNSEC_PROC_USER
48603+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
48604+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48605+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48606+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
48607+#else
48608 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
48609+#endif
48610 inode->i_op = &proc_tgid_base_inode_operations;
48611 inode->i_fop = &proc_tgid_base_operations;
48612 inode->i_flags|=S_IMMUTABLE;
48613@@ -3214,7 +3350,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct
48614 if (!task)
48615 goto out;
48616
48617+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48618+ goto out_put_task;
48619+
48620 result = proc_pid_instantiate(dir, dentry, task, NULL);
48621+out_put_task:
48622 put_task_struct(task);
48623 out:
48624 return result;
48625@@ -3277,6 +3417,8 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
48626 static int fake_filldir(void *buf, const char *name, int namelen,
48627 loff_t offset, u64 ino, unsigned d_type)
48628 {
48629+ struct getdents_callback * __buf = (struct getdents_callback *) buf;
48630+ __buf->error = -EINVAL;
48631 return 0;
48632 }
48633
48634@@ -3343,7 +3485,7 @@ static const struct pid_entry tid_base_stuff[] = {
48635 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
48636 #endif
48637 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
48638-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48639+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48640 INF("syscall", S_IRUGO, proc_pid_syscall),
48641 #endif
48642 INF("cmdline", S_IRUGO, proc_pid_cmdline),
48643@@ -3367,10 +3509,10 @@ static const struct pid_entry tid_base_stuff[] = {
48644 #ifdef CONFIG_SECURITY
48645 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
48646 #endif
48647-#ifdef CONFIG_KALLSYMS
48648+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48649 INF("wchan", S_IRUGO, proc_pid_wchan),
48650 #endif
48651-#ifdef CONFIG_STACKTRACE
48652+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48653 ONE("stack", S_IRUGO, proc_pid_stack),
48654 #endif
48655 #ifdef CONFIG_SCHEDSTATS
48656diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
48657index 82676e3..5f8518a 100644
48658--- a/fs/proc/cmdline.c
48659+++ b/fs/proc/cmdline.c
48660@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
48661
48662 static int __init proc_cmdline_init(void)
48663 {
48664+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48665+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
48666+#else
48667 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
48668+#endif
48669 return 0;
48670 }
48671 module_init(proc_cmdline_init);
48672diff --git a/fs/proc/devices.c b/fs/proc/devices.c
48673index b143471..bb105e5 100644
48674--- a/fs/proc/devices.c
48675+++ b/fs/proc/devices.c
48676@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
48677
48678 static int __init proc_devices_init(void)
48679 {
48680+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48681+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
48682+#else
48683 proc_create("devices", 0, NULL, &proc_devinfo_operations);
48684+#endif
48685 return 0;
48686 }
48687 module_init(proc_devices_init);
48688diff --git a/fs/proc/inode.c b/fs/proc/inode.c
48689index 84fd323..f698a32 100644
48690--- a/fs/proc/inode.c
48691+++ b/fs/proc/inode.c
48692@@ -21,12 +21,18 @@
48693 #include <linux/seq_file.h>
48694 #include <linux/slab.h>
48695 #include <linux/mount.h>
48696+#include <linux/grsecurity.h>
48697
48698 #include <asm/system.h>
48699 #include <asm/uaccess.h>
48700
48701 #include "internal.h"
48702
48703+#ifdef CONFIG_PROC_SYSCTL
48704+extern const struct inode_operations proc_sys_inode_operations;
48705+extern const struct inode_operations proc_sys_dir_operations;
48706+#endif
48707+
48708 static void proc_evict_inode(struct inode *inode)
48709 {
48710 struct proc_dir_entry *de;
48711@@ -52,6 +58,13 @@ static void proc_evict_inode(struct inode *inode)
48712 ns_ops = PROC_I(inode)->ns_ops;
48713 if (ns_ops && ns_ops->put)
48714 ns_ops->put(PROC_I(inode)->ns);
48715+
48716+#ifdef CONFIG_PROC_SYSCTL
48717+ if (inode->i_op == &proc_sys_inode_operations ||
48718+ inode->i_op == &proc_sys_dir_operations)
48719+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
48720+#endif
48721+
48722 }
48723
48724 static struct kmem_cache * proc_inode_cachep;
48725@@ -457,7 +470,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
48726 if (de->mode) {
48727 inode->i_mode = de->mode;
48728 inode->i_uid = de->uid;
48729+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48730+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48731+#else
48732 inode->i_gid = de->gid;
48733+#endif
48734 }
48735 if (de->size)
48736 inode->i_size = de->size;
48737diff --git a/fs/proc/internal.h b/fs/proc/internal.h
48738index 2925775..4f08fae 100644
48739--- a/fs/proc/internal.h
48740+++ b/fs/proc/internal.h
48741@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
48742 struct pid *pid, struct task_struct *task);
48743 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48744 struct pid *pid, struct task_struct *task);
48745+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48746+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
48747+#endif
48748 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
48749
48750 extern const struct file_operations proc_maps_operations;
48751diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
48752index d245cb2..f4e8498 100644
48753--- a/fs/proc/kcore.c
48754+++ b/fs/proc/kcore.c
48755@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48756 * the addresses in the elf_phdr on our list.
48757 */
48758 start = kc_offset_to_vaddr(*fpos - elf_buflen);
48759- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
48760+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
48761+ if (tsz > buflen)
48762 tsz = buflen;
48763-
48764+
48765 while (buflen) {
48766 struct kcore_list *m;
48767
48768@@ -509,20 +510,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48769 kfree(elf_buf);
48770 } else {
48771 if (kern_addr_valid(start)) {
48772- unsigned long n;
48773+ char *elf_buf;
48774+ mm_segment_t oldfs;
48775
48776- n = copy_to_user(buffer, (char *)start, tsz);
48777- /*
48778- * We cannot distingush between fault on source
48779- * and fault on destination. When this happens
48780- * we clear too and hope it will trigger the
48781- * EFAULT again.
48782- */
48783- if (n) {
48784- if (clear_user(buffer + tsz - n,
48785- n))
48786+ elf_buf = kmalloc(tsz, GFP_KERNEL);
48787+ if (!elf_buf)
48788+ return -ENOMEM;
48789+ oldfs = get_fs();
48790+ set_fs(KERNEL_DS);
48791+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
48792+ set_fs(oldfs);
48793+ if (copy_to_user(buffer, elf_buf, tsz)) {
48794+ kfree(elf_buf);
48795 return -EFAULT;
48796+ }
48797 }
48798+ set_fs(oldfs);
48799+ kfree(elf_buf);
48800 } else {
48801 if (clear_user(buffer, tsz))
48802 return -EFAULT;
48803@@ -542,6 +546,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48804
48805 static int open_kcore(struct inode *inode, struct file *filp)
48806 {
48807+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
48808+ return -EPERM;
48809+#endif
48810 if (!capable(CAP_SYS_RAWIO))
48811 return -EPERM;
48812 if (kcore_need_update)
48813diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
48814index 80e4645..53e5fcf 100644
48815--- a/fs/proc/meminfo.c
48816+++ b/fs/proc/meminfo.c
48817@@ -158,7 +158,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
48818 vmi.used >> 10,
48819 vmi.largest_chunk >> 10
48820 #ifdef CONFIG_MEMORY_FAILURE
48821- ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
48822+ ,atomic_long_read_unchecked(&mce_bad_pages) << (PAGE_SHIFT - 10)
48823 #endif
48824 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
48825 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
48826diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
48827index b1822dd..df622cb 100644
48828--- a/fs/proc/nommu.c
48829+++ b/fs/proc/nommu.c
48830@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
48831 if (len < 1)
48832 len = 1;
48833 seq_printf(m, "%*c", len, ' ');
48834- seq_path(m, &file->f_path, "");
48835+ seq_path(m, &file->f_path, "\n\\");
48836 }
48837
48838 seq_putc(m, '\n');
48839diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
48840index 06e1cc1..177cd98 100644
48841--- a/fs/proc/proc_net.c
48842+++ b/fs/proc/proc_net.c
48843@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(struct inode *dir)
48844 struct task_struct *task;
48845 struct nsproxy *ns;
48846 struct net *net = NULL;
48847+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48848+ const struct cred *cred = current_cred();
48849+#endif
48850+
48851+#ifdef CONFIG_GRKERNSEC_PROC_USER
48852+ if (cred->fsuid)
48853+ return net;
48854+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48855+ if (cred->fsuid && !in_group_p(CONFIG_GRKERNSEC_PROC_GID))
48856+ return net;
48857+#endif
48858
48859 rcu_read_lock();
48860 task = pid_task(proc_pid(dir), PIDTYPE_PID);
48861diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
48862index 53c3bce..10ad159 100644
48863--- a/fs/proc/proc_sysctl.c
48864+++ b/fs/proc/proc_sysctl.c
48865@@ -9,11 +9,13 @@
48866 #include <linux/namei.h>
48867 #include "internal.h"
48868
48869+extern __u32 gr_handle_sysctl(const struct ctl_table *table, const int op);
48870+
48871 static const struct dentry_operations proc_sys_dentry_operations;
48872 static const struct file_operations proc_sys_file_operations;
48873-static const struct inode_operations proc_sys_inode_operations;
48874+const struct inode_operations proc_sys_inode_operations;
48875 static const struct file_operations proc_sys_dir_file_operations;
48876-static const struct inode_operations proc_sys_dir_operations;
48877+const struct inode_operations proc_sys_dir_operations;
48878
48879 void proc_sys_poll_notify(struct ctl_table_poll *poll)
48880 {
48881@@ -131,8 +133,14 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
48882
48883 err = NULL;
48884 d_set_d_op(dentry, &proc_sys_dentry_operations);
48885+
48886+ gr_handle_proc_create(dentry, inode);
48887+
48888 d_add(dentry, inode);
48889
48890+ if (gr_handle_sysctl(p, MAY_EXEC))
48891+ err = ERR_PTR(-ENOENT);
48892+
48893 out:
48894 sysctl_head_finish(head);
48895 return err;
48896@@ -163,6 +171,12 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
48897 if (!table->proc_handler)
48898 goto out;
48899
48900+#ifdef CONFIG_GRKERNSEC
48901+ error = -EPERM;
48902+ if (write && !capable(CAP_SYS_ADMIN))
48903+ goto out;
48904+#endif
48905+
48906 /* careful: calling conventions are nasty here */
48907 res = count;
48908 error = table->proc_handler(table, write, buf, &res, ppos);
48909@@ -260,6 +274,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
48910 return -ENOMEM;
48911 } else {
48912 d_set_d_op(child, &proc_sys_dentry_operations);
48913+
48914+ gr_handle_proc_create(child, inode);
48915+
48916 d_add(child, inode);
48917 }
48918 } else {
48919@@ -288,6 +305,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
48920 if (*pos < file->f_pos)
48921 continue;
48922
48923+ if (gr_handle_sysctl(table, 0))
48924+ continue;
48925+
48926 res = proc_sys_fill_cache(file, dirent, filldir, head, table);
48927 if (res)
48928 return res;
48929@@ -413,6 +433,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
48930 if (IS_ERR(head))
48931 return PTR_ERR(head);
48932
48933+ if (table && gr_handle_sysctl(table, MAY_EXEC))
48934+ return -ENOENT;
48935+
48936 generic_fillattr(inode, stat);
48937 if (table)
48938 stat->mode = (stat->mode & S_IFMT) | table->mode;
48939@@ -435,13 +458,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
48940 .llseek = generic_file_llseek,
48941 };
48942
48943-static const struct inode_operations proc_sys_inode_operations = {
48944+const struct inode_operations proc_sys_inode_operations = {
48945 .permission = proc_sys_permission,
48946 .setattr = proc_sys_setattr,
48947 .getattr = proc_sys_getattr,
48948 };
48949
48950-static const struct inode_operations proc_sys_dir_operations = {
48951+const struct inode_operations proc_sys_dir_operations = {
48952 .lookup = proc_sys_lookup,
48953 .permission = proc_sys_permission,
48954 .setattr = proc_sys_setattr,
48955diff --git a/fs/proc/root.c b/fs/proc/root.c
48956index 46a15d8..335631a 100644
48957--- a/fs/proc/root.c
48958+++ b/fs/proc/root.c
48959@@ -187,7 +187,15 @@ void __init proc_root_init(void)
48960 #ifdef CONFIG_PROC_DEVICETREE
48961 proc_device_tree_init();
48962 #endif
48963+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48964+#ifdef CONFIG_GRKERNSEC_PROC_USER
48965+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
48966+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48967+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
48968+#endif
48969+#else
48970 proc_mkdir("bus", NULL);
48971+#endif
48972 proc_sys_init();
48973 }
48974
48975diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
48976index 3efa725..23c925b 100644
48977--- a/fs/proc/task_mmu.c
48978+++ b/fs/proc/task_mmu.c
48979@@ -11,6 +11,7 @@
48980 #include <linux/rmap.h>
48981 #include <linux/swap.h>
48982 #include <linux/swapops.h>
48983+#include <linux/grsecurity.h>
48984
48985 #include <asm/elf.h>
48986 #include <asm/uaccess.h>
48987@@ -52,8 +53,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
48988 "VmExe:\t%8lu kB\n"
48989 "VmLib:\t%8lu kB\n"
48990 "VmPTE:\t%8lu kB\n"
48991- "VmSwap:\t%8lu kB\n",
48992- hiwater_vm << (PAGE_SHIFT-10),
48993+ "VmSwap:\t%8lu kB\n"
48994+
48995+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
48996+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
48997+#endif
48998+
48999+ ,hiwater_vm << (PAGE_SHIFT-10),
49000 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
49001 mm->locked_vm << (PAGE_SHIFT-10),
49002 mm->pinned_vm << (PAGE_SHIFT-10),
49003@@ -62,7 +68,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
49004 data << (PAGE_SHIFT-10),
49005 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
49006 (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
49007- swap << (PAGE_SHIFT-10));
49008+ swap << (PAGE_SHIFT-10)
49009+
49010+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
49011+ , mm->context.user_cs_base, mm->context.user_cs_limit
49012+#endif
49013+
49014+ );
49015 }
49016
49017 unsigned long task_vsize(struct mm_struct *mm)
49018@@ -209,6 +221,12 @@ static int do_maps_open(struct inode *inode, struct file *file,
49019 return ret;
49020 }
49021
49022+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49023+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
49024+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
49025+ _mm->pax_flags & MF_PAX_SEGMEXEC))
49026+#endif
49027+
49028 static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
49029 {
49030 struct mm_struct *mm = vma->vm_mm;
49031@@ -227,13 +245,13 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
49032 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
49033 }
49034
49035- /* We don't show the stack guard page in /proc/maps */
49036+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49037+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
49038+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
49039+#else
49040 start = vma->vm_start;
49041- if (stack_guard_page_start(vma, start))
49042- start += PAGE_SIZE;
49043 end = vma->vm_end;
49044- if (stack_guard_page_end(vma, end))
49045- end -= PAGE_SIZE;
49046+#endif
49047
49048 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
49049 start,
49050@@ -242,7 +260,11 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
49051 flags & VM_WRITE ? 'w' : '-',
49052 flags & VM_EXEC ? 'x' : '-',
49053 flags & VM_MAYSHARE ? 's' : 'p',
49054+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49055+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
49056+#else
49057 pgoff,
49058+#endif
49059 MAJOR(dev), MINOR(dev), ino, &len);
49060
49061 /*
49062@@ -251,7 +273,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
49063 */
49064 if (file) {
49065 pad_len_spaces(m, len);
49066- seq_path(m, &file->f_path, "\n");
49067+ seq_path(m, &file->f_path, "\n\\");
49068 } else {
49069 const char *name = arch_vma_name(vma);
49070 if (!name) {
49071@@ -259,8 +281,9 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
49072 if (vma->vm_start <= mm->brk &&
49073 vma->vm_end >= mm->start_brk) {
49074 name = "[heap]";
49075- } else if (vma->vm_start <= mm->start_stack &&
49076- vma->vm_end >= mm->start_stack) {
49077+ } else if ((vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
49078+ (vma->vm_start <= mm->start_stack &&
49079+ vma->vm_end >= mm->start_stack)) {
49080 name = "[stack]";
49081 }
49082 } else {
49083@@ -281,6 +304,13 @@ static int show_map(struct seq_file *m, void *v)
49084 struct proc_maps_private *priv = m->private;
49085 struct task_struct *task = priv->task;
49086
49087+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49088+ if (current->exec_id != m->exec_id) {
49089+ gr_log_badprocpid("maps");
49090+ return 0;
49091+ }
49092+#endif
49093+
49094 show_map_vma(m, vma);
49095
49096 if (m->count < m->size) /* vma is copied successfully */
49097@@ -437,12 +467,23 @@ static int show_smap(struct seq_file *m, void *v)
49098 .private = &mss,
49099 };
49100
49101+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49102+ if (current->exec_id != m->exec_id) {
49103+ gr_log_badprocpid("smaps");
49104+ return 0;
49105+ }
49106+#endif
49107 memset(&mss, 0, sizeof mss);
49108- mss.vma = vma;
49109- /* mmap_sem is held in m_start */
49110- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
49111- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
49112-
49113+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49114+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
49115+#endif
49116+ mss.vma = vma;
49117+ /* mmap_sem is held in m_start */
49118+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
49119+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
49120+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49121+ }
49122+#endif
49123 show_map_vma(m, vma);
49124
49125 seq_printf(m,
49126@@ -460,7 +501,11 @@ static int show_smap(struct seq_file *m, void *v)
49127 "KernelPageSize: %8lu kB\n"
49128 "MMUPageSize: %8lu kB\n"
49129 "Locked: %8lu kB\n",
49130+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49131+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
49132+#else
49133 (vma->vm_end - vma->vm_start) >> 10,
49134+#endif
49135 mss.resident >> 10,
49136 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
49137 mss.shared_clean >> 10,
49138@@ -1024,6 +1069,13 @@ static int show_numa_map(struct seq_file *m, void *v)
49139 int n;
49140 char buffer[50];
49141
49142+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49143+ if (current->exec_id != m->exec_id) {
49144+ gr_log_badprocpid("numa_maps");
49145+ return 0;
49146+ }
49147+#endif
49148+
49149 if (!mm)
49150 return 0;
49151
49152@@ -1041,11 +1093,15 @@ static int show_numa_map(struct seq_file *m, void *v)
49153 mpol_to_str(buffer, sizeof(buffer), pol, 0);
49154 mpol_cond_put(pol);
49155
49156+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49157+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
49158+#else
49159 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
49160+#endif
49161
49162 if (file) {
49163 seq_printf(m, " file=");
49164- seq_path(m, &file->f_path, "\n\t= ");
49165+ seq_path(m, &file->f_path, "\n\t\\= ");
49166 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
49167 seq_printf(m, " heap");
49168 } else if (vma->vm_start <= mm->start_stack &&
49169diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
49170index 980de54..2a4db5f 100644
49171--- a/fs/proc/task_nommu.c
49172+++ b/fs/proc/task_nommu.c
49173@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
49174 else
49175 bytes += kobjsize(mm);
49176
49177- if (current->fs && current->fs->users > 1)
49178+ if (current->fs && atomic_read(&current->fs->users) > 1)
49179 sbytes += kobjsize(current->fs);
49180 else
49181 bytes += kobjsize(current->fs);
49182@@ -166,7 +166,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
49183
49184 if (file) {
49185 pad_len_spaces(m, len);
49186- seq_path(m, &file->f_path, "");
49187+ seq_path(m, &file->f_path, "\n\\");
49188 } else if (mm) {
49189 if (vma->vm_start <= mm->start_stack &&
49190 vma->vm_end >= mm->start_stack) {
49191diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
49192index d67908b..d13f6a6 100644
49193--- a/fs/quota/netlink.c
49194+++ b/fs/quota/netlink.c
49195@@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
49196 void quota_send_warning(short type, unsigned int id, dev_t dev,
49197 const char warntype)
49198 {
49199- static atomic_t seq;
49200+ static atomic_unchecked_t seq;
49201 struct sk_buff *skb;
49202 void *msg_head;
49203 int ret;
49204@@ -49,7 +49,7 @@ void quota_send_warning(short type, unsigned int id, dev_t dev,
49205 "VFS: Not enough memory to send quota warning.\n");
49206 return;
49207 }
49208- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
49209+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
49210 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
49211 if (!msg_head) {
49212 printk(KERN_ERR
49213diff --git a/fs/readdir.c b/fs/readdir.c
49214index 356f715..c918d38 100644
49215--- a/fs/readdir.c
49216+++ b/fs/readdir.c
49217@@ -17,6 +17,7 @@
49218 #include <linux/security.h>
49219 #include <linux/syscalls.h>
49220 #include <linux/unistd.h>
49221+#include <linux/namei.h>
49222
49223 #include <asm/uaccess.h>
49224
49225@@ -67,6 +68,7 @@ struct old_linux_dirent {
49226
49227 struct readdir_callback {
49228 struct old_linux_dirent __user * dirent;
49229+ struct file * file;
49230 int result;
49231 };
49232
49233@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
49234 buf->result = -EOVERFLOW;
49235 return -EOVERFLOW;
49236 }
49237+
49238+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49239+ return 0;
49240+
49241 buf->result++;
49242 dirent = buf->dirent;
49243 if (!access_ok(VERIFY_WRITE, dirent,
49244@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
49245
49246 buf.result = 0;
49247 buf.dirent = dirent;
49248+ buf.file = file;
49249
49250 error = vfs_readdir(file, fillonedir, &buf);
49251 if (buf.result)
49252@@ -142,6 +149,7 @@ struct linux_dirent {
49253 struct getdents_callback {
49254 struct linux_dirent __user * current_dir;
49255 struct linux_dirent __user * previous;
49256+ struct file * file;
49257 int count;
49258 int error;
49259 };
49260@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
49261 buf->error = -EOVERFLOW;
49262 return -EOVERFLOW;
49263 }
49264+
49265+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49266+ return 0;
49267+
49268 dirent = buf->previous;
49269 if (dirent) {
49270 if (__put_user(offset, &dirent->d_off))
49271@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
49272 buf.previous = NULL;
49273 buf.count = count;
49274 buf.error = 0;
49275+ buf.file = file;
49276
49277 error = vfs_readdir(file, filldir, &buf);
49278 if (error >= 0)
49279@@ -229,6 +242,7 @@ out:
49280 struct getdents_callback64 {
49281 struct linux_dirent64 __user * current_dir;
49282 struct linux_dirent64 __user * previous;
49283+ struct file *file;
49284 int count;
49285 int error;
49286 };
49287@@ -244,6 +258,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
49288 buf->error = -EINVAL; /* only used if we fail.. */
49289 if (reclen > buf->count)
49290 return -EINVAL;
49291+
49292+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49293+ return 0;
49294+
49295 dirent = buf->previous;
49296 if (dirent) {
49297 if (__put_user(offset, &dirent->d_off))
49298@@ -291,6 +309,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
49299
49300 buf.current_dir = dirent;
49301 buf.previous = NULL;
49302+ buf.file = file;
49303 buf.count = count;
49304 buf.error = 0;
49305
49306@@ -299,7 +318,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
49307 error = buf.error;
49308 lastdirent = buf.previous;
49309 if (lastdirent) {
49310- typeof(lastdirent->d_off) d_off = file->f_pos;
49311+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
49312 if (__put_user(d_off, &lastdirent->d_off))
49313 error = -EFAULT;
49314 else
49315diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
49316index 60c0804..d814f98 100644
49317--- a/fs/reiserfs/do_balan.c
49318+++ b/fs/reiserfs/do_balan.c
49319@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
49320 return;
49321 }
49322
49323- atomic_inc(&(fs_generation(tb->tb_sb)));
49324+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
49325 do_balance_starts(tb);
49326
49327 /* balance leaf returns 0 except if combining L R and S into
49328diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
49329index 7a99811..a7c96c4 100644
49330--- a/fs/reiserfs/procfs.c
49331+++ b/fs/reiserfs/procfs.c
49332@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
49333 "SMALL_TAILS " : "NO_TAILS ",
49334 replay_only(sb) ? "REPLAY_ONLY " : "",
49335 convert_reiserfs(sb) ? "CONV " : "",
49336- atomic_read(&r->s_generation_counter),
49337+ atomic_read_unchecked(&r->s_generation_counter),
49338 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
49339 SF(s_do_balance), SF(s_unneeded_left_neighbor),
49340 SF(s_good_search_by_key_reada), SF(s_bmaps),
49341diff --git a/fs/select.c b/fs/select.c
49342index e782258..3b4b44c 100644
49343--- a/fs/select.c
49344+++ b/fs/select.c
49345@@ -20,6 +20,7 @@
49346 #include <linux/module.h>
49347 #include <linux/slab.h>
49348 #include <linux/poll.h>
49349+#include <linux/security.h>
49350 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
49351 #include <linux/file.h>
49352 #include <linux/fdtable.h>
49353@@ -837,6 +838,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
49354 struct poll_list *walk = head;
49355 unsigned long todo = nfds;
49356
49357+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
49358 if (nfds > rlimit(RLIMIT_NOFILE))
49359 return -EINVAL;
49360
49361diff --git a/fs/seq_file.c b/fs/seq_file.c
49362index 4023d6b..ab46c6a 100644
49363--- a/fs/seq_file.c
49364+++ b/fs/seq_file.c
49365@@ -9,6 +9,7 @@
49366 #include <linux/module.h>
49367 #include <linux/seq_file.h>
49368 #include <linux/slab.h>
49369+#include <linux/sched.h>
49370
49371 #include <asm/uaccess.h>
49372 #include <asm/page.h>
49373@@ -40,6 +41,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
49374 memset(p, 0, sizeof(*p));
49375 mutex_init(&p->lock);
49376 p->op = op;
49377+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49378+ p->exec_id = current->exec_id;
49379+#endif
49380
49381 /*
49382 * Wrappers around seq_open(e.g. swaps_open) need to be
49383@@ -549,7 +553,7 @@ static void single_stop(struct seq_file *p, void *v)
49384 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
49385 void *data)
49386 {
49387- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
49388+ seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
49389 int res = -ENOMEM;
49390
49391 if (op) {
49392diff --git a/fs/splice.c b/fs/splice.c
49393index 96d7b28..fd465ac 100644
49394--- a/fs/splice.c
49395+++ b/fs/splice.c
49396@@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
49397 pipe_lock(pipe);
49398
49399 for (;;) {
49400- if (!pipe->readers) {
49401+ if (!atomic_read(&pipe->readers)) {
49402 send_sig(SIGPIPE, current, 0);
49403 if (!ret)
49404 ret = -EPIPE;
49405@@ -248,9 +248,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
49406 do_wakeup = 0;
49407 }
49408
49409- pipe->waiting_writers++;
49410+ atomic_inc(&pipe->waiting_writers);
49411 pipe_wait(pipe);
49412- pipe->waiting_writers--;
49413+ atomic_dec(&pipe->waiting_writers);
49414 }
49415
49416 pipe_unlock(pipe);
49417@@ -560,7 +560,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
49418 old_fs = get_fs();
49419 set_fs(get_ds());
49420 /* The cast to a user pointer is valid due to the set_fs() */
49421- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
49422+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
49423 set_fs(old_fs);
49424
49425 return res;
49426@@ -575,7 +575,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
49427 old_fs = get_fs();
49428 set_fs(get_ds());
49429 /* The cast to a user pointer is valid due to the set_fs() */
49430- res = vfs_write(file, (const char __user *)buf, count, &pos);
49431+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
49432 set_fs(old_fs);
49433
49434 return res;
49435@@ -626,7 +626,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
49436 goto err;
49437
49438 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
49439- vec[i].iov_base = (void __user *) page_address(page);
49440+ vec[i].iov_base = (void __force_user *) page_address(page);
49441 vec[i].iov_len = this_len;
49442 spd.pages[i] = page;
49443 spd.nr_pages++;
49444@@ -848,10 +848,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
49445 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
49446 {
49447 while (!pipe->nrbufs) {
49448- if (!pipe->writers)
49449+ if (!atomic_read(&pipe->writers))
49450 return 0;
49451
49452- if (!pipe->waiting_writers && sd->num_spliced)
49453+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
49454 return 0;
49455
49456 if (sd->flags & SPLICE_F_NONBLOCK)
49457@@ -1184,7 +1184,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
49458 * out of the pipe right after the splice_to_pipe(). So set
49459 * PIPE_READERS appropriately.
49460 */
49461- pipe->readers = 1;
49462+ atomic_set(&pipe->readers, 1);
49463
49464 current->splice_pipe = pipe;
49465 }
49466@@ -1736,9 +1736,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49467 ret = -ERESTARTSYS;
49468 break;
49469 }
49470- if (!pipe->writers)
49471+ if (!atomic_read(&pipe->writers))
49472 break;
49473- if (!pipe->waiting_writers) {
49474+ if (!atomic_read(&pipe->waiting_writers)) {
49475 if (flags & SPLICE_F_NONBLOCK) {
49476 ret = -EAGAIN;
49477 break;
49478@@ -1770,7 +1770,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49479 pipe_lock(pipe);
49480
49481 while (pipe->nrbufs >= pipe->buffers) {
49482- if (!pipe->readers) {
49483+ if (!atomic_read(&pipe->readers)) {
49484 send_sig(SIGPIPE, current, 0);
49485 ret = -EPIPE;
49486 break;
49487@@ -1783,9 +1783,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49488 ret = -ERESTARTSYS;
49489 break;
49490 }
49491- pipe->waiting_writers++;
49492+ atomic_inc(&pipe->waiting_writers);
49493 pipe_wait(pipe);
49494- pipe->waiting_writers--;
49495+ atomic_dec(&pipe->waiting_writers);
49496 }
49497
49498 pipe_unlock(pipe);
49499@@ -1821,14 +1821,14 @@ retry:
49500 pipe_double_lock(ipipe, opipe);
49501
49502 do {
49503- if (!opipe->readers) {
49504+ if (!atomic_read(&opipe->readers)) {
49505 send_sig(SIGPIPE, current, 0);
49506 if (!ret)
49507 ret = -EPIPE;
49508 break;
49509 }
49510
49511- if (!ipipe->nrbufs && !ipipe->writers)
49512+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
49513 break;
49514
49515 /*
49516@@ -1925,7 +1925,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
49517 pipe_double_lock(ipipe, opipe);
49518
49519 do {
49520- if (!opipe->readers) {
49521+ if (!atomic_read(&opipe->readers)) {
49522 send_sig(SIGPIPE, current, 0);
49523 if (!ret)
49524 ret = -EPIPE;
49525@@ -1970,7 +1970,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
49526 * return EAGAIN if we have the potential of some data in the
49527 * future, otherwise just return 0
49528 */
49529- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
49530+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
49531 ret = -EAGAIN;
49532
49533 pipe_unlock(ipipe);
49534diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
49535index a475983..9c6a1f0 100644
49536--- a/fs/sysfs/bin.c
49537+++ b/fs/sysfs/bin.c
49538@@ -67,6 +67,8 @@ fill_read(struct file *file, char *buffer, loff_t off, size_t count)
49539 }
49540
49541 static ssize_t
49542+read(struct file *file, char __user *userbuf, size_t bytes, loff_t *off) __size_overflow(3);
49543+static ssize_t
49544 read(struct file *file, char __user *userbuf, size_t bytes, loff_t *off)
49545 {
49546 struct bin_buffer *bb = file->private_data;
49547diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
49548index 7fdf6a7..e6cd8ad 100644
49549--- a/fs/sysfs/dir.c
49550+++ b/fs/sysfs/dir.c
49551@@ -642,6 +642,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
49552 struct sysfs_dirent *sd;
49553 int rc;
49554
49555+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
49556+ const char *parent_name = parent_sd->s_name;
49557+
49558+ mode = S_IFDIR | S_IRWXU;
49559+
49560+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
49561+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
49562+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse"))) ||
49563+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
49564+ mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
49565+#endif
49566+
49567 /* allocate */
49568 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
49569 if (!sd)
49570diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
49571index 00012e3..8392349 100644
49572--- a/fs/sysfs/file.c
49573+++ b/fs/sysfs/file.c
49574@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
49575
49576 struct sysfs_open_dirent {
49577 atomic_t refcnt;
49578- atomic_t event;
49579+ atomic_unchecked_t event;
49580 wait_queue_head_t poll;
49581 struct list_head buffers; /* goes through sysfs_buffer.list */
49582 };
49583@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
49584 if (!sysfs_get_active(attr_sd))
49585 return -ENODEV;
49586
49587- buffer->event = atomic_read(&attr_sd->s_attr.open->event);
49588+ buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
49589 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
49590
49591 sysfs_put_active(attr_sd);
49592@@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
49593 return -ENOMEM;
49594
49595 atomic_set(&new_od->refcnt, 0);
49596- atomic_set(&new_od->event, 1);
49597+ atomic_set_unchecked(&new_od->event, 1);
49598 init_waitqueue_head(&new_od->poll);
49599 INIT_LIST_HEAD(&new_od->buffers);
49600 goto retry;
49601@@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
49602
49603 sysfs_put_active(attr_sd);
49604
49605- if (buffer->event != atomic_read(&od->event))
49606+ if (buffer->event != atomic_read_unchecked(&od->event))
49607 goto trigger;
49608
49609 return DEFAULT_POLLMASK;
49610@@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
49611
49612 od = sd->s_attr.open;
49613 if (od) {
49614- atomic_inc(&od->event);
49615+ atomic_inc_unchecked(&od->event);
49616 wake_up_interruptible(&od->poll);
49617 }
49618
49619diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
49620index a7ac78f..02158e1 100644
49621--- a/fs/sysfs/symlink.c
49622+++ b/fs/sysfs/symlink.c
49623@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
49624
49625 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
49626 {
49627- char *page = nd_get_link(nd);
49628+ const char *page = nd_get_link(nd);
49629 if (!IS_ERR(page))
49630 free_page((unsigned long)page);
49631 }
49632diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
49633index f922cba..062fb02 100644
49634--- a/fs/ubifs/debug.c
49635+++ b/fs/ubifs/debug.c
49636@@ -2819,6 +2819,7 @@ static ssize_t dfs_file_read(struct file *file, char __user *u, size_t count,
49637 * debugfs file. Returns %0 or %1 in case of success and a negative error code
49638 * in case of failure.
49639 */
49640+static int interpret_user_input(const char __user *u, size_t count) __size_overflow(2);
49641 static int interpret_user_input(const char __user *u, size_t count)
49642 {
49643 size_t buf_size;
49644@@ -2837,6 +2838,8 @@ static int interpret_user_input(const char __user *u, size_t count)
49645 }
49646
49647 static ssize_t dfs_file_write(struct file *file, const char __user *u,
49648+ size_t count, loff_t *ppos) __size_overflow(3);
49649+static ssize_t dfs_file_write(struct file *file, const char __user *u,
49650 size_t count, loff_t *ppos)
49651 {
49652 struct ubifs_info *c = file->private_data;
49653diff --git a/fs/udf/misc.c b/fs/udf/misc.c
49654index c175b4d..8f36a16 100644
49655--- a/fs/udf/misc.c
49656+++ b/fs/udf/misc.c
49657@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
49658
49659 u8 udf_tag_checksum(const struct tag *t)
49660 {
49661- u8 *data = (u8 *)t;
49662+ const u8 *data = (const u8 *)t;
49663 u8 checksum = 0;
49664 int i;
49665 for (i = 0; i < sizeof(struct tag); ++i)
49666diff --git a/fs/utimes.c b/fs/utimes.c
49667index ba653f3..06ea4b1 100644
49668--- a/fs/utimes.c
49669+++ b/fs/utimes.c
49670@@ -1,6 +1,7 @@
49671 #include <linux/compiler.h>
49672 #include <linux/file.h>
49673 #include <linux/fs.h>
49674+#include <linux/security.h>
49675 #include <linux/linkage.h>
49676 #include <linux/mount.h>
49677 #include <linux/namei.h>
49678@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
49679 goto mnt_drop_write_and_out;
49680 }
49681 }
49682+
49683+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
49684+ error = -EACCES;
49685+ goto mnt_drop_write_and_out;
49686+ }
49687+
49688 mutex_lock(&inode->i_mutex);
49689 error = notify_change(path->dentry, &newattrs);
49690 mutex_unlock(&inode->i_mutex);
49691diff --git a/fs/xattr.c b/fs/xattr.c
49692index 82f4337..236473c 100644
49693--- a/fs/xattr.c
49694+++ b/fs/xattr.c
49695@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
49696 * Extended attribute SET operations
49697 */
49698 static long
49699-setxattr(struct dentry *d, const char __user *name, const void __user *value,
49700+setxattr(struct path *path, const char __user *name, const void __user *value,
49701 size_t size, int flags)
49702 {
49703 int error;
49704@@ -339,7 +339,13 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
49705 return PTR_ERR(kvalue);
49706 }
49707
49708- error = vfs_setxattr(d, kname, kvalue, size, flags);
49709+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
49710+ error = -EACCES;
49711+ goto out;
49712+ }
49713+
49714+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
49715+out:
49716 kfree(kvalue);
49717 return error;
49718 }
49719@@ -356,7 +362,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
49720 return error;
49721 error = mnt_want_write(path.mnt);
49722 if (!error) {
49723- error = setxattr(path.dentry, name, value, size, flags);
49724+ error = setxattr(&path, name, value, size, flags);
49725 mnt_drop_write(path.mnt);
49726 }
49727 path_put(&path);
49728@@ -375,7 +381,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
49729 return error;
49730 error = mnt_want_write(path.mnt);
49731 if (!error) {
49732- error = setxattr(path.dentry, name, value, size, flags);
49733+ error = setxattr(&path, name, value, size, flags);
49734 mnt_drop_write(path.mnt);
49735 }
49736 path_put(&path);
49737@@ -386,17 +392,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
49738 const void __user *,value, size_t, size, int, flags)
49739 {
49740 struct file *f;
49741- struct dentry *dentry;
49742 int error = -EBADF;
49743
49744 f = fget(fd);
49745 if (!f)
49746 return error;
49747- dentry = f->f_path.dentry;
49748- audit_inode(NULL, dentry);
49749+ audit_inode(NULL, f->f_path.dentry);
49750 error = mnt_want_write_file(f);
49751 if (!error) {
49752- error = setxattr(dentry, name, value, size, flags);
49753+ error = setxattr(&f->f_path, name, value, size, flags);
49754 mnt_drop_write_file(f);
49755 }
49756 fput(f);
49757diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
49758index 8d5a506..7f62712 100644
49759--- a/fs/xattr_acl.c
49760+++ b/fs/xattr_acl.c
49761@@ -17,8 +17,8 @@
49762 struct posix_acl *
49763 posix_acl_from_xattr(const void *value, size_t size)
49764 {
49765- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
49766- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
49767+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
49768+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
49769 int count;
49770 struct posix_acl *acl;
49771 struct posix_acl_entry *acl_e;
49772diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
49773index 188ef2f..adcf864 100644
49774--- a/fs/xfs/xfs_bmap.c
49775+++ b/fs/xfs/xfs_bmap.c
49776@@ -190,7 +190,7 @@ xfs_bmap_validate_ret(
49777 int nmap,
49778 int ret_nmap);
49779 #else
49780-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
49781+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
49782 #endif /* DEBUG */
49783
49784 STATIC int
49785diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
49786index 79d05e8..e3e5861 100644
49787--- a/fs/xfs/xfs_dir2_sf.c
49788+++ b/fs/xfs/xfs_dir2_sf.c
49789@@ -852,7 +852,15 @@ xfs_dir2_sf_getdents(
49790 }
49791
49792 ino = xfs_dir2_sfe_get_ino(sfp, sfep);
49793- if (filldir(dirent, (char *)sfep->name, sfep->namelen,
49794+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
49795+ char name[sfep->namelen];
49796+ memcpy(name, sfep->name, sfep->namelen);
49797+ if (filldir(dirent, name, sfep->namelen,
49798+ off & 0x7fffffff, ino, DT_UNKNOWN)) {
49799+ *offset = off & 0x7fffffff;
49800+ return 0;
49801+ }
49802+ } else if (filldir(dirent, (char *)sfep->name, sfep->namelen,
49803 off & 0x7fffffff, ino, DT_UNKNOWN)) {
49804 *offset = off & 0x7fffffff;
49805 return 0;
49806diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
49807index 76f3ca5..f57f712 100644
49808--- a/fs/xfs/xfs_ioctl.c
49809+++ b/fs/xfs/xfs_ioctl.c
49810@@ -128,7 +128,7 @@ xfs_find_handle(
49811 }
49812
49813 error = -EFAULT;
49814- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
49815+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
49816 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
49817 goto out_put;
49818
49819diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
49820index ab30253..4d86958 100644
49821--- a/fs/xfs/xfs_iops.c
49822+++ b/fs/xfs/xfs_iops.c
49823@@ -447,7 +447,7 @@ xfs_vn_put_link(
49824 struct nameidata *nd,
49825 void *p)
49826 {
49827- char *s = nd_get_link(nd);
49828+ const char *s = nd_get_link(nd);
49829
49830 if (!IS_ERR(s))
49831 kfree(s);
49832diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
49833new file mode 100644
49834index 0000000..4089e05
49835--- /dev/null
49836+++ b/grsecurity/Kconfig
49837@@ -0,0 +1,1078 @@
49838+#
49839+# grecurity configuration
49840+#
49841+
49842+menu "Grsecurity"
49843+
49844+config GRKERNSEC
49845+ bool "Grsecurity"
49846+ select CRYPTO
49847+ select CRYPTO_SHA256
49848+ help
49849+ If you say Y here, you will be able to configure many features
49850+ that will enhance the security of your system. It is highly
49851+ recommended that you say Y here and read through the help
49852+ for each option so that you fully understand the features and
49853+ can evaluate their usefulness for your machine.
49854+
49855+choice
49856+ prompt "Security Level"
49857+ depends on GRKERNSEC
49858+ default GRKERNSEC_CUSTOM
49859+
49860+config GRKERNSEC_LOW
49861+ bool "Low"
49862+ select GRKERNSEC_LINK
49863+ select GRKERNSEC_FIFO
49864+ select GRKERNSEC_RANDNET
49865+ select GRKERNSEC_DMESG
49866+ select GRKERNSEC_CHROOT
49867+ select GRKERNSEC_CHROOT_CHDIR
49868+
49869+ help
49870+ If you choose this option, several of the grsecurity options will
49871+ be enabled that will give you greater protection against a number
49872+ of attacks, while assuring that none of your software will have any
49873+ conflicts with the additional security measures. If you run a lot
49874+ of unusual software, or you are having problems with the higher
49875+ security levels, you should say Y here. With this option, the
49876+ following features are enabled:
49877+
49878+ - Linking restrictions
49879+ - FIFO restrictions
49880+ - Restricted dmesg
49881+ - Enforced chdir("/") on chroot
49882+ - Runtime module disabling
49883+
49884+config GRKERNSEC_MEDIUM
49885+ bool "Medium"
49886+ select PAX
49887+ select PAX_EI_PAX
49888+ select PAX_PT_PAX_FLAGS
49889+ select PAX_HAVE_ACL_FLAGS
49890+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
49891+ select GRKERNSEC_CHROOT
49892+ select GRKERNSEC_CHROOT_SYSCTL
49893+ select GRKERNSEC_LINK
49894+ select GRKERNSEC_FIFO
49895+ select GRKERNSEC_DMESG
49896+ select GRKERNSEC_RANDNET
49897+ select GRKERNSEC_FORKFAIL
49898+ select GRKERNSEC_TIME
49899+ select GRKERNSEC_SIGNAL
49900+ select GRKERNSEC_CHROOT
49901+ select GRKERNSEC_CHROOT_UNIX
49902+ select GRKERNSEC_CHROOT_MOUNT
49903+ select GRKERNSEC_CHROOT_PIVOT
49904+ select GRKERNSEC_CHROOT_DOUBLE
49905+ select GRKERNSEC_CHROOT_CHDIR
49906+ select GRKERNSEC_CHROOT_MKNOD
49907+ select GRKERNSEC_PROC
49908+ select GRKERNSEC_PROC_USERGROUP
49909+ select PAX_RANDUSTACK
49910+ select PAX_ASLR
49911+ select PAX_RANDMMAP
49912+ select PAX_REFCOUNT if (X86 || SPARC64)
49913+ select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
49914+
49915+ help
49916+ If you say Y here, several features in addition to those included
49917+ in the low additional security level will be enabled. These
49918+ features provide even more security to your system, though in rare
49919+ cases they may be incompatible with very old or poorly written
49920+ software. If you enable this option, make sure that your auth
49921+ service (identd) is running as gid 1001. With this option,
49922+ the following features (in addition to those provided in the
49923+ low additional security level) will be enabled:
49924+
49925+ - Failed fork logging
49926+ - Time change logging
49927+ - Signal logging
49928+ - Deny mounts in chroot
49929+ - Deny double chrooting
49930+ - Deny sysctl writes in chroot
49931+ - Deny mknod in chroot
49932+ - Deny access to abstract AF_UNIX sockets out of chroot
49933+ - Deny pivot_root in chroot
49934+ - Denied reads/writes of /dev/kmem, /dev/mem, and /dev/port
49935+ - /proc restrictions with special GID set to 10 (usually wheel)
49936+ - Address Space Layout Randomization (ASLR)
49937+ - Prevent exploitation of most refcount overflows
49938+ - Bounds checking of copying between the kernel and userland
49939+
49940+config GRKERNSEC_HIGH
49941+ bool "High"
49942+ select GRKERNSEC_LINK
49943+ select GRKERNSEC_FIFO
49944+ select GRKERNSEC_DMESG
49945+ select GRKERNSEC_FORKFAIL
49946+ select GRKERNSEC_TIME
49947+ select GRKERNSEC_SIGNAL
49948+ select GRKERNSEC_CHROOT
49949+ select GRKERNSEC_CHROOT_SHMAT
49950+ select GRKERNSEC_CHROOT_UNIX
49951+ select GRKERNSEC_CHROOT_MOUNT
49952+ select GRKERNSEC_CHROOT_FCHDIR
49953+ select GRKERNSEC_CHROOT_PIVOT
49954+ select GRKERNSEC_CHROOT_DOUBLE
49955+ select GRKERNSEC_CHROOT_CHDIR
49956+ select GRKERNSEC_CHROOT_MKNOD
49957+ select GRKERNSEC_CHROOT_CAPS
49958+ select GRKERNSEC_CHROOT_SYSCTL
49959+ select GRKERNSEC_CHROOT_FINDTASK
49960+ select GRKERNSEC_SYSFS_RESTRICT
49961+ select GRKERNSEC_PROC
49962+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
49963+ select GRKERNSEC_HIDESYM
49964+ select GRKERNSEC_BRUTE
49965+ select GRKERNSEC_PROC_USERGROUP
49966+ select GRKERNSEC_KMEM
49967+ select GRKERNSEC_RESLOG
49968+ select GRKERNSEC_RANDNET
49969+ select GRKERNSEC_PROC_ADD
49970+ select GRKERNSEC_CHROOT_CHMOD
49971+ select GRKERNSEC_CHROOT_NICE
49972+ select GRKERNSEC_SETXID
49973+ select GRKERNSEC_AUDIT_MOUNT
49974+ select GRKERNSEC_MODHARDEN if (MODULES)
49975+ select GRKERNSEC_HARDEN_PTRACE
49976+ select GRKERNSEC_PTRACE_READEXEC
49977+ select GRKERNSEC_VM86 if (X86_32)
49978+ select GRKERNSEC_KERN_LOCKOUT if (X86 || ARM || PPC || SPARC)
49979+ select PAX
49980+ select PAX_RANDUSTACK
49981+ select PAX_ASLR
49982+ select PAX_RANDMMAP
49983+ select PAX_NOEXEC
49984+ select PAX_MPROTECT
49985+ select PAX_EI_PAX
49986+ select PAX_PT_PAX_FLAGS
49987+ select PAX_HAVE_ACL_FLAGS
49988+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
49989+ select PAX_MEMORY_UDEREF if (X86 && !XEN)
49990+ select PAX_RANDKSTACK if (X86_TSC && X86)
49991+ select PAX_SEGMEXEC if (X86_32)
49992+ select PAX_PAGEEXEC
49993+ select PAX_EMUPLT if (ALPHA || PARISC || SPARC)
49994+ select PAX_EMUTRAMP if (PARISC)
49995+ select PAX_EMUSIGRT if (PARISC)
49996+ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
49997+ select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
49998+ select PAX_REFCOUNT if (X86 || SPARC64)
49999+ select PAX_USERCOPY if ((X86 || PPC || SPARC || ARM) && (SLAB || SLUB || SLOB))
50000+ help
50001+ If you say Y here, many of the features of grsecurity will be
50002+ enabled, which will protect you against many kinds of attacks
50003+ against your system. The heightened security comes at a cost
50004+ of an increased chance of incompatibilities with rare software
50005+ on your machine. Since this security level enables PaX, you should
50006+ view <http://pax.grsecurity.net> and read about the PaX
50007+ project. While you are there, download chpax and run it on
50008+ binaries that cause problems with PaX. Also remember that
50009+ since the /proc restrictions are enabled, you must run your
50010+ identd as gid 1001. This security level enables the following
50011+ features in addition to those listed in the low and medium
50012+ security levels:
50013+
50014+ - Additional /proc restrictions
50015+ - Chmod restrictions in chroot
50016+ - No signals, ptrace, or viewing of processes outside of chroot
50017+ - Capability restrictions in chroot
50018+ - Deny fchdir out of chroot
50019+ - Priority restrictions in chroot
50020+ - Segmentation-based implementation of PaX
50021+ - Mprotect restrictions
50022+ - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
50023+ - Kernel stack randomization
50024+ - Mount/unmount/remount logging
50025+ - Kernel symbol hiding
50026+ - Hardening of module auto-loading
50027+ - Ptrace restrictions
50028+ - Restricted vm86 mode
50029+ - Restricted sysfs/debugfs
50030+ - Active kernel exploit response
50031+
50032+config GRKERNSEC_CUSTOM
50033+ bool "Custom"
50034+ help
50035+ If you say Y here, you will be able to configure every grsecurity
50036+ option, which allows you to enable many more features that aren't
50037+ covered in the basic security levels. These additional features
50038+ include TPE, socket restrictions, and the sysctl system for
50039+ grsecurity. It is advised that you read through the help for
50040+ each option to determine its usefulness in your situation.
50041+
50042+endchoice
50043+
50044+menu "Memory Protections"
50045+depends on GRKERNSEC
50046+
50047+config GRKERNSEC_KMEM
50048+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
50049+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
50050+ help
50051+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
50052+ be written to or read from to modify or leak the contents of the running
50053+ kernel. /dev/port will also not be allowed to be opened. If you have module
50054+ support disabled, enabling this will close up four ways that are
50055+ currently used to insert malicious code into the running kernel.
50056+ Even with all these features enabled, we still highly recommend that
50057+ you use the RBAC system, as it is still possible for an attacker to
50058+ modify the running kernel through privileged I/O granted by ioperm/iopl.
50059+ If you are not using XFree86, you may be able to stop this additional
50060+ case by enabling the 'Disable privileged I/O' option. Though nothing
50061+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
50062+ but only to video memory, which is the only writing we allow in this
50063+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
50064+ not be allowed to mprotect it with PROT_WRITE later.
50065+ It is highly recommended that you say Y here if you meet all the
50066+ conditions above.
50067+
50068+config GRKERNSEC_VM86
50069+ bool "Restrict VM86 mode"
50070+ depends on X86_32
50071+
50072+ help
50073+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
50074+ make use of a special execution mode on 32bit x86 processors called
50075+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
50076+ video cards and will still work with this option enabled. The purpose
50077+ of the option is to prevent exploitation of emulation errors in
50078+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
50079+ Nearly all users should be able to enable this option.
50080+
50081+config GRKERNSEC_IO
50082+ bool "Disable privileged I/O"
50083+ depends on X86
50084+ select RTC_CLASS
50085+ select RTC_INTF_DEV
50086+ select RTC_DRV_CMOS
50087+
50088+ help
50089+ If you say Y here, all ioperm and iopl calls will return an error.
50090+ Ioperm and iopl can be used to modify the running kernel.
50091+ Unfortunately, some programs need this access to operate properly,
50092+ the most notable of which are XFree86 and hwclock. hwclock can be
50093+ remedied by having RTC support in the kernel, so real-time
50094+ clock support is enabled if this option is enabled, to ensure
50095+ that hwclock operates correctly. XFree86 still will not
50096+ operate correctly with this option enabled, so DO NOT CHOOSE Y
50097+ IF YOU USE XFree86. If you use XFree86 and you still want to
50098+ protect your kernel against modification, use the RBAC system.
50099+
50100+config GRKERNSEC_PROC_MEMMAP
50101+ bool "Harden ASLR against information leaks and entropy reduction"
50102+ default y if (PAX_NOEXEC || PAX_ASLR)
50103+ depends on PAX_NOEXEC || PAX_ASLR
50104+ help
50105+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
50106+ give no information about the addresses of its mappings if
50107+ PaX features that rely on random addresses are enabled on the task.
50108+ In addition to sanitizing this information and disabling other
50109+ dangerous sources of information, this option causes reads of sensitive
50110+ /proc/<pid> entries where the file descriptor was opened in a different
50111+ task than the one performing the read. Such attempts are logged.
50112+ This option also limits argv/env strings for suid/sgid binaries
50113+ to 512KB to prevent a complete exhaustion of the stack entropy provided
50114+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
50115+ binaries to prevent alternative mmap layouts from being abused.
50116+
50117+ If you use PaX it is essential that you say Y here as it closes up
50118+ several holes that make full ASLR useless locally.
50119+
50120+config GRKERNSEC_BRUTE
50121+ bool "Deter exploit bruteforcing"
50122+ help
50123+ If you say Y here, attempts to bruteforce exploits against forking
50124+ daemons such as apache or sshd, as well as against suid/sgid binaries
50125+ will be deterred. When a child of a forking daemon is killed by PaX
50126+ or crashes due to an illegal instruction or other suspicious signal,
50127+ the parent process will be delayed 30 seconds upon every subsequent
50128+ fork until the administrator is able to assess the situation and
50129+ restart the daemon.
50130+ In the suid/sgid case, the attempt is logged, the user has all their
50131+ processes terminated, and they are prevented from executing any further
50132+ processes for 15 minutes.
50133+ It is recommended that you also enable signal logging in the auditing
50134+ section so that logs are generated when a process triggers a suspicious
50135+ signal.
50136+ If the sysctl option is enabled, a sysctl option with name
50137+ "deter_bruteforce" is created.
50138+
50139+
50140+config GRKERNSEC_MODHARDEN
50141+ bool "Harden module auto-loading"
50142+ depends on MODULES
50143+ help
50144+ If you say Y here, module auto-loading in response to use of some
50145+ feature implemented by an unloaded module will be restricted to
50146+ root users. Enabling this option helps defend against attacks
50147+ by unprivileged users who abuse the auto-loading behavior to
50148+ cause a vulnerable module to load that is then exploited.
50149+
50150+ If this option prevents a legitimate use of auto-loading for a
50151+ non-root user, the administrator can execute modprobe manually
50152+ with the exact name of the module mentioned in the alert log.
50153+ Alternatively, the administrator can add the module to the list
50154+ of modules loaded at boot by modifying init scripts.
50155+
50156+ Modification of init scripts will most likely be needed on
50157+ Ubuntu servers with encrypted home directory support enabled,
50158+ as the first non-root user logging in will cause the ecb(aes),
50159+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
50160+
50161+config GRKERNSEC_HIDESYM
50162+ bool "Hide kernel symbols"
50163+ help
50164+ If you say Y here, getting information on loaded modules, and
50165+ displaying all kernel symbols through a syscall will be restricted
50166+ to users with CAP_SYS_MODULE. For software compatibility reasons,
50167+ /proc/kallsyms will be restricted to the root user. The RBAC
50168+ system can hide that entry even from root.
50169+
50170+ This option also prevents leaking of kernel addresses through
50171+ several /proc entries.
50172+
50173+ Note that this option is only effective provided the following
50174+ conditions are met:
50175+ 1) The kernel using grsecurity is not precompiled by some distribution
50176+ 2) You have also enabled GRKERNSEC_DMESG
50177+ 3) You are using the RBAC system and hiding other files such as your
50178+ kernel image and System.map. Alternatively, enabling this option
50179+ causes the permissions on /boot, /lib/modules, and the kernel
50180+ source directory to change at compile time to prevent
50181+ reading by non-root users.
50182+ If the above conditions are met, this option will aid in providing a
50183+ useful protection against local kernel exploitation of overflows
50184+ and arbitrary read/write vulnerabilities.
50185+
50186+config GRKERNSEC_KERN_LOCKOUT
50187+ bool "Active kernel exploit response"
50188+ depends on X86 || ARM || PPC || SPARC
50189+ help
50190+ If you say Y here, when a PaX alert is triggered due to suspicious
50191+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
50192+ or an OOPs occurs due to bad memory accesses, instead of just
50193+ terminating the offending process (and potentially allowing
50194+ a subsequent exploit from the same user), we will take one of two
50195+ actions:
50196+ If the user was root, we will panic the system
50197+ If the user was non-root, we will log the attempt, terminate
50198+ all processes owned by the user, then prevent them from creating
50199+ any new processes until the system is restarted
50200+ This deters repeated kernel exploitation/bruteforcing attempts
50201+ and is useful for later forensics.
50202+
50203+endmenu
50204+menu "Role Based Access Control Options"
50205+depends on GRKERNSEC
50206+
50207+config GRKERNSEC_RBAC_DEBUG
50208+ bool
50209+
50210+config GRKERNSEC_NO_RBAC
50211+ bool "Disable RBAC system"
50212+ help
50213+ If you say Y here, the /dev/grsec device will be removed from the kernel,
50214+ preventing the RBAC system from being enabled. You should only say Y
50215+ here if you have no intention of using the RBAC system, so as to prevent
50216+ an attacker with root access from misusing the RBAC system to hide files
50217+ and processes when loadable module support and /dev/[k]mem have been
50218+ locked down.
50219+
50220+config GRKERNSEC_ACL_HIDEKERN
50221+ bool "Hide kernel processes"
50222+ help
50223+ If you say Y here, all kernel threads will be hidden to all
50224+ processes but those whose subject has the "view hidden processes"
50225+ flag.
50226+
50227+config GRKERNSEC_ACL_MAXTRIES
50228+ int "Maximum tries before password lockout"
50229+ default 3
50230+ help
50231+ This option enforces the maximum number of times a user can attempt
50232+ to authorize themselves with the grsecurity RBAC system before being
50233+ denied the ability to attempt authorization again for a specified time.
50234+ The lower the number, the harder it will be to brute-force a password.
50235+
50236+config GRKERNSEC_ACL_TIMEOUT
50237+ int "Time to wait after max password tries, in seconds"
50238+ default 30
50239+ help
50240+ This option specifies the time the user must wait after attempting to
50241+ authorize to the RBAC system with the maximum number of invalid
50242+ passwords. The higher the number, the harder it will be to brute-force
50243+ a password.
50244+
50245+endmenu
50246+menu "Filesystem Protections"
50247+depends on GRKERNSEC
50248+
50249+config GRKERNSEC_PROC
50250+ bool "Proc restrictions"
50251+ help
50252+ If you say Y here, the permissions of the /proc filesystem
50253+ will be altered to enhance system security and privacy. You MUST
50254+ choose either a user only restriction or a user and group restriction.
50255+ Depending upon the option you choose, you can either restrict users to
50256+ see only the processes they themselves run, or choose a group that can
50257+ view all processes and files normally restricted to root if you choose
50258+ the "restrict to user only" option. NOTE: If you're running identd or
50259+ ntpd as a non-root user, you will have to run it as the group you
50260+ specify here.
50261+
50262+config GRKERNSEC_PROC_USER
50263+ bool "Restrict /proc to user only"
50264+ depends on GRKERNSEC_PROC
50265+ help
50266+ If you say Y here, non-root users will only be able to view their own
50267+ processes, and restricts them from viewing network-related information,
50268+ and viewing kernel symbol and module information.
50269+
50270+config GRKERNSEC_PROC_USERGROUP
50271+ bool "Allow special group"
50272+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
50273+ help
50274+ If you say Y here, you will be able to select a group that will be
50275+ able to view all processes and network-related information. If you've
50276+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
50277+ remain hidden. This option is useful if you want to run identd as
50278+ a non-root user.
50279+
50280+config GRKERNSEC_PROC_GID
50281+ int "GID for special group"
50282+ depends on GRKERNSEC_PROC_USERGROUP
50283+ default 1001
50284+
50285+config GRKERNSEC_PROC_ADD
50286+ bool "Additional restrictions"
50287+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
50288+ help
50289+ If you say Y here, additional restrictions will be placed on
50290+ /proc that keep normal users from viewing device information and
50291+ slabinfo information that could be useful for exploits.
50292+
50293+config GRKERNSEC_LINK
50294+ bool "Linking restrictions"
50295+ help
50296+ If you say Y here, /tmp race exploits will be prevented, since users
50297+ will no longer be able to follow symlinks owned by other users in
50298+ world-writable +t directories (e.g. /tmp), unless the owner of the
50299+ symlink is the owner of the directory. users will also not be
50300+ able to hardlink to files they do not own. If the sysctl option is
50301+ enabled, a sysctl option with name "linking_restrictions" is created.
50302+
50303+config GRKERNSEC_FIFO
50304+ bool "FIFO restrictions"
50305+ help
50306+ If you say Y here, users will not be able to write to FIFOs they don't
50307+ own in world-writable +t directories (e.g. /tmp), unless the owner of
50308+ the FIFO is the same owner of the directory it's held in. If the sysctl
50309+ option is enabled, a sysctl option with name "fifo_restrictions" is
50310+ created.
50311+
50312+config GRKERNSEC_SYSFS_RESTRICT
50313+ bool "Sysfs/debugfs restriction"
50314+ depends on SYSFS
50315+ help
50316+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
50317+ any filesystem normally mounted under it (e.g. debugfs) will be
50318+ mostly accessible only by root. These filesystems generally provide access
50319+ to hardware and debug information that isn't appropriate for unprivileged
50320+ users of the system. Sysfs and debugfs have also become a large source
50321+ of new vulnerabilities, ranging from infoleaks to local compromise.
50322+ There has been very little oversight with an eye toward security involved
50323+ in adding new exporters of information to these filesystems, so their
50324+ use is discouraged.
50325+ For reasons of compatibility, a few directories have been whitelisted
50326+ for access by non-root users:
50327+ /sys/fs/selinux
50328+ /sys/fs/fuse
50329+ /sys/devices/system/cpu
50330+
50331+config GRKERNSEC_ROFS
50332+ bool "Runtime read-only mount protection"
50333+ help
50334+ If you say Y here, a sysctl option with name "romount_protect" will
50335+ be created. By setting this option to 1 at runtime, filesystems
50336+ will be protected in the following ways:
50337+ * No new writable mounts will be allowed
50338+ * Existing read-only mounts won't be able to be remounted read/write
50339+ * Write operations will be denied on all block devices
50340+ This option acts independently of grsec_lock: once it is set to 1,
50341+ it cannot be turned off. Therefore, please be mindful of the resulting
50342+ behavior if this option is enabled in an init script on a read-only
50343+ filesystem. This feature is mainly intended for secure embedded systems.
50344+
50345+config GRKERNSEC_CHROOT
50346+ bool "Chroot jail restrictions"
50347+ help
50348+ If you say Y here, you will be able to choose several options that will
50349+ make breaking out of a chrooted jail much more difficult. If you
50350+ encounter no software incompatibilities with the following options, it
50351+ is recommended that you enable each one.
50352+
50353+config GRKERNSEC_CHROOT_MOUNT
50354+ bool "Deny mounts"
50355+ depends on GRKERNSEC_CHROOT
50356+ help
50357+ If you say Y here, processes inside a chroot will not be able to
50358+ mount or remount filesystems. If the sysctl option is enabled, a
50359+ sysctl option with name "chroot_deny_mount" is created.
50360+
50361+config GRKERNSEC_CHROOT_DOUBLE
50362+ bool "Deny double-chroots"
50363+ depends on GRKERNSEC_CHROOT
50364+ help
50365+ If you say Y here, processes inside a chroot will not be able to chroot
50366+ again outside the chroot. This is a widely used method of breaking
50367+ out of a chroot jail and should not be allowed. If the sysctl
50368+ option is enabled, a sysctl option with name
50369+ "chroot_deny_chroot" is created.
50370+
50371+config GRKERNSEC_CHROOT_PIVOT
50372+ bool "Deny pivot_root in chroot"
50373+ depends on GRKERNSEC_CHROOT
50374+ help
50375+ If you say Y here, processes inside a chroot will not be able to use
50376+ a function called pivot_root() that was introduced in Linux 2.3.41. It
50377+ works similar to chroot in that it changes the root filesystem. This
50378+ function could be misused in a chrooted process to attempt to break out
50379+ of the chroot, and therefore should not be allowed. If the sysctl
50380+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
50381+ created.
50382+
50383+config GRKERNSEC_CHROOT_CHDIR
50384+ bool "Enforce chdir(\"/\") on all chroots"
50385+ depends on GRKERNSEC_CHROOT
50386+ help
50387+ If you say Y here, the current working directory of all newly-chrooted
50388+ applications will be set to the the root directory of the chroot.
50389+ The man page on chroot(2) states:
50390+ Note that this call does not change the current working
50391+ directory, so that `.' can be outside the tree rooted at
50392+ `/'. In particular, the super-user can escape from a
50393+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
50394+
50395+ It is recommended that you say Y here, since it's not known to break
50396+ any software. If the sysctl option is enabled, a sysctl option with
50397+ name "chroot_enforce_chdir" is created.
50398+
50399+config GRKERNSEC_CHROOT_CHMOD
50400+ bool "Deny (f)chmod +s"
50401+ depends on GRKERNSEC_CHROOT
50402+ help
50403+ If you say Y here, processes inside a chroot will not be able to chmod
50404+ or fchmod files to make them have suid or sgid bits. This protects
50405+ against another published method of breaking a chroot. If the sysctl
50406+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
50407+ created.
50408+
50409+config GRKERNSEC_CHROOT_FCHDIR
50410+ bool "Deny fchdir out of chroot"
50411+ depends on GRKERNSEC_CHROOT
50412+ help
50413+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
50414+ to a file descriptor of the chrooting process that points to a directory
50415+ outside the filesystem will be stopped. If the sysctl option
50416+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
50417+
50418+config GRKERNSEC_CHROOT_MKNOD
50419+ bool "Deny mknod"
50420+ depends on GRKERNSEC_CHROOT
50421+ help
50422+ If you say Y here, processes inside a chroot will not be allowed to
50423+ mknod. The problem with using mknod inside a chroot is that it
50424+ would allow an attacker to create a device entry that is the same
50425+ as one on the physical root of your system, which could range from
50426+ anything from the console device to a device for your harddrive (which
50427+ they could then use to wipe the drive or steal data). It is recommended
50428+ that you say Y here, unless you run into software incompatibilities.
50429+ If the sysctl option is enabled, a sysctl option with name
50430+ "chroot_deny_mknod" is created.
50431+
50432+config GRKERNSEC_CHROOT_SHMAT
50433+ bool "Deny shmat() out of chroot"
50434+ depends on GRKERNSEC_CHROOT
50435+ help
50436+ If you say Y here, processes inside a chroot will not be able to attach
50437+ to shared memory segments that were created outside of the chroot jail.
50438+ It is recommended that you say Y here. If the sysctl option is enabled,
50439+ a sysctl option with name "chroot_deny_shmat" is created.
50440+
50441+config GRKERNSEC_CHROOT_UNIX
50442+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
50443+ depends on GRKERNSEC_CHROOT
50444+ help
50445+ If you say Y here, processes inside a chroot will not be able to
50446+ connect to abstract (meaning not belonging to a filesystem) Unix
50447+ domain sockets that were bound outside of a chroot. It is recommended
50448+ that you say Y here. If the sysctl option is enabled, a sysctl option
50449+ with name "chroot_deny_unix" is created.
50450+
50451+config GRKERNSEC_CHROOT_FINDTASK
50452+ bool "Protect outside processes"
50453+ depends on GRKERNSEC_CHROOT
50454+ help
50455+ If you say Y here, processes inside a chroot will not be able to
50456+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
50457+ getsid, or view any process outside of the chroot. If the sysctl
50458+ option is enabled, a sysctl option with name "chroot_findtask" is
50459+ created.
50460+
50461+config GRKERNSEC_CHROOT_NICE
50462+ bool "Restrict priority changes"
50463+ depends on GRKERNSEC_CHROOT
50464+ help
50465+ If you say Y here, processes inside a chroot will not be able to raise
50466+ the priority of processes in the chroot, or alter the priority of
50467+ processes outside the chroot. This provides more security than simply
50468+ removing CAP_SYS_NICE from the process' capability set. If the
50469+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
50470+ is created.
50471+
50472+config GRKERNSEC_CHROOT_SYSCTL
50473+ bool "Deny sysctl writes"
50474+ depends on GRKERNSEC_CHROOT
50475+ help
50476+ If you say Y here, an attacker in a chroot will not be able to
50477+ write to sysctl entries, either by sysctl(2) or through a /proc
50478+ interface. It is strongly recommended that you say Y here. If the
50479+ sysctl option is enabled, a sysctl option with name
50480+ "chroot_deny_sysctl" is created.
50481+
50482+config GRKERNSEC_CHROOT_CAPS
50483+ bool "Capability restrictions"
50484+ depends on GRKERNSEC_CHROOT
50485+ help
50486+ If you say Y here, the capabilities on all processes within a
50487+ chroot jail will be lowered to stop module insertion, raw i/o,
50488+ system and net admin tasks, rebooting the system, modifying immutable
50489+ files, modifying IPC owned by another, and changing the system time.
50490+ This is left an option because it can break some apps. Disable this
50491+ if your chrooted apps are having problems performing those kinds of
50492+ tasks. If the sysctl option is enabled, a sysctl option with
50493+ name "chroot_caps" is created.
50494+
50495+endmenu
50496+menu "Kernel Auditing"
50497+depends on GRKERNSEC
50498+
50499+config GRKERNSEC_AUDIT_GROUP
50500+ bool "Single group for auditing"
50501+ help
50502+ If you say Y here, the exec, chdir, and (un)mount logging features
50503+ will only operate on a group you specify. This option is recommended
50504+ if you only want to watch certain users instead of having a large
50505+ amount of logs from the entire system. If the sysctl option is enabled,
50506+ a sysctl option with name "audit_group" is created.
50507+
50508+config GRKERNSEC_AUDIT_GID
50509+ int "GID for auditing"
50510+ depends on GRKERNSEC_AUDIT_GROUP
50511+ default 1007
50512+
50513+config GRKERNSEC_EXECLOG
50514+ bool "Exec logging"
50515+ help
50516+ If you say Y here, all execve() calls will be logged (since the
50517+ other exec*() calls are frontends to execve(), all execution
50518+ will be logged). Useful for shell-servers that like to keep track
50519+ of their users. If the sysctl option is enabled, a sysctl option with
50520+ name "exec_logging" is created.
50521+ WARNING: This option when enabled will produce a LOT of logs, especially
50522+ on an active system.
50523+
50524+config GRKERNSEC_RESLOG
50525+ bool "Resource logging"
50526+ help
50527+ If you say Y here, all attempts to overstep resource limits will
50528+ be logged with the resource name, the requested size, and the current
50529+ limit. It is highly recommended that you say Y here. If the sysctl
50530+ option is enabled, a sysctl option with name "resource_logging" is
50531+ created. If the RBAC system is enabled, the sysctl value is ignored.
50532+
50533+config GRKERNSEC_CHROOT_EXECLOG
50534+ bool "Log execs within chroot"
50535+ help
50536+ If you say Y here, all executions inside a chroot jail will be logged
50537+ to syslog. This can cause a large amount of logs if certain
50538+ applications (eg. djb's daemontools) are installed on the system, and
50539+ is therefore left as an option. If the sysctl option is enabled, a
50540+ sysctl option with name "chroot_execlog" is created.
50541+
50542+config GRKERNSEC_AUDIT_PTRACE
50543+ bool "Ptrace logging"
50544+ help
50545+ If you say Y here, all attempts to attach to a process via ptrace
50546+ will be logged. If the sysctl option is enabled, a sysctl option
50547+ with name "audit_ptrace" is created.
50548+
50549+config GRKERNSEC_AUDIT_CHDIR
50550+ bool "Chdir logging"
50551+ help
50552+ If you say Y here, all chdir() calls will be logged. If the sysctl
50553+ option is enabled, a sysctl option with name "audit_chdir" is created.
50554+
50555+config GRKERNSEC_AUDIT_MOUNT
50556+ bool "(Un)Mount logging"
50557+ help
50558+ If you say Y here, all mounts and unmounts will be logged. If the
50559+ sysctl option is enabled, a sysctl option with name "audit_mount" is
50560+ created.
50561+
50562+config GRKERNSEC_SIGNAL
50563+ bool "Signal logging"
50564+ help
50565+ If you say Y here, certain important signals will be logged, such as
50566+ SIGSEGV, which will as a result inform you of when a error in a program
50567+ occurred, which in some cases could mean a possible exploit attempt.
50568+ If the sysctl option is enabled, a sysctl option with name
50569+ "signal_logging" is created.
50570+
50571+config GRKERNSEC_FORKFAIL
50572+ bool "Fork failure logging"
50573+ help
50574+ If you say Y here, all failed fork() attempts will be logged.
50575+ This could suggest a fork bomb, or someone attempting to overstep
50576+ their process limit. If the sysctl option is enabled, a sysctl option
50577+ with name "forkfail_logging" is created.
50578+
50579+config GRKERNSEC_TIME
50580+ bool "Time change logging"
50581+ help
50582+ If you say Y here, any changes of the system clock will be logged.
50583+ If the sysctl option is enabled, a sysctl option with name
50584+ "timechange_logging" is created.
50585+
50586+config GRKERNSEC_PROC_IPADDR
50587+ bool "/proc/<pid>/ipaddr support"
50588+ help
50589+ If you say Y here, a new entry will be added to each /proc/<pid>
50590+ directory that contains the IP address of the person using the task.
50591+ The IP is carried across local TCP and AF_UNIX stream sockets.
50592+ This information can be useful for IDS/IPSes to perform remote response
50593+ to a local attack. The entry is readable by only the owner of the
50594+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
50595+ the RBAC system), and thus does not create privacy concerns.
50596+
50597+config GRKERNSEC_RWXMAP_LOG
50598+ bool 'Denied RWX mmap/mprotect logging'
50599+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
50600+ help
50601+ If you say Y here, calls to mmap() and mprotect() with explicit
50602+ usage of PROT_WRITE and PROT_EXEC together will be logged when
50603+ denied by the PAX_MPROTECT feature. If the sysctl option is
50604+ enabled, a sysctl option with name "rwxmap_logging" is created.
50605+
50606+config GRKERNSEC_AUDIT_TEXTREL
50607+ bool 'ELF text relocations logging (READ HELP)'
50608+ depends on PAX_MPROTECT
50609+ help
50610+ If you say Y here, text relocations will be logged with the filename
50611+ of the offending library or binary. The purpose of the feature is
50612+ to help Linux distribution developers get rid of libraries and
50613+ binaries that need text relocations which hinder the future progress
50614+ of PaX. Only Linux distribution developers should say Y here, and
50615+ never on a production machine, as this option creates an information
50616+ leak that could aid an attacker in defeating the randomization of
50617+ a single memory region. If the sysctl option is enabled, a sysctl
50618+ option with name "audit_textrel" is created.
50619+
50620+endmenu
50621+
50622+menu "Executable Protections"
50623+depends on GRKERNSEC
50624+
50625+config GRKERNSEC_DMESG
50626+ bool "Dmesg(8) restriction"
50627+ help
50628+ If you say Y here, non-root users will not be able to use dmesg(8)
50629+ to view up to the last 4kb of messages in the kernel's log buffer.
50630+ The kernel's log buffer often contains kernel addresses and other
50631+ identifying information useful to an attacker in fingerprinting a
50632+ system for a targeted exploit.
50633+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
50634+ created.
50635+
50636+config GRKERNSEC_HARDEN_PTRACE
50637+ bool "Deter ptrace-based process snooping"
50638+ help
50639+ If you say Y here, TTY sniffers and other malicious monitoring
50640+ programs implemented through ptrace will be defeated. If you
50641+ have been using the RBAC system, this option has already been
50642+ enabled for several years for all users, with the ability to make
50643+ fine-grained exceptions.
50644+
50645+ This option only affects the ability of non-root users to ptrace
50646+ processes that are not a descendent of the ptracing process.
50647+ This means that strace ./binary and gdb ./binary will still work,
50648+ but attaching to arbitrary processes will not. If the sysctl
50649+ option is enabled, a sysctl option with name "harden_ptrace" is
50650+ created.
50651+
50652+config GRKERNSEC_PTRACE_READEXEC
50653+ bool "Require read access to ptrace sensitive binaries"
50654+ help
50655+ If you say Y here, unprivileged users will not be able to ptrace unreadable
50656+ binaries. This option is useful in environments that
50657+ remove the read bits (e.g. file mode 4711) from suid binaries to
50658+ prevent infoleaking of their contents. This option adds
50659+ consistency to the use of that file mode, as the binary could normally
50660+ be read out when run without privileges while ptracing.
50661+
50662+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
50663+ is created.
50664+
50665+config GRKERNSEC_SETXID
50666+ bool "Enforce consistent multithreaded privileges"
50667+ help
50668+ If you say Y here, a change from a root uid to a non-root uid
50669+ in a multithreaded application will cause the resulting uids,
50670+ gids, supplementary groups, and capabilities in that thread
50671+ to be propagated to the other threads of the process. In most
50672+ cases this is unnecessary, as glibc will emulate this behavior
50673+ on behalf of the application. Other libcs do not act in the
50674+ same way, allowing the other threads of the process to continue
50675+ running with root privileges. If the sysctl option is enabled,
50676+ a sysctl option with name "consistent_setxid" is created.
50677+
50678+config GRKERNSEC_TPE
50679+ bool "Trusted Path Execution (TPE)"
50680+ help
50681+ If you say Y here, you will be able to choose a gid to add to the
50682+ supplementary groups of users you want to mark as "untrusted."
50683+ These users will not be able to execute any files that are not in
50684+ root-owned directories writable only by root. If the sysctl option
50685+ is enabled, a sysctl option with name "tpe" is created.
50686+
50687+config GRKERNSEC_TPE_ALL
50688+ bool "Partially restrict all non-root users"
50689+ depends on GRKERNSEC_TPE
50690+ help
50691+ If you say Y here, all non-root users will be covered under
50692+ a weaker TPE restriction. This is separate from, and in addition to,
50693+ the main TPE options that you have selected elsewhere. Thus, if a
50694+ "trusted" GID is chosen, this restriction applies to even that GID.
50695+ Under this restriction, all non-root users will only be allowed to
50696+ execute files in directories they own that are not group or
50697+ world-writable, or in directories owned by root and writable only by
50698+ root. If the sysctl option is enabled, a sysctl option with name
50699+ "tpe_restrict_all" is created.
50700+
50701+config GRKERNSEC_TPE_INVERT
50702+ bool "Invert GID option"
50703+ depends on GRKERNSEC_TPE
50704+ help
50705+ If you say Y here, the group you specify in the TPE configuration will
50706+ decide what group TPE restrictions will be *disabled* for. This
50707+ option is useful if you want TPE restrictions to be applied to most
50708+ users on the system. If the sysctl option is enabled, a sysctl option
50709+ with name "tpe_invert" is created. Unlike other sysctl options, this
50710+ entry will default to on for backward-compatibility.
50711+
50712+config GRKERNSEC_TPE_GID
50713+ int "GID for untrusted users"
50714+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
50715+ default 1005
50716+ help
50717+ Setting this GID determines what group TPE restrictions will be
50718+ *enabled* for. If the sysctl option is enabled, a sysctl option
50719+ with name "tpe_gid" is created.
50720+
50721+config GRKERNSEC_TPE_GID
50722+ int "GID for trusted users"
50723+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
50724+ default 1005
50725+ help
50726+ Setting this GID determines what group TPE restrictions will be
50727+ *disabled* for. If the sysctl option is enabled, a sysctl option
50728+ with name "tpe_gid" is created.
50729+
50730+endmenu
50731+menu "Network Protections"
50732+depends on GRKERNSEC
50733+
50734+config GRKERNSEC_RANDNET
50735+ bool "Larger entropy pools"
50736+ help
50737+ If you say Y here, the entropy pools used for many features of Linux
50738+ and grsecurity will be doubled in size. Since several grsecurity
50739+ features use additional randomness, it is recommended that you say Y
50740+ here. Saying Y here has a similar effect as modifying
50741+ /proc/sys/kernel/random/poolsize.
50742+
50743+config GRKERNSEC_BLACKHOLE
50744+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
50745+ depends on NET
50746+ help
50747+ If you say Y here, neither TCP resets nor ICMP
50748+ destination-unreachable packets will be sent in response to packets
50749+ sent to ports for which no associated listening process exists.
50750+ This feature supports both IPV4 and IPV6 and exempts the
50751+ loopback interface from blackholing. Enabling this feature
50752+ makes a host more resilient to DoS attacks and reduces network
50753+ visibility against scanners.
50754+
50755+ The blackhole feature as-implemented is equivalent to the FreeBSD
50756+ blackhole feature, as it prevents RST responses to all packets, not
50757+ just SYNs. Under most application behavior this causes no
50758+ problems, but applications (like haproxy) may not close certain
50759+ connections in a way that cleanly terminates them on the remote
50760+ end, leaving the remote host in LAST_ACK state. Because of this
50761+ side-effect and to prevent intentional LAST_ACK DoSes, this
50762+ feature also adds automatic mitigation against such attacks.
50763+ The mitigation drastically reduces the amount of time a socket
50764+ can spend in LAST_ACK state. If you're using haproxy and not
50765+ all servers it connects to have this option enabled, consider
50766+ disabling this feature on the haproxy host.
50767+
50768+ If the sysctl option is enabled, two sysctl options with names
50769+ "ip_blackhole" and "lastack_retries" will be created.
50770+ While "ip_blackhole" takes the standard zero/non-zero on/off
50771+ toggle, "lastack_retries" uses the same kinds of values as
50772+ "tcp_retries1" and "tcp_retries2". The default value of 4
50773+ prevents a socket from lasting more than 45 seconds in LAST_ACK
50774+ state.
50775+
50776+config GRKERNSEC_SOCKET
50777+ bool "Socket restrictions"
50778+ depends on NET
50779+ help
50780+ If you say Y here, you will be able to choose from several options.
50781+ If you assign a GID on your system and add it to the supplementary
50782+ groups of users you want to restrict socket access to, this patch
50783+ will perform up to three things, based on the option(s) you choose.
50784+
50785+config GRKERNSEC_SOCKET_ALL
50786+ bool "Deny any sockets to group"
50787+ depends on GRKERNSEC_SOCKET
50788+ help
50789+ If you say Y here, you will be able to choose a GID of whose users will
50790+ be unable to connect to other hosts from your machine or run server
50791+ applications from your machine. If the sysctl option is enabled, a
50792+ sysctl option with name "socket_all" is created.
50793+
50794+config GRKERNSEC_SOCKET_ALL_GID
50795+ int "GID to deny all sockets for"
50796+ depends on GRKERNSEC_SOCKET_ALL
50797+ default 1004
50798+ help
50799+ Here you can choose the GID to disable socket access for. Remember to
50800+ add the users you want socket access disabled for to the GID
50801+ specified here. If the sysctl option is enabled, a sysctl option
50802+ with name "socket_all_gid" is created.
50803+
50804+config GRKERNSEC_SOCKET_CLIENT
50805+ bool "Deny client sockets to group"
50806+ depends on GRKERNSEC_SOCKET
50807+ help
50808+ If you say Y here, you will be able to choose a GID of whose users will
50809+ be unable to connect to other hosts from your machine, but will be
50810+ able to run servers. If this option is enabled, all users in the group
50811+ you specify will have to use passive mode when initiating ftp transfers
50812+ from the shell on your machine. If the sysctl option is enabled, a
50813+ sysctl option with name "socket_client" is created.
50814+
50815+config GRKERNSEC_SOCKET_CLIENT_GID
50816+ int "GID to deny client sockets for"
50817+ depends on GRKERNSEC_SOCKET_CLIENT
50818+ default 1003
50819+ help
50820+ Here you can choose the GID to disable client socket access for.
50821+ Remember to add the users you want client socket access disabled for to
50822+ the GID specified here. If the sysctl option is enabled, a sysctl
50823+ option with name "socket_client_gid" is created.
50824+
50825+config GRKERNSEC_SOCKET_SERVER
50826+ bool "Deny server sockets to group"
50827+ depends on GRKERNSEC_SOCKET
50828+ help
50829+ If you say Y here, you will be able to choose a GID of whose users will
50830+ be unable to run server applications from your machine. If the sysctl
50831+ option is enabled, a sysctl option with name "socket_server" is created.
50832+
50833+config GRKERNSEC_SOCKET_SERVER_GID
50834+ int "GID to deny server sockets for"
50835+ depends on GRKERNSEC_SOCKET_SERVER
50836+ default 1002
50837+ help
50838+ Here you can choose the GID to disable server socket access for.
50839+ Remember to add the users you want server socket access disabled for to
50840+ the GID specified here. If the sysctl option is enabled, a sysctl
50841+ option with name "socket_server_gid" is created.
50842+
50843+endmenu
50844+menu "Sysctl support"
50845+depends on GRKERNSEC && SYSCTL
50846+
50847+config GRKERNSEC_SYSCTL
50848+ bool "Sysctl support"
50849+ help
50850+ If you say Y here, you will be able to change the options that
50851+ grsecurity runs with at bootup, without having to recompile your
50852+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
50853+ to enable (1) or disable (0) various features. All the sysctl entries
50854+ are mutable until the "grsec_lock" entry is set to a non-zero value.
50855+ All features enabled in the kernel configuration are disabled at boot
50856+ if you do not say Y to the "Turn on features by default" option.
50857+ All options should be set at startup, and the grsec_lock entry should
50858+ be set to a non-zero value after all the options are set.
50859+ *THIS IS EXTREMELY IMPORTANT*
50860+
50861+config GRKERNSEC_SYSCTL_DISTRO
50862+ bool "Extra sysctl support for distro makers (READ HELP)"
50863+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
50864+ help
50865+ If you say Y here, additional sysctl options will be created
50866+ for features that affect processes running as root. Therefore,
50867+ it is critical when using this option that the grsec_lock entry be
50868+ enabled after boot. Only distros with prebuilt kernel packages
50869+ with this option enabled that can ensure grsec_lock is enabled
50870+ after boot should use this option.
50871+ *Failure to set grsec_lock after boot makes all grsec features
50872+ this option covers useless*
50873+
50874+ Currently this option creates the following sysctl entries:
50875+ "Disable Privileged I/O": "disable_priv_io"
50876+
50877+config GRKERNSEC_SYSCTL_ON
50878+ bool "Turn on features by default"
50879+ depends on GRKERNSEC_SYSCTL
50880+ help
50881+ If you say Y here, instead of having all features enabled in the
50882+ kernel configuration disabled at boot time, the features will be
50883+ enabled at boot time. It is recommended you say Y here unless
50884+ there is some reason you would want all sysctl-tunable features to
50885+ be disabled by default. As mentioned elsewhere, it is important
50886+ to enable the grsec_lock entry once you have finished modifying
50887+ the sysctl entries.
50888+
50889+endmenu
50890+menu "Logging Options"
50891+depends on GRKERNSEC
50892+
50893+config GRKERNSEC_FLOODTIME
50894+ int "Seconds in between log messages (minimum)"
50895+ default 10
50896+ help
50897+ This option allows you to enforce the number of seconds between
50898+ grsecurity log messages. The default should be suitable for most
50899+ people, however, if you choose to change it, choose a value small enough
50900+ to allow informative logs to be produced, but large enough to
50901+ prevent flooding.
50902+
50903+config GRKERNSEC_FLOODBURST
50904+ int "Number of messages in a burst (maximum)"
50905+ default 6
50906+ help
50907+ This option allows you to choose the maximum number of messages allowed
50908+ within the flood time interval you chose in a separate option. The
50909+ default should be suitable for most people, however if you find that
50910+ many of your logs are being interpreted as flooding, you may want to
50911+ raise this value.
50912+
50913+endmenu
50914+
50915+endmenu
50916diff --git a/grsecurity/Makefile b/grsecurity/Makefile
50917new file mode 100644
50918index 0000000..1b9afa9
50919--- /dev/null
50920+++ b/grsecurity/Makefile
50921@@ -0,0 +1,38 @@
50922+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
50923+# during 2001-2009 it has been completely redesigned by Brad Spengler
50924+# into an RBAC system
50925+#
50926+# All code in this directory and various hooks inserted throughout the kernel
50927+# are copyright Brad Spengler - Open Source Security, Inc., and released
50928+# under the GPL v2 or higher
50929+
50930+KBUILD_CFLAGS += -Werror
50931+
50932+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
50933+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
50934+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
50935+
50936+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
50937+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
50938+ gracl_learn.o grsec_log.o
50939+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
50940+
50941+ifdef CONFIG_NET
50942+obj-y += grsec_sock.o
50943+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
50944+endif
50945+
50946+ifndef CONFIG_GRKERNSEC
50947+obj-y += grsec_disabled.o
50948+endif
50949+
50950+ifdef CONFIG_GRKERNSEC_HIDESYM
50951+extra-y := grsec_hidesym.o
50952+$(obj)/grsec_hidesym.o:
50953+ @-chmod -f 500 /boot
50954+ @-chmod -f 500 /lib/modules
50955+ @-chmod -f 500 /lib64/modules
50956+ @-chmod -f 500 /lib32/modules
50957+ @-chmod -f 700 .
50958+ @echo ' grsec: protected kernel image paths'
50959+endif
50960diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
50961new file mode 100644
50962index 0000000..42813ac
50963--- /dev/null
50964+++ b/grsecurity/gracl.c
50965@@ -0,0 +1,4192 @@
50966+#include <linux/kernel.h>
50967+#include <linux/module.h>
50968+#include <linux/sched.h>
50969+#include <linux/mm.h>
50970+#include <linux/file.h>
50971+#include <linux/fs.h>
50972+#include <linux/namei.h>
50973+#include <linux/mount.h>
50974+#include <linux/tty.h>
50975+#include <linux/proc_fs.h>
50976+#include <linux/lglock.h>
50977+#include <linux/slab.h>
50978+#include <linux/vmalloc.h>
50979+#include <linux/types.h>
50980+#include <linux/sysctl.h>
50981+#include <linux/netdevice.h>
50982+#include <linux/ptrace.h>
50983+#include <linux/gracl.h>
50984+#include <linux/gralloc.h>
50985+#include <linux/security.h>
50986+#include <linux/grinternal.h>
50987+#include <linux/pid_namespace.h>
50988+#include <linux/fdtable.h>
50989+#include <linux/percpu.h>
50990+#include "../fs/mount.h"
50991+
50992+#include <asm/uaccess.h>
50993+#include <asm/errno.h>
50994+#include <asm/mman.h>
50995+
50996+static struct acl_role_db acl_role_set;
50997+static struct name_db name_set;
50998+static struct inodev_db inodev_set;
50999+
51000+/* for keeping track of userspace pointers used for subjects, so we
51001+ can share references in the kernel as well
51002+*/
51003+
51004+static struct path real_root;
51005+
51006+static struct acl_subj_map_db subj_map_set;
51007+
51008+static struct acl_role_label *default_role;
51009+
51010+static struct acl_role_label *role_list;
51011+
51012+static u16 acl_sp_role_value;
51013+
51014+extern char *gr_shared_page[4];
51015+static DEFINE_MUTEX(gr_dev_mutex);
51016+DEFINE_RWLOCK(gr_inode_lock);
51017+
51018+struct gr_arg *gr_usermode;
51019+
51020+static unsigned int gr_status __read_only = GR_STATUS_INIT;
51021+
51022+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
51023+extern void gr_clear_learn_entries(void);
51024+
51025+#ifdef CONFIG_GRKERNSEC_RESLOG
51026+extern void gr_log_resource(const struct task_struct *task,
51027+ const int res, const unsigned long wanted, const int gt);
51028+#endif
51029+
51030+unsigned char *gr_system_salt;
51031+unsigned char *gr_system_sum;
51032+
51033+static struct sprole_pw **acl_special_roles = NULL;
51034+static __u16 num_sprole_pws = 0;
51035+
51036+static struct acl_role_label *kernel_role = NULL;
51037+
51038+static unsigned int gr_auth_attempts = 0;
51039+static unsigned long gr_auth_expires = 0UL;
51040+
51041+#ifdef CONFIG_NET
51042+extern struct vfsmount *sock_mnt;
51043+#endif
51044+
51045+extern struct vfsmount *pipe_mnt;
51046+extern struct vfsmount *shm_mnt;
51047+#ifdef CONFIG_HUGETLBFS
51048+extern struct vfsmount *hugetlbfs_vfsmount;
51049+#endif
51050+
51051+static struct acl_object_label *fakefs_obj_rw;
51052+static struct acl_object_label *fakefs_obj_rwx;
51053+
51054+extern int gr_init_uidset(void);
51055+extern void gr_free_uidset(void);
51056+extern void gr_remove_uid(uid_t uid);
51057+extern int gr_find_uid(uid_t uid);
51058+
51059+DECLARE_BRLOCK(vfsmount_lock);
51060+
51061+__inline__ int
51062+gr_acl_is_enabled(void)
51063+{
51064+ return (gr_status & GR_READY);
51065+}
51066+
51067+#ifdef CONFIG_BTRFS_FS
51068+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
51069+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
51070+#endif
51071+
51072+static inline dev_t __get_dev(const struct dentry *dentry)
51073+{
51074+#ifdef CONFIG_BTRFS_FS
51075+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
51076+ return get_btrfs_dev_from_inode(dentry->d_inode);
51077+ else
51078+#endif
51079+ return dentry->d_inode->i_sb->s_dev;
51080+}
51081+
51082+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
51083+{
51084+ return __get_dev(dentry);
51085+}
51086+
51087+static char gr_task_roletype_to_char(struct task_struct *task)
51088+{
51089+ switch (task->role->roletype &
51090+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
51091+ GR_ROLE_SPECIAL)) {
51092+ case GR_ROLE_DEFAULT:
51093+ return 'D';
51094+ case GR_ROLE_USER:
51095+ return 'U';
51096+ case GR_ROLE_GROUP:
51097+ return 'G';
51098+ case GR_ROLE_SPECIAL:
51099+ return 'S';
51100+ }
51101+
51102+ return 'X';
51103+}
51104+
51105+char gr_roletype_to_char(void)
51106+{
51107+ return gr_task_roletype_to_char(current);
51108+}
51109+
51110+__inline__ int
51111+gr_acl_tpe_check(void)
51112+{
51113+ if (unlikely(!(gr_status & GR_READY)))
51114+ return 0;
51115+ if (current->role->roletype & GR_ROLE_TPE)
51116+ return 1;
51117+ else
51118+ return 0;
51119+}
51120+
51121+int
51122+gr_handle_rawio(const struct inode *inode)
51123+{
51124+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
51125+ if (inode && S_ISBLK(inode->i_mode) &&
51126+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
51127+ !capable(CAP_SYS_RAWIO))
51128+ return 1;
51129+#endif
51130+ return 0;
51131+}
51132+
51133+static int
51134+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
51135+{
51136+ if (likely(lena != lenb))
51137+ return 0;
51138+
51139+ return !memcmp(a, b, lena);
51140+}
51141+
51142+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
51143+{
51144+ *buflen -= namelen;
51145+ if (*buflen < 0)
51146+ return -ENAMETOOLONG;
51147+ *buffer -= namelen;
51148+ memcpy(*buffer, str, namelen);
51149+ return 0;
51150+}
51151+
51152+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
51153+{
51154+ return prepend(buffer, buflen, name->name, name->len);
51155+}
51156+
51157+static int prepend_path(const struct path *path, struct path *root,
51158+ char **buffer, int *buflen)
51159+{
51160+ struct dentry *dentry = path->dentry;
51161+ struct vfsmount *vfsmnt = path->mnt;
51162+ struct mount *mnt = real_mount(vfsmnt);
51163+ bool slash = false;
51164+ int error = 0;
51165+
51166+ while (dentry != root->dentry || vfsmnt != root->mnt) {
51167+ struct dentry * parent;
51168+
51169+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
51170+ /* Global root? */
51171+ if (!mnt_has_parent(mnt)) {
51172+ goto out;
51173+ }
51174+ dentry = mnt->mnt_mountpoint;
51175+ mnt = mnt->mnt_parent;
51176+ vfsmnt = &mnt->mnt;
51177+ continue;
51178+ }
51179+ parent = dentry->d_parent;
51180+ prefetch(parent);
51181+ spin_lock(&dentry->d_lock);
51182+ error = prepend_name(buffer, buflen, &dentry->d_name);
51183+ spin_unlock(&dentry->d_lock);
51184+ if (!error)
51185+ error = prepend(buffer, buflen, "/", 1);
51186+ if (error)
51187+ break;
51188+
51189+ slash = true;
51190+ dentry = parent;
51191+ }
51192+
51193+out:
51194+ if (!error && !slash)
51195+ error = prepend(buffer, buflen, "/", 1);
51196+
51197+ return error;
51198+}
51199+
51200+/* this must be called with vfsmount_lock and rename_lock held */
51201+
51202+static char *__our_d_path(const struct path *path, struct path *root,
51203+ char *buf, int buflen)
51204+{
51205+ char *res = buf + buflen;
51206+ int error;
51207+
51208+ prepend(&res, &buflen, "\0", 1);
51209+ error = prepend_path(path, root, &res, &buflen);
51210+ if (error)
51211+ return ERR_PTR(error);
51212+
51213+ return res;
51214+}
51215+
51216+static char *
51217+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
51218+{
51219+ char *retval;
51220+
51221+ retval = __our_d_path(path, root, buf, buflen);
51222+ if (unlikely(IS_ERR(retval)))
51223+ retval = strcpy(buf, "<path too long>");
51224+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
51225+ retval[1] = '\0';
51226+
51227+ return retval;
51228+}
51229+
51230+static char *
51231+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
51232+ char *buf, int buflen)
51233+{
51234+ struct path path;
51235+ char *res;
51236+
51237+ path.dentry = (struct dentry *)dentry;
51238+ path.mnt = (struct vfsmount *)vfsmnt;
51239+
51240+ /* we can use real_root.dentry, real_root.mnt, because this is only called
51241+ by the RBAC system */
51242+ res = gen_full_path(&path, &real_root, buf, buflen);
51243+
51244+ return res;
51245+}
51246+
51247+static char *
51248+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
51249+ char *buf, int buflen)
51250+{
51251+ char *res;
51252+ struct path path;
51253+ struct path root;
51254+ struct task_struct *reaper = &init_task;
51255+
51256+ path.dentry = (struct dentry *)dentry;
51257+ path.mnt = (struct vfsmount *)vfsmnt;
51258+
51259+ /* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */
51260+ get_fs_root(reaper->fs, &root);
51261+
51262+ write_seqlock(&rename_lock);
51263+ br_read_lock(vfsmount_lock);
51264+ res = gen_full_path(&path, &root, buf, buflen);
51265+ br_read_unlock(vfsmount_lock);
51266+ write_sequnlock(&rename_lock);
51267+
51268+ path_put(&root);
51269+ return res;
51270+}
51271+
51272+static char *
51273+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
51274+{
51275+ char *ret;
51276+ write_seqlock(&rename_lock);
51277+ br_read_lock(vfsmount_lock);
51278+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
51279+ PAGE_SIZE);
51280+ br_read_unlock(vfsmount_lock);
51281+ write_sequnlock(&rename_lock);
51282+ return ret;
51283+}
51284+
51285+static char *
51286+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
51287+{
51288+ char *ret;
51289+ char *buf;
51290+ int buflen;
51291+
51292+ write_seqlock(&rename_lock);
51293+ br_read_lock(vfsmount_lock);
51294+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
51295+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
51296+ buflen = (int)(ret - buf);
51297+ if (buflen >= 5)
51298+ prepend(&ret, &buflen, "/proc", 5);
51299+ else
51300+ ret = strcpy(buf, "<path too long>");
51301+ br_read_unlock(vfsmount_lock);
51302+ write_sequnlock(&rename_lock);
51303+ return ret;
51304+}
51305+
51306+char *
51307+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
51308+{
51309+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
51310+ PAGE_SIZE);
51311+}
51312+
51313+char *
51314+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
51315+{
51316+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
51317+ PAGE_SIZE);
51318+}
51319+
51320+char *
51321+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
51322+{
51323+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
51324+ PAGE_SIZE);
51325+}
51326+
51327+char *
51328+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
51329+{
51330+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
51331+ PAGE_SIZE);
51332+}
51333+
51334+char *
51335+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
51336+{
51337+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
51338+ PAGE_SIZE);
51339+}
51340+
51341+__inline__ __u32
51342+to_gr_audit(const __u32 reqmode)
51343+{
51344+ /* masks off auditable permission flags, then shifts them to create
51345+ auditing flags, and adds the special case of append auditing if
51346+ we're requesting write */
51347+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
51348+}
51349+
51350+struct acl_subject_label *
51351+lookup_subject_map(const struct acl_subject_label *userp)
51352+{
51353+ unsigned int index = shash(userp, subj_map_set.s_size);
51354+ struct subject_map *match;
51355+
51356+ match = subj_map_set.s_hash[index];
51357+
51358+ while (match && match->user != userp)
51359+ match = match->next;
51360+
51361+ if (match != NULL)
51362+ return match->kernel;
51363+ else
51364+ return NULL;
51365+}
51366+
51367+static void
51368+insert_subj_map_entry(struct subject_map *subjmap)
51369+{
51370+ unsigned int index = shash(subjmap->user, subj_map_set.s_size);
51371+ struct subject_map **curr;
51372+
51373+ subjmap->prev = NULL;
51374+
51375+ curr = &subj_map_set.s_hash[index];
51376+ if (*curr != NULL)
51377+ (*curr)->prev = subjmap;
51378+
51379+ subjmap->next = *curr;
51380+ *curr = subjmap;
51381+
51382+ return;
51383+}
51384+
51385+static struct acl_role_label *
51386+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
51387+ const gid_t gid)
51388+{
51389+ unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
51390+ struct acl_role_label *match;
51391+ struct role_allowed_ip *ipp;
51392+ unsigned int x;
51393+ u32 curr_ip = task->signal->curr_ip;
51394+
51395+ task->signal->saved_ip = curr_ip;
51396+
51397+ match = acl_role_set.r_hash[index];
51398+
51399+ while (match) {
51400+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
51401+ for (x = 0; x < match->domain_child_num; x++) {
51402+ if (match->domain_children[x] == uid)
51403+ goto found;
51404+ }
51405+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
51406+ break;
51407+ match = match->next;
51408+ }
51409+found:
51410+ if (match == NULL) {
51411+ try_group:
51412+ index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
51413+ match = acl_role_set.r_hash[index];
51414+
51415+ while (match) {
51416+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
51417+ for (x = 0; x < match->domain_child_num; x++) {
51418+ if (match->domain_children[x] == gid)
51419+ goto found2;
51420+ }
51421+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
51422+ break;
51423+ match = match->next;
51424+ }
51425+found2:
51426+ if (match == NULL)
51427+ match = default_role;
51428+ if (match->allowed_ips == NULL)
51429+ return match;
51430+ else {
51431+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
51432+ if (likely
51433+ ((ntohl(curr_ip) & ipp->netmask) ==
51434+ (ntohl(ipp->addr) & ipp->netmask)))
51435+ return match;
51436+ }
51437+ match = default_role;
51438+ }
51439+ } else if (match->allowed_ips == NULL) {
51440+ return match;
51441+ } else {
51442+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
51443+ if (likely
51444+ ((ntohl(curr_ip) & ipp->netmask) ==
51445+ (ntohl(ipp->addr) & ipp->netmask)))
51446+ return match;
51447+ }
51448+ goto try_group;
51449+ }
51450+
51451+ return match;
51452+}
51453+
51454+struct acl_subject_label *
51455+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
51456+ const struct acl_role_label *role)
51457+{
51458+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
51459+ struct acl_subject_label *match;
51460+
51461+ match = role->subj_hash[index];
51462+
51463+ while (match && (match->inode != ino || match->device != dev ||
51464+ (match->mode & GR_DELETED))) {
51465+ match = match->next;
51466+ }
51467+
51468+ if (match && !(match->mode & GR_DELETED))
51469+ return match;
51470+ else
51471+ return NULL;
51472+}
51473+
51474+struct acl_subject_label *
51475+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
51476+ const struct acl_role_label *role)
51477+{
51478+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
51479+ struct acl_subject_label *match;
51480+
51481+ match = role->subj_hash[index];
51482+
51483+ while (match && (match->inode != ino || match->device != dev ||
51484+ !(match->mode & GR_DELETED))) {
51485+ match = match->next;
51486+ }
51487+
51488+ if (match && (match->mode & GR_DELETED))
51489+ return match;
51490+ else
51491+ return NULL;
51492+}
51493+
51494+static struct acl_object_label *
51495+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
51496+ const struct acl_subject_label *subj)
51497+{
51498+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51499+ struct acl_object_label *match;
51500+
51501+ match = subj->obj_hash[index];
51502+
51503+ while (match && (match->inode != ino || match->device != dev ||
51504+ (match->mode & GR_DELETED))) {
51505+ match = match->next;
51506+ }
51507+
51508+ if (match && !(match->mode & GR_DELETED))
51509+ return match;
51510+ else
51511+ return NULL;
51512+}
51513+
51514+static struct acl_object_label *
51515+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
51516+ const struct acl_subject_label *subj)
51517+{
51518+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51519+ struct acl_object_label *match;
51520+
51521+ match = subj->obj_hash[index];
51522+
51523+ while (match && (match->inode != ino || match->device != dev ||
51524+ !(match->mode & GR_DELETED))) {
51525+ match = match->next;
51526+ }
51527+
51528+ if (match && (match->mode & GR_DELETED))
51529+ return match;
51530+
51531+ match = subj->obj_hash[index];
51532+
51533+ while (match && (match->inode != ino || match->device != dev ||
51534+ (match->mode & GR_DELETED))) {
51535+ match = match->next;
51536+ }
51537+
51538+ if (match && !(match->mode & GR_DELETED))
51539+ return match;
51540+ else
51541+ return NULL;
51542+}
51543+
51544+static struct name_entry *
51545+lookup_name_entry(const char *name)
51546+{
51547+ unsigned int len = strlen(name);
51548+ unsigned int key = full_name_hash(name, len);
51549+ unsigned int index = key % name_set.n_size;
51550+ struct name_entry *match;
51551+
51552+ match = name_set.n_hash[index];
51553+
51554+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
51555+ match = match->next;
51556+
51557+ return match;
51558+}
51559+
51560+static struct name_entry *
51561+lookup_name_entry_create(const char *name)
51562+{
51563+ unsigned int len = strlen(name);
51564+ unsigned int key = full_name_hash(name, len);
51565+ unsigned int index = key % name_set.n_size;
51566+ struct name_entry *match;
51567+
51568+ match = name_set.n_hash[index];
51569+
51570+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51571+ !match->deleted))
51572+ match = match->next;
51573+
51574+ if (match && match->deleted)
51575+ return match;
51576+
51577+ match = name_set.n_hash[index];
51578+
51579+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51580+ match->deleted))
51581+ match = match->next;
51582+
51583+ if (match && !match->deleted)
51584+ return match;
51585+ else
51586+ return NULL;
51587+}
51588+
51589+static struct inodev_entry *
51590+lookup_inodev_entry(const ino_t ino, const dev_t dev)
51591+{
51592+ unsigned int index = fhash(ino, dev, inodev_set.i_size);
51593+ struct inodev_entry *match;
51594+
51595+ match = inodev_set.i_hash[index];
51596+
51597+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
51598+ match = match->next;
51599+
51600+ return match;
51601+}
51602+
51603+static void
51604+insert_inodev_entry(struct inodev_entry *entry)
51605+{
51606+ unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
51607+ inodev_set.i_size);
51608+ struct inodev_entry **curr;
51609+
51610+ entry->prev = NULL;
51611+
51612+ curr = &inodev_set.i_hash[index];
51613+ if (*curr != NULL)
51614+ (*curr)->prev = entry;
51615+
51616+ entry->next = *curr;
51617+ *curr = entry;
51618+
51619+ return;
51620+}
51621+
51622+static void
51623+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
51624+{
51625+ unsigned int index =
51626+ rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
51627+ struct acl_role_label **curr;
51628+ struct acl_role_label *tmp, *tmp2;
51629+
51630+ curr = &acl_role_set.r_hash[index];
51631+
51632+ /* simple case, slot is empty, just set it to our role */
51633+ if (*curr == NULL) {
51634+ *curr = role;
51635+ } else {
51636+ /* example:
51637+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
51638+ 2 -> 3
51639+ */
51640+ /* first check to see if we can already be reached via this slot */
51641+ tmp = *curr;
51642+ while (tmp && tmp != role)
51643+ tmp = tmp->next;
51644+ if (tmp == role) {
51645+ /* we don't need to add ourselves to this slot's chain */
51646+ return;
51647+ }
51648+ /* we need to add ourselves to this chain, two cases */
51649+ if (role->next == NULL) {
51650+ /* simple case, append the current chain to our role */
51651+ role->next = *curr;
51652+ *curr = role;
51653+ } else {
51654+ /* 1 -> 2 -> 3 -> 4
51655+ 2 -> 3 -> 4
51656+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
51657+ */
51658+ /* trickier case: walk our role's chain until we find
51659+ the role for the start of the current slot's chain */
51660+ tmp = role;
51661+ tmp2 = *curr;
51662+ while (tmp->next && tmp->next != tmp2)
51663+ tmp = tmp->next;
51664+ if (tmp->next == tmp2) {
51665+ /* from example above, we found 3, so just
51666+ replace this slot's chain with ours */
51667+ *curr = role;
51668+ } else {
51669+ /* we didn't find a subset of our role's chain
51670+ in the current slot's chain, so append their
51671+ chain to ours, and set us as the first role in
51672+ the slot's chain
51673+
51674+ we could fold this case with the case above,
51675+ but making it explicit for clarity
51676+ */
51677+ tmp->next = tmp2;
51678+ *curr = role;
51679+ }
51680+ }
51681+ }
51682+
51683+ return;
51684+}
51685+
51686+static void
51687+insert_acl_role_label(struct acl_role_label *role)
51688+{
51689+ int i;
51690+
51691+ if (role_list == NULL) {
51692+ role_list = role;
51693+ role->prev = NULL;
51694+ } else {
51695+ role->prev = role_list;
51696+ role_list = role;
51697+ }
51698+
51699+ /* used for hash chains */
51700+ role->next = NULL;
51701+
51702+ if (role->roletype & GR_ROLE_DOMAIN) {
51703+ for (i = 0; i < role->domain_child_num; i++)
51704+ __insert_acl_role_label(role, role->domain_children[i]);
51705+ } else
51706+ __insert_acl_role_label(role, role->uidgid);
51707+}
51708+
51709+static int
51710+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
51711+{
51712+ struct name_entry **curr, *nentry;
51713+ struct inodev_entry *ientry;
51714+ unsigned int len = strlen(name);
51715+ unsigned int key = full_name_hash(name, len);
51716+ unsigned int index = key % name_set.n_size;
51717+
51718+ curr = &name_set.n_hash[index];
51719+
51720+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
51721+ curr = &((*curr)->next);
51722+
51723+ if (*curr != NULL)
51724+ return 1;
51725+
51726+ nentry = acl_alloc(sizeof (struct name_entry));
51727+ if (nentry == NULL)
51728+ return 0;
51729+ ientry = acl_alloc(sizeof (struct inodev_entry));
51730+ if (ientry == NULL)
51731+ return 0;
51732+ ientry->nentry = nentry;
51733+
51734+ nentry->key = key;
51735+ nentry->name = name;
51736+ nentry->inode = inode;
51737+ nentry->device = device;
51738+ nentry->len = len;
51739+ nentry->deleted = deleted;
51740+
51741+ nentry->prev = NULL;
51742+ curr = &name_set.n_hash[index];
51743+ if (*curr != NULL)
51744+ (*curr)->prev = nentry;
51745+ nentry->next = *curr;
51746+ *curr = nentry;
51747+
51748+ /* insert us into the table searchable by inode/dev */
51749+ insert_inodev_entry(ientry);
51750+
51751+ return 1;
51752+}
51753+
51754+static void
51755+insert_acl_obj_label(struct acl_object_label *obj,
51756+ struct acl_subject_label *subj)
51757+{
51758+ unsigned int index =
51759+ fhash(obj->inode, obj->device, subj->obj_hash_size);
51760+ struct acl_object_label **curr;
51761+
51762+
51763+ obj->prev = NULL;
51764+
51765+ curr = &subj->obj_hash[index];
51766+ if (*curr != NULL)
51767+ (*curr)->prev = obj;
51768+
51769+ obj->next = *curr;
51770+ *curr = obj;
51771+
51772+ return;
51773+}
51774+
51775+static void
51776+insert_acl_subj_label(struct acl_subject_label *obj,
51777+ struct acl_role_label *role)
51778+{
51779+ unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
51780+ struct acl_subject_label **curr;
51781+
51782+ obj->prev = NULL;
51783+
51784+ curr = &role->subj_hash[index];
51785+ if (*curr != NULL)
51786+ (*curr)->prev = obj;
51787+
51788+ obj->next = *curr;
51789+ *curr = obj;
51790+
51791+ return;
51792+}
51793+
51794+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
51795+
51796+static void *
51797+create_table(__u32 * len, int elementsize)
51798+{
51799+ unsigned int table_sizes[] = {
51800+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
51801+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
51802+ 4194301, 8388593, 16777213, 33554393, 67108859
51803+ };
51804+ void *newtable = NULL;
51805+ unsigned int pwr = 0;
51806+
51807+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
51808+ table_sizes[pwr] <= *len)
51809+ pwr++;
51810+
51811+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
51812+ return newtable;
51813+
51814+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
51815+ newtable =
51816+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
51817+ else
51818+ newtable = vmalloc(table_sizes[pwr] * elementsize);
51819+
51820+ *len = table_sizes[pwr];
51821+
51822+ return newtable;
51823+}
51824+
51825+static int
51826+init_variables(const struct gr_arg *arg)
51827+{
51828+ struct task_struct *reaper = &init_task;
51829+ unsigned int stacksize;
51830+
51831+ subj_map_set.s_size = arg->role_db.num_subjects;
51832+ acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
51833+ name_set.n_size = arg->role_db.num_objects;
51834+ inodev_set.i_size = arg->role_db.num_objects;
51835+
51836+ if (!subj_map_set.s_size || !acl_role_set.r_size ||
51837+ !name_set.n_size || !inodev_set.i_size)
51838+ return 1;
51839+
51840+ if (!gr_init_uidset())
51841+ return 1;
51842+
51843+ /* set up the stack that holds allocation info */
51844+
51845+ stacksize = arg->role_db.num_pointers + 5;
51846+
51847+ if (!acl_alloc_stack_init(stacksize))
51848+ return 1;
51849+
51850+ /* grab reference for the real root dentry and vfsmount */
51851+ get_fs_root(reaper->fs, &real_root);
51852+
51853+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
51854+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino);
51855+#endif
51856+
51857+ fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
51858+ if (fakefs_obj_rw == NULL)
51859+ return 1;
51860+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
51861+
51862+ fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
51863+ if (fakefs_obj_rwx == NULL)
51864+ return 1;
51865+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
51866+
51867+ subj_map_set.s_hash =
51868+ (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
51869+ acl_role_set.r_hash =
51870+ (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
51871+ name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
51872+ inodev_set.i_hash =
51873+ (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
51874+
51875+ if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
51876+ !name_set.n_hash || !inodev_set.i_hash)
51877+ return 1;
51878+
51879+ memset(subj_map_set.s_hash, 0,
51880+ sizeof(struct subject_map *) * subj_map_set.s_size);
51881+ memset(acl_role_set.r_hash, 0,
51882+ sizeof (struct acl_role_label *) * acl_role_set.r_size);
51883+ memset(name_set.n_hash, 0,
51884+ sizeof (struct name_entry *) * name_set.n_size);
51885+ memset(inodev_set.i_hash, 0,
51886+ sizeof (struct inodev_entry *) * inodev_set.i_size);
51887+
51888+ return 0;
51889+}
51890+
51891+/* free information not needed after startup
51892+ currently contains user->kernel pointer mappings for subjects
51893+*/
51894+
51895+static void
51896+free_init_variables(void)
51897+{
51898+ __u32 i;
51899+
51900+ if (subj_map_set.s_hash) {
51901+ for (i = 0; i < subj_map_set.s_size; i++) {
51902+ if (subj_map_set.s_hash[i]) {
51903+ kfree(subj_map_set.s_hash[i]);
51904+ subj_map_set.s_hash[i] = NULL;
51905+ }
51906+ }
51907+
51908+ if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
51909+ PAGE_SIZE)
51910+ kfree(subj_map_set.s_hash);
51911+ else
51912+ vfree(subj_map_set.s_hash);
51913+ }
51914+
51915+ return;
51916+}
51917+
51918+static void
51919+free_variables(void)
51920+{
51921+ struct acl_subject_label *s;
51922+ struct acl_role_label *r;
51923+ struct task_struct *task, *task2;
51924+ unsigned int x;
51925+
51926+ gr_clear_learn_entries();
51927+
51928+ read_lock(&tasklist_lock);
51929+ do_each_thread(task2, task) {
51930+ task->acl_sp_role = 0;
51931+ task->acl_role_id = 0;
51932+ task->acl = NULL;
51933+ task->role = NULL;
51934+ } while_each_thread(task2, task);
51935+ read_unlock(&tasklist_lock);
51936+
51937+ /* release the reference to the real root dentry and vfsmount */
51938+ path_put(&real_root);
51939+ memset(&real_root, 0, sizeof(real_root));
51940+
51941+ /* free all object hash tables */
51942+
51943+ FOR_EACH_ROLE_START(r)
51944+ if (r->subj_hash == NULL)
51945+ goto next_role;
51946+ FOR_EACH_SUBJECT_START(r, s, x)
51947+ if (s->obj_hash == NULL)
51948+ break;
51949+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
51950+ kfree(s->obj_hash);
51951+ else
51952+ vfree(s->obj_hash);
51953+ FOR_EACH_SUBJECT_END(s, x)
51954+ FOR_EACH_NESTED_SUBJECT_START(r, s)
51955+ if (s->obj_hash == NULL)
51956+ break;
51957+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
51958+ kfree(s->obj_hash);
51959+ else
51960+ vfree(s->obj_hash);
51961+ FOR_EACH_NESTED_SUBJECT_END(s)
51962+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
51963+ kfree(r->subj_hash);
51964+ else
51965+ vfree(r->subj_hash);
51966+ r->subj_hash = NULL;
51967+next_role:
51968+ FOR_EACH_ROLE_END(r)
51969+
51970+ acl_free_all();
51971+
51972+ if (acl_role_set.r_hash) {
51973+ if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
51974+ PAGE_SIZE)
51975+ kfree(acl_role_set.r_hash);
51976+ else
51977+ vfree(acl_role_set.r_hash);
51978+ }
51979+ if (name_set.n_hash) {
51980+ if ((name_set.n_size * sizeof (struct name_entry *)) <=
51981+ PAGE_SIZE)
51982+ kfree(name_set.n_hash);
51983+ else
51984+ vfree(name_set.n_hash);
51985+ }
51986+
51987+ if (inodev_set.i_hash) {
51988+ if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
51989+ PAGE_SIZE)
51990+ kfree(inodev_set.i_hash);
51991+ else
51992+ vfree(inodev_set.i_hash);
51993+ }
51994+
51995+ gr_free_uidset();
51996+
51997+ memset(&name_set, 0, sizeof (struct name_db));
51998+ memset(&inodev_set, 0, sizeof (struct inodev_db));
51999+ memset(&acl_role_set, 0, sizeof (struct acl_role_db));
52000+ memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
52001+
52002+ default_role = NULL;
52003+ kernel_role = NULL;
52004+ role_list = NULL;
52005+
52006+ return;
52007+}
52008+
52009+static __u32
52010+count_user_objs(struct acl_object_label *userp)
52011+{
52012+ struct acl_object_label o_tmp;
52013+ __u32 num = 0;
52014+
52015+ while (userp) {
52016+ if (copy_from_user(&o_tmp, userp,
52017+ sizeof (struct acl_object_label)))
52018+ break;
52019+
52020+ userp = o_tmp.prev;
52021+ num++;
52022+ }
52023+
52024+ return num;
52025+}
52026+
52027+static struct acl_subject_label *
52028+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
52029+
52030+static int
52031+copy_user_glob(struct acl_object_label *obj)
52032+{
52033+ struct acl_object_label *g_tmp, **guser;
52034+ unsigned int len;
52035+ char *tmp;
52036+
52037+ if (obj->globbed == NULL)
52038+ return 0;
52039+
52040+ guser = &obj->globbed;
52041+ while (*guser) {
52042+ g_tmp = (struct acl_object_label *)
52043+ acl_alloc(sizeof (struct acl_object_label));
52044+ if (g_tmp == NULL)
52045+ return -ENOMEM;
52046+
52047+ if (copy_from_user(g_tmp, *guser,
52048+ sizeof (struct acl_object_label)))
52049+ return -EFAULT;
52050+
52051+ len = strnlen_user(g_tmp->filename, PATH_MAX);
52052+
52053+ if (!len || len >= PATH_MAX)
52054+ return -EINVAL;
52055+
52056+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52057+ return -ENOMEM;
52058+
52059+ if (copy_from_user(tmp, g_tmp->filename, len))
52060+ return -EFAULT;
52061+ tmp[len-1] = '\0';
52062+ g_tmp->filename = tmp;
52063+
52064+ *guser = g_tmp;
52065+ guser = &(g_tmp->next);
52066+ }
52067+
52068+ return 0;
52069+}
52070+
52071+static int
52072+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
52073+ struct acl_role_label *role)
52074+{
52075+ struct acl_object_label *o_tmp;
52076+ unsigned int len;
52077+ int ret;
52078+ char *tmp;
52079+
52080+ while (userp) {
52081+ if ((o_tmp = (struct acl_object_label *)
52082+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
52083+ return -ENOMEM;
52084+
52085+ if (copy_from_user(o_tmp, userp,
52086+ sizeof (struct acl_object_label)))
52087+ return -EFAULT;
52088+
52089+ userp = o_tmp->prev;
52090+
52091+ len = strnlen_user(o_tmp->filename, PATH_MAX);
52092+
52093+ if (!len || len >= PATH_MAX)
52094+ return -EINVAL;
52095+
52096+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52097+ return -ENOMEM;
52098+
52099+ if (copy_from_user(tmp, o_tmp->filename, len))
52100+ return -EFAULT;
52101+ tmp[len-1] = '\0';
52102+ o_tmp->filename = tmp;
52103+
52104+ insert_acl_obj_label(o_tmp, subj);
52105+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
52106+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
52107+ return -ENOMEM;
52108+
52109+ ret = copy_user_glob(o_tmp);
52110+ if (ret)
52111+ return ret;
52112+
52113+ if (o_tmp->nested) {
52114+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role);
52115+ if (IS_ERR(o_tmp->nested))
52116+ return PTR_ERR(o_tmp->nested);
52117+
52118+ /* insert into nested subject list */
52119+ o_tmp->nested->next = role->hash->first;
52120+ role->hash->first = o_tmp->nested;
52121+ }
52122+ }
52123+
52124+ return 0;
52125+}
52126+
52127+static __u32
52128+count_user_subjs(struct acl_subject_label *userp)
52129+{
52130+ struct acl_subject_label s_tmp;
52131+ __u32 num = 0;
52132+
52133+ while (userp) {
52134+ if (copy_from_user(&s_tmp, userp,
52135+ sizeof (struct acl_subject_label)))
52136+ break;
52137+
52138+ userp = s_tmp.prev;
52139+ /* do not count nested subjects against this count, since
52140+ they are not included in the hash table, but are
52141+ attached to objects. We have already counted
52142+ the subjects in userspace for the allocation
52143+ stack
52144+ */
52145+ if (!(s_tmp.mode & GR_NESTED))
52146+ num++;
52147+ }
52148+
52149+ return num;
52150+}
52151+
52152+static int
52153+copy_user_allowedips(struct acl_role_label *rolep)
52154+{
52155+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
52156+
52157+ ruserip = rolep->allowed_ips;
52158+
52159+ while (ruserip) {
52160+ rlast = rtmp;
52161+
52162+ if ((rtmp = (struct role_allowed_ip *)
52163+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
52164+ return -ENOMEM;
52165+
52166+ if (copy_from_user(rtmp, ruserip,
52167+ sizeof (struct role_allowed_ip)))
52168+ return -EFAULT;
52169+
52170+ ruserip = rtmp->prev;
52171+
52172+ if (!rlast) {
52173+ rtmp->prev = NULL;
52174+ rolep->allowed_ips = rtmp;
52175+ } else {
52176+ rlast->next = rtmp;
52177+ rtmp->prev = rlast;
52178+ }
52179+
52180+ if (!ruserip)
52181+ rtmp->next = NULL;
52182+ }
52183+
52184+ return 0;
52185+}
52186+
52187+static int
52188+copy_user_transitions(struct acl_role_label *rolep)
52189+{
52190+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
52191+
52192+ unsigned int len;
52193+ char *tmp;
52194+
52195+ rusertp = rolep->transitions;
52196+
52197+ while (rusertp) {
52198+ rlast = rtmp;
52199+
52200+ if ((rtmp = (struct role_transition *)
52201+ acl_alloc(sizeof (struct role_transition))) == NULL)
52202+ return -ENOMEM;
52203+
52204+ if (copy_from_user(rtmp, rusertp,
52205+ sizeof (struct role_transition)))
52206+ return -EFAULT;
52207+
52208+ rusertp = rtmp->prev;
52209+
52210+ len = strnlen_user(rtmp->rolename, GR_SPROLE_LEN);
52211+
52212+ if (!len || len >= GR_SPROLE_LEN)
52213+ return -EINVAL;
52214+
52215+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52216+ return -ENOMEM;
52217+
52218+ if (copy_from_user(tmp, rtmp->rolename, len))
52219+ return -EFAULT;
52220+ tmp[len-1] = '\0';
52221+ rtmp->rolename = tmp;
52222+
52223+ if (!rlast) {
52224+ rtmp->prev = NULL;
52225+ rolep->transitions = rtmp;
52226+ } else {
52227+ rlast->next = rtmp;
52228+ rtmp->prev = rlast;
52229+ }
52230+
52231+ if (!rusertp)
52232+ rtmp->next = NULL;
52233+ }
52234+
52235+ return 0;
52236+}
52237+
52238+static struct acl_subject_label *
52239+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
52240+{
52241+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
52242+ unsigned int len;
52243+ char *tmp;
52244+ __u32 num_objs;
52245+ struct acl_ip_label **i_tmp, *i_utmp2;
52246+ struct gr_hash_struct ghash;
52247+ struct subject_map *subjmap;
52248+ unsigned int i_num;
52249+ int err;
52250+
52251+ s_tmp = lookup_subject_map(userp);
52252+
52253+ /* we've already copied this subject into the kernel, just return
52254+ the reference to it, and don't copy it over again
52255+ */
52256+ if (s_tmp)
52257+ return(s_tmp);
52258+
52259+ if ((s_tmp = (struct acl_subject_label *)
52260+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
52261+ return ERR_PTR(-ENOMEM);
52262+
52263+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
52264+ if (subjmap == NULL)
52265+ return ERR_PTR(-ENOMEM);
52266+
52267+ subjmap->user = userp;
52268+ subjmap->kernel = s_tmp;
52269+ insert_subj_map_entry(subjmap);
52270+
52271+ if (copy_from_user(s_tmp, userp,
52272+ sizeof (struct acl_subject_label)))
52273+ return ERR_PTR(-EFAULT);
52274+
52275+ len = strnlen_user(s_tmp->filename, PATH_MAX);
52276+
52277+ if (!len || len >= PATH_MAX)
52278+ return ERR_PTR(-EINVAL);
52279+
52280+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52281+ return ERR_PTR(-ENOMEM);
52282+
52283+ if (copy_from_user(tmp, s_tmp->filename, len))
52284+ return ERR_PTR(-EFAULT);
52285+ tmp[len-1] = '\0';
52286+ s_tmp->filename = tmp;
52287+
52288+ if (!strcmp(s_tmp->filename, "/"))
52289+ role->root_label = s_tmp;
52290+
52291+ if (copy_from_user(&ghash, s_tmp->hash, sizeof(struct gr_hash_struct)))
52292+ return ERR_PTR(-EFAULT);
52293+
52294+ /* copy user and group transition tables */
52295+
52296+ if (s_tmp->user_trans_num) {
52297+ uid_t *uidlist;
52298+
52299+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
52300+ if (uidlist == NULL)
52301+ return ERR_PTR(-ENOMEM);
52302+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
52303+ return ERR_PTR(-EFAULT);
52304+
52305+ s_tmp->user_transitions = uidlist;
52306+ }
52307+
52308+ if (s_tmp->group_trans_num) {
52309+ gid_t *gidlist;
52310+
52311+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
52312+ if (gidlist == NULL)
52313+ return ERR_PTR(-ENOMEM);
52314+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
52315+ return ERR_PTR(-EFAULT);
52316+
52317+ s_tmp->group_transitions = gidlist;
52318+ }
52319+
52320+ /* set up object hash table */
52321+ num_objs = count_user_objs(ghash.first);
52322+
52323+ s_tmp->obj_hash_size = num_objs;
52324+ s_tmp->obj_hash =
52325+ (struct acl_object_label **)
52326+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
52327+
52328+ if (!s_tmp->obj_hash)
52329+ return ERR_PTR(-ENOMEM);
52330+
52331+ memset(s_tmp->obj_hash, 0,
52332+ s_tmp->obj_hash_size *
52333+ sizeof (struct acl_object_label *));
52334+
52335+ /* add in objects */
52336+ err = copy_user_objs(ghash.first, s_tmp, role);
52337+
52338+ if (err)
52339+ return ERR_PTR(err);
52340+
52341+ /* set pointer for parent subject */
52342+ if (s_tmp->parent_subject) {
52343+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role);
52344+
52345+ if (IS_ERR(s_tmp2))
52346+ return s_tmp2;
52347+
52348+ s_tmp->parent_subject = s_tmp2;
52349+ }
52350+
52351+ /* add in ip acls */
52352+
52353+ if (!s_tmp->ip_num) {
52354+ s_tmp->ips = NULL;
52355+ goto insert;
52356+ }
52357+
52358+ i_tmp =
52359+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
52360+ sizeof (struct acl_ip_label *));
52361+
52362+ if (!i_tmp)
52363+ return ERR_PTR(-ENOMEM);
52364+
52365+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
52366+ *(i_tmp + i_num) =
52367+ (struct acl_ip_label *)
52368+ acl_alloc(sizeof (struct acl_ip_label));
52369+ if (!*(i_tmp + i_num))
52370+ return ERR_PTR(-ENOMEM);
52371+
52372+ if (copy_from_user
52373+ (&i_utmp2, s_tmp->ips + i_num,
52374+ sizeof (struct acl_ip_label *)))
52375+ return ERR_PTR(-EFAULT);
52376+
52377+ if (copy_from_user
52378+ (*(i_tmp + i_num), i_utmp2,
52379+ sizeof (struct acl_ip_label)))
52380+ return ERR_PTR(-EFAULT);
52381+
52382+ if ((*(i_tmp + i_num))->iface == NULL)
52383+ continue;
52384+
52385+ len = strnlen_user((*(i_tmp + i_num))->iface, IFNAMSIZ);
52386+ if (!len || len >= IFNAMSIZ)
52387+ return ERR_PTR(-EINVAL);
52388+ tmp = acl_alloc(len);
52389+ if (tmp == NULL)
52390+ return ERR_PTR(-ENOMEM);
52391+ if (copy_from_user(tmp, (*(i_tmp + i_num))->iface, len))
52392+ return ERR_PTR(-EFAULT);
52393+ (*(i_tmp + i_num))->iface = tmp;
52394+ }
52395+
52396+ s_tmp->ips = i_tmp;
52397+
52398+insert:
52399+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
52400+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
52401+ return ERR_PTR(-ENOMEM);
52402+
52403+ return s_tmp;
52404+}
52405+
52406+static int
52407+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
52408+{
52409+ struct acl_subject_label s_pre;
52410+ struct acl_subject_label * ret;
52411+ int err;
52412+
52413+ while (userp) {
52414+ if (copy_from_user(&s_pre, userp,
52415+ sizeof (struct acl_subject_label)))
52416+ return -EFAULT;
52417+
52418+ /* do not add nested subjects here, add
52419+ while parsing objects
52420+ */
52421+
52422+ if (s_pre.mode & GR_NESTED) {
52423+ userp = s_pre.prev;
52424+ continue;
52425+ }
52426+
52427+ ret = do_copy_user_subj(userp, role);
52428+
52429+ err = PTR_ERR(ret);
52430+ if (IS_ERR(ret))
52431+ return err;
52432+
52433+ insert_acl_subj_label(ret, role);
52434+
52435+ userp = s_pre.prev;
52436+ }
52437+
52438+ return 0;
52439+}
52440+
52441+static int
52442+copy_user_acl(struct gr_arg *arg)
52443+{
52444+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
52445+ struct sprole_pw *sptmp;
52446+ struct gr_hash_struct *ghash;
52447+ uid_t *domainlist;
52448+ unsigned int r_num;
52449+ unsigned int len;
52450+ char *tmp;
52451+ int err = 0;
52452+ __u16 i;
52453+ __u32 num_subjs;
52454+
52455+ /* we need a default and kernel role */
52456+ if (arg->role_db.num_roles < 2)
52457+ return -EINVAL;
52458+
52459+ /* copy special role authentication info from userspace */
52460+
52461+ num_sprole_pws = arg->num_sprole_pws;
52462+ acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
52463+
52464+ if (!acl_special_roles && num_sprole_pws)
52465+ return -ENOMEM;
52466+
52467+ for (i = 0; i < num_sprole_pws; i++) {
52468+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
52469+ if (!sptmp)
52470+ return -ENOMEM;
52471+ if (copy_from_user(sptmp, arg->sprole_pws + i,
52472+ sizeof (struct sprole_pw)))
52473+ return -EFAULT;
52474+
52475+ len = strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
52476+
52477+ if (!len || len >= GR_SPROLE_LEN)
52478+ return -EINVAL;
52479+
52480+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52481+ return -ENOMEM;
52482+
52483+ if (copy_from_user(tmp, sptmp->rolename, len))
52484+ return -EFAULT;
52485+
52486+ tmp[len-1] = '\0';
52487+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
52488+ printk(KERN_ALERT "Copying special role %s\n", tmp);
52489+#endif
52490+ sptmp->rolename = tmp;
52491+ acl_special_roles[i] = sptmp;
52492+ }
52493+
52494+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
52495+
52496+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
52497+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
52498+
52499+ if (!r_tmp)
52500+ return -ENOMEM;
52501+
52502+ if (copy_from_user(&r_utmp2, r_utmp + r_num,
52503+ sizeof (struct acl_role_label *)))
52504+ return -EFAULT;
52505+
52506+ if (copy_from_user(r_tmp, r_utmp2,
52507+ sizeof (struct acl_role_label)))
52508+ return -EFAULT;
52509+
52510+ len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
52511+
52512+ if (!len || len >= PATH_MAX)
52513+ return -EINVAL;
52514+
52515+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52516+ return -ENOMEM;
52517+
52518+ if (copy_from_user(tmp, r_tmp->rolename, len))
52519+ return -EFAULT;
52520+
52521+ tmp[len-1] = '\0';
52522+ r_tmp->rolename = tmp;
52523+
52524+ if (!strcmp(r_tmp->rolename, "default")
52525+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
52526+ default_role = r_tmp;
52527+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
52528+ kernel_role = r_tmp;
52529+ }
52530+
52531+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
52532+ return -ENOMEM;
52533+
52534+ if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct)))
52535+ return -EFAULT;
52536+
52537+ r_tmp->hash = ghash;
52538+
52539+ num_subjs = count_user_subjs(r_tmp->hash->first);
52540+
52541+ r_tmp->subj_hash_size = num_subjs;
52542+ r_tmp->subj_hash =
52543+ (struct acl_subject_label **)
52544+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
52545+
52546+ if (!r_tmp->subj_hash)
52547+ return -ENOMEM;
52548+
52549+ err = copy_user_allowedips(r_tmp);
52550+ if (err)
52551+ return err;
52552+
52553+ /* copy domain info */
52554+ if (r_tmp->domain_children != NULL) {
52555+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
52556+ if (domainlist == NULL)
52557+ return -ENOMEM;
52558+
52559+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
52560+ return -EFAULT;
52561+
52562+ r_tmp->domain_children = domainlist;
52563+ }
52564+
52565+ err = copy_user_transitions(r_tmp);
52566+ if (err)
52567+ return err;
52568+
52569+ memset(r_tmp->subj_hash, 0,
52570+ r_tmp->subj_hash_size *
52571+ sizeof (struct acl_subject_label *));
52572+
52573+ err = copy_user_subjs(r_tmp->hash->first, r_tmp);
52574+
52575+ if (err)
52576+ return err;
52577+
52578+ /* set nested subject list to null */
52579+ r_tmp->hash->first = NULL;
52580+
52581+ insert_acl_role_label(r_tmp);
52582+ }
52583+
52584+ if (default_role == NULL || kernel_role == NULL)
52585+ return -EINVAL;
52586+
52587+ return err;
52588+}
52589+
52590+static int
52591+gracl_init(struct gr_arg *args)
52592+{
52593+ int error = 0;
52594+
52595+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
52596+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
52597+
52598+ if (init_variables(args)) {
52599+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
52600+ error = -ENOMEM;
52601+ free_variables();
52602+ goto out;
52603+ }
52604+
52605+ error = copy_user_acl(args);
52606+ free_init_variables();
52607+ if (error) {
52608+ free_variables();
52609+ goto out;
52610+ }
52611+
52612+ if ((error = gr_set_acls(0))) {
52613+ free_variables();
52614+ goto out;
52615+ }
52616+
52617+ pax_open_kernel();
52618+ gr_status |= GR_READY;
52619+ pax_close_kernel();
52620+
52621+ out:
52622+ return error;
52623+}
52624+
52625+/* derived from glibc fnmatch() 0: match, 1: no match*/
52626+
52627+static int
52628+glob_match(const char *p, const char *n)
52629+{
52630+ char c;
52631+
52632+ while ((c = *p++) != '\0') {
52633+ switch (c) {
52634+ case '?':
52635+ if (*n == '\0')
52636+ return 1;
52637+ else if (*n == '/')
52638+ return 1;
52639+ break;
52640+ case '\\':
52641+ if (*n != c)
52642+ return 1;
52643+ break;
52644+ case '*':
52645+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
52646+ if (*n == '/')
52647+ return 1;
52648+ else if (c == '?') {
52649+ if (*n == '\0')
52650+ return 1;
52651+ else
52652+ ++n;
52653+ }
52654+ }
52655+ if (c == '\0') {
52656+ return 0;
52657+ } else {
52658+ const char *endp;
52659+
52660+ if ((endp = strchr(n, '/')) == NULL)
52661+ endp = n + strlen(n);
52662+
52663+ if (c == '[') {
52664+ for (--p; n < endp; ++n)
52665+ if (!glob_match(p, n))
52666+ return 0;
52667+ } else if (c == '/') {
52668+ while (*n != '\0' && *n != '/')
52669+ ++n;
52670+ if (*n == '/' && !glob_match(p, n + 1))
52671+ return 0;
52672+ } else {
52673+ for (--p; n < endp; ++n)
52674+ if (*n == c && !glob_match(p, n))
52675+ return 0;
52676+ }
52677+
52678+ return 1;
52679+ }
52680+ case '[':
52681+ {
52682+ int not;
52683+ char cold;
52684+
52685+ if (*n == '\0' || *n == '/')
52686+ return 1;
52687+
52688+ not = (*p == '!' || *p == '^');
52689+ if (not)
52690+ ++p;
52691+
52692+ c = *p++;
52693+ for (;;) {
52694+ unsigned char fn = (unsigned char)*n;
52695+
52696+ if (c == '\0')
52697+ return 1;
52698+ else {
52699+ if (c == fn)
52700+ goto matched;
52701+ cold = c;
52702+ c = *p++;
52703+
52704+ if (c == '-' && *p != ']') {
52705+ unsigned char cend = *p++;
52706+
52707+ if (cend == '\0')
52708+ return 1;
52709+
52710+ if (cold <= fn && fn <= cend)
52711+ goto matched;
52712+
52713+ c = *p++;
52714+ }
52715+ }
52716+
52717+ if (c == ']')
52718+ break;
52719+ }
52720+ if (!not)
52721+ return 1;
52722+ break;
52723+ matched:
52724+ while (c != ']') {
52725+ if (c == '\0')
52726+ return 1;
52727+
52728+ c = *p++;
52729+ }
52730+ if (not)
52731+ return 1;
52732+ }
52733+ break;
52734+ default:
52735+ if (c != *n)
52736+ return 1;
52737+ }
52738+
52739+ ++n;
52740+ }
52741+
52742+ if (*n == '\0')
52743+ return 0;
52744+
52745+ if (*n == '/')
52746+ return 0;
52747+
52748+ return 1;
52749+}
52750+
52751+static struct acl_object_label *
52752+chk_glob_label(struct acl_object_label *globbed,
52753+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
52754+{
52755+ struct acl_object_label *tmp;
52756+
52757+ if (*path == NULL)
52758+ *path = gr_to_filename_nolock(dentry, mnt);
52759+
52760+ tmp = globbed;
52761+
52762+ while (tmp) {
52763+ if (!glob_match(tmp->filename, *path))
52764+ return tmp;
52765+ tmp = tmp->next;
52766+ }
52767+
52768+ return NULL;
52769+}
52770+
52771+static struct acl_object_label *
52772+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
52773+ const ino_t curr_ino, const dev_t curr_dev,
52774+ const struct acl_subject_label *subj, char **path, const int checkglob)
52775+{
52776+ struct acl_subject_label *tmpsubj;
52777+ struct acl_object_label *retval;
52778+ struct acl_object_label *retval2;
52779+
52780+ tmpsubj = (struct acl_subject_label *) subj;
52781+ read_lock(&gr_inode_lock);
52782+ do {
52783+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
52784+ if (retval) {
52785+ if (checkglob && retval->globbed) {
52786+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
52787+ if (retval2)
52788+ retval = retval2;
52789+ }
52790+ break;
52791+ }
52792+ } while ((tmpsubj = tmpsubj->parent_subject));
52793+ read_unlock(&gr_inode_lock);
52794+
52795+ return retval;
52796+}
52797+
52798+static __inline__ struct acl_object_label *
52799+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
52800+ struct dentry *curr_dentry,
52801+ const struct acl_subject_label *subj, char **path, const int checkglob)
52802+{
52803+ int newglob = checkglob;
52804+ ino_t inode;
52805+ dev_t device;
52806+
52807+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
52808+ as we don't want a / * rule to match instead of the / object
52809+ don't do this for create lookups that call this function though, since they're looking up
52810+ on the parent and thus need globbing checks on all paths
52811+ */
52812+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
52813+ newglob = GR_NO_GLOB;
52814+
52815+ spin_lock(&curr_dentry->d_lock);
52816+ inode = curr_dentry->d_inode->i_ino;
52817+ device = __get_dev(curr_dentry);
52818+ spin_unlock(&curr_dentry->d_lock);
52819+
52820+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
52821+}
52822+
52823+static struct acl_object_label *
52824+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52825+ const struct acl_subject_label *subj, char *path, const int checkglob)
52826+{
52827+ struct dentry *dentry = (struct dentry *) l_dentry;
52828+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
52829+ struct mount *real_mnt = real_mount(mnt);
52830+ struct acl_object_label *retval;
52831+ struct dentry *parent;
52832+
52833+ write_seqlock(&rename_lock);
52834+ br_read_lock(vfsmount_lock);
52835+
52836+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
52837+#ifdef CONFIG_NET
52838+ mnt == sock_mnt ||
52839+#endif
52840+#ifdef CONFIG_HUGETLBFS
52841+ (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
52842+#endif
52843+ /* ignore Eric Biederman */
52844+ IS_PRIVATE(l_dentry->d_inode))) {
52845+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
52846+ goto out;
52847+ }
52848+
52849+ for (;;) {
52850+ if (dentry == real_root.dentry && mnt == real_root.mnt)
52851+ break;
52852+
52853+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
52854+ if (!mnt_has_parent(real_mnt))
52855+ break;
52856+
52857+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52858+ if (retval != NULL)
52859+ goto out;
52860+
52861+ dentry = real_mnt->mnt_mountpoint;
52862+ real_mnt = real_mnt->mnt_parent;
52863+ mnt = &real_mnt->mnt;
52864+ continue;
52865+ }
52866+
52867+ parent = dentry->d_parent;
52868+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52869+ if (retval != NULL)
52870+ goto out;
52871+
52872+ dentry = parent;
52873+ }
52874+
52875+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52876+
52877+ /* real_root is pinned so we don't have to hold a reference */
52878+ if (retval == NULL)
52879+ retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob);
52880+out:
52881+ br_read_unlock(vfsmount_lock);
52882+ write_sequnlock(&rename_lock);
52883+
52884+ BUG_ON(retval == NULL);
52885+
52886+ return retval;
52887+}
52888+
52889+static __inline__ struct acl_object_label *
52890+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52891+ const struct acl_subject_label *subj)
52892+{
52893+ char *path = NULL;
52894+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
52895+}
52896+
52897+static __inline__ struct acl_object_label *
52898+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52899+ const struct acl_subject_label *subj)
52900+{
52901+ char *path = NULL;
52902+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
52903+}
52904+
52905+static __inline__ struct acl_object_label *
52906+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52907+ const struct acl_subject_label *subj, char *path)
52908+{
52909+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
52910+}
52911+
52912+static struct acl_subject_label *
52913+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52914+ const struct acl_role_label *role)
52915+{
52916+ struct dentry *dentry = (struct dentry *) l_dentry;
52917+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
52918+ struct mount *real_mnt = real_mount(mnt);
52919+ struct acl_subject_label *retval;
52920+ struct dentry *parent;
52921+
52922+ write_seqlock(&rename_lock);
52923+ br_read_lock(vfsmount_lock);
52924+
52925+ for (;;) {
52926+ if (dentry == real_root.dentry && mnt == real_root.mnt)
52927+ break;
52928+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
52929+ if (!mnt_has_parent(real_mnt))
52930+ break;
52931+
52932+ spin_lock(&dentry->d_lock);
52933+ read_lock(&gr_inode_lock);
52934+ retval =
52935+ lookup_acl_subj_label(dentry->d_inode->i_ino,
52936+ __get_dev(dentry), role);
52937+ read_unlock(&gr_inode_lock);
52938+ spin_unlock(&dentry->d_lock);
52939+ if (retval != NULL)
52940+ goto out;
52941+
52942+ dentry = real_mnt->mnt_mountpoint;
52943+ real_mnt = real_mnt->mnt_parent;
52944+ mnt = &real_mnt->mnt;
52945+ continue;
52946+ }
52947+
52948+ spin_lock(&dentry->d_lock);
52949+ read_lock(&gr_inode_lock);
52950+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
52951+ __get_dev(dentry), role);
52952+ read_unlock(&gr_inode_lock);
52953+ parent = dentry->d_parent;
52954+ spin_unlock(&dentry->d_lock);
52955+
52956+ if (retval != NULL)
52957+ goto out;
52958+
52959+ dentry = parent;
52960+ }
52961+
52962+ spin_lock(&dentry->d_lock);
52963+ read_lock(&gr_inode_lock);
52964+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
52965+ __get_dev(dentry), role);
52966+ read_unlock(&gr_inode_lock);
52967+ spin_unlock(&dentry->d_lock);
52968+
52969+ if (unlikely(retval == NULL)) {
52970+ /* real_root is pinned, we don't need to hold a reference */
52971+ read_lock(&gr_inode_lock);
52972+ retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino,
52973+ __get_dev(real_root.dentry), role);
52974+ read_unlock(&gr_inode_lock);
52975+ }
52976+out:
52977+ br_read_unlock(vfsmount_lock);
52978+ write_sequnlock(&rename_lock);
52979+
52980+ BUG_ON(retval == NULL);
52981+
52982+ return retval;
52983+}
52984+
52985+static void
52986+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
52987+{
52988+ struct task_struct *task = current;
52989+ const struct cred *cred = current_cred();
52990+
52991+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
52992+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
52993+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
52994+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
52995+
52996+ return;
52997+}
52998+
52999+static void
53000+gr_log_learn_sysctl(const char *path, const __u32 mode)
53001+{
53002+ struct task_struct *task = current;
53003+ const struct cred *cred = current_cred();
53004+
53005+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
53006+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
53007+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
53008+ 1UL, 1UL, path, (unsigned long) mode, &task->signal->saved_ip);
53009+
53010+ return;
53011+}
53012+
53013+static void
53014+gr_log_learn_id_change(const char type, const unsigned int real,
53015+ const unsigned int effective, const unsigned int fs)
53016+{
53017+ struct task_struct *task = current;
53018+ const struct cred *cred = current_cred();
53019+
53020+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
53021+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
53022+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
53023+ type, real, effective, fs, &task->signal->saved_ip);
53024+
53025+ return;
53026+}
53027+
53028+__u32
53029+gr_search_file(const struct dentry * dentry, const __u32 mode,
53030+ const struct vfsmount * mnt)
53031+{
53032+ __u32 retval = mode;
53033+ struct acl_subject_label *curracl;
53034+ struct acl_object_label *currobj;
53035+
53036+ if (unlikely(!(gr_status & GR_READY)))
53037+ return (mode & ~GR_AUDITS);
53038+
53039+ curracl = current->acl;
53040+
53041+ currobj = chk_obj_label(dentry, mnt, curracl);
53042+ retval = currobj->mode & mode;
53043+
53044+ /* if we're opening a specified transfer file for writing
53045+ (e.g. /dev/initctl), then transfer our role to init
53046+ */
53047+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
53048+ current->role->roletype & GR_ROLE_PERSIST)) {
53049+ struct task_struct *task = init_pid_ns.child_reaper;
53050+
53051+ if (task->role != current->role) {
53052+ task->acl_sp_role = 0;
53053+ task->acl_role_id = current->acl_role_id;
53054+ task->role = current->role;
53055+ rcu_read_lock();
53056+ read_lock(&grsec_exec_file_lock);
53057+ gr_apply_subject_to_task(task);
53058+ read_unlock(&grsec_exec_file_lock);
53059+ rcu_read_unlock();
53060+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
53061+ }
53062+ }
53063+
53064+ if (unlikely
53065+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
53066+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
53067+ __u32 new_mode = mode;
53068+
53069+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
53070+
53071+ retval = new_mode;
53072+
53073+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
53074+ new_mode |= GR_INHERIT;
53075+
53076+ if (!(mode & GR_NOLEARN))
53077+ gr_log_learn(dentry, mnt, new_mode);
53078+ }
53079+
53080+ return retval;
53081+}
53082+
53083+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
53084+ const struct dentry *parent,
53085+ const struct vfsmount *mnt)
53086+{
53087+ struct name_entry *match;
53088+ struct acl_object_label *matchpo;
53089+ struct acl_subject_label *curracl;
53090+ char *path;
53091+
53092+ if (unlikely(!(gr_status & GR_READY)))
53093+ return NULL;
53094+
53095+ preempt_disable();
53096+ path = gr_to_filename_rbac(new_dentry, mnt);
53097+ match = lookup_name_entry_create(path);
53098+
53099+ curracl = current->acl;
53100+
53101+ if (match) {
53102+ read_lock(&gr_inode_lock);
53103+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
53104+ read_unlock(&gr_inode_lock);
53105+
53106+ if (matchpo) {
53107+ preempt_enable();
53108+ return matchpo;
53109+ }
53110+ }
53111+
53112+ // lookup parent
53113+
53114+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
53115+
53116+ preempt_enable();
53117+ return matchpo;
53118+}
53119+
53120+__u32
53121+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
53122+ const struct vfsmount * mnt, const __u32 mode)
53123+{
53124+ struct acl_object_label *matchpo;
53125+ __u32 retval;
53126+
53127+ if (unlikely(!(gr_status & GR_READY)))
53128+ return (mode & ~GR_AUDITS);
53129+
53130+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
53131+
53132+ retval = matchpo->mode & mode;
53133+
53134+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
53135+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
53136+ __u32 new_mode = mode;
53137+
53138+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
53139+
53140+ gr_log_learn(new_dentry, mnt, new_mode);
53141+ return new_mode;
53142+ }
53143+
53144+ return retval;
53145+}
53146+
53147+__u32
53148+gr_check_link(const struct dentry * new_dentry,
53149+ const struct dentry * parent_dentry,
53150+ const struct vfsmount * parent_mnt,
53151+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
53152+{
53153+ struct acl_object_label *obj;
53154+ __u32 oldmode, newmode;
53155+ __u32 needmode;
53156+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
53157+ GR_DELETE | GR_INHERIT;
53158+
53159+ if (unlikely(!(gr_status & GR_READY)))
53160+ return (GR_CREATE | GR_LINK);
53161+
53162+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
53163+ oldmode = obj->mode;
53164+
53165+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
53166+ newmode = obj->mode;
53167+
53168+ needmode = newmode & checkmodes;
53169+
53170+ // old name for hardlink must have at least the permissions of the new name
53171+ if ((oldmode & needmode) != needmode)
53172+ goto bad;
53173+
53174+ // if old name had restrictions/auditing, make sure the new name does as well
53175+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
53176+
53177+ // don't allow hardlinking of suid/sgid files without permission
53178+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
53179+ needmode |= GR_SETID;
53180+
53181+ if ((newmode & needmode) != needmode)
53182+ goto bad;
53183+
53184+ // enforce minimum permissions
53185+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
53186+ return newmode;
53187+bad:
53188+ needmode = oldmode;
53189+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
53190+ needmode |= GR_SETID;
53191+
53192+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
53193+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
53194+ return (GR_CREATE | GR_LINK);
53195+ } else if (newmode & GR_SUPPRESS)
53196+ return GR_SUPPRESS;
53197+ else
53198+ return 0;
53199+}
53200+
53201+int
53202+gr_check_hidden_task(const struct task_struct *task)
53203+{
53204+ if (unlikely(!(gr_status & GR_READY)))
53205+ return 0;
53206+
53207+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
53208+ return 1;
53209+
53210+ return 0;
53211+}
53212+
53213+int
53214+gr_check_protected_task(const struct task_struct *task)
53215+{
53216+ if (unlikely(!(gr_status & GR_READY) || !task))
53217+ return 0;
53218+
53219+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
53220+ task->acl != current->acl)
53221+ return 1;
53222+
53223+ return 0;
53224+}
53225+
53226+int
53227+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
53228+{
53229+ struct task_struct *p;
53230+ int ret = 0;
53231+
53232+ if (unlikely(!(gr_status & GR_READY) || !pid))
53233+ return ret;
53234+
53235+ read_lock(&tasklist_lock);
53236+ do_each_pid_task(pid, type, p) {
53237+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
53238+ p->acl != current->acl) {
53239+ ret = 1;
53240+ goto out;
53241+ }
53242+ } while_each_pid_task(pid, type, p);
53243+out:
53244+ read_unlock(&tasklist_lock);
53245+
53246+ return ret;
53247+}
53248+
53249+void
53250+gr_copy_label(struct task_struct *tsk)
53251+{
53252+ /* plain copying of fields is already done by dup_task_struct */
53253+ tsk->signal->used_accept = 0;
53254+ tsk->acl_sp_role = 0;
53255+ //tsk->acl_role_id = current->acl_role_id;
53256+ //tsk->acl = current->acl;
53257+ //tsk->role = current->role;
53258+ tsk->signal->curr_ip = current->signal->curr_ip;
53259+ tsk->signal->saved_ip = current->signal->saved_ip;
53260+ if (current->exec_file)
53261+ get_file(current->exec_file);
53262+ //tsk->exec_file = current->exec_file;
53263+ //tsk->is_writable = current->is_writable;
53264+ if (unlikely(current->signal->used_accept)) {
53265+ current->signal->curr_ip = 0;
53266+ current->signal->saved_ip = 0;
53267+ }
53268+
53269+ return;
53270+}
53271+
53272+static void
53273+gr_set_proc_res(struct task_struct *task)
53274+{
53275+ struct acl_subject_label *proc;
53276+ unsigned short i;
53277+
53278+ proc = task->acl;
53279+
53280+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
53281+ return;
53282+
53283+ for (i = 0; i < RLIM_NLIMITS; i++) {
53284+ if (!(proc->resmask & (1 << i)))
53285+ continue;
53286+
53287+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
53288+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
53289+ }
53290+
53291+ return;
53292+}
53293+
53294+extern int __gr_process_user_ban(struct user_struct *user);
53295+
53296+int
53297+gr_check_user_change(int real, int effective, int fs)
53298+{
53299+ unsigned int i;
53300+ __u16 num;
53301+ uid_t *uidlist;
53302+ int curuid;
53303+ int realok = 0;
53304+ int effectiveok = 0;
53305+ int fsok = 0;
53306+
53307+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
53308+ struct user_struct *user;
53309+
53310+ if (real == -1)
53311+ goto skipit;
53312+
53313+ user = find_user(real);
53314+ if (user == NULL)
53315+ goto skipit;
53316+
53317+ if (__gr_process_user_ban(user)) {
53318+ /* for find_user */
53319+ free_uid(user);
53320+ return 1;
53321+ }
53322+
53323+ /* for find_user */
53324+ free_uid(user);
53325+
53326+skipit:
53327+#endif
53328+
53329+ if (unlikely(!(gr_status & GR_READY)))
53330+ return 0;
53331+
53332+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
53333+ gr_log_learn_id_change('u', real, effective, fs);
53334+
53335+ num = current->acl->user_trans_num;
53336+ uidlist = current->acl->user_transitions;
53337+
53338+ if (uidlist == NULL)
53339+ return 0;
53340+
53341+ if (real == -1)
53342+ realok = 1;
53343+ if (effective == -1)
53344+ effectiveok = 1;
53345+ if (fs == -1)
53346+ fsok = 1;
53347+
53348+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
53349+ for (i = 0; i < num; i++) {
53350+ curuid = (int)uidlist[i];
53351+ if (real == curuid)
53352+ realok = 1;
53353+ if (effective == curuid)
53354+ effectiveok = 1;
53355+ if (fs == curuid)
53356+ fsok = 1;
53357+ }
53358+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
53359+ for (i = 0; i < num; i++) {
53360+ curuid = (int)uidlist[i];
53361+ if (real == curuid)
53362+ break;
53363+ if (effective == curuid)
53364+ break;
53365+ if (fs == curuid)
53366+ break;
53367+ }
53368+ /* not in deny list */
53369+ if (i == num) {
53370+ realok = 1;
53371+ effectiveok = 1;
53372+ fsok = 1;
53373+ }
53374+ }
53375+
53376+ if (realok && effectiveok && fsok)
53377+ return 0;
53378+ else {
53379+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
53380+ return 1;
53381+ }
53382+}
53383+
53384+int
53385+gr_check_group_change(int real, int effective, int fs)
53386+{
53387+ unsigned int i;
53388+ __u16 num;
53389+ gid_t *gidlist;
53390+ int curgid;
53391+ int realok = 0;
53392+ int effectiveok = 0;
53393+ int fsok = 0;
53394+
53395+ if (unlikely(!(gr_status & GR_READY)))
53396+ return 0;
53397+
53398+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
53399+ gr_log_learn_id_change('g', real, effective, fs);
53400+
53401+ num = current->acl->group_trans_num;
53402+ gidlist = current->acl->group_transitions;
53403+
53404+ if (gidlist == NULL)
53405+ return 0;
53406+
53407+ if (real == -1)
53408+ realok = 1;
53409+ if (effective == -1)
53410+ effectiveok = 1;
53411+ if (fs == -1)
53412+ fsok = 1;
53413+
53414+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
53415+ for (i = 0; i < num; i++) {
53416+ curgid = (int)gidlist[i];
53417+ if (real == curgid)
53418+ realok = 1;
53419+ if (effective == curgid)
53420+ effectiveok = 1;
53421+ if (fs == curgid)
53422+ fsok = 1;
53423+ }
53424+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
53425+ for (i = 0; i < num; i++) {
53426+ curgid = (int)gidlist[i];
53427+ if (real == curgid)
53428+ break;
53429+ if (effective == curgid)
53430+ break;
53431+ if (fs == curgid)
53432+ break;
53433+ }
53434+ /* not in deny list */
53435+ if (i == num) {
53436+ realok = 1;
53437+ effectiveok = 1;
53438+ fsok = 1;
53439+ }
53440+ }
53441+
53442+ if (realok && effectiveok && fsok)
53443+ return 0;
53444+ else {
53445+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
53446+ return 1;
53447+ }
53448+}
53449+
53450+extern int gr_acl_is_capable(const int cap);
53451+
53452+void
53453+gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
53454+{
53455+ struct acl_role_label *role = task->role;
53456+ struct acl_subject_label *subj = NULL;
53457+ struct acl_object_label *obj;
53458+ struct file *filp;
53459+
53460+ if (unlikely(!(gr_status & GR_READY)))
53461+ return;
53462+
53463+ filp = task->exec_file;
53464+
53465+ /* kernel process, we'll give them the kernel role */
53466+ if (unlikely(!filp)) {
53467+ task->role = kernel_role;
53468+ task->acl = kernel_role->root_label;
53469+ return;
53470+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
53471+ role = lookup_acl_role_label(task, uid, gid);
53472+
53473+ /* don't change the role if we're not a privileged process */
53474+ if (role && task->role != role &&
53475+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
53476+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
53477+ return;
53478+
53479+ /* perform subject lookup in possibly new role
53480+ we can use this result below in the case where role == task->role
53481+ */
53482+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
53483+
53484+ /* if we changed uid/gid, but result in the same role
53485+ and are using inheritance, don't lose the inherited subject
53486+ if current subject is other than what normal lookup
53487+ would result in, we arrived via inheritance, don't
53488+ lose subject
53489+ */
53490+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
53491+ (subj == task->acl)))
53492+ task->acl = subj;
53493+
53494+ task->role = role;
53495+
53496+ task->is_writable = 0;
53497+
53498+ /* ignore additional mmap checks for processes that are writable
53499+ by the default ACL */
53500+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
53501+ if (unlikely(obj->mode & GR_WRITE))
53502+ task->is_writable = 1;
53503+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
53504+ if (unlikely(obj->mode & GR_WRITE))
53505+ task->is_writable = 1;
53506+
53507+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53508+ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53509+#endif
53510+
53511+ gr_set_proc_res(task);
53512+
53513+ return;
53514+}
53515+
53516+int
53517+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
53518+ const int unsafe_flags)
53519+{
53520+ struct task_struct *task = current;
53521+ struct acl_subject_label *newacl;
53522+ struct acl_object_label *obj;
53523+ __u32 retmode;
53524+
53525+ if (unlikely(!(gr_status & GR_READY)))
53526+ return 0;
53527+
53528+ newacl = chk_subj_label(dentry, mnt, task->role);
53529+
53530+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
53531+ did an exec
53532+ */
53533+ rcu_read_lock();
53534+ read_lock(&tasklist_lock);
53535+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
53536+ (task->parent->acl->mode & GR_POVERRIDE))) {
53537+ read_unlock(&tasklist_lock);
53538+ rcu_read_unlock();
53539+ goto skip_check;
53540+ }
53541+ read_unlock(&tasklist_lock);
53542+ rcu_read_unlock();
53543+
53544+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
53545+ !(task->role->roletype & GR_ROLE_GOD) &&
53546+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
53547+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
53548+ if (unsafe_flags & LSM_UNSAFE_SHARE)
53549+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
53550+ else
53551+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
53552+ return -EACCES;
53553+ }
53554+
53555+skip_check:
53556+
53557+ obj = chk_obj_label(dentry, mnt, task->acl);
53558+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
53559+
53560+ if (!(task->acl->mode & GR_INHERITLEARN) &&
53561+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
53562+ if (obj->nested)
53563+ task->acl = obj->nested;
53564+ else
53565+ task->acl = newacl;
53566+ } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
53567+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
53568+
53569+ task->is_writable = 0;
53570+
53571+ /* ignore additional mmap checks for processes that are writable
53572+ by the default ACL */
53573+ obj = chk_obj_label(dentry, mnt, default_role->root_label);
53574+ if (unlikely(obj->mode & GR_WRITE))
53575+ task->is_writable = 1;
53576+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
53577+ if (unlikely(obj->mode & GR_WRITE))
53578+ task->is_writable = 1;
53579+
53580+ gr_set_proc_res(task);
53581+
53582+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53583+ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53584+#endif
53585+ return 0;
53586+}
53587+
53588+/* always called with valid inodev ptr */
53589+static void
53590+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
53591+{
53592+ struct acl_object_label *matchpo;
53593+ struct acl_subject_label *matchps;
53594+ struct acl_subject_label *subj;
53595+ struct acl_role_label *role;
53596+ unsigned int x;
53597+
53598+ FOR_EACH_ROLE_START(role)
53599+ FOR_EACH_SUBJECT_START(role, subj, x)
53600+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
53601+ matchpo->mode |= GR_DELETED;
53602+ FOR_EACH_SUBJECT_END(subj,x)
53603+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
53604+ if (subj->inode == ino && subj->device == dev)
53605+ subj->mode |= GR_DELETED;
53606+ FOR_EACH_NESTED_SUBJECT_END(subj)
53607+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
53608+ matchps->mode |= GR_DELETED;
53609+ FOR_EACH_ROLE_END(role)
53610+
53611+ inodev->nentry->deleted = 1;
53612+
53613+ return;
53614+}
53615+
53616+void
53617+gr_handle_delete(const ino_t ino, const dev_t dev)
53618+{
53619+ struct inodev_entry *inodev;
53620+
53621+ if (unlikely(!(gr_status & GR_READY)))
53622+ return;
53623+
53624+ write_lock(&gr_inode_lock);
53625+ inodev = lookup_inodev_entry(ino, dev);
53626+ if (inodev != NULL)
53627+ do_handle_delete(inodev, ino, dev);
53628+ write_unlock(&gr_inode_lock);
53629+
53630+ return;
53631+}
53632+
53633+static void
53634+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
53635+ const ino_t newinode, const dev_t newdevice,
53636+ struct acl_subject_label *subj)
53637+{
53638+ unsigned int index = fhash(oldinode, olddevice, subj->obj_hash_size);
53639+ struct acl_object_label *match;
53640+
53641+ match = subj->obj_hash[index];
53642+
53643+ while (match && (match->inode != oldinode ||
53644+ match->device != olddevice ||
53645+ !(match->mode & GR_DELETED)))
53646+ match = match->next;
53647+
53648+ if (match && (match->inode == oldinode)
53649+ && (match->device == olddevice)
53650+ && (match->mode & GR_DELETED)) {
53651+ if (match->prev == NULL) {
53652+ subj->obj_hash[index] = match->next;
53653+ if (match->next != NULL)
53654+ match->next->prev = NULL;
53655+ } else {
53656+ match->prev->next = match->next;
53657+ if (match->next != NULL)
53658+ match->next->prev = match->prev;
53659+ }
53660+ match->prev = NULL;
53661+ match->next = NULL;
53662+ match->inode = newinode;
53663+ match->device = newdevice;
53664+ match->mode &= ~GR_DELETED;
53665+
53666+ insert_acl_obj_label(match, subj);
53667+ }
53668+
53669+ return;
53670+}
53671+
53672+static void
53673+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
53674+ const ino_t newinode, const dev_t newdevice,
53675+ struct acl_role_label *role)
53676+{
53677+ unsigned int index = fhash(oldinode, olddevice, role->subj_hash_size);
53678+ struct acl_subject_label *match;
53679+
53680+ match = role->subj_hash[index];
53681+
53682+ while (match && (match->inode != oldinode ||
53683+ match->device != olddevice ||
53684+ !(match->mode & GR_DELETED)))
53685+ match = match->next;
53686+
53687+ if (match && (match->inode == oldinode)
53688+ && (match->device == olddevice)
53689+ && (match->mode & GR_DELETED)) {
53690+ if (match->prev == NULL) {
53691+ role->subj_hash[index] = match->next;
53692+ if (match->next != NULL)
53693+ match->next->prev = NULL;
53694+ } else {
53695+ match->prev->next = match->next;
53696+ if (match->next != NULL)
53697+ match->next->prev = match->prev;
53698+ }
53699+ match->prev = NULL;
53700+ match->next = NULL;
53701+ match->inode = newinode;
53702+ match->device = newdevice;
53703+ match->mode &= ~GR_DELETED;
53704+
53705+ insert_acl_subj_label(match, role);
53706+ }
53707+
53708+ return;
53709+}
53710+
53711+static void
53712+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
53713+ const ino_t newinode, const dev_t newdevice)
53714+{
53715+ unsigned int index = fhash(oldinode, olddevice, inodev_set.i_size);
53716+ struct inodev_entry *match;
53717+
53718+ match = inodev_set.i_hash[index];
53719+
53720+ while (match && (match->nentry->inode != oldinode ||
53721+ match->nentry->device != olddevice || !match->nentry->deleted))
53722+ match = match->next;
53723+
53724+ if (match && (match->nentry->inode == oldinode)
53725+ && (match->nentry->device == olddevice) &&
53726+ match->nentry->deleted) {
53727+ if (match->prev == NULL) {
53728+ inodev_set.i_hash[index] = match->next;
53729+ if (match->next != NULL)
53730+ match->next->prev = NULL;
53731+ } else {
53732+ match->prev->next = match->next;
53733+ if (match->next != NULL)
53734+ match->next->prev = match->prev;
53735+ }
53736+ match->prev = NULL;
53737+ match->next = NULL;
53738+ match->nentry->inode = newinode;
53739+ match->nentry->device = newdevice;
53740+ match->nentry->deleted = 0;
53741+
53742+ insert_inodev_entry(match);
53743+ }
53744+
53745+ return;
53746+}
53747+
53748+static void
53749+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
53750+{
53751+ struct acl_subject_label *subj;
53752+ struct acl_role_label *role;
53753+ unsigned int x;
53754+
53755+ FOR_EACH_ROLE_START(role)
53756+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
53757+
53758+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
53759+ if ((subj->inode == ino) && (subj->device == dev)) {
53760+ subj->inode = ino;
53761+ subj->device = dev;
53762+ }
53763+ FOR_EACH_NESTED_SUBJECT_END(subj)
53764+ FOR_EACH_SUBJECT_START(role, subj, x)
53765+ update_acl_obj_label(matchn->inode, matchn->device,
53766+ ino, dev, subj);
53767+ FOR_EACH_SUBJECT_END(subj,x)
53768+ FOR_EACH_ROLE_END(role)
53769+
53770+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
53771+
53772+ return;
53773+}
53774+
53775+static void
53776+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
53777+ const struct vfsmount *mnt)
53778+{
53779+ ino_t ino = dentry->d_inode->i_ino;
53780+ dev_t dev = __get_dev(dentry);
53781+
53782+ __do_handle_create(matchn, ino, dev);
53783+
53784+ return;
53785+}
53786+
53787+void
53788+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
53789+{
53790+ struct name_entry *matchn;
53791+
53792+ if (unlikely(!(gr_status & GR_READY)))
53793+ return;
53794+
53795+ preempt_disable();
53796+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
53797+
53798+ if (unlikely((unsigned long)matchn)) {
53799+ write_lock(&gr_inode_lock);
53800+ do_handle_create(matchn, dentry, mnt);
53801+ write_unlock(&gr_inode_lock);
53802+ }
53803+ preempt_enable();
53804+
53805+ return;
53806+}
53807+
53808+void
53809+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
53810+{
53811+ struct name_entry *matchn;
53812+
53813+ if (unlikely(!(gr_status & GR_READY)))
53814+ return;
53815+
53816+ preempt_disable();
53817+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
53818+
53819+ if (unlikely((unsigned long)matchn)) {
53820+ write_lock(&gr_inode_lock);
53821+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
53822+ write_unlock(&gr_inode_lock);
53823+ }
53824+ preempt_enable();
53825+
53826+ return;
53827+}
53828+
53829+void
53830+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
53831+ struct dentry *old_dentry,
53832+ struct dentry *new_dentry,
53833+ struct vfsmount *mnt, const __u8 replace)
53834+{
53835+ struct name_entry *matchn;
53836+ struct inodev_entry *inodev;
53837+ struct inode *inode = new_dentry->d_inode;
53838+ ino_t old_ino = old_dentry->d_inode->i_ino;
53839+ dev_t old_dev = __get_dev(old_dentry);
53840+
53841+ /* vfs_rename swaps the name and parent link for old_dentry and
53842+ new_dentry
53843+ at this point, old_dentry has the new name, parent link, and inode
53844+ for the renamed file
53845+ if a file is being replaced by a rename, new_dentry has the inode
53846+ and name for the replaced file
53847+ */
53848+
53849+ if (unlikely(!(gr_status & GR_READY)))
53850+ return;
53851+
53852+ preempt_disable();
53853+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
53854+
53855+ /* we wouldn't have to check d_inode if it weren't for
53856+ NFS silly-renaming
53857+ */
53858+
53859+ write_lock(&gr_inode_lock);
53860+ if (unlikely(replace && inode)) {
53861+ ino_t new_ino = inode->i_ino;
53862+ dev_t new_dev = __get_dev(new_dentry);
53863+
53864+ inodev = lookup_inodev_entry(new_ino, new_dev);
53865+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
53866+ do_handle_delete(inodev, new_ino, new_dev);
53867+ }
53868+
53869+ inodev = lookup_inodev_entry(old_ino, old_dev);
53870+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
53871+ do_handle_delete(inodev, old_ino, old_dev);
53872+
53873+ if (unlikely((unsigned long)matchn))
53874+ do_handle_create(matchn, old_dentry, mnt);
53875+
53876+ write_unlock(&gr_inode_lock);
53877+ preempt_enable();
53878+
53879+ return;
53880+}
53881+
53882+static int
53883+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
53884+ unsigned char **sum)
53885+{
53886+ struct acl_role_label *r;
53887+ struct role_allowed_ip *ipp;
53888+ struct role_transition *trans;
53889+ unsigned int i;
53890+ int found = 0;
53891+ u32 curr_ip = current->signal->curr_ip;
53892+
53893+ current->signal->saved_ip = curr_ip;
53894+
53895+ /* check transition table */
53896+
53897+ for (trans = current->role->transitions; trans; trans = trans->next) {
53898+ if (!strcmp(rolename, trans->rolename)) {
53899+ found = 1;
53900+ break;
53901+ }
53902+ }
53903+
53904+ if (!found)
53905+ return 0;
53906+
53907+ /* handle special roles that do not require authentication
53908+ and check ip */
53909+
53910+ FOR_EACH_ROLE_START(r)
53911+ if (!strcmp(rolename, r->rolename) &&
53912+ (r->roletype & GR_ROLE_SPECIAL)) {
53913+ found = 0;
53914+ if (r->allowed_ips != NULL) {
53915+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
53916+ if ((ntohl(curr_ip) & ipp->netmask) ==
53917+ (ntohl(ipp->addr) & ipp->netmask))
53918+ found = 1;
53919+ }
53920+ } else
53921+ found = 2;
53922+ if (!found)
53923+ return 0;
53924+
53925+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
53926+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
53927+ *salt = NULL;
53928+ *sum = NULL;
53929+ return 1;
53930+ }
53931+ }
53932+ FOR_EACH_ROLE_END(r)
53933+
53934+ for (i = 0; i < num_sprole_pws; i++) {
53935+ if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
53936+ *salt = acl_special_roles[i]->salt;
53937+ *sum = acl_special_roles[i]->sum;
53938+ return 1;
53939+ }
53940+ }
53941+
53942+ return 0;
53943+}
53944+
53945+static void
53946+assign_special_role(char *rolename)
53947+{
53948+ struct acl_object_label *obj;
53949+ struct acl_role_label *r;
53950+ struct acl_role_label *assigned = NULL;
53951+ struct task_struct *tsk;
53952+ struct file *filp;
53953+
53954+ FOR_EACH_ROLE_START(r)
53955+ if (!strcmp(rolename, r->rolename) &&
53956+ (r->roletype & GR_ROLE_SPECIAL)) {
53957+ assigned = r;
53958+ break;
53959+ }
53960+ FOR_EACH_ROLE_END(r)
53961+
53962+ if (!assigned)
53963+ return;
53964+
53965+ read_lock(&tasklist_lock);
53966+ read_lock(&grsec_exec_file_lock);
53967+
53968+ tsk = current->real_parent;
53969+ if (tsk == NULL)
53970+ goto out_unlock;
53971+
53972+ filp = tsk->exec_file;
53973+ if (filp == NULL)
53974+ goto out_unlock;
53975+
53976+ tsk->is_writable = 0;
53977+
53978+ tsk->acl_sp_role = 1;
53979+ tsk->acl_role_id = ++acl_sp_role_value;
53980+ tsk->role = assigned;
53981+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
53982+
53983+ /* ignore additional mmap checks for processes that are writable
53984+ by the default ACL */
53985+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
53986+ if (unlikely(obj->mode & GR_WRITE))
53987+ tsk->is_writable = 1;
53988+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
53989+ if (unlikely(obj->mode & GR_WRITE))
53990+ tsk->is_writable = 1;
53991+
53992+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53993+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
53994+#endif
53995+
53996+out_unlock:
53997+ read_unlock(&grsec_exec_file_lock);
53998+ read_unlock(&tasklist_lock);
53999+ return;
54000+}
54001+
54002+int gr_check_secure_terminal(struct task_struct *task)
54003+{
54004+ struct task_struct *p, *p2, *p3;
54005+ struct files_struct *files;
54006+ struct fdtable *fdt;
54007+ struct file *our_file = NULL, *file;
54008+ int i;
54009+
54010+ if (task->signal->tty == NULL)
54011+ return 1;
54012+
54013+ files = get_files_struct(task);
54014+ if (files != NULL) {
54015+ rcu_read_lock();
54016+ fdt = files_fdtable(files);
54017+ for (i=0; i < fdt->max_fds; i++) {
54018+ file = fcheck_files(files, i);
54019+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
54020+ get_file(file);
54021+ our_file = file;
54022+ }
54023+ }
54024+ rcu_read_unlock();
54025+ put_files_struct(files);
54026+ }
54027+
54028+ if (our_file == NULL)
54029+ return 1;
54030+
54031+ read_lock(&tasklist_lock);
54032+ do_each_thread(p2, p) {
54033+ files = get_files_struct(p);
54034+ if (files == NULL ||
54035+ (p->signal && p->signal->tty == task->signal->tty)) {
54036+ if (files != NULL)
54037+ put_files_struct(files);
54038+ continue;
54039+ }
54040+ rcu_read_lock();
54041+ fdt = files_fdtable(files);
54042+ for (i=0; i < fdt->max_fds; i++) {
54043+ file = fcheck_files(files, i);
54044+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
54045+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
54046+ p3 = task;
54047+ while (p3->pid > 0) {
54048+ if (p3 == p)
54049+ break;
54050+ p3 = p3->real_parent;
54051+ }
54052+ if (p3 == p)
54053+ break;
54054+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
54055+ gr_handle_alertkill(p);
54056+ rcu_read_unlock();
54057+ put_files_struct(files);
54058+ read_unlock(&tasklist_lock);
54059+ fput(our_file);
54060+ return 0;
54061+ }
54062+ }
54063+ rcu_read_unlock();
54064+ put_files_struct(files);
54065+ } while_each_thread(p2, p);
54066+ read_unlock(&tasklist_lock);
54067+
54068+ fput(our_file);
54069+ return 1;
54070+}
54071+
54072+ssize_t
54073+write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos)
54074+{
54075+ struct gr_arg_wrapper uwrap;
54076+ unsigned char *sprole_salt = NULL;
54077+ unsigned char *sprole_sum = NULL;
54078+ int error = sizeof (struct gr_arg_wrapper);
54079+ int error2 = 0;
54080+
54081+ mutex_lock(&gr_dev_mutex);
54082+
54083+ if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
54084+ error = -EPERM;
54085+ goto out;
54086+ }
54087+
54088+ if (count != sizeof (struct gr_arg_wrapper)) {
54089+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)sizeof(struct gr_arg_wrapper));
54090+ error = -EINVAL;
54091+ goto out;
54092+ }
54093+
54094+
54095+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
54096+ gr_auth_expires = 0;
54097+ gr_auth_attempts = 0;
54098+ }
54099+
54100+ if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
54101+ error = -EFAULT;
54102+ goto out;
54103+ }
54104+
54105+ if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
54106+ error = -EINVAL;
54107+ goto out;
54108+ }
54109+
54110+ if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
54111+ error = -EFAULT;
54112+ goto out;
54113+ }
54114+
54115+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
54116+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
54117+ time_after(gr_auth_expires, get_seconds())) {
54118+ error = -EBUSY;
54119+ goto out;
54120+ }
54121+
54122+ /* if non-root trying to do anything other than use a special role,
54123+ do not attempt authentication, do not count towards authentication
54124+ locking
54125+ */
54126+
54127+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
54128+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
54129+ current_uid()) {
54130+ error = -EPERM;
54131+ goto out;
54132+ }
54133+
54134+ /* ensure pw and special role name are null terminated */
54135+
54136+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
54137+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
54138+
54139+ /* Okay.
54140+ * We have our enough of the argument structure..(we have yet
54141+ * to copy_from_user the tables themselves) . Copy the tables
54142+ * only if we need them, i.e. for loading operations. */
54143+
54144+ switch (gr_usermode->mode) {
54145+ case GR_STATUS:
54146+ if (gr_status & GR_READY) {
54147+ error = 1;
54148+ if (!gr_check_secure_terminal(current))
54149+ error = 3;
54150+ } else
54151+ error = 2;
54152+ goto out;
54153+ case GR_SHUTDOWN:
54154+ if ((gr_status & GR_READY)
54155+ && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54156+ pax_open_kernel();
54157+ gr_status &= ~GR_READY;
54158+ pax_close_kernel();
54159+
54160+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
54161+ free_variables();
54162+ memset(gr_usermode, 0, sizeof (struct gr_arg));
54163+ memset(gr_system_salt, 0, GR_SALT_LEN);
54164+ memset(gr_system_sum, 0, GR_SHA_LEN);
54165+ } else if (gr_status & GR_READY) {
54166+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
54167+ error = -EPERM;
54168+ } else {
54169+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
54170+ error = -EAGAIN;
54171+ }
54172+ break;
54173+ case GR_ENABLE:
54174+ if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
54175+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
54176+ else {
54177+ if (gr_status & GR_READY)
54178+ error = -EAGAIN;
54179+ else
54180+ error = error2;
54181+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
54182+ }
54183+ break;
54184+ case GR_RELOAD:
54185+ if (!(gr_status & GR_READY)) {
54186+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
54187+ error = -EAGAIN;
54188+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54189+ preempt_disable();
54190+
54191+ pax_open_kernel();
54192+ gr_status &= ~GR_READY;
54193+ pax_close_kernel();
54194+
54195+ free_variables();
54196+ if (!(error2 = gracl_init(gr_usermode))) {
54197+ preempt_enable();
54198+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
54199+ } else {
54200+ preempt_enable();
54201+ error = error2;
54202+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
54203+ }
54204+ } else {
54205+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
54206+ error = -EPERM;
54207+ }
54208+ break;
54209+ case GR_SEGVMOD:
54210+ if (unlikely(!(gr_status & GR_READY))) {
54211+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
54212+ error = -EAGAIN;
54213+ break;
54214+ }
54215+
54216+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54217+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
54218+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
54219+ struct acl_subject_label *segvacl;
54220+ segvacl =
54221+ lookup_acl_subj_label(gr_usermode->segv_inode,
54222+ gr_usermode->segv_device,
54223+ current->role);
54224+ if (segvacl) {
54225+ segvacl->crashes = 0;
54226+ segvacl->expires = 0;
54227+ }
54228+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
54229+ gr_remove_uid(gr_usermode->segv_uid);
54230+ }
54231+ } else {
54232+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
54233+ error = -EPERM;
54234+ }
54235+ break;
54236+ case GR_SPROLE:
54237+ case GR_SPROLEPAM:
54238+ if (unlikely(!(gr_status & GR_READY))) {
54239+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
54240+ error = -EAGAIN;
54241+ break;
54242+ }
54243+
54244+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
54245+ current->role->expires = 0;
54246+ current->role->auth_attempts = 0;
54247+ }
54248+
54249+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
54250+ time_after(current->role->expires, get_seconds())) {
54251+ error = -EBUSY;
54252+ goto out;
54253+ }
54254+
54255+ if (lookup_special_role_auth
54256+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
54257+ && ((!sprole_salt && !sprole_sum)
54258+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
54259+ char *p = "";
54260+ assign_special_role(gr_usermode->sp_role);
54261+ read_lock(&tasklist_lock);
54262+ if (current->real_parent)
54263+ p = current->real_parent->role->rolename;
54264+ read_unlock(&tasklist_lock);
54265+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
54266+ p, acl_sp_role_value);
54267+ } else {
54268+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
54269+ error = -EPERM;
54270+ if(!(current->role->auth_attempts++))
54271+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
54272+
54273+ goto out;
54274+ }
54275+ break;
54276+ case GR_UNSPROLE:
54277+ if (unlikely(!(gr_status & GR_READY))) {
54278+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
54279+ error = -EAGAIN;
54280+ break;
54281+ }
54282+
54283+ if (current->role->roletype & GR_ROLE_SPECIAL) {
54284+ char *p = "";
54285+ int i = 0;
54286+
54287+ read_lock(&tasklist_lock);
54288+ if (current->real_parent) {
54289+ p = current->real_parent->role->rolename;
54290+ i = current->real_parent->acl_role_id;
54291+ }
54292+ read_unlock(&tasklist_lock);
54293+
54294+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
54295+ gr_set_acls(1);
54296+ } else {
54297+ error = -EPERM;
54298+ goto out;
54299+ }
54300+ break;
54301+ default:
54302+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
54303+ error = -EINVAL;
54304+ break;
54305+ }
54306+
54307+ if (error != -EPERM)
54308+ goto out;
54309+
54310+ if(!(gr_auth_attempts++))
54311+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
54312+
54313+ out:
54314+ mutex_unlock(&gr_dev_mutex);
54315+ return error;
54316+}
54317+
54318+/* must be called with
54319+ rcu_read_lock();
54320+ read_lock(&tasklist_lock);
54321+ read_lock(&grsec_exec_file_lock);
54322+*/
54323+int gr_apply_subject_to_task(struct task_struct *task)
54324+{
54325+ struct acl_object_label *obj;
54326+ char *tmpname;
54327+ struct acl_subject_label *tmpsubj;
54328+ struct file *filp;
54329+ struct name_entry *nmatch;
54330+
54331+ filp = task->exec_file;
54332+ if (filp == NULL)
54333+ return 0;
54334+
54335+ /* the following is to apply the correct subject
54336+ on binaries running when the RBAC system
54337+ is enabled, when the binaries have been
54338+ replaced or deleted since their execution
54339+ -----
54340+ when the RBAC system starts, the inode/dev
54341+ from exec_file will be one the RBAC system
54342+ is unaware of. It only knows the inode/dev
54343+ of the present file on disk, or the absence
54344+ of it.
54345+ */
54346+ preempt_disable();
54347+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
54348+
54349+ nmatch = lookup_name_entry(tmpname);
54350+ preempt_enable();
54351+ tmpsubj = NULL;
54352+ if (nmatch) {
54353+ if (nmatch->deleted)
54354+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
54355+ else
54356+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
54357+ if (tmpsubj != NULL)
54358+ task->acl = tmpsubj;
54359+ }
54360+ if (tmpsubj == NULL)
54361+ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
54362+ task->role);
54363+ if (task->acl) {
54364+ task->is_writable = 0;
54365+ /* ignore additional mmap checks for processes that are writable
54366+ by the default ACL */
54367+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54368+ if (unlikely(obj->mode & GR_WRITE))
54369+ task->is_writable = 1;
54370+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
54371+ if (unlikely(obj->mode & GR_WRITE))
54372+ task->is_writable = 1;
54373+
54374+ gr_set_proc_res(task);
54375+
54376+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
54377+ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
54378+#endif
54379+ } else {
54380+ return 1;
54381+ }
54382+
54383+ return 0;
54384+}
54385+
54386+int
54387+gr_set_acls(const int type)
54388+{
54389+ struct task_struct *task, *task2;
54390+ struct acl_role_label *role = current->role;
54391+ __u16 acl_role_id = current->acl_role_id;
54392+ const struct cred *cred;
54393+ int ret;
54394+
54395+ rcu_read_lock();
54396+ read_lock(&tasklist_lock);
54397+ read_lock(&grsec_exec_file_lock);
54398+ do_each_thread(task2, task) {
54399+ /* check to see if we're called from the exit handler,
54400+ if so, only replace ACLs that have inherited the admin
54401+ ACL */
54402+
54403+ if (type && (task->role != role ||
54404+ task->acl_role_id != acl_role_id))
54405+ continue;
54406+
54407+ task->acl_role_id = 0;
54408+ task->acl_sp_role = 0;
54409+
54410+ if (task->exec_file) {
54411+ cred = __task_cred(task);
54412+ task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
54413+ ret = gr_apply_subject_to_task(task);
54414+ if (ret) {
54415+ read_unlock(&grsec_exec_file_lock);
54416+ read_unlock(&tasklist_lock);
54417+ rcu_read_unlock();
54418+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
54419+ return ret;
54420+ }
54421+ } else {
54422+ // it's a kernel process
54423+ task->role = kernel_role;
54424+ task->acl = kernel_role->root_label;
54425+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
54426+ task->acl->mode &= ~GR_PROCFIND;
54427+#endif
54428+ }
54429+ } while_each_thread(task2, task);
54430+ read_unlock(&grsec_exec_file_lock);
54431+ read_unlock(&tasklist_lock);
54432+ rcu_read_unlock();
54433+
54434+ return 0;
54435+}
54436+
54437+void
54438+gr_learn_resource(const struct task_struct *task,
54439+ const int res, const unsigned long wanted, const int gt)
54440+{
54441+ struct acl_subject_label *acl;
54442+ const struct cred *cred;
54443+
54444+ if (unlikely((gr_status & GR_READY) &&
54445+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
54446+ goto skip_reslog;
54447+
54448+#ifdef CONFIG_GRKERNSEC_RESLOG
54449+ gr_log_resource(task, res, wanted, gt);
54450+#endif
54451+ skip_reslog:
54452+
54453+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
54454+ return;
54455+
54456+ acl = task->acl;
54457+
54458+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
54459+ !(acl->resmask & (1 << (unsigned short) res))))
54460+ return;
54461+
54462+ if (wanted >= acl->res[res].rlim_cur) {
54463+ unsigned long res_add;
54464+
54465+ res_add = wanted;
54466+ switch (res) {
54467+ case RLIMIT_CPU:
54468+ res_add += GR_RLIM_CPU_BUMP;
54469+ break;
54470+ case RLIMIT_FSIZE:
54471+ res_add += GR_RLIM_FSIZE_BUMP;
54472+ break;
54473+ case RLIMIT_DATA:
54474+ res_add += GR_RLIM_DATA_BUMP;
54475+ break;
54476+ case RLIMIT_STACK:
54477+ res_add += GR_RLIM_STACK_BUMP;
54478+ break;
54479+ case RLIMIT_CORE:
54480+ res_add += GR_RLIM_CORE_BUMP;
54481+ break;
54482+ case RLIMIT_RSS:
54483+ res_add += GR_RLIM_RSS_BUMP;
54484+ break;
54485+ case RLIMIT_NPROC:
54486+ res_add += GR_RLIM_NPROC_BUMP;
54487+ break;
54488+ case RLIMIT_NOFILE:
54489+ res_add += GR_RLIM_NOFILE_BUMP;
54490+ break;
54491+ case RLIMIT_MEMLOCK:
54492+ res_add += GR_RLIM_MEMLOCK_BUMP;
54493+ break;
54494+ case RLIMIT_AS:
54495+ res_add += GR_RLIM_AS_BUMP;
54496+ break;
54497+ case RLIMIT_LOCKS:
54498+ res_add += GR_RLIM_LOCKS_BUMP;
54499+ break;
54500+ case RLIMIT_SIGPENDING:
54501+ res_add += GR_RLIM_SIGPENDING_BUMP;
54502+ break;
54503+ case RLIMIT_MSGQUEUE:
54504+ res_add += GR_RLIM_MSGQUEUE_BUMP;
54505+ break;
54506+ case RLIMIT_NICE:
54507+ res_add += GR_RLIM_NICE_BUMP;
54508+ break;
54509+ case RLIMIT_RTPRIO:
54510+ res_add += GR_RLIM_RTPRIO_BUMP;
54511+ break;
54512+ case RLIMIT_RTTIME:
54513+ res_add += GR_RLIM_RTTIME_BUMP;
54514+ break;
54515+ }
54516+
54517+ acl->res[res].rlim_cur = res_add;
54518+
54519+ if (wanted > acl->res[res].rlim_max)
54520+ acl->res[res].rlim_max = res_add;
54521+
54522+ /* only log the subject filename, since resource logging is supported for
54523+ single-subject learning only */
54524+ rcu_read_lock();
54525+ cred = __task_cred(task);
54526+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
54527+ task->role->roletype, cred->uid, cred->gid, acl->filename,
54528+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
54529+ "", (unsigned long) res, &task->signal->saved_ip);
54530+ rcu_read_unlock();
54531+ }
54532+
54533+ return;
54534+}
54535+
54536+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
54537+void
54538+pax_set_initial_flags(struct linux_binprm *bprm)
54539+{
54540+ struct task_struct *task = current;
54541+ struct acl_subject_label *proc;
54542+ unsigned long flags;
54543+
54544+ if (unlikely(!(gr_status & GR_READY)))
54545+ return;
54546+
54547+ flags = pax_get_flags(task);
54548+
54549+ proc = task->acl;
54550+
54551+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
54552+ flags &= ~MF_PAX_PAGEEXEC;
54553+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
54554+ flags &= ~MF_PAX_SEGMEXEC;
54555+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
54556+ flags &= ~MF_PAX_RANDMMAP;
54557+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
54558+ flags &= ~MF_PAX_EMUTRAMP;
54559+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
54560+ flags &= ~MF_PAX_MPROTECT;
54561+
54562+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
54563+ flags |= MF_PAX_PAGEEXEC;
54564+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
54565+ flags |= MF_PAX_SEGMEXEC;
54566+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
54567+ flags |= MF_PAX_RANDMMAP;
54568+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
54569+ flags |= MF_PAX_EMUTRAMP;
54570+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
54571+ flags |= MF_PAX_MPROTECT;
54572+
54573+ pax_set_flags(task, flags);
54574+
54575+ return;
54576+}
54577+#endif
54578+
54579+#ifdef CONFIG_SYSCTL
54580+/* Eric Biederman likes breaking userland ABI and every inode-based security
54581+ system to save 35kb of memory */
54582+
54583+/* we modify the passed in filename, but adjust it back before returning */
54584+static struct acl_object_label *gr_lookup_by_name(char *name, unsigned int len)
54585+{
54586+ struct name_entry *nmatch;
54587+ char *p, *lastp = NULL;
54588+ struct acl_object_label *obj = NULL, *tmp;
54589+ struct acl_subject_label *tmpsubj;
54590+ char c = '\0';
54591+
54592+ read_lock(&gr_inode_lock);
54593+
54594+ p = name + len - 1;
54595+ do {
54596+ nmatch = lookup_name_entry(name);
54597+ if (lastp != NULL)
54598+ *lastp = c;
54599+
54600+ if (nmatch == NULL)
54601+ goto next_component;
54602+ tmpsubj = current->acl;
54603+ do {
54604+ obj = lookup_acl_obj_label(nmatch->inode, nmatch->device, tmpsubj);
54605+ if (obj != NULL) {
54606+ tmp = obj->globbed;
54607+ while (tmp) {
54608+ if (!glob_match(tmp->filename, name)) {
54609+ obj = tmp;
54610+ goto found_obj;
54611+ }
54612+ tmp = tmp->next;
54613+ }
54614+ goto found_obj;
54615+ }
54616+ } while ((tmpsubj = tmpsubj->parent_subject));
54617+next_component:
54618+ /* end case */
54619+ if (p == name)
54620+ break;
54621+
54622+ while (*p != '/')
54623+ p--;
54624+ if (p == name)
54625+ lastp = p + 1;
54626+ else {
54627+ lastp = p;
54628+ p--;
54629+ }
54630+ c = *lastp;
54631+ *lastp = '\0';
54632+ } while (1);
54633+found_obj:
54634+ read_unlock(&gr_inode_lock);
54635+ /* obj returned will always be non-null */
54636+ return obj;
54637+}
54638+
54639+/* returns 0 when allowing, non-zero on error
54640+ op of 0 is used for readdir, so we don't log the names of hidden files
54641+*/
54642+__u32
54643+gr_handle_sysctl(const struct ctl_table *table, const int op)
54644+{
54645+ struct ctl_table *tmp;
54646+ const char *proc_sys = "/proc/sys";
54647+ char *path;
54648+ struct acl_object_label *obj;
54649+ unsigned short len = 0, pos = 0, depth = 0, i;
54650+ __u32 err = 0;
54651+ __u32 mode = 0;
54652+
54653+ if (unlikely(!(gr_status & GR_READY)))
54654+ return 0;
54655+
54656+ /* for now, ignore operations on non-sysctl entries if it's not a
54657+ readdir*/
54658+ if (table->child != NULL && op != 0)
54659+ return 0;
54660+
54661+ mode |= GR_FIND;
54662+ /* it's only a read if it's an entry, read on dirs is for readdir */
54663+ if (op & MAY_READ)
54664+ mode |= GR_READ;
54665+ if (op & MAY_WRITE)
54666+ mode |= GR_WRITE;
54667+
54668+ preempt_disable();
54669+
54670+ path = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
54671+
54672+ /* it's only a read/write if it's an actual entry, not a dir
54673+ (which are opened for readdir)
54674+ */
54675+
54676+ /* convert the requested sysctl entry into a pathname */
54677+
54678+ for (tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
54679+ len += strlen(tmp->procname);
54680+ len++;
54681+ depth++;
54682+ }
54683+
54684+ if ((len + depth + strlen(proc_sys) + 1) > PAGE_SIZE) {
54685+ /* deny */
54686+ goto out;
54687+ }
54688+
54689+ memset(path, 0, PAGE_SIZE);
54690+
54691+ memcpy(path, proc_sys, strlen(proc_sys));
54692+
54693+ pos += strlen(proc_sys);
54694+
54695+ for (; depth > 0; depth--) {
54696+ path[pos] = '/';
54697+ pos++;
54698+ for (i = 1, tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
54699+ if (depth == i) {
54700+ memcpy(path + pos, tmp->procname,
54701+ strlen(tmp->procname));
54702+ pos += strlen(tmp->procname);
54703+ }
54704+ i++;
54705+ }
54706+ }
54707+
54708+ obj = gr_lookup_by_name(path, pos);
54709+ err = obj->mode & (mode | to_gr_audit(mode) | GR_SUPPRESS);
54710+
54711+ if (unlikely((current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) &&
54712+ ((err & mode) != mode))) {
54713+ __u32 new_mode = mode;
54714+
54715+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
54716+
54717+ err = 0;
54718+ gr_log_learn_sysctl(path, new_mode);
54719+ } else if (!(err & GR_FIND) && !(err & GR_SUPPRESS) && op != 0) {
54720+ gr_log_hidden_sysctl(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, path);
54721+ err = -ENOENT;
54722+ } else if (!(err & GR_FIND)) {
54723+ err = -ENOENT;
54724+ } else if (((err & mode) & ~GR_FIND) != (mode & ~GR_FIND) && !(err & GR_SUPPRESS)) {
54725+ gr_log_str4(GR_DONT_AUDIT, GR_SYSCTL_ACL_MSG, "denied",
54726+ path, (mode & GR_READ) ? " reading" : "",
54727+ (mode & GR_WRITE) ? " writing" : "");
54728+ err = -EACCES;
54729+ } else if ((err & mode) != mode) {
54730+ err = -EACCES;
54731+ } else if ((((err & mode) & ~GR_FIND) == (mode & ~GR_FIND)) && (err & GR_AUDITS)) {
54732+ gr_log_str4(GR_DO_AUDIT, GR_SYSCTL_ACL_MSG, "successful",
54733+ path, (mode & GR_READ) ? " reading" : "",
54734+ (mode & GR_WRITE) ? " writing" : "");
54735+ err = 0;
54736+ } else
54737+ err = 0;
54738+
54739+ out:
54740+ preempt_enable();
54741+
54742+ return err;
54743+}
54744+#endif
54745+
54746+int
54747+gr_handle_proc_ptrace(struct task_struct *task)
54748+{
54749+ struct file *filp;
54750+ struct task_struct *tmp = task;
54751+ struct task_struct *curtemp = current;
54752+ __u32 retmode;
54753+
54754+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54755+ if (unlikely(!(gr_status & GR_READY)))
54756+ return 0;
54757+#endif
54758+
54759+ read_lock(&tasklist_lock);
54760+ read_lock(&grsec_exec_file_lock);
54761+ filp = task->exec_file;
54762+
54763+ while (tmp->pid > 0) {
54764+ if (tmp == curtemp)
54765+ break;
54766+ tmp = tmp->real_parent;
54767+ }
54768+
54769+ if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
54770+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
54771+ read_unlock(&grsec_exec_file_lock);
54772+ read_unlock(&tasklist_lock);
54773+ return 1;
54774+ }
54775+
54776+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54777+ if (!(gr_status & GR_READY)) {
54778+ read_unlock(&grsec_exec_file_lock);
54779+ read_unlock(&tasklist_lock);
54780+ return 0;
54781+ }
54782+#endif
54783+
54784+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
54785+ read_unlock(&grsec_exec_file_lock);
54786+ read_unlock(&tasklist_lock);
54787+
54788+ if (retmode & GR_NOPTRACE)
54789+ return 1;
54790+
54791+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
54792+ && (current->acl != task->acl || (current->acl != current->role->root_label
54793+ && current->pid != task->pid)))
54794+ return 1;
54795+
54796+ return 0;
54797+}
54798+
54799+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
54800+{
54801+ if (unlikely(!(gr_status & GR_READY)))
54802+ return;
54803+
54804+ if (!(current->role->roletype & GR_ROLE_GOD))
54805+ return;
54806+
54807+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
54808+ p->role->rolename, gr_task_roletype_to_char(p),
54809+ p->acl->filename);
54810+}
54811+
54812+int
54813+gr_handle_ptrace(struct task_struct *task, const long request)
54814+{
54815+ struct task_struct *tmp = task;
54816+ struct task_struct *curtemp = current;
54817+ __u32 retmode;
54818+
54819+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54820+ if (unlikely(!(gr_status & GR_READY)))
54821+ return 0;
54822+#endif
54823+
54824+ read_lock(&tasklist_lock);
54825+ while (tmp->pid > 0) {
54826+ if (tmp == curtemp)
54827+ break;
54828+ tmp = tmp->real_parent;
54829+ }
54830+
54831+ if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
54832+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
54833+ read_unlock(&tasklist_lock);
54834+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54835+ return 1;
54836+ }
54837+ read_unlock(&tasklist_lock);
54838+
54839+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54840+ if (!(gr_status & GR_READY))
54841+ return 0;
54842+#endif
54843+
54844+ read_lock(&grsec_exec_file_lock);
54845+ if (unlikely(!task->exec_file)) {
54846+ read_unlock(&grsec_exec_file_lock);
54847+ return 0;
54848+ }
54849+
54850+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
54851+ read_unlock(&grsec_exec_file_lock);
54852+
54853+ if (retmode & GR_NOPTRACE) {
54854+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54855+ return 1;
54856+ }
54857+
54858+ if (retmode & GR_PTRACERD) {
54859+ switch (request) {
54860+ case PTRACE_SEIZE:
54861+ case PTRACE_POKETEXT:
54862+ case PTRACE_POKEDATA:
54863+ case PTRACE_POKEUSR:
54864+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
54865+ case PTRACE_SETREGS:
54866+ case PTRACE_SETFPREGS:
54867+#endif
54868+#ifdef CONFIG_X86
54869+ case PTRACE_SETFPXREGS:
54870+#endif
54871+#ifdef CONFIG_ALTIVEC
54872+ case PTRACE_SETVRREGS:
54873+#endif
54874+ return 1;
54875+ default:
54876+ return 0;
54877+ }
54878+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
54879+ !(current->role->roletype & GR_ROLE_GOD) &&
54880+ (current->acl != task->acl)) {
54881+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54882+ return 1;
54883+ }
54884+
54885+ return 0;
54886+}
54887+
54888+static int is_writable_mmap(const struct file *filp)
54889+{
54890+ struct task_struct *task = current;
54891+ struct acl_object_label *obj, *obj2;
54892+
54893+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
54894+ !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))) {
54895+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54896+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
54897+ task->role->root_label);
54898+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
54899+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
54900+ return 1;
54901+ }
54902+ }
54903+ return 0;
54904+}
54905+
54906+int
54907+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
54908+{
54909+ __u32 mode;
54910+
54911+ if (unlikely(!file || !(prot & PROT_EXEC)))
54912+ return 1;
54913+
54914+ if (is_writable_mmap(file))
54915+ return 0;
54916+
54917+ mode =
54918+ gr_search_file(file->f_path.dentry,
54919+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
54920+ file->f_path.mnt);
54921+
54922+ if (!gr_tpe_allow(file))
54923+ return 0;
54924+
54925+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
54926+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54927+ return 0;
54928+ } else if (unlikely(!(mode & GR_EXEC))) {
54929+ return 0;
54930+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
54931+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54932+ return 1;
54933+ }
54934+
54935+ return 1;
54936+}
54937+
54938+int
54939+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
54940+{
54941+ __u32 mode;
54942+
54943+ if (unlikely(!file || !(prot & PROT_EXEC)))
54944+ return 1;
54945+
54946+ if (is_writable_mmap(file))
54947+ return 0;
54948+
54949+ mode =
54950+ gr_search_file(file->f_path.dentry,
54951+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
54952+ file->f_path.mnt);
54953+
54954+ if (!gr_tpe_allow(file))
54955+ return 0;
54956+
54957+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
54958+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54959+ return 0;
54960+ } else if (unlikely(!(mode & GR_EXEC))) {
54961+ return 0;
54962+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
54963+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54964+ return 1;
54965+ }
54966+
54967+ return 1;
54968+}
54969+
54970+void
54971+gr_acl_handle_psacct(struct task_struct *task, const long code)
54972+{
54973+ unsigned long runtime;
54974+ unsigned long cputime;
54975+ unsigned int wday, cday;
54976+ __u8 whr, chr;
54977+ __u8 wmin, cmin;
54978+ __u8 wsec, csec;
54979+ struct timespec timeval;
54980+
54981+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
54982+ !(task->acl->mode & GR_PROCACCT)))
54983+ return;
54984+
54985+ do_posix_clock_monotonic_gettime(&timeval);
54986+ runtime = timeval.tv_sec - task->start_time.tv_sec;
54987+ wday = runtime / (3600 * 24);
54988+ runtime -= wday * (3600 * 24);
54989+ whr = runtime / 3600;
54990+ runtime -= whr * 3600;
54991+ wmin = runtime / 60;
54992+ runtime -= wmin * 60;
54993+ wsec = runtime;
54994+
54995+ cputime = (task->utime + task->stime) / HZ;
54996+ cday = cputime / (3600 * 24);
54997+ cputime -= cday * (3600 * 24);
54998+ chr = cputime / 3600;
54999+ cputime -= chr * 3600;
55000+ cmin = cputime / 60;
55001+ cputime -= cmin * 60;
55002+ csec = cputime;
55003+
55004+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
55005+
55006+ return;
55007+}
55008+
55009+void gr_set_kernel_label(struct task_struct *task)
55010+{
55011+ if (gr_status & GR_READY) {
55012+ task->role = kernel_role;
55013+ task->acl = kernel_role->root_label;
55014+ }
55015+ return;
55016+}
55017+
55018+#ifdef CONFIG_TASKSTATS
55019+int gr_is_taskstats_denied(int pid)
55020+{
55021+ struct task_struct *task;
55022+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
55023+ const struct cred *cred;
55024+#endif
55025+ int ret = 0;
55026+
55027+ /* restrict taskstats viewing to un-chrooted root users
55028+ who have the 'view' subject flag if the RBAC system is enabled
55029+ */
55030+
55031+ rcu_read_lock();
55032+ read_lock(&tasklist_lock);
55033+ task = find_task_by_vpid(pid);
55034+ if (task) {
55035+#ifdef CONFIG_GRKERNSEC_CHROOT
55036+ if (proc_is_chrooted(task))
55037+ ret = -EACCES;
55038+#endif
55039+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
55040+ cred = __task_cred(task);
55041+#ifdef CONFIG_GRKERNSEC_PROC_USER
55042+ if (cred->uid != 0)
55043+ ret = -EACCES;
55044+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
55045+ if (cred->uid != 0 && !groups_search(cred->group_info, CONFIG_GRKERNSEC_PROC_GID))
55046+ ret = -EACCES;
55047+#endif
55048+#endif
55049+ if (gr_status & GR_READY) {
55050+ if (!(task->acl->mode & GR_VIEW))
55051+ ret = -EACCES;
55052+ }
55053+ } else
55054+ ret = -ENOENT;
55055+
55056+ read_unlock(&tasklist_lock);
55057+ rcu_read_unlock();
55058+
55059+ return ret;
55060+}
55061+#endif
55062+
55063+/* AUXV entries are filled via a descendant of search_binary_handler
55064+ after we've already applied the subject for the target
55065+*/
55066+int gr_acl_enable_at_secure(void)
55067+{
55068+ if (unlikely(!(gr_status & GR_READY)))
55069+ return 0;
55070+
55071+ if (current->acl->mode & GR_ATSECURE)
55072+ return 1;
55073+
55074+ return 0;
55075+}
55076+
55077+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
55078+{
55079+ struct task_struct *task = current;
55080+ struct dentry *dentry = file->f_path.dentry;
55081+ struct vfsmount *mnt = file->f_path.mnt;
55082+ struct acl_object_label *obj, *tmp;
55083+ struct acl_subject_label *subj;
55084+ unsigned int bufsize;
55085+ int is_not_root;
55086+ char *path;
55087+ dev_t dev = __get_dev(dentry);
55088+
55089+ if (unlikely(!(gr_status & GR_READY)))
55090+ return 1;
55091+
55092+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
55093+ return 1;
55094+
55095+ /* ignore Eric Biederman */
55096+ if (IS_PRIVATE(dentry->d_inode))
55097+ return 1;
55098+
55099+ subj = task->acl;
55100+ do {
55101+ obj = lookup_acl_obj_label(ino, dev, subj);
55102+ if (obj != NULL)
55103+ return (obj->mode & GR_FIND) ? 1 : 0;
55104+ } while ((subj = subj->parent_subject));
55105+
55106+ /* this is purely an optimization since we're looking for an object
55107+ for the directory we're doing a readdir on
55108+ if it's possible for any globbed object to match the entry we're
55109+ filling into the directory, then the object we find here will be
55110+ an anchor point with attached globbed objects
55111+ */
55112+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
55113+ if (obj->globbed == NULL)
55114+ return (obj->mode & GR_FIND) ? 1 : 0;
55115+
55116+ is_not_root = ((obj->filename[0] == '/') &&
55117+ (obj->filename[1] == '\0')) ? 0 : 1;
55118+ bufsize = PAGE_SIZE - namelen - is_not_root;
55119+
55120+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
55121+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
55122+ return 1;
55123+
55124+ preempt_disable();
55125+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
55126+ bufsize);
55127+
55128+ bufsize = strlen(path);
55129+
55130+ /* if base is "/", don't append an additional slash */
55131+ if (is_not_root)
55132+ *(path + bufsize) = '/';
55133+ memcpy(path + bufsize + is_not_root, name, namelen);
55134+ *(path + bufsize + namelen + is_not_root) = '\0';
55135+
55136+ tmp = obj->globbed;
55137+ while (tmp) {
55138+ if (!glob_match(tmp->filename, path)) {
55139+ preempt_enable();
55140+ return (tmp->mode & GR_FIND) ? 1 : 0;
55141+ }
55142+ tmp = tmp->next;
55143+ }
55144+ preempt_enable();
55145+ return (obj->mode & GR_FIND) ? 1 : 0;
55146+}
55147+
55148+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
55149+EXPORT_SYMBOL(gr_acl_is_enabled);
55150+#endif
55151+EXPORT_SYMBOL(gr_learn_resource);
55152+EXPORT_SYMBOL(gr_set_kernel_label);
55153+#ifdef CONFIG_SECURITY
55154+EXPORT_SYMBOL(gr_check_user_change);
55155+EXPORT_SYMBOL(gr_check_group_change);
55156+#endif
55157+
55158diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
55159new file mode 100644
55160index 0000000..34fefda
55161--- /dev/null
55162+++ b/grsecurity/gracl_alloc.c
55163@@ -0,0 +1,105 @@
55164+#include <linux/kernel.h>
55165+#include <linux/mm.h>
55166+#include <linux/slab.h>
55167+#include <linux/vmalloc.h>
55168+#include <linux/gracl.h>
55169+#include <linux/grsecurity.h>
55170+
55171+static unsigned long alloc_stack_next = 1;
55172+static unsigned long alloc_stack_size = 1;
55173+static void **alloc_stack;
55174+
55175+static __inline__ int
55176+alloc_pop(void)
55177+{
55178+ if (alloc_stack_next == 1)
55179+ return 0;
55180+
55181+ kfree(alloc_stack[alloc_stack_next - 2]);
55182+
55183+ alloc_stack_next--;
55184+
55185+ return 1;
55186+}
55187+
55188+static __inline__ int
55189+alloc_push(void *buf)
55190+{
55191+ if (alloc_stack_next >= alloc_stack_size)
55192+ return 1;
55193+
55194+ alloc_stack[alloc_stack_next - 1] = buf;
55195+
55196+ alloc_stack_next++;
55197+
55198+ return 0;
55199+}
55200+
55201+void *
55202+acl_alloc(unsigned long len)
55203+{
55204+ void *ret = NULL;
55205+
55206+ if (!len || len > PAGE_SIZE)
55207+ goto out;
55208+
55209+ ret = kmalloc(len, GFP_KERNEL);
55210+
55211+ if (ret) {
55212+ if (alloc_push(ret)) {
55213+ kfree(ret);
55214+ ret = NULL;
55215+ }
55216+ }
55217+
55218+out:
55219+ return ret;
55220+}
55221+
55222+void *
55223+acl_alloc_num(unsigned long num, unsigned long len)
55224+{
55225+ if (!len || (num > (PAGE_SIZE / len)))
55226+ return NULL;
55227+
55228+ return acl_alloc(num * len);
55229+}
55230+
55231+void
55232+acl_free_all(void)
55233+{
55234+ if (gr_acl_is_enabled() || !alloc_stack)
55235+ return;
55236+
55237+ while (alloc_pop()) ;
55238+
55239+ if (alloc_stack) {
55240+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
55241+ kfree(alloc_stack);
55242+ else
55243+ vfree(alloc_stack);
55244+ }
55245+
55246+ alloc_stack = NULL;
55247+ alloc_stack_size = 1;
55248+ alloc_stack_next = 1;
55249+
55250+ return;
55251+}
55252+
55253+int
55254+acl_alloc_stack_init(unsigned long size)
55255+{
55256+ if ((size * sizeof (void *)) <= PAGE_SIZE)
55257+ alloc_stack =
55258+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
55259+ else
55260+ alloc_stack = (void **) vmalloc(size * sizeof (void *));
55261+
55262+ alloc_stack_size = size;
55263+
55264+ if (!alloc_stack)
55265+ return 0;
55266+ else
55267+ return 1;
55268+}
55269diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
55270new file mode 100644
55271index 0000000..6d21049
55272--- /dev/null
55273+++ b/grsecurity/gracl_cap.c
55274@@ -0,0 +1,110 @@
55275+#include <linux/kernel.h>
55276+#include <linux/module.h>
55277+#include <linux/sched.h>
55278+#include <linux/gracl.h>
55279+#include <linux/grsecurity.h>
55280+#include <linux/grinternal.h>
55281+
55282+extern const char *captab_log[];
55283+extern int captab_log_entries;
55284+
55285+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
55286+{
55287+ struct acl_subject_label *curracl;
55288+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
55289+ kernel_cap_t cap_audit = __cap_empty_set;
55290+
55291+ if (!gr_acl_is_enabled())
55292+ return 1;
55293+
55294+ curracl = task->acl;
55295+
55296+ cap_drop = curracl->cap_lower;
55297+ cap_mask = curracl->cap_mask;
55298+ cap_audit = curracl->cap_invert_audit;
55299+
55300+ while ((curracl = curracl->parent_subject)) {
55301+ /* if the cap isn't specified in the current computed mask but is specified in the
55302+ current level subject, and is lowered in the current level subject, then add
55303+ it to the set of dropped capabilities
55304+ otherwise, add the current level subject's mask to the current computed mask
55305+ */
55306+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
55307+ cap_raise(cap_mask, cap);
55308+ if (cap_raised(curracl->cap_lower, cap))
55309+ cap_raise(cap_drop, cap);
55310+ if (cap_raised(curracl->cap_invert_audit, cap))
55311+ cap_raise(cap_audit, cap);
55312+ }
55313+ }
55314+
55315+ if (!cap_raised(cap_drop, cap)) {
55316+ if (cap_raised(cap_audit, cap))
55317+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
55318+ return 1;
55319+ }
55320+
55321+ curracl = task->acl;
55322+
55323+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
55324+ && cap_raised(cred->cap_effective, cap)) {
55325+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
55326+ task->role->roletype, cred->uid,
55327+ cred->gid, task->exec_file ?
55328+ gr_to_filename(task->exec_file->f_path.dentry,
55329+ task->exec_file->f_path.mnt) : curracl->filename,
55330+ curracl->filename, 0UL,
55331+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
55332+ return 1;
55333+ }
55334+
55335+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
55336+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
55337+
55338+ return 0;
55339+}
55340+
55341+int
55342+gr_acl_is_capable(const int cap)
55343+{
55344+ return gr_task_acl_is_capable(current, current_cred(), cap);
55345+}
55346+
55347+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
55348+{
55349+ struct acl_subject_label *curracl;
55350+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
55351+
55352+ if (!gr_acl_is_enabled())
55353+ return 1;
55354+
55355+ curracl = task->acl;
55356+
55357+ cap_drop = curracl->cap_lower;
55358+ cap_mask = curracl->cap_mask;
55359+
55360+ while ((curracl = curracl->parent_subject)) {
55361+ /* if the cap isn't specified in the current computed mask but is specified in the
55362+ current level subject, and is lowered in the current level subject, then add
55363+ it to the set of dropped capabilities
55364+ otherwise, add the current level subject's mask to the current computed mask
55365+ */
55366+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
55367+ cap_raise(cap_mask, cap);
55368+ if (cap_raised(curracl->cap_lower, cap))
55369+ cap_raise(cap_drop, cap);
55370+ }
55371+ }
55372+
55373+ if (!cap_raised(cap_drop, cap))
55374+ return 1;
55375+
55376+ return 0;
55377+}
55378+
55379+int
55380+gr_acl_is_capable_nolog(const int cap)
55381+{
55382+ return gr_task_acl_is_capable_nolog(current, cap);
55383+}
55384+
55385diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
55386new file mode 100644
55387index 0000000..88d0e87
55388--- /dev/null
55389+++ b/grsecurity/gracl_fs.c
55390@@ -0,0 +1,435 @@
55391+#include <linux/kernel.h>
55392+#include <linux/sched.h>
55393+#include <linux/types.h>
55394+#include <linux/fs.h>
55395+#include <linux/file.h>
55396+#include <linux/stat.h>
55397+#include <linux/grsecurity.h>
55398+#include <linux/grinternal.h>
55399+#include <linux/gracl.h>
55400+
55401+umode_t
55402+gr_acl_umask(void)
55403+{
55404+ if (unlikely(!gr_acl_is_enabled()))
55405+ return 0;
55406+
55407+ return current->role->umask;
55408+}
55409+
55410+__u32
55411+gr_acl_handle_hidden_file(const struct dentry * dentry,
55412+ const struct vfsmount * mnt)
55413+{
55414+ __u32 mode;
55415+
55416+ if (unlikely(!dentry->d_inode))
55417+ return GR_FIND;
55418+
55419+ mode =
55420+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
55421+
55422+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
55423+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
55424+ return mode;
55425+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
55426+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
55427+ return 0;
55428+ } else if (unlikely(!(mode & GR_FIND)))
55429+ return 0;
55430+
55431+ return GR_FIND;
55432+}
55433+
55434+__u32
55435+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
55436+ int acc_mode)
55437+{
55438+ __u32 reqmode = GR_FIND;
55439+ __u32 mode;
55440+
55441+ if (unlikely(!dentry->d_inode))
55442+ return reqmode;
55443+
55444+ if (acc_mode & MAY_APPEND)
55445+ reqmode |= GR_APPEND;
55446+ else if (acc_mode & MAY_WRITE)
55447+ reqmode |= GR_WRITE;
55448+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
55449+ reqmode |= GR_READ;
55450+
55451+ mode =
55452+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
55453+ mnt);
55454+
55455+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55456+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
55457+ reqmode & GR_READ ? " reading" : "",
55458+ reqmode & GR_WRITE ? " writing" : reqmode &
55459+ GR_APPEND ? " appending" : "");
55460+ return reqmode;
55461+ } else
55462+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55463+ {
55464+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
55465+ reqmode & GR_READ ? " reading" : "",
55466+ reqmode & GR_WRITE ? " writing" : reqmode &
55467+ GR_APPEND ? " appending" : "");
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_creat(const struct dentry * dentry,
55477+ const struct dentry * p_dentry,
55478+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
55479+ const int imode)
55480+{
55481+ __u32 reqmode = GR_WRITE | GR_CREATE;
55482+ __u32 mode;
55483+
55484+ if (acc_mode & MAY_APPEND)
55485+ reqmode |= GR_APPEND;
55486+ // if a directory was required or the directory already exists, then
55487+ // don't count this open as a read
55488+ if ((acc_mode & MAY_READ) &&
55489+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
55490+ reqmode |= GR_READ;
55491+ if ((open_flags & O_CREAT) && (imode & (S_ISUID | S_ISGID)))
55492+ reqmode |= GR_SETID;
55493+
55494+ mode =
55495+ gr_check_create(dentry, p_dentry, p_mnt,
55496+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
55497+
55498+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55499+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
55500+ reqmode & GR_READ ? " reading" : "",
55501+ reqmode & GR_WRITE ? " writing" : reqmode &
55502+ GR_APPEND ? " appending" : "");
55503+ return reqmode;
55504+ } else
55505+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55506+ {
55507+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
55508+ reqmode & GR_READ ? " reading" : "",
55509+ reqmode & GR_WRITE ? " writing" : reqmode &
55510+ GR_APPEND ? " appending" : "");
55511+ return 0;
55512+ } else if (unlikely((mode & reqmode) != reqmode))
55513+ return 0;
55514+
55515+ return reqmode;
55516+}
55517+
55518+__u32
55519+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
55520+ const int fmode)
55521+{
55522+ __u32 mode, reqmode = GR_FIND;
55523+
55524+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
55525+ reqmode |= GR_EXEC;
55526+ if (fmode & S_IWOTH)
55527+ reqmode |= GR_WRITE;
55528+ if (fmode & S_IROTH)
55529+ reqmode |= GR_READ;
55530+
55531+ mode =
55532+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
55533+ mnt);
55534+
55535+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55536+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
55537+ reqmode & GR_READ ? " reading" : "",
55538+ reqmode & GR_WRITE ? " writing" : "",
55539+ reqmode & GR_EXEC ? " executing" : "");
55540+ return reqmode;
55541+ } else
55542+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55543+ {
55544+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
55545+ reqmode & GR_READ ? " reading" : "",
55546+ reqmode & GR_WRITE ? " writing" : "",
55547+ reqmode & GR_EXEC ? " executing" : "");
55548+ return 0;
55549+ } else if (unlikely((mode & reqmode) != reqmode))
55550+ return 0;
55551+
55552+ return reqmode;
55553+}
55554+
55555+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
55556+{
55557+ __u32 mode;
55558+
55559+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
55560+
55561+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
55562+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
55563+ return mode;
55564+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
55565+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
55566+ return 0;
55567+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
55568+ return 0;
55569+
55570+ return (reqmode);
55571+}
55572+
55573+__u32
55574+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
55575+{
55576+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
55577+}
55578+
55579+__u32
55580+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
55581+{
55582+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
55583+}
55584+
55585+__u32
55586+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
55587+{
55588+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
55589+}
55590+
55591+__u32
55592+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
55593+{
55594+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
55595+}
55596+
55597+__u32
55598+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
55599+ umode_t *modeptr)
55600+{
55601+ umode_t mode;
55602+
55603+ *modeptr &= ~gr_acl_umask();
55604+ mode = *modeptr;
55605+
55606+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
55607+ return 1;
55608+
55609+ if (unlikely(mode & (S_ISUID | S_ISGID))) {
55610+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
55611+ GR_CHMOD_ACL_MSG);
55612+ } else {
55613+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
55614+ }
55615+}
55616+
55617+__u32
55618+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
55619+{
55620+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
55621+}
55622+
55623+__u32
55624+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
55625+{
55626+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
55627+}
55628+
55629+__u32
55630+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
55631+{
55632+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
55633+}
55634+
55635+__u32
55636+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
55637+{
55638+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
55639+ GR_UNIXCONNECT_ACL_MSG);
55640+}
55641+
55642+/* hardlinks require at minimum create and link permission,
55643+ any additional privilege required is based on the
55644+ privilege of the file being linked to
55645+*/
55646+__u32
55647+gr_acl_handle_link(const struct dentry * new_dentry,
55648+ const struct dentry * parent_dentry,
55649+ const struct vfsmount * parent_mnt,
55650+ const struct dentry * old_dentry,
55651+ const struct vfsmount * old_mnt, const char *to)
55652+{
55653+ __u32 mode;
55654+ __u32 needmode = GR_CREATE | GR_LINK;
55655+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
55656+
55657+ mode =
55658+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
55659+ old_mnt);
55660+
55661+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
55662+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
55663+ return mode;
55664+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
55665+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
55666+ return 0;
55667+ } else if (unlikely((mode & needmode) != needmode))
55668+ return 0;
55669+
55670+ return 1;
55671+}
55672+
55673+__u32
55674+gr_acl_handle_symlink(const struct dentry * new_dentry,
55675+ const struct dentry * parent_dentry,
55676+ const struct vfsmount * parent_mnt, const char *from)
55677+{
55678+ __u32 needmode = GR_WRITE | GR_CREATE;
55679+ __u32 mode;
55680+
55681+ mode =
55682+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
55683+ GR_CREATE | GR_AUDIT_CREATE |
55684+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
55685+
55686+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
55687+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55688+ return mode;
55689+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
55690+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55691+ return 0;
55692+ } else if (unlikely((mode & needmode) != needmode))
55693+ return 0;
55694+
55695+ return (GR_WRITE | GR_CREATE);
55696+}
55697+
55698+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)
55699+{
55700+ __u32 mode;
55701+
55702+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
55703+
55704+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
55705+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
55706+ return mode;
55707+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
55708+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
55709+ return 0;
55710+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
55711+ return 0;
55712+
55713+ return (reqmode);
55714+}
55715+
55716+__u32
55717+gr_acl_handle_mknod(const struct dentry * new_dentry,
55718+ const struct dentry * parent_dentry,
55719+ const struct vfsmount * parent_mnt,
55720+ const int mode)
55721+{
55722+ __u32 reqmode = GR_WRITE | GR_CREATE;
55723+ if (unlikely(mode & (S_ISUID | S_ISGID)))
55724+ reqmode |= GR_SETID;
55725+
55726+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55727+ reqmode, GR_MKNOD_ACL_MSG);
55728+}
55729+
55730+__u32
55731+gr_acl_handle_mkdir(const struct dentry *new_dentry,
55732+ const struct dentry *parent_dentry,
55733+ const struct vfsmount *parent_mnt)
55734+{
55735+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55736+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
55737+}
55738+
55739+#define RENAME_CHECK_SUCCESS(old, new) \
55740+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
55741+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
55742+
55743+int
55744+gr_acl_handle_rename(struct dentry *new_dentry,
55745+ struct dentry *parent_dentry,
55746+ const struct vfsmount *parent_mnt,
55747+ struct dentry *old_dentry,
55748+ struct inode *old_parent_inode,
55749+ struct vfsmount *old_mnt, const char *newname)
55750+{
55751+ __u32 comp1, comp2;
55752+ int error = 0;
55753+
55754+ if (unlikely(!gr_acl_is_enabled()))
55755+ return 0;
55756+
55757+ if (!new_dentry->d_inode) {
55758+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
55759+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
55760+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
55761+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
55762+ GR_DELETE | GR_AUDIT_DELETE |
55763+ GR_AUDIT_READ | GR_AUDIT_WRITE |
55764+ GR_SUPPRESS, old_mnt);
55765+ } else {
55766+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
55767+ GR_CREATE | GR_DELETE |
55768+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
55769+ GR_AUDIT_READ | GR_AUDIT_WRITE |
55770+ GR_SUPPRESS, parent_mnt);
55771+ comp2 =
55772+ gr_search_file(old_dentry,
55773+ GR_READ | GR_WRITE | GR_AUDIT_READ |
55774+ GR_DELETE | GR_AUDIT_DELETE |
55775+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
55776+ }
55777+
55778+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
55779+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
55780+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55781+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
55782+ && !(comp2 & GR_SUPPRESS)) {
55783+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55784+ error = -EACCES;
55785+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
55786+ error = -EACCES;
55787+
55788+ return error;
55789+}
55790+
55791+void
55792+gr_acl_handle_exit(void)
55793+{
55794+ u16 id;
55795+ char *rolename;
55796+ struct file *exec_file;
55797+
55798+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
55799+ !(current->role->roletype & GR_ROLE_PERSIST))) {
55800+ id = current->acl_role_id;
55801+ rolename = current->role->rolename;
55802+ gr_set_acls(1);
55803+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
55804+ }
55805+
55806+ write_lock(&grsec_exec_file_lock);
55807+ exec_file = current->exec_file;
55808+ current->exec_file = NULL;
55809+ write_unlock(&grsec_exec_file_lock);
55810+
55811+ if (exec_file)
55812+ fput(exec_file);
55813+}
55814+
55815+int
55816+gr_acl_handle_procpidmem(const struct task_struct *task)
55817+{
55818+ if (unlikely(!gr_acl_is_enabled()))
55819+ return 0;
55820+
55821+ if (task != current && task->acl->mode & GR_PROTPROCFD)
55822+ return -EACCES;
55823+
55824+ return 0;
55825+}
55826diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
55827new file mode 100644
55828index 0000000..58800a7
55829--- /dev/null
55830+++ b/grsecurity/gracl_ip.c
55831@@ -0,0 +1,384 @@
55832+#include <linux/kernel.h>
55833+#include <asm/uaccess.h>
55834+#include <asm/errno.h>
55835+#include <net/sock.h>
55836+#include <linux/file.h>
55837+#include <linux/fs.h>
55838+#include <linux/net.h>
55839+#include <linux/in.h>
55840+#include <linux/skbuff.h>
55841+#include <linux/ip.h>
55842+#include <linux/udp.h>
55843+#include <linux/types.h>
55844+#include <linux/sched.h>
55845+#include <linux/netdevice.h>
55846+#include <linux/inetdevice.h>
55847+#include <linux/gracl.h>
55848+#include <linux/grsecurity.h>
55849+#include <linux/grinternal.h>
55850+
55851+#define GR_BIND 0x01
55852+#define GR_CONNECT 0x02
55853+#define GR_INVERT 0x04
55854+#define GR_BINDOVERRIDE 0x08
55855+#define GR_CONNECTOVERRIDE 0x10
55856+#define GR_SOCK_FAMILY 0x20
55857+
55858+static const char * gr_protocols[IPPROTO_MAX] = {
55859+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
55860+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
55861+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
55862+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
55863+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
55864+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
55865+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
55866+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
55867+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
55868+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
55869+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
55870+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
55871+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
55872+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
55873+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
55874+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
55875+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
55876+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
55877+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
55878+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
55879+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
55880+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
55881+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
55882+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
55883+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
55884+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
55885+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
55886+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
55887+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
55888+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
55889+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
55890+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
55891+ };
55892+
55893+static const char * gr_socktypes[SOCK_MAX] = {
55894+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
55895+ "unknown:7", "unknown:8", "unknown:9", "packet"
55896+ };
55897+
55898+static const char * gr_sockfamilies[AF_MAX+1] = {
55899+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
55900+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
55901+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
55902+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
55903+ };
55904+
55905+const char *
55906+gr_proto_to_name(unsigned char proto)
55907+{
55908+ return gr_protocols[proto];
55909+}
55910+
55911+const char *
55912+gr_socktype_to_name(unsigned char type)
55913+{
55914+ return gr_socktypes[type];
55915+}
55916+
55917+const char *
55918+gr_sockfamily_to_name(unsigned char family)
55919+{
55920+ return gr_sockfamilies[family];
55921+}
55922+
55923+int
55924+gr_search_socket(const int domain, const int type, const int protocol)
55925+{
55926+ struct acl_subject_label *curr;
55927+ const struct cred *cred = current_cred();
55928+
55929+ if (unlikely(!gr_acl_is_enabled()))
55930+ goto exit;
55931+
55932+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
55933+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
55934+ goto exit; // let the kernel handle it
55935+
55936+ curr = current->acl;
55937+
55938+ if (curr->sock_families[domain / 32] & (1 << (domain % 32))) {
55939+ /* the family is allowed, if this is PF_INET allow it only if
55940+ the extra sock type/protocol checks pass */
55941+ if (domain == PF_INET)
55942+ goto inet_check;
55943+ goto exit;
55944+ } else {
55945+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55946+ __u32 fakeip = 0;
55947+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55948+ current->role->roletype, cred->uid,
55949+ cred->gid, current->exec_file ?
55950+ gr_to_filename(current->exec_file->f_path.dentry,
55951+ current->exec_file->f_path.mnt) :
55952+ curr->filename, curr->filename,
55953+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
55954+ &current->signal->saved_ip);
55955+ goto exit;
55956+ }
55957+ goto exit_fail;
55958+ }
55959+
55960+inet_check:
55961+ /* the rest of this checking is for IPv4 only */
55962+ if (!curr->ips)
55963+ goto exit;
55964+
55965+ if ((curr->ip_type & (1 << type)) &&
55966+ (curr->ip_proto[protocol / 32] & (1 << (protocol % 32))))
55967+ goto exit;
55968+
55969+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55970+ /* we don't place acls on raw sockets , and sometimes
55971+ dgram/ip sockets are opened for ioctl and not
55972+ bind/connect, so we'll fake a bind learn log */
55973+ if (type == SOCK_RAW || type == SOCK_PACKET) {
55974+ __u32 fakeip = 0;
55975+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55976+ current->role->roletype, cred->uid,
55977+ cred->gid, current->exec_file ?
55978+ gr_to_filename(current->exec_file->f_path.dentry,
55979+ current->exec_file->f_path.mnt) :
55980+ curr->filename, curr->filename,
55981+ &fakeip, 0, type,
55982+ protocol, GR_CONNECT, &current->signal->saved_ip);
55983+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
55984+ __u32 fakeip = 0;
55985+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55986+ current->role->roletype, cred->uid,
55987+ cred->gid, current->exec_file ?
55988+ gr_to_filename(current->exec_file->f_path.dentry,
55989+ current->exec_file->f_path.mnt) :
55990+ curr->filename, curr->filename,
55991+ &fakeip, 0, type,
55992+ protocol, GR_BIND, &current->signal->saved_ip);
55993+ }
55994+ /* we'll log when they use connect or bind */
55995+ goto exit;
55996+ }
55997+
55998+exit_fail:
55999+ if (domain == PF_INET)
56000+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
56001+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
56002+ else
56003+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
56004+ gr_socktype_to_name(type), protocol);
56005+
56006+ return 0;
56007+exit:
56008+ return 1;
56009+}
56010+
56011+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)
56012+{
56013+ if ((ip->mode & mode) &&
56014+ (ip_port >= ip->low) &&
56015+ (ip_port <= ip->high) &&
56016+ ((ntohl(ip_addr) & our_netmask) ==
56017+ (ntohl(our_addr) & our_netmask))
56018+ && (ip->proto[protocol / 32] & (1 << (protocol % 32)))
56019+ && (ip->type & (1 << type))) {
56020+ if (ip->mode & GR_INVERT)
56021+ return 2; // specifically denied
56022+ else
56023+ return 1; // allowed
56024+ }
56025+
56026+ return 0; // not specifically allowed, may continue parsing
56027+}
56028+
56029+static int
56030+gr_search_connectbind(const int full_mode, struct sock *sk,
56031+ struct sockaddr_in *addr, const int type)
56032+{
56033+ char iface[IFNAMSIZ] = {0};
56034+ struct acl_subject_label *curr;
56035+ struct acl_ip_label *ip;
56036+ struct inet_sock *isk;
56037+ struct net_device *dev;
56038+ struct in_device *idev;
56039+ unsigned long i;
56040+ int ret;
56041+ int mode = full_mode & (GR_BIND | GR_CONNECT);
56042+ __u32 ip_addr = 0;
56043+ __u32 our_addr;
56044+ __u32 our_netmask;
56045+ char *p;
56046+ __u16 ip_port = 0;
56047+ const struct cred *cred = current_cred();
56048+
56049+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
56050+ return 0;
56051+
56052+ curr = current->acl;
56053+ isk = inet_sk(sk);
56054+
56055+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
56056+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
56057+ addr->sin_addr.s_addr = curr->inaddr_any_override;
56058+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
56059+ struct sockaddr_in saddr;
56060+ int err;
56061+
56062+ saddr.sin_family = AF_INET;
56063+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
56064+ saddr.sin_port = isk->inet_sport;
56065+
56066+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
56067+ if (err)
56068+ return err;
56069+
56070+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
56071+ if (err)
56072+ return err;
56073+ }
56074+
56075+ if (!curr->ips)
56076+ return 0;
56077+
56078+ ip_addr = addr->sin_addr.s_addr;
56079+ ip_port = ntohs(addr->sin_port);
56080+
56081+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
56082+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
56083+ current->role->roletype, cred->uid,
56084+ cred->gid, current->exec_file ?
56085+ gr_to_filename(current->exec_file->f_path.dentry,
56086+ current->exec_file->f_path.mnt) :
56087+ curr->filename, curr->filename,
56088+ &ip_addr, ip_port, type,
56089+ sk->sk_protocol, mode, &current->signal->saved_ip);
56090+ return 0;
56091+ }
56092+
56093+ for (i = 0; i < curr->ip_num; i++) {
56094+ ip = *(curr->ips + i);
56095+ if (ip->iface != NULL) {
56096+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
56097+ p = strchr(iface, ':');
56098+ if (p != NULL)
56099+ *p = '\0';
56100+ dev = dev_get_by_name(sock_net(sk), iface);
56101+ if (dev == NULL)
56102+ continue;
56103+ idev = in_dev_get(dev);
56104+ if (idev == NULL) {
56105+ dev_put(dev);
56106+ continue;
56107+ }
56108+ rcu_read_lock();
56109+ for_ifa(idev) {
56110+ if (!strcmp(ip->iface, ifa->ifa_label)) {
56111+ our_addr = ifa->ifa_address;
56112+ our_netmask = 0xffffffff;
56113+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
56114+ if (ret == 1) {
56115+ rcu_read_unlock();
56116+ in_dev_put(idev);
56117+ dev_put(dev);
56118+ return 0;
56119+ } else if (ret == 2) {
56120+ rcu_read_unlock();
56121+ in_dev_put(idev);
56122+ dev_put(dev);
56123+ goto denied;
56124+ }
56125+ }
56126+ } endfor_ifa(idev);
56127+ rcu_read_unlock();
56128+ in_dev_put(idev);
56129+ dev_put(dev);
56130+ } else {
56131+ our_addr = ip->addr;
56132+ our_netmask = ip->netmask;
56133+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
56134+ if (ret == 1)
56135+ return 0;
56136+ else if (ret == 2)
56137+ goto denied;
56138+ }
56139+ }
56140+
56141+denied:
56142+ if (mode == GR_BIND)
56143+ 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));
56144+ else if (mode == GR_CONNECT)
56145+ 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));
56146+
56147+ return -EACCES;
56148+}
56149+
56150+int
56151+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
56152+{
56153+ /* always allow disconnection of dgram sockets with connect */
56154+ if (addr->sin_family == AF_UNSPEC)
56155+ return 0;
56156+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
56157+}
56158+
56159+int
56160+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
56161+{
56162+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
56163+}
56164+
56165+int gr_search_listen(struct socket *sock)
56166+{
56167+ struct sock *sk = sock->sk;
56168+ struct sockaddr_in addr;
56169+
56170+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
56171+ addr.sin_port = inet_sk(sk)->inet_sport;
56172+
56173+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
56174+}
56175+
56176+int gr_search_accept(struct socket *sock)
56177+{
56178+ struct sock *sk = sock->sk;
56179+ struct sockaddr_in addr;
56180+
56181+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
56182+ addr.sin_port = inet_sk(sk)->inet_sport;
56183+
56184+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
56185+}
56186+
56187+int
56188+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
56189+{
56190+ if (addr)
56191+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
56192+ else {
56193+ struct sockaddr_in sin;
56194+ const struct inet_sock *inet = inet_sk(sk);
56195+
56196+ sin.sin_addr.s_addr = inet->inet_daddr;
56197+ sin.sin_port = inet->inet_dport;
56198+
56199+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
56200+ }
56201+}
56202+
56203+int
56204+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
56205+{
56206+ struct sockaddr_in sin;
56207+
56208+ if (unlikely(skb->len < sizeof (struct udphdr)))
56209+ return 0; // skip this packet
56210+
56211+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
56212+ sin.sin_port = udp_hdr(skb)->source;
56213+
56214+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
56215+}
56216diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
56217new file mode 100644
56218index 0000000..25f54ef
56219--- /dev/null
56220+++ b/grsecurity/gracl_learn.c
56221@@ -0,0 +1,207 @@
56222+#include <linux/kernel.h>
56223+#include <linux/mm.h>
56224+#include <linux/sched.h>
56225+#include <linux/poll.h>
56226+#include <linux/string.h>
56227+#include <linux/file.h>
56228+#include <linux/types.h>
56229+#include <linux/vmalloc.h>
56230+#include <linux/grinternal.h>
56231+
56232+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
56233+ size_t count, loff_t *ppos);
56234+extern int gr_acl_is_enabled(void);
56235+
56236+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
56237+static int gr_learn_attached;
56238+
56239+/* use a 512k buffer */
56240+#define LEARN_BUFFER_SIZE (512 * 1024)
56241+
56242+static DEFINE_SPINLOCK(gr_learn_lock);
56243+static DEFINE_MUTEX(gr_learn_user_mutex);
56244+
56245+/* we need to maintain two buffers, so that the kernel context of grlearn
56246+ uses a semaphore around the userspace copying, and the other kernel contexts
56247+ use a spinlock when copying into the buffer, since they cannot sleep
56248+*/
56249+static char *learn_buffer;
56250+static char *learn_buffer_user;
56251+static int learn_buffer_len;
56252+static int learn_buffer_user_len;
56253+
56254+static ssize_t
56255+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
56256+{
56257+ DECLARE_WAITQUEUE(wait, current);
56258+ ssize_t retval = 0;
56259+
56260+ add_wait_queue(&learn_wait, &wait);
56261+ set_current_state(TASK_INTERRUPTIBLE);
56262+ do {
56263+ mutex_lock(&gr_learn_user_mutex);
56264+ spin_lock(&gr_learn_lock);
56265+ if (learn_buffer_len)
56266+ break;
56267+ spin_unlock(&gr_learn_lock);
56268+ mutex_unlock(&gr_learn_user_mutex);
56269+ if (file->f_flags & O_NONBLOCK) {
56270+ retval = -EAGAIN;
56271+ goto out;
56272+ }
56273+ if (signal_pending(current)) {
56274+ retval = -ERESTARTSYS;
56275+ goto out;
56276+ }
56277+
56278+ schedule();
56279+ } while (1);
56280+
56281+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
56282+ learn_buffer_user_len = learn_buffer_len;
56283+ retval = learn_buffer_len;
56284+ learn_buffer_len = 0;
56285+
56286+ spin_unlock(&gr_learn_lock);
56287+
56288+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
56289+ retval = -EFAULT;
56290+
56291+ mutex_unlock(&gr_learn_user_mutex);
56292+out:
56293+ set_current_state(TASK_RUNNING);
56294+ remove_wait_queue(&learn_wait, &wait);
56295+ return retval;
56296+}
56297+
56298+static unsigned int
56299+poll_learn(struct file * file, poll_table * wait)
56300+{
56301+ poll_wait(file, &learn_wait, wait);
56302+
56303+ if (learn_buffer_len)
56304+ return (POLLIN | POLLRDNORM);
56305+
56306+ return 0;
56307+}
56308+
56309+void
56310+gr_clear_learn_entries(void)
56311+{
56312+ char *tmp;
56313+
56314+ mutex_lock(&gr_learn_user_mutex);
56315+ spin_lock(&gr_learn_lock);
56316+ tmp = learn_buffer;
56317+ learn_buffer = NULL;
56318+ spin_unlock(&gr_learn_lock);
56319+ if (tmp)
56320+ vfree(tmp);
56321+ if (learn_buffer_user != NULL) {
56322+ vfree(learn_buffer_user);
56323+ learn_buffer_user = NULL;
56324+ }
56325+ learn_buffer_len = 0;
56326+ mutex_unlock(&gr_learn_user_mutex);
56327+
56328+ return;
56329+}
56330+
56331+void
56332+gr_add_learn_entry(const char *fmt, ...)
56333+{
56334+ va_list args;
56335+ unsigned int len;
56336+
56337+ if (!gr_learn_attached)
56338+ return;
56339+
56340+ spin_lock(&gr_learn_lock);
56341+
56342+ /* leave a gap at the end so we know when it's "full" but don't have to
56343+ compute the exact length of the string we're trying to append
56344+ */
56345+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
56346+ spin_unlock(&gr_learn_lock);
56347+ wake_up_interruptible(&learn_wait);
56348+ return;
56349+ }
56350+ if (learn_buffer == NULL) {
56351+ spin_unlock(&gr_learn_lock);
56352+ return;
56353+ }
56354+
56355+ va_start(args, fmt);
56356+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
56357+ va_end(args);
56358+
56359+ learn_buffer_len += len + 1;
56360+
56361+ spin_unlock(&gr_learn_lock);
56362+ wake_up_interruptible(&learn_wait);
56363+
56364+ return;
56365+}
56366+
56367+static int
56368+open_learn(struct inode *inode, struct file *file)
56369+{
56370+ if (file->f_mode & FMODE_READ && gr_learn_attached)
56371+ return -EBUSY;
56372+ if (file->f_mode & FMODE_READ) {
56373+ int retval = 0;
56374+ mutex_lock(&gr_learn_user_mutex);
56375+ if (learn_buffer == NULL)
56376+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
56377+ if (learn_buffer_user == NULL)
56378+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
56379+ if (learn_buffer == NULL) {
56380+ retval = -ENOMEM;
56381+ goto out_error;
56382+ }
56383+ if (learn_buffer_user == NULL) {
56384+ retval = -ENOMEM;
56385+ goto out_error;
56386+ }
56387+ learn_buffer_len = 0;
56388+ learn_buffer_user_len = 0;
56389+ gr_learn_attached = 1;
56390+out_error:
56391+ mutex_unlock(&gr_learn_user_mutex);
56392+ return retval;
56393+ }
56394+ return 0;
56395+}
56396+
56397+static int
56398+close_learn(struct inode *inode, struct file *file)
56399+{
56400+ if (file->f_mode & FMODE_READ) {
56401+ char *tmp = NULL;
56402+ mutex_lock(&gr_learn_user_mutex);
56403+ spin_lock(&gr_learn_lock);
56404+ tmp = learn_buffer;
56405+ learn_buffer = NULL;
56406+ spin_unlock(&gr_learn_lock);
56407+ if (tmp)
56408+ vfree(tmp);
56409+ if (learn_buffer_user != NULL) {
56410+ vfree(learn_buffer_user);
56411+ learn_buffer_user = NULL;
56412+ }
56413+ learn_buffer_len = 0;
56414+ learn_buffer_user_len = 0;
56415+ gr_learn_attached = 0;
56416+ mutex_unlock(&gr_learn_user_mutex);
56417+ }
56418+
56419+ return 0;
56420+}
56421+
56422+const struct file_operations grsec_fops = {
56423+ .read = read_learn,
56424+ .write = write_grsec_handler,
56425+ .open = open_learn,
56426+ .release = close_learn,
56427+ .poll = poll_learn,
56428+};
56429diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
56430new file mode 100644
56431index 0000000..39645c9
56432--- /dev/null
56433+++ b/grsecurity/gracl_res.c
56434@@ -0,0 +1,68 @@
56435+#include <linux/kernel.h>
56436+#include <linux/sched.h>
56437+#include <linux/gracl.h>
56438+#include <linux/grinternal.h>
56439+
56440+static const char *restab_log[] = {
56441+ [RLIMIT_CPU] = "RLIMIT_CPU",
56442+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
56443+ [RLIMIT_DATA] = "RLIMIT_DATA",
56444+ [RLIMIT_STACK] = "RLIMIT_STACK",
56445+ [RLIMIT_CORE] = "RLIMIT_CORE",
56446+ [RLIMIT_RSS] = "RLIMIT_RSS",
56447+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
56448+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
56449+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
56450+ [RLIMIT_AS] = "RLIMIT_AS",
56451+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
56452+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
56453+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
56454+ [RLIMIT_NICE] = "RLIMIT_NICE",
56455+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
56456+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
56457+ [GR_CRASH_RES] = "RLIMIT_CRASH"
56458+};
56459+
56460+void
56461+gr_log_resource(const struct task_struct *task,
56462+ const int res, const unsigned long wanted, const int gt)
56463+{
56464+ const struct cred *cred;
56465+ unsigned long rlim;
56466+
56467+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
56468+ return;
56469+
56470+ // not yet supported resource
56471+ if (unlikely(!restab_log[res]))
56472+ return;
56473+
56474+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
56475+ rlim = task_rlimit_max(task, res);
56476+ else
56477+ rlim = task_rlimit(task, res);
56478+
56479+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
56480+ return;
56481+
56482+ rcu_read_lock();
56483+ cred = __task_cred(task);
56484+
56485+ if (res == RLIMIT_NPROC &&
56486+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
56487+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
56488+ goto out_rcu_unlock;
56489+ else if (res == RLIMIT_MEMLOCK &&
56490+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
56491+ goto out_rcu_unlock;
56492+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
56493+ goto out_rcu_unlock;
56494+ rcu_read_unlock();
56495+
56496+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
56497+
56498+ return;
56499+out_rcu_unlock:
56500+ rcu_read_unlock();
56501+ return;
56502+}
56503diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
56504new file mode 100644
56505index 0000000..5556be3
56506--- /dev/null
56507+++ b/grsecurity/gracl_segv.c
56508@@ -0,0 +1,299 @@
56509+#include <linux/kernel.h>
56510+#include <linux/mm.h>
56511+#include <asm/uaccess.h>
56512+#include <asm/errno.h>
56513+#include <asm/mman.h>
56514+#include <net/sock.h>
56515+#include <linux/file.h>
56516+#include <linux/fs.h>
56517+#include <linux/net.h>
56518+#include <linux/in.h>
56519+#include <linux/slab.h>
56520+#include <linux/types.h>
56521+#include <linux/sched.h>
56522+#include <linux/timer.h>
56523+#include <linux/gracl.h>
56524+#include <linux/grsecurity.h>
56525+#include <linux/grinternal.h>
56526+
56527+static struct crash_uid *uid_set;
56528+static unsigned short uid_used;
56529+static DEFINE_SPINLOCK(gr_uid_lock);
56530+extern rwlock_t gr_inode_lock;
56531+extern struct acl_subject_label *
56532+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
56533+ struct acl_role_label *role);
56534+
56535+#ifdef CONFIG_BTRFS_FS
56536+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
56537+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
56538+#endif
56539+
56540+static inline dev_t __get_dev(const struct dentry *dentry)
56541+{
56542+#ifdef CONFIG_BTRFS_FS
56543+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
56544+ return get_btrfs_dev_from_inode(dentry->d_inode);
56545+ else
56546+#endif
56547+ return dentry->d_inode->i_sb->s_dev;
56548+}
56549+
56550+int
56551+gr_init_uidset(void)
56552+{
56553+ uid_set =
56554+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
56555+ uid_used = 0;
56556+
56557+ return uid_set ? 1 : 0;
56558+}
56559+
56560+void
56561+gr_free_uidset(void)
56562+{
56563+ if (uid_set)
56564+ kfree(uid_set);
56565+
56566+ return;
56567+}
56568+
56569+int
56570+gr_find_uid(const uid_t uid)
56571+{
56572+ struct crash_uid *tmp = uid_set;
56573+ uid_t buid;
56574+ int low = 0, high = uid_used - 1, mid;
56575+
56576+ while (high >= low) {
56577+ mid = (low + high) >> 1;
56578+ buid = tmp[mid].uid;
56579+ if (buid == uid)
56580+ return mid;
56581+ if (buid > uid)
56582+ high = mid - 1;
56583+ if (buid < uid)
56584+ low = mid + 1;
56585+ }
56586+
56587+ return -1;
56588+}
56589+
56590+static __inline__ void
56591+gr_insertsort(void)
56592+{
56593+ unsigned short i, j;
56594+ struct crash_uid index;
56595+
56596+ for (i = 1; i < uid_used; i++) {
56597+ index = uid_set[i];
56598+ j = i;
56599+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
56600+ uid_set[j] = uid_set[j - 1];
56601+ j--;
56602+ }
56603+ uid_set[j] = index;
56604+ }
56605+
56606+ return;
56607+}
56608+
56609+static __inline__ void
56610+gr_insert_uid(const uid_t uid, const unsigned long expires)
56611+{
56612+ int loc;
56613+
56614+ if (uid_used == GR_UIDTABLE_MAX)
56615+ return;
56616+
56617+ loc = gr_find_uid(uid);
56618+
56619+ if (loc >= 0) {
56620+ uid_set[loc].expires = expires;
56621+ return;
56622+ }
56623+
56624+ uid_set[uid_used].uid = uid;
56625+ uid_set[uid_used].expires = expires;
56626+ uid_used++;
56627+
56628+ gr_insertsort();
56629+
56630+ return;
56631+}
56632+
56633+void
56634+gr_remove_uid(const unsigned short loc)
56635+{
56636+ unsigned short i;
56637+
56638+ for (i = loc + 1; i < uid_used; i++)
56639+ uid_set[i - 1] = uid_set[i];
56640+
56641+ uid_used--;
56642+
56643+ return;
56644+}
56645+
56646+int
56647+gr_check_crash_uid(const uid_t uid)
56648+{
56649+ int loc;
56650+ int ret = 0;
56651+
56652+ if (unlikely(!gr_acl_is_enabled()))
56653+ return 0;
56654+
56655+ spin_lock(&gr_uid_lock);
56656+ loc = gr_find_uid(uid);
56657+
56658+ if (loc < 0)
56659+ goto out_unlock;
56660+
56661+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
56662+ gr_remove_uid(loc);
56663+ else
56664+ ret = 1;
56665+
56666+out_unlock:
56667+ spin_unlock(&gr_uid_lock);
56668+ return ret;
56669+}
56670+
56671+static __inline__ int
56672+proc_is_setxid(const struct cred *cred)
56673+{
56674+ if (cred->uid != cred->euid || cred->uid != cred->suid ||
56675+ cred->uid != cred->fsuid)
56676+ return 1;
56677+ if (cred->gid != cred->egid || cred->gid != cred->sgid ||
56678+ cred->gid != cred->fsgid)
56679+ return 1;
56680+
56681+ return 0;
56682+}
56683+
56684+extern int gr_fake_force_sig(int sig, struct task_struct *t);
56685+
56686+void
56687+gr_handle_crash(struct task_struct *task, const int sig)
56688+{
56689+ struct acl_subject_label *curr;
56690+ struct task_struct *tsk, *tsk2;
56691+ const struct cred *cred;
56692+ const struct cred *cred2;
56693+
56694+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
56695+ return;
56696+
56697+ if (unlikely(!gr_acl_is_enabled()))
56698+ return;
56699+
56700+ curr = task->acl;
56701+
56702+ if (!(curr->resmask & (1 << GR_CRASH_RES)))
56703+ return;
56704+
56705+ if (time_before_eq(curr->expires, get_seconds())) {
56706+ curr->expires = 0;
56707+ curr->crashes = 0;
56708+ }
56709+
56710+ curr->crashes++;
56711+
56712+ if (!curr->expires)
56713+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
56714+
56715+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56716+ time_after(curr->expires, get_seconds())) {
56717+ rcu_read_lock();
56718+ cred = __task_cred(task);
56719+ if (cred->uid && proc_is_setxid(cred)) {
56720+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56721+ spin_lock(&gr_uid_lock);
56722+ gr_insert_uid(cred->uid, curr->expires);
56723+ spin_unlock(&gr_uid_lock);
56724+ curr->expires = 0;
56725+ curr->crashes = 0;
56726+ read_lock(&tasklist_lock);
56727+ do_each_thread(tsk2, tsk) {
56728+ cred2 = __task_cred(tsk);
56729+ if (tsk != task && cred2->uid == cred->uid)
56730+ gr_fake_force_sig(SIGKILL, tsk);
56731+ } while_each_thread(tsk2, tsk);
56732+ read_unlock(&tasklist_lock);
56733+ } else {
56734+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56735+ read_lock(&tasklist_lock);
56736+ read_lock(&grsec_exec_file_lock);
56737+ do_each_thread(tsk2, tsk) {
56738+ if (likely(tsk != task)) {
56739+ // if this thread has the same subject as the one that triggered
56740+ // RES_CRASH and it's the same binary, kill it
56741+ if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
56742+ gr_fake_force_sig(SIGKILL, tsk);
56743+ }
56744+ } while_each_thread(tsk2, tsk);
56745+ read_unlock(&grsec_exec_file_lock);
56746+ read_unlock(&tasklist_lock);
56747+ }
56748+ rcu_read_unlock();
56749+ }
56750+
56751+ return;
56752+}
56753+
56754+int
56755+gr_check_crash_exec(const struct file *filp)
56756+{
56757+ struct acl_subject_label *curr;
56758+
56759+ if (unlikely(!gr_acl_is_enabled()))
56760+ return 0;
56761+
56762+ read_lock(&gr_inode_lock);
56763+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
56764+ __get_dev(filp->f_path.dentry),
56765+ current->role);
56766+ read_unlock(&gr_inode_lock);
56767+
56768+ if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
56769+ (!curr->crashes && !curr->expires))
56770+ return 0;
56771+
56772+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56773+ time_after(curr->expires, get_seconds()))
56774+ return 1;
56775+ else if (time_before_eq(curr->expires, get_seconds())) {
56776+ curr->crashes = 0;
56777+ curr->expires = 0;
56778+ }
56779+
56780+ return 0;
56781+}
56782+
56783+void
56784+gr_handle_alertkill(struct task_struct *task)
56785+{
56786+ struct acl_subject_label *curracl;
56787+ __u32 curr_ip;
56788+ struct task_struct *p, *p2;
56789+
56790+ if (unlikely(!gr_acl_is_enabled()))
56791+ return;
56792+
56793+ curracl = task->acl;
56794+ curr_ip = task->signal->curr_ip;
56795+
56796+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
56797+ read_lock(&tasklist_lock);
56798+ do_each_thread(p2, p) {
56799+ if (p->signal->curr_ip == curr_ip)
56800+ gr_fake_force_sig(SIGKILL, p);
56801+ } while_each_thread(p2, p);
56802+ read_unlock(&tasklist_lock);
56803+ } else if (curracl->mode & GR_KILLPROC)
56804+ gr_fake_force_sig(SIGKILL, task);
56805+
56806+ return;
56807+}
56808diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
56809new file mode 100644
56810index 0000000..9d83a69
56811--- /dev/null
56812+++ b/grsecurity/gracl_shm.c
56813@@ -0,0 +1,40 @@
56814+#include <linux/kernel.h>
56815+#include <linux/mm.h>
56816+#include <linux/sched.h>
56817+#include <linux/file.h>
56818+#include <linux/ipc.h>
56819+#include <linux/gracl.h>
56820+#include <linux/grsecurity.h>
56821+#include <linux/grinternal.h>
56822+
56823+int
56824+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
56825+ const time_t shm_createtime, const uid_t cuid, const int shmid)
56826+{
56827+ struct task_struct *task;
56828+
56829+ if (!gr_acl_is_enabled())
56830+ return 1;
56831+
56832+ rcu_read_lock();
56833+ read_lock(&tasklist_lock);
56834+
56835+ task = find_task_by_vpid(shm_cprid);
56836+
56837+ if (unlikely(!task))
56838+ task = find_task_by_vpid(shm_lapid);
56839+
56840+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
56841+ (task->pid == shm_lapid)) &&
56842+ (task->acl->mode & GR_PROTSHM) &&
56843+ (task->acl != current->acl))) {
56844+ read_unlock(&tasklist_lock);
56845+ rcu_read_unlock();
56846+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
56847+ return 0;
56848+ }
56849+ read_unlock(&tasklist_lock);
56850+ rcu_read_unlock();
56851+
56852+ return 1;
56853+}
56854diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
56855new file mode 100644
56856index 0000000..bc0be01
56857--- /dev/null
56858+++ b/grsecurity/grsec_chdir.c
56859@@ -0,0 +1,19 @@
56860+#include <linux/kernel.h>
56861+#include <linux/sched.h>
56862+#include <linux/fs.h>
56863+#include <linux/file.h>
56864+#include <linux/grsecurity.h>
56865+#include <linux/grinternal.h>
56866+
56867+void
56868+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
56869+{
56870+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
56871+ if ((grsec_enable_chdir && grsec_enable_group &&
56872+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
56873+ !grsec_enable_group)) {
56874+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
56875+ }
56876+#endif
56877+ return;
56878+}
56879diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
56880new file mode 100644
56881index 0000000..9807ee2
56882--- /dev/null
56883+++ b/grsecurity/grsec_chroot.c
56884@@ -0,0 +1,368 @@
56885+#include <linux/kernel.h>
56886+#include <linux/module.h>
56887+#include <linux/sched.h>
56888+#include <linux/file.h>
56889+#include <linux/fs.h>
56890+#include <linux/mount.h>
56891+#include <linux/types.h>
56892+#include "../fs/mount.h"
56893+#include <linux/grsecurity.h>
56894+#include <linux/grinternal.h>
56895+
56896+void gr_set_chroot_entries(struct task_struct *task, struct path *path)
56897+{
56898+#ifdef CONFIG_GRKERNSEC
56899+ if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
56900+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root)
56901+ task->gr_is_chrooted = 1;
56902+ else
56903+ task->gr_is_chrooted = 0;
56904+
56905+ task->gr_chroot_dentry = path->dentry;
56906+#endif
56907+ return;
56908+}
56909+
56910+void gr_clear_chroot_entries(struct task_struct *task)
56911+{
56912+#ifdef CONFIG_GRKERNSEC
56913+ task->gr_is_chrooted = 0;
56914+ task->gr_chroot_dentry = NULL;
56915+#endif
56916+ return;
56917+}
56918+
56919+int
56920+gr_handle_chroot_unix(const pid_t pid)
56921+{
56922+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
56923+ struct task_struct *p;
56924+
56925+ if (unlikely(!grsec_enable_chroot_unix))
56926+ return 1;
56927+
56928+ if (likely(!proc_is_chrooted(current)))
56929+ return 1;
56930+
56931+ rcu_read_lock();
56932+ read_lock(&tasklist_lock);
56933+ p = find_task_by_vpid_unrestricted(pid);
56934+ if (unlikely(p && !have_same_root(current, p))) {
56935+ read_unlock(&tasklist_lock);
56936+ rcu_read_unlock();
56937+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
56938+ return 0;
56939+ }
56940+ read_unlock(&tasklist_lock);
56941+ rcu_read_unlock();
56942+#endif
56943+ return 1;
56944+}
56945+
56946+int
56947+gr_handle_chroot_nice(void)
56948+{
56949+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
56950+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
56951+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
56952+ return -EPERM;
56953+ }
56954+#endif
56955+ return 0;
56956+}
56957+
56958+int
56959+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
56960+{
56961+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
56962+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
56963+ && proc_is_chrooted(current)) {
56964+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
56965+ return -EACCES;
56966+ }
56967+#endif
56968+ return 0;
56969+}
56970+
56971+int
56972+gr_handle_chroot_rawio(const struct inode *inode)
56973+{
56974+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56975+ if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
56976+ inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
56977+ return 1;
56978+#endif
56979+ return 0;
56980+}
56981+
56982+int
56983+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
56984+{
56985+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
56986+ struct task_struct *p;
56987+ int ret = 0;
56988+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
56989+ return ret;
56990+
56991+ read_lock(&tasklist_lock);
56992+ do_each_pid_task(pid, type, p) {
56993+ if (!have_same_root(current, p)) {
56994+ ret = 1;
56995+ goto out;
56996+ }
56997+ } while_each_pid_task(pid, type, p);
56998+out:
56999+ read_unlock(&tasklist_lock);
57000+ return ret;
57001+#endif
57002+ return 0;
57003+}
57004+
57005+int
57006+gr_pid_is_chrooted(struct task_struct *p)
57007+{
57008+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
57009+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
57010+ return 0;
57011+
57012+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
57013+ !have_same_root(current, p)) {
57014+ return 1;
57015+ }
57016+#endif
57017+ return 0;
57018+}
57019+
57020+EXPORT_SYMBOL(gr_pid_is_chrooted);
57021+
57022+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
57023+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
57024+{
57025+ struct path path, currentroot;
57026+ int ret = 0;
57027+
57028+ path.dentry = (struct dentry *)u_dentry;
57029+ path.mnt = (struct vfsmount *)u_mnt;
57030+ get_fs_root(current->fs, &currentroot);
57031+ if (path_is_under(&path, &currentroot))
57032+ ret = 1;
57033+ path_put(&currentroot);
57034+
57035+ return ret;
57036+}
57037+#endif
57038+
57039+int
57040+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
57041+{
57042+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
57043+ if (!grsec_enable_chroot_fchdir)
57044+ return 1;
57045+
57046+ if (!proc_is_chrooted(current))
57047+ return 1;
57048+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
57049+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
57050+ return 0;
57051+ }
57052+#endif
57053+ return 1;
57054+}
57055+
57056+int
57057+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
57058+ const time_t shm_createtime)
57059+{
57060+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
57061+ struct task_struct *p;
57062+ time_t starttime;
57063+
57064+ if (unlikely(!grsec_enable_chroot_shmat))
57065+ return 1;
57066+
57067+ if (likely(!proc_is_chrooted(current)))
57068+ return 1;
57069+
57070+ rcu_read_lock();
57071+ read_lock(&tasklist_lock);
57072+
57073+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
57074+ starttime = p->start_time.tv_sec;
57075+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
57076+ if (have_same_root(current, p)) {
57077+ goto allow;
57078+ } else {
57079+ read_unlock(&tasklist_lock);
57080+ rcu_read_unlock();
57081+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
57082+ return 0;
57083+ }
57084+ }
57085+ /* creator exited, pid reuse, fall through to next check */
57086+ }
57087+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
57088+ if (unlikely(!have_same_root(current, p))) {
57089+ read_unlock(&tasklist_lock);
57090+ rcu_read_unlock();
57091+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
57092+ return 0;
57093+ }
57094+ }
57095+
57096+allow:
57097+ read_unlock(&tasklist_lock);
57098+ rcu_read_unlock();
57099+#endif
57100+ return 1;
57101+}
57102+
57103+void
57104+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
57105+{
57106+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
57107+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
57108+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
57109+#endif
57110+ return;
57111+}
57112+
57113+int
57114+gr_handle_chroot_mknod(const struct dentry *dentry,
57115+ const struct vfsmount *mnt, const int mode)
57116+{
57117+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
57118+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
57119+ proc_is_chrooted(current)) {
57120+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
57121+ return -EPERM;
57122+ }
57123+#endif
57124+ return 0;
57125+}
57126+
57127+int
57128+gr_handle_chroot_mount(const struct dentry *dentry,
57129+ const struct vfsmount *mnt, const char *dev_name)
57130+{
57131+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
57132+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
57133+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
57134+ return -EPERM;
57135+ }
57136+#endif
57137+ return 0;
57138+}
57139+
57140+int
57141+gr_handle_chroot_pivot(void)
57142+{
57143+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
57144+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
57145+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
57146+ return -EPERM;
57147+ }
57148+#endif
57149+ return 0;
57150+}
57151+
57152+int
57153+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
57154+{
57155+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
57156+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
57157+ !gr_is_outside_chroot(dentry, mnt)) {
57158+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
57159+ return -EPERM;
57160+ }
57161+#endif
57162+ return 0;
57163+}
57164+
57165+extern const char *captab_log[];
57166+extern int captab_log_entries;
57167+
57168+int
57169+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
57170+{
57171+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57172+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
57173+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
57174+ if (cap_raised(chroot_caps, cap)) {
57175+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
57176+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
57177+ }
57178+ return 0;
57179+ }
57180+ }
57181+#endif
57182+ return 1;
57183+}
57184+
57185+int
57186+gr_chroot_is_capable(const int cap)
57187+{
57188+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57189+ return gr_task_chroot_is_capable(current, current_cred(), cap);
57190+#endif
57191+ return 1;
57192+}
57193+
57194+int
57195+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
57196+{
57197+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57198+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
57199+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
57200+ if (cap_raised(chroot_caps, cap)) {
57201+ return 0;
57202+ }
57203+ }
57204+#endif
57205+ return 1;
57206+}
57207+
57208+int
57209+gr_chroot_is_capable_nolog(const int cap)
57210+{
57211+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57212+ return gr_task_chroot_is_capable_nolog(current, cap);
57213+#endif
57214+ return 1;
57215+}
57216+
57217+int
57218+gr_handle_chroot_sysctl(const int op)
57219+{
57220+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
57221+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
57222+ proc_is_chrooted(current))
57223+ return -EACCES;
57224+#endif
57225+ return 0;
57226+}
57227+
57228+void
57229+gr_handle_chroot_chdir(struct path *path)
57230+{
57231+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
57232+ if (grsec_enable_chroot_chdir)
57233+ set_fs_pwd(current->fs, path);
57234+#endif
57235+ return;
57236+}
57237+
57238+int
57239+gr_handle_chroot_chmod(const struct dentry *dentry,
57240+ const struct vfsmount *mnt, const int mode)
57241+{
57242+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
57243+ /* allow chmod +s on directories, but not files */
57244+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
57245+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
57246+ proc_is_chrooted(current)) {
57247+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
57248+ return -EPERM;
57249+ }
57250+#endif
57251+ return 0;
57252+}
57253diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
57254new file mode 100644
57255index 0000000..213ad8b
57256--- /dev/null
57257+++ b/grsecurity/grsec_disabled.c
57258@@ -0,0 +1,437 @@
57259+#include <linux/kernel.h>
57260+#include <linux/module.h>
57261+#include <linux/sched.h>
57262+#include <linux/file.h>
57263+#include <linux/fs.h>
57264+#include <linux/kdev_t.h>
57265+#include <linux/net.h>
57266+#include <linux/in.h>
57267+#include <linux/ip.h>
57268+#include <linux/skbuff.h>
57269+#include <linux/sysctl.h>
57270+
57271+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
57272+void
57273+pax_set_initial_flags(struct linux_binprm *bprm)
57274+{
57275+ return;
57276+}
57277+#endif
57278+
57279+#ifdef CONFIG_SYSCTL
57280+__u32
57281+gr_handle_sysctl(const struct ctl_table * table, const int op)
57282+{
57283+ return 0;
57284+}
57285+#endif
57286+
57287+#ifdef CONFIG_TASKSTATS
57288+int gr_is_taskstats_denied(int pid)
57289+{
57290+ return 0;
57291+}
57292+#endif
57293+
57294+int
57295+gr_acl_is_enabled(void)
57296+{
57297+ return 0;
57298+}
57299+
57300+void
57301+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
57302+{
57303+ return;
57304+}
57305+
57306+int
57307+gr_handle_rawio(const struct inode *inode)
57308+{
57309+ return 0;
57310+}
57311+
57312+void
57313+gr_acl_handle_psacct(struct task_struct *task, const long code)
57314+{
57315+ return;
57316+}
57317+
57318+int
57319+gr_handle_ptrace(struct task_struct *task, const long request)
57320+{
57321+ return 0;
57322+}
57323+
57324+int
57325+gr_handle_proc_ptrace(struct task_struct *task)
57326+{
57327+ return 0;
57328+}
57329+
57330+void
57331+gr_learn_resource(const struct task_struct *task,
57332+ const int res, const unsigned long wanted, const int gt)
57333+{
57334+ return;
57335+}
57336+
57337+int
57338+gr_set_acls(const int type)
57339+{
57340+ return 0;
57341+}
57342+
57343+int
57344+gr_check_hidden_task(const struct task_struct *tsk)
57345+{
57346+ return 0;
57347+}
57348+
57349+int
57350+gr_check_protected_task(const struct task_struct *task)
57351+{
57352+ return 0;
57353+}
57354+
57355+int
57356+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
57357+{
57358+ return 0;
57359+}
57360+
57361+void
57362+gr_copy_label(struct task_struct *tsk)
57363+{
57364+ return;
57365+}
57366+
57367+void
57368+gr_set_pax_flags(struct task_struct *task)
57369+{
57370+ return;
57371+}
57372+
57373+int
57374+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
57375+ const int unsafe_share)
57376+{
57377+ return 0;
57378+}
57379+
57380+void
57381+gr_handle_delete(const ino_t ino, const dev_t dev)
57382+{
57383+ return;
57384+}
57385+
57386+void
57387+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
57388+{
57389+ return;
57390+}
57391+
57392+void
57393+gr_handle_crash(struct task_struct *task, const int sig)
57394+{
57395+ return;
57396+}
57397+
57398+int
57399+gr_check_crash_exec(const struct file *filp)
57400+{
57401+ return 0;
57402+}
57403+
57404+int
57405+gr_check_crash_uid(const uid_t uid)
57406+{
57407+ return 0;
57408+}
57409+
57410+void
57411+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
57412+ struct dentry *old_dentry,
57413+ struct dentry *new_dentry,
57414+ struct vfsmount *mnt, const __u8 replace)
57415+{
57416+ return;
57417+}
57418+
57419+int
57420+gr_search_socket(const int family, const int type, const int protocol)
57421+{
57422+ return 1;
57423+}
57424+
57425+int
57426+gr_search_connectbind(const int mode, const struct socket *sock,
57427+ const struct sockaddr_in *addr)
57428+{
57429+ return 0;
57430+}
57431+
57432+void
57433+gr_handle_alertkill(struct task_struct *task)
57434+{
57435+ return;
57436+}
57437+
57438+__u32
57439+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
57440+{
57441+ return 1;
57442+}
57443+
57444+__u32
57445+gr_acl_handle_hidden_file(const struct dentry * dentry,
57446+ const struct vfsmount * mnt)
57447+{
57448+ return 1;
57449+}
57450+
57451+__u32
57452+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
57453+ int acc_mode)
57454+{
57455+ return 1;
57456+}
57457+
57458+__u32
57459+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
57460+{
57461+ return 1;
57462+}
57463+
57464+__u32
57465+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
57466+{
57467+ return 1;
57468+}
57469+
57470+int
57471+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
57472+ unsigned int *vm_flags)
57473+{
57474+ return 1;
57475+}
57476+
57477+__u32
57478+gr_acl_handle_truncate(const struct dentry * dentry,
57479+ const struct vfsmount * mnt)
57480+{
57481+ return 1;
57482+}
57483+
57484+__u32
57485+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
57486+{
57487+ return 1;
57488+}
57489+
57490+__u32
57491+gr_acl_handle_access(const struct dentry * dentry,
57492+ const struct vfsmount * mnt, const int fmode)
57493+{
57494+ return 1;
57495+}
57496+
57497+__u32
57498+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
57499+ umode_t *mode)
57500+{
57501+ return 1;
57502+}
57503+
57504+__u32
57505+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
57506+{
57507+ return 1;
57508+}
57509+
57510+__u32
57511+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
57512+{
57513+ return 1;
57514+}
57515+
57516+void
57517+grsecurity_init(void)
57518+{
57519+ return;
57520+}
57521+
57522+umode_t gr_acl_umask(void)
57523+{
57524+ return 0;
57525+}
57526+
57527+__u32
57528+gr_acl_handle_mknod(const struct dentry * new_dentry,
57529+ const struct dentry * parent_dentry,
57530+ const struct vfsmount * parent_mnt,
57531+ const int mode)
57532+{
57533+ return 1;
57534+}
57535+
57536+__u32
57537+gr_acl_handle_mkdir(const struct dentry * new_dentry,
57538+ const struct dentry * parent_dentry,
57539+ const struct vfsmount * parent_mnt)
57540+{
57541+ return 1;
57542+}
57543+
57544+__u32
57545+gr_acl_handle_symlink(const struct dentry * new_dentry,
57546+ const struct dentry * parent_dentry,
57547+ const struct vfsmount * parent_mnt, const char *from)
57548+{
57549+ return 1;
57550+}
57551+
57552+__u32
57553+gr_acl_handle_link(const struct dentry * new_dentry,
57554+ const struct dentry * parent_dentry,
57555+ const struct vfsmount * parent_mnt,
57556+ const struct dentry * old_dentry,
57557+ const struct vfsmount * old_mnt, const char *to)
57558+{
57559+ return 1;
57560+}
57561+
57562+int
57563+gr_acl_handle_rename(const struct dentry *new_dentry,
57564+ const struct dentry *parent_dentry,
57565+ const struct vfsmount *parent_mnt,
57566+ const struct dentry *old_dentry,
57567+ const struct inode *old_parent_inode,
57568+ const struct vfsmount *old_mnt, const char *newname)
57569+{
57570+ return 0;
57571+}
57572+
57573+int
57574+gr_acl_handle_filldir(const struct file *file, const char *name,
57575+ const int namelen, const ino_t ino)
57576+{
57577+ return 1;
57578+}
57579+
57580+int
57581+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
57582+ const time_t shm_createtime, const uid_t cuid, const int shmid)
57583+{
57584+ return 1;
57585+}
57586+
57587+int
57588+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
57589+{
57590+ return 0;
57591+}
57592+
57593+int
57594+gr_search_accept(const struct socket *sock)
57595+{
57596+ return 0;
57597+}
57598+
57599+int
57600+gr_search_listen(const struct socket *sock)
57601+{
57602+ return 0;
57603+}
57604+
57605+int
57606+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
57607+{
57608+ return 0;
57609+}
57610+
57611+__u32
57612+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
57613+{
57614+ return 1;
57615+}
57616+
57617+__u32
57618+gr_acl_handle_creat(const struct dentry * dentry,
57619+ const struct dentry * p_dentry,
57620+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
57621+ const int imode)
57622+{
57623+ return 1;
57624+}
57625+
57626+void
57627+gr_acl_handle_exit(void)
57628+{
57629+ return;
57630+}
57631+
57632+int
57633+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
57634+{
57635+ return 1;
57636+}
57637+
57638+void
57639+gr_set_role_label(const uid_t uid, const gid_t gid)
57640+{
57641+ return;
57642+}
57643+
57644+int
57645+gr_acl_handle_procpidmem(const struct task_struct *task)
57646+{
57647+ return 0;
57648+}
57649+
57650+int
57651+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
57652+{
57653+ return 0;
57654+}
57655+
57656+int
57657+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
57658+{
57659+ return 0;
57660+}
57661+
57662+void
57663+gr_set_kernel_label(struct task_struct *task)
57664+{
57665+ return;
57666+}
57667+
57668+int
57669+gr_check_user_change(int real, int effective, int fs)
57670+{
57671+ return 0;
57672+}
57673+
57674+int
57675+gr_check_group_change(int real, int effective, int fs)
57676+{
57677+ return 0;
57678+}
57679+
57680+int gr_acl_enable_at_secure(void)
57681+{
57682+ return 0;
57683+}
57684+
57685+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
57686+{
57687+ return dentry->d_inode->i_sb->s_dev;
57688+}
57689+
57690+EXPORT_SYMBOL(gr_learn_resource);
57691+EXPORT_SYMBOL(gr_set_kernel_label);
57692+#ifdef CONFIG_SECURITY
57693+EXPORT_SYMBOL(gr_check_user_change);
57694+EXPORT_SYMBOL(gr_check_group_change);
57695+#endif
57696diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
57697new file mode 100644
57698index 0000000..abfa971
57699--- /dev/null
57700+++ b/grsecurity/grsec_exec.c
57701@@ -0,0 +1,174 @@
57702+#include <linux/kernel.h>
57703+#include <linux/sched.h>
57704+#include <linux/file.h>
57705+#include <linux/binfmts.h>
57706+#include <linux/fs.h>
57707+#include <linux/types.h>
57708+#include <linux/grdefs.h>
57709+#include <linux/grsecurity.h>
57710+#include <linux/grinternal.h>
57711+#include <linux/capability.h>
57712+#include <linux/module.h>
57713+
57714+#include <asm/uaccess.h>
57715+
57716+#ifdef CONFIG_GRKERNSEC_EXECLOG
57717+static char gr_exec_arg_buf[132];
57718+static DEFINE_MUTEX(gr_exec_arg_mutex);
57719+#endif
57720+
57721+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
57722+
57723+void
57724+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
57725+{
57726+#ifdef CONFIG_GRKERNSEC_EXECLOG
57727+ char *grarg = gr_exec_arg_buf;
57728+ unsigned int i, x, execlen = 0;
57729+ char c;
57730+
57731+ if (!((grsec_enable_execlog && grsec_enable_group &&
57732+ in_group_p(grsec_audit_gid))
57733+ || (grsec_enable_execlog && !grsec_enable_group)))
57734+ return;
57735+
57736+ mutex_lock(&gr_exec_arg_mutex);
57737+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
57738+
57739+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
57740+ const char __user *p;
57741+ unsigned int len;
57742+
57743+ p = get_user_arg_ptr(argv, i);
57744+ if (IS_ERR(p))
57745+ goto log;
57746+
57747+ len = strnlen_user(p, 128 - execlen);
57748+ if (len > 128 - execlen)
57749+ len = 128 - execlen;
57750+ else if (len > 0)
57751+ len--;
57752+ if (copy_from_user(grarg + execlen, p, len))
57753+ goto log;
57754+
57755+ /* rewrite unprintable characters */
57756+ for (x = 0; x < len; x++) {
57757+ c = *(grarg + execlen + x);
57758+ if (c < 32 || c > 126)
57759+ *(grarg + execlen + x) = ' ';
57760+ }
57761+
57762+ execlen += len;
57763+ *(grarg + execlen) = ' ';
57764+ *(grarg + execlen + 1) = '\0';
57765+ execlen++;
57766+ }
57767+
57768+ log:
57769+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
57770+ bprm->file->f_path.mnt, grarg);
57771+ mutex_unlock(&gr_exec_arg_mutex);
57772+#endif
57773+ return;
57774+}
57775+
57776+#ifdef CONFIG_GRKERNSEC
57777+extern int gr_acl_is_capable(const int cap);
57778+extern int gr_acl_is_capable_nolog(const int cap);
57779+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
57780+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
57781+extern int gr_chroot_is_capable(const int cap);
57782+extern int gr_chroot_is_capable_nolog(const int cap);
57783+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
57784+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
57785+#endif
57786+
57787+const char *captab_log[] = {
57788+ "CAP_CHOWN",
57789+ "CAP_DAC_OVERRIDE",
57790+ "CAP_DAC_READ_SEARCH",
57791+ "CAP_FOWNER",
57792+ "CAP_FSETID",
57793+ "CAP_KILL",
57794+ "CAP_SETGID",
57795+ "CAP_SETUID",
57796+ "CAP_SETPCAP",
57797+ "CAP_LINUX_IMMUTABLE",
57798+ "CAP_NET_BIND_SERVICE",
57799+ "CAP_NET_BROADCAST",
57800+ "CAP_NET_ADMIN",
57801+ "CAP_NET_RAW",
57802+ "CAP_IPC_LOCK",
57803+ "CAP_IPC_OWNER",
57804+ "CAP_SYS_MODULE",
57805+ "CAP_SYS_RAWIO",
57806+ "CAP_SYS_CHROOT",
57807+ "CAP_SYS_PTRACE",
57808+ "CAP_SYS_PACCT",
57809+ "CAP_SYS_ADMIN",
57810+ "CAP_SYS_BOOT",
57811+ "CAP_SYS_NICE",
57812+ "CAP_SYS_RESOURCE",
57813+ "CAP_SYS_TIME",
57814+ "CAP_SYS_TTY_CONFIG",
57815+ "CAP_MKNOD",
57816+ "CAP_LEASE",
57817+ "CAP_AUDIT_WRITE",
57818+ "CAP_AUDIT_CONTROL",
57819+ "CAP_SETFCAP",
57820+ "CAP_MAC_OVERRIDE",
57821+ "CAP_MAC_ADMIN",
57822+ "CAP_SYSLOG",
57823+ "CAP_WAKE_ALARM"
57824+};
57825+
57826+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
57827+
57828+int gr_is_capable(const int cap)
57829+{
57830+#ifdef CONFIG_GRKERNSEC
57831+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
57832+ return 1;
57833+ return 0;
57834+#else
57835+ return 1;
57836+#endif
57837+}
57838+
57839+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
57840+{
57841+#ifdef CONFIG_GRKERNSEC
57842+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
57843+ return 1;
57844+ return 0;
57845+#else
57846+ return 1;
57847+#endif
57848+}
57849+
57850+int gr_is_capable_nolog(const int cap)
57851+{
57852+#ifdef CONFIG_GRKERNSEC
57853+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
57854+ return 1;
57855+ return 0;
57856+#else
57857+ return 1;
57858+#endif
57859+}
57860+
57861+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
57862+{
57863+#ifdef CONFIG_GRKERNSEC
57864+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
57865+ return 1;
57866+ return 0;
57867+#else
57868+ return 1;
57869+#endif
57870+}
57871+
57872+EXPORT_SYMBOL(gr_is_capable);
57873+EXPORT_SYMBOL(gr_is_capable_nolog);
57874+EXPORT_SYMBOL(gr_task_is_capable);
57875+EXPORT_SYMBOL(gr_task_is_capable_nolog);
57876diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
57877new file mode 100644
57878index 0000000..d3ee748
57879--- /dev/null
57880+++ b/grsecurity/grsec_fifo.c
57881@@ -0,0 +1,24 @@
57882+#include <linux/kernel.h>
57883+#include <linux/sched.h>
57884+#include <linux/fs.h>
57885+#include <linux/file.h>
57886+#include <linux/grinternal.h>
57887+
57888+int
57889+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
57890+ const struct dentry *dir, const int flag, const int acc_mode)
57891+{
57892+#ifdef CONFIG_GRKERNSEC_FIFO
57893+ const struct cred *cred = current_cred();
57894+
57895+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
57896+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
57897+ (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
57898+ (cred->fsuid != dentry->d_inode->i_uid)) {
57899+ if (!inode_permission(dentry->d_inode, acc_mode))
57900+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
57901+ return -EACCES;
57902+ }
57903+#endif
57904+ return 0;
57905+}
57906diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
57907new file mode 100644
57908index 0000000..8ca18bf
57909--- /dev/null
57910+++ b/grsecurity/grsec_fork.c
57911@@ -0,0 +1,23 @@
57912+#include <linux/kernel.h>
57913+#include <linux/sched.h>
57914+#include <linux/grsecurity.h>
57915+#include <linux/grinternal.h>
57916+#include <linux/errno.h>
57917+
57918+void
57919+gr_log_forkfail(const int retval)
57920+{
57921+#ifdef CONFIG_GRKERNSEC_FORKFAIL
57922+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
57923+ switch (retval) {
57924+ case -EAGAIN:
57925+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
57926+ break;
57927+ case -ENOMEM:
57928+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
57929+ break;
57930+ }
57931+ }
57932+#endif
57933+ return;
57934+}
57935diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
57936new file mode 100644
57937index 0000000..01ddde4
57938--- /dev/null
57939+++ b/grsecurity/grsec_init.c
57940@@ -0,0 +1,277 @@
57941+#include <linux/kernel.h>
57942+#include <linux/sched.h>
57943+#include <linux/mm.h>
57944+#include <linux/gracl.h>
57945+#include <linux/slab.h>
57946+#include <linux/vmalloc.h>
57947+#include <linux/percpu.h>
57948+#include <linux/module.h>
57949+
57950+int grsec_enable_ptrace_readexec;
57951+int grsec_enable_setxid;
57952+int grsec_enable_brute;
57953+int grsec_enable_link;
57954+int grsec_enable_dmesg;
57955+int grsec_enable_harden_ptrace;
57956+int grsec_enable_fifo;
57957+int grsec_enable_execlog;
57958+int grsec_enable_signal;
57959+int grsec_enable_forkfail;
57960+int grsec_enable_audit_ptrace;
57961+int grsec_enable_time;
57962+int grsec_enable_audit_textrel;
57963+int grsec_enable_group;
57964+int grsec_audit_gid;
57965+int grsec_enable_chdir;
57966+int grsec_enable_mount;
57967+int grsec_enable_rofs;
57968+int grsec_enable_chroot_findtask;
57969+int grsec_enable_chroot_mount;
57970+int grsec_enable_chroot_shmat;
57971+int grsec_enable_chroot_fchdir;
57972+int grsec_enable_chroot_double;
57973+int grsec_enable_chroot_pivot;
57974+int grsec_enable_chroot_chdir;
57975+int grsec_enable_chroot_chmod;
57976+int grsec_enable_chroot_mknod;
57977+int grsec_enable_chroot_nice;
57978+int grsec_enable_chroot_execlog;
57979+int grsec_enable_chroot_caps;
57980+int grsec_enable_chroot_sysctl;
57981+int grsec_enable_chroot_unix;
57982+int grsec_enable_tpe;
57983+int grsec_tpe_gid;
57984+int grsec_enable_blackhole;
57985+#ifdef CONFIG_IPV6_MODULE
57986+EXPORT_SYMBOL(grsec_enable_blackhole);
57987+#endif
57988+int grsec_lastack_retries;
57989+int grsec_enable_tpe_all;
57990+int grsec_enable_tpe_invert;
57991+int grsec_enable_socket_all;
57992+int grsec_socket_all_gid;
57993+int grsec_enable_socket_client;
57994+int grsec_socket_client_gid;
57995+int grsec_enable_socket_server;
57996+int grsec_socket_server_gid;
57997+int grsec_resource_logging;
57998+int grsec_disable_privio;
57999+int grsec_enable_log_rwxmaps;
58000+int grsec_lock;
58001+
58002+DEFINE_SPINLOCK(grsec_alert_lock);
58003+unsigned long grsec_alert_wtime = 0;
58004+unsigned long grsec_alert_fyet = 0;
58005+
58006+DEFINE_SPINLOCK(grsec_audit_lock);
58007+
58008+DEFINE_RWLOCK(grsec_exec_file_lock);
58009+
58010+char *gr_shared_page[4];
58011+
58012+char *gr_alert_log_fmt;
58013+char *gr_audit_log_fmt;
58014+char *gr_alert_log_buf;
58015+char *gr_audit_log_buf;
58016+
58017+extern struct gr_arg *gr_usermode;
58018+extern unsigned char *gr_system_salt;
58019+extern unsigned char *gr_system_sum;
58020+
58021+void __init
58022+grsecurity_init(void)
58023+{
58024+ int j;
58025+ /* create the per-cpu shared pages */
58026+
58027+#ifdef CONFIG_X86
58028+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
58029+#endif
58030+
58031+ for (j = 0; j < 4; j++) {
58032+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
58033+ if (gr_shared_page[j] == NULL) {
58034+ panic("Unable to allocate grsecurity shared page");
58035+ return;
58036+ }
58037+ }
58038+
58039+ /* allocate log buffers */
58040+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
58041+ if (!gr_alert_log_fmt) {
58042+ panic("Unable to allocate grsecurity alert log format buffer");
58043+ return;
58044+ }
58045+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
58046+ if (!gr_audit_log_fmt) {
58047+ panic("Unable to allocate grsecurity audit log format buffer");
58048+ return;
58049+ }
58050+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
58051+ if (!gr_alert_log_buf) {
58052+ panic("Unable to allocate grsecurity alert log buffer");
58053+ return;
58054+ }
58055+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
58056+ if (!gr_audit_log_buf) {
58057+ panic("Unable to allocate grsecurity audit log buffer");
58058+ return;
58059+ }
58060+
58061+ /* allocate memory for authentication structure */
58062+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
58063+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
58064+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
58065+
58066+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
58067+ panic("Unable to allocate grsecurity authentication structure");
58068+ return;
58069+ }
58070+
58071+
58072+#ifdef CONFIG_GRKERNSEC_IO
58073+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
58074+ grsec_disable_privio = 1;
58075+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
58076+ grsec_disable_privio = 1;
58077+#else
58078+ grsec_disable_privio = 0;
58079+#endif
58080+#endif
58081+
58082+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
58083+ /* for backward compatibility, tpe_invert always defaults to on if
58084+ enabled in the kernel
58085+ */
58086+ grsec_enable_tpe_invert = 1;
58087+#endif
58088+
58089+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
58090+#ifndef CONFIG_GRKERNSEC_SYSCTL
58091+ grsec_lock = 1;
58092+#endif
58093+
58094+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
58095+ grsec_enable_audit_textrel = 1;
58096+#endif
58097+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58098+ grsec_enable_log_rwxmaps = 1;
58099+#endif
58100+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
58101+ grsec_enable_group = 1;
58102+ grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
58103+#endif
58104+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
58105+ grsec_enable_ptrace_readexec = 1;
58106+#endif
58107+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
58108+ grsec_enable_chdir = 1;
58109+#endif
58110+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
58111+ grsec_enable_harden_ptrace = 1;
58112+#endif
58113+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58114+ grsec_enable_mount = 1;
58115+#endif
58116+#ifdef CONFIG_GRKERNSEC_LINK
58117+ grsec_enable_link = 1;
58118+#endif
58119+#ifdef CONFIG_GRKERNSEC_BRUTE
58120+ grsec_enable_brute = 1;
58121+#endif
58122+#ifdef CONFIG_GRKERNSEC_DMESG
58123+ grsec_enable_dmesg = 1;
58124+#endif
58125+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
58126+ grsec_enable_blackhole = 1;
58127+ grsec_lastack_retries = 4;
58128+#endif
58129+#ifdef CONFIG_GRKERNSEC_FIFO
58130+ grsec_enable_fifo = 1;
58131+#endif
58132+#ifdef CONFIG_GRKERNSEC_EXECLOG
58133+ grsec_enable_execlog = 1;
58134+#endif
58135+#ifdef CONFIG_GRKERNSEC_SETXID
58136+ grsec_enable_setxid = 1;
58137+#endif
58138+#ifdef CONFIG_GRKERNSEC_SIGNAL
58139+ grsec_enable_signal = 1;
58140+#endif
58141+#ifdef CONFIG_GRKERNSEC_FORKFAIL
58142+ grsec_enable_forkfail = 1;
58143+#endif
58144+#ifdef CONFIG_GRKERNSEC_TIME
58145+ grsec_enable_time = 1;
58146+#endif
58147+#ifdef CONFIG_GRKERNSEC_RESLOG
58148+ grsec_resource_logging = 1;
58149+#endif
58150+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
58151+ grsec_enable_chroot_findtask = 1;
58152+#endif
58153+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
58154+ grsec_enable_chroot_unix = 1;
58155+#endif
58156+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
58157+ grsec_enable_chroot_mount = 1;
58158+#endif
58159+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
58160+ grsec_enable_chroot_fchdir = 1;
58161+#endif
58162+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
58163+ grsec_enable_chroot_shmat = 1;
58164+#endif
58165+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
58166+ grsec_enable_audit_ptrace = 1;
58167+#endif
58168+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
58169+ grsec_enable_chroot_double = 1;
58170+#endif
58171+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
58172+ grsec_enable_chroot_pivot = 1;
58173+#endif
58174+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
58175+ grsec_enable_chroot_chdir = 1;
58176+#endif
58177+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
58178+ grsec_enable_chroot_chmod = 1;
58179+#endif
58180+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
58181+ grsec_enable_chroot_mknod = 1;
58182+#endif
58183+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
58184+ grsec_enable_chroot_nice = 1;
58185+#endif
58186+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
58187+ grsec_enable_chroot_execlog = 1;
58188+#endif
58189+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
58190+ grsec_enable_chroot_caps = 1;
58191+#endif
58192+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
58193+ grsec_enable_chroot_sysctl = 1;
58194+#endif
58195+#ifdef CONFIG_GRKERNSEC_TPE
58196+ grsec_enable_tpe = 1;
58197+ grsec_tpe_gid = CONFIG_GRKERNSEC_TPE_GID;
58198+#ifdef CONFIG_GRKERNSEC_TPE_ALL
58199+ grsec_enable_tpe_all = 1;
58200+#endif
58201+#endif
58202+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
58203+ grsec_enable_socket_all = 1;
58204+ grsec_socket_all_gid = CONFIG_GRKERNSEC_SOCKET_ALL_GID;
58205+#endif
58206+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
58207+ grsec_enable_socket_client = 1;
58208+ grsec_socket_client_gid = CONFIG_GRKERNSEC_SOCKET_CLIENT_GID;
58209+#endif
58210+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
58211+ grsec_enable_socket_server = 1;
58212+ grsec_socket_server_gid = CONFIG_GRKERNSEC_SOCKET_SERVER_GID;
58213+#endif
58214+#endif
58215+
58216+ return;
58217+}
58218diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
58219new file mode 100644
58220index 0000000..3efe141
58221--- /dev/null
58222+++ b/grsecurity/grsec_link.c
58223@@ -0,0 +1,43 @@
58224+#include <linux/kernel.h>
58225+#include <linux/sched.h>
58226+#include <linux/fs.h>
58227+#include <linux/file.h>
58228+#include <linux/grinternal.h>
58229+
58230+int
58231+gr_handle_follow_link(const struct inode *parent,
58232+ const struct inode *inode,
58233+ const struct dentry *dentry, const struct vfsmount *mnt)
58234+{
58235+#ifdef CONFIG_GRKERNSEC_LINK
58236+ const struct cred *cred = current_cred();
58237+
58238+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
58239+ (parent->i_mode & S_ISVTX) && (parent->i_uid != inode->i_uid) &&
58240+ (parent->i_mode & S_IWOTH) && (cred->fsuid != inode->i_uid)) {
58241+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
58242+ return -EACCES;
58243+ }
58244+#endif
58245+ return 0;
58246+}
58247+
58248+int
58249+gr_handle_hardlink(const struct dentry *dentry,
58250+ const struct vfsmount *mnt,
58251+ struct inode *inode, const int mode, const char *to)
58252+{
58253+#ifdef CONFIG_GRKERNSEC_LINK
58254+ const struct cred *cred = current_cred();
58255+
58256+ if (grsec_enable_link && cred->fsuid != inode->i_uid &&
58257+ (!S_ISREG(mode) || (mode & S_ISUID) ||
58258+ ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) ||
58259+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
58260+ !capable(CAP_FOWNER) && cred->uid) {
58261+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
58262+ return -EPERM;
58263+ }
58264+#endif
58265+ return 0;
58266+}
58267diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
58268new file mode 100644
58269index 0000000..a45d2e9
58270--- /dev/null
58271+++ b/grsecurity/grsec_log.c
58272@@ -0,0 +1,322 @@
58273+#include <linux/kernel.h>
58274+#include <linux/sched.h>
58275+#include <linux/file.h>
58276+#include <linux/tty.h>
58277+#include <linux/fs.h>
58278+#include <linux/grinternal.h>
58279+
58280+#ifdef CONFIG_TREE_PREEMPT_RCU
58281+#define DISABLE_PREEMPT() preempt_disable()
58282+#define ENABLE_PREEMPT() preempt_enable()
58283+#else
58284+#define DISABLE_PREEMPT()
58285+#define ENABLE_PREEMPT()
58286+#endif
58287+
58288+#define BEGIN_LOCKS(x) \
58289+ DISABLE_PREEMPT(); \
58290+ rcu_read_lock(); \
58291+ read_lock(&tasklist_lock); \
58292+ read_lock(&grsec_exec_file_lock); \
58293+ if (x != GR_DO_AUDIT) \
58294+ spin_lock(&grsec_alert_lock); \
58295+ else \
58296+ spin_lock(&grsec_audit_lock)
58297+
58298+#define END_LOCKS(x) \
58299+ if (x != GR_DO_AUDIT) \
58300+ spin_unlock(&grsec_alert_lock); \
58301+ else \
58302+ spin_unlock(&grsec_audit_lock); \
58303+ read_unlock(&grsec_exec_file_lock); \
58304+ read_unlock(&tasklist_lock); \
58305+ rcu_read_unlock(); \
58306+ ENABLE_PREEMPT(); \
58307+ if (x == GR_DONT_AUDIT) \
58308+ gr_handle_alertkill(current)
58309+
58310+enum {
58311+ FLOODING,
58312+ NO_FLOODING
58313+};
58314+
58315+extern char *gr_alert_log_fmt;
58316+extern char *gr_audit_log_fmt;
58317+extern char *gr_alert_log_buf;
58318+extern char *gr_audit_log_buf;
58319+
58320+static int gr_log_start(int audit)
58321+{
58322+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
58323+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
58324+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58325+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
58326+ unsigned long curr_secs = get_seconds();
58327+
58328+ if (audit == GR_DO_AUDIT)
58329+ goto set_fmt;
58330+
58331+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
58332+ grsec_alert_wtime = curr_secs;
58333+ grsec_alert_fyet = 0;
58334+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
58335+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
58336+ grsec_alert_fyet++;
58337+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
58338+ grsec_alert_wtime = curr_secs;
58339+ grsec_alert_fyet++;
58340+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
58341+ return FLOODING;
58342+ }
58343+ else return FLOODING;
58344+
58345+set_fmt:
58346+#endif
58347+ memset(buf, 0, PAGE_SIZE);
58348+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
58349+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
58350+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
58351+ } else if (current->signal->curr_ip) {
58352+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
58353+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
58354+ } else if (gr_acl_is_enabled()) {
58355+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
58356+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
58357+ } else {
58358+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
58359+ strcpy(buf, fmt);
58360+ }
58361+
58362+ return NO_FLOODING;
58363+}
58364+
58365+static void gr_log_middle(int audit, const char *msg, va_list ap)
58366+ __attribute__ ((format (printf, 2, 0)));
58367+
58368+static void gr_log_middle(int audit, const char *msg, va_list ap)
58369+{
58370+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58371+ unsigned int len = strlen(buf);
58372+
58373+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
58374+
58375+ return;
58376+}
58377+
58378+static void gr_log_middle_varargs(int audit, const char *msg, ...)
58379+ __attribute__ ((format (printf, 2, 3)));
58380+
58381+static void gr_log_middle_varargs(int audit, const char *msg, ...)
58382+{
58383+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58384+ unsigned int len = strlen(buf);
58385+ va_list ap;
58386+
58387+ va_start(ap, msg);
58388+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
58389+ va_end(ap);
58390+
58391+ return;
58392+}
58393+
58394+static void gr_log_end(int audit, int append_default)
58395+{
58396+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58397+
58398+ if (append_default) {
58399+ unsigned int len = strlen(buf);
58400+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
58401+ }
58402+
58403+ printk("%s\n", buf);
58404+
58405+ return;
58406+}
58407+
58408+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
58409+{
58410+ int logtype;
58411+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
58412+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
58413+ void *voidptr = NULL;
58414+ int num1 = 0, num2 = 0;
58415+ unsigned long ulong1 = 0, ulong2 = 0;
58416+ struct dentry *dentry = NULL;
58417+ struct vfsmount *mnt = NULL;
58418+ struct file *file = NULL;
58419+ struct task_struct *task = NULL;
58420+ const struct cred *cred, *pcred;
58421+ va_list ap;
58422+
58423+ BEGIN_LOCKS(audit);
58424+ logtype = gr_log_start(audit);
58425+ if (logtype == FLOODING) {
58426+ END_LOCKS(audit);
58427+ return;
58428+ }
58429+ va_start(ap, argtypes);
58430+ switch (argtypes) {
58431+ case GR_TTYSNIFF:
58432+ task = va_arg(ap, struct task_struct *);
58433+ 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);
58434+ break;
58435+ case GR_SYSCTL_HIDDEN:
58436+ str1 = va_arg(ap, char *);
58437+ gr_log_middle_varargs(audit, msg, result, str1);
58438+ break;
58439+ case GR_RBAC:
58440+ dentry = va_arg(ap, struct dentry *);
58441+ mnt = va_arg(ap, struct vfsmount *);
58442+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
58443+ break;
58444+ case GR_RBAC_STR:
58445+ dentry = va_arg(ap, struct dentry *);
58446+ mnt = va_arg(ap, struct vfsmount *);
58447+ str1 = va_arg(ap, char *);
58448+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
58449+ break;
58450+ case GR_STR_RBAC:
58451+ str1 = va_arg(ap, char *);
58452+ dentry = va_arg(ap, struct dentry *);
58453+ mnt = va_arg(ap, struct vfsmount *);
58454+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
58455+ break;
58456+ case GR_RBAC_MODE2:
58457+ dentry = va_arg(ap, struct dentry *);
58458+ mnt = va_arg(ap, struct vfsmount *);
58459+ str1 = va_arg(ap, char *);
58460+ str2 = va_arg(ap, char *);
58461+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
58462+ break;
58463+ case GR_RBAC_MODE3:
58464+ dentry = va_arg(ap, struct dentry *);
58465+ mnt = va_arg(ap, struct vfsmount *);
58466+ str1 = va_arg(ap, char *);
58467+ str2 = va_arg(ap, char *);
58468+ str3 = va_arg(ap, char *);
58469+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
58470+ break;
58471+ case GR_FILENAME:
58472+ dentry = va_arg(ap, struct dentry *);
58473+ mnt = va_arg(ap, struct vfsmount *);
58474+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
58475+ break;
58476+ case GR_STR_FILENAME:
58477+ str1 = va_arg(ap, char *);
58478+ dentry = va_arg(ap, struct dentry *);
58479+ mnt = va_arg(ap, struct vfsmount *);
58480+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
58481+ break;
58482+ case GR_FILENAME_STR:
58483+ dentry = va_arg(ap, struct dentry *);
58484+ mnt = va_arg(ap, struct vfsmount *);
58485+ str1 = va_arg(ap, char *);
58486+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
58487+ break;
58488+ case GR_FILENAME_TWO_INT:
58489+ dentry = va_arg(ap, struct dentry *);
58490+ mnt = va_arg(ap, struct vfsmount *);
58491+ num1 = va_arg(ap, int);
58492+ num2 = va_arg(ap, int);
58493+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
58494+ break;
58495+ case GR_FILENAME_TWO_INT_STR:
58496+ dentry = va_arg(ap, struct dentry *);
58497+ mnt = va_arg(ap, struct vfsmount *);
58498+ num1 = va_arg(ap, int);
58499+ num2 = va_arg(ap, int);
58500+ str1 = va_arg(ap, char *);
58501+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
58502+ break;
58503+ case GR_TEXTREL:
58504+ file = va_arg(ap, struct file *);
58505+ ulong1 = va_arg(ap, unsigned long);
58506+ ulong2 = va_arg(ap, unsigned long);
58507+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
58508+ break;
58509+ case GR_PTRACE:
58510+ task = va_arg(ap, struct task_struct *);
58511+ 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);
58512+ break;
58513+ case GR_RESOURCE:
58514+ task = va_arg(ap, struct task_struct *);
58515+ cred = __task_cred(task);
58516+ pcred = __task_cred(task->real_parent);
58517+ ulong1 = va_arg(ap, unsigned long);
58518+ str1 = va_arg(ap, char *);
58519+ ulong2 = va_arg(ap, unsigned long);
58520+ 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);
58521+ break;
58522+ case GR_CAP:
58523+ task = va_arg(ap, struct task_struct *);
58524+ cred = __task_cred(task);
58525+ pcred = __task_cred(task->real_parent);
58526+ str1 = va_arg(ap, char *);
58527+ 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);
58528+ break;
58529+ case GR_SIG:
58530+ str1 = va_arg(ap, char *);
58531+ voidptr = va_arg(ap, void *);
58532+ gr_log_middle_varargs(audit, msg, str1, voidptr);
58533+ break;
58534+ case GR_SIG2:
58535+ task = va_arg(ap, struct task_struct *);
58536+ cred = __task_cred(task);
58537+ pcred = __task_cred(task->real_parent);
58538+ num1 = va_arg(ap, int);
58539+ 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);
58540+ break;
58541+ case GR_CRASH1:
58542+ task = va_arg(ap, struct task_struct *);
58543+ cred = __task_cred(task);
58544+ pcred = __task_cred(task->real_parent);
58545+ ulong1 = va_arg(ap, unsigned long);
58546+ 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);
58547+ break;
58548+ case GR_CRASH2:
58549+ task = va_arg(ap, struct task_struct *);
58550+ cred = __task_cred(task);
58551+ pcred = __task_cred(task->real_parent);
58552+ ulong1 = va_arg(ap, unsigned long);
58553+ 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);
58554+ break;
58555+ case GR_RWXMAP:
58556+ file = va_arg(ap, struct file *);
58557+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
58558+ break;
58559+ case GR_PSACCT:
58560+ {
58561+ unsigned int wday, cday;
58562+ __u8 whr, chr;
58563+ __u8 wmin, cmin;
58564+ __u8 wsec, csec;
58565+ char cur_tty[64] = { 0 };
58566+ char parent_tty[64] = { 0 };
58567+
58568+ task = va_arg(ap, struct task_struct *);
58569+ wday = va_arg(ap, unsigned int);
58570+ cday = va_arg(ap, unsigned int);
58571+ whr = va_arg(ap, int);
58572+ chr = va_arg(ap, int);
58573+ wmin = va_arg(ap, int);
58574+ cmin = va_arg(ap, int);
58575+ wsec = va_arg(ap, int);
58576+ csec = va_arg(ap, int);
58577+ ulong1 = va_arg(ap, unsigned long);
58578+ cred = __task_cred(task);
58579+ pcred = __task_cred(task->real_parent);
58580+
58581+ 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);
58582+ }
58583+ break;
58584+ default:
58585+ gr_log_middle(audit, msg, ap);
58586+ }
58587+ va_end(ap);
58588+ // these don't need DEFAULTSECARGS printed on the end
58589+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
58590+ gr_log_end(audit, 0);
58591+ else
58592+ gr_log_end(audit, 1);
58593+ END_LOCKS(audit);
58594+}
58595diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
58596new file mode 100644
58597index 0000000..f536303
58598--- /dev/null
58599+++ b/grsecurity/grsec_mem.c
58600@@ -0,0 +1,40 @@
58601+#include <linux/kernel.h>
58602+#include <linux/sched.h>
58603+#include <linux/mm.h>
58604+#include <linux/mman.h>
58605+#include <linux/grinternal.h>
58606+
58607+void
58608+gr_handle_ioperm(void)
58609+{
58610+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
58611+ return;
58612+}
58613+
58614+void
58615+gr_handle_iopl(void)
58616+{
58617+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
58618+ return;
58619+}
58620+
58621+void
58622+gr_handle_mem_readwrite(u64 from, u64 to)
58623+{
58624+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
58625+ return;
58626+}
58627+
58628+void
58629+gr_handle_vm86(void)
58630+{
58631+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
58632+ return;
58633+}
58634+
58635+void
58636+gr_log_badprocpid(const char *entry)
58637+{
58638+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
58639+ return;
58640+}
58641diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
58642new file mode 100644
58643index 0000000..2131422
58644--- /dev/null
58645+++ b/grsecurity/grsec_mount.c
58646@@ -0,0 +1,62 @@
58647+#include <linux/kernel.h>
58648+#include <linux/sched.h>
58649+#include <linux/mount.h>
58650+#include <linux/grsecurity.h>
58651+#include <linux/grinternal.h>
58652+
58653+void
58654+gr_log_remount(const char *devname, const int retval)
58655+{
58656+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58657+ if (grsec_enable_mount && (retval >= 0))
58658+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
58659+#endif
58660+ return;
58661+}
58662+
58663+void
58664+gr_log_unmount(const char *devname, const int retval)
58665+{
58666+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58667+ if (grsec_enable_mount && (retval >= 0))
58668+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
58669+#endif
58670+ return;
58671+}
58672+
58673+void
58674+gr_log_mount(const char *from, const char *to, const int retval)
58675+{
58676+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58677+ if (grsec_enable_mount && (retval >= 0))
58678+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
58679+#endif
58680+ return;
58681+}
58682+
58683+int
58684+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
58685+{
58686+#ifdef CONFIG_GRKERNSEC_ROFS
58687+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
58688+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
58689+ return -EPERM;
58690+ } else
58691+ return 0;
58692+#endif
58693+ return 0;
58694+}
58695+
58696+int
58697+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
58698+{
58699+#ifdef CONFIG_GRKERNSEC_ROFS
58700+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
58701+ dentry->d_inode && S_ISBLK(dentry->d_inode->i_mode)) {
58702+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
58703+ return -EPERM;
58704+ } else
58705+ return 0;
58706+#endif
58707+ return 0;
58708+}
58709diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
58710new file mode 100644
58711index 0000000..a3b12a0
58712--- /dev/null
58713+++ b/grsecurity/grsec_pax.c
58714@@ -0,0 +1,36 @@
58715+#include <linux/kernel.h>
58716+#include <linux/sched.h>
58717+#include <linux/mm.h>
58718+#include <linux/file.h>
58719+#include <linux/grinternal.h>
58720+#include <linux/grsecurity.h>
58721+
58722+void
58723+gr_log_textrel(struct vm_area_struct * vma)
58724+{
58725+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
58726+ if (grsec_enable_audit_textrel)
58727+ gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
58728+#endif
58729+ return;
58730+}
58731+
58732+void
58733+gr_log_rwxmmap(struct file *file)
58734+{
58735+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58736+ if (grsec_enable_log_rwxmaps)
58737+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
58738+#endif
58739+ return;
58740+}
58741+
58742+void
58743+gr_log_rwxmprotect(struct file *file)
58744+{
58745+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58746+ if (grsec_enable_log_rwxmaps)
58747+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
58748+#endif
58749+ return;
58750+}
58751diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
58752new file mode 100644
58753index 0000000..f7f29aa
58754--- /dev/null
58755+++ b/grsecurity/grsec_ptrace.c
58756@@ -0,0 +1,30 @@
58757+#include <linux/kernel.h>
58758+#include <linux/sched.h>
58759+#include <linux/grinternal.h>
58760+#include <linux/security.h>
58761+
58762+void
58763+gr_audit_ptrace(struct task_struct *task)
58764+{
58765+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
58766+ if (grsec_enable_audit_ptrace)
58767+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
58768+#endif
58769+ return;
58770+}
58771+
58772+int
58773+gr_ptrace_readexec(struct file *file, int unsafe_flags)
58774+{
58775+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
58776+ const struct dentry *dentry = file->f_path.dentry;
58777+ const struct vfsmount *mnt = file->f_path.mnt;
58778+
58779+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
58780+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
58781+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
58782+ return -EACCES;
58783+ }
58784+#endif
58785+ return 0;
58786+}
58787diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
58788new file mode 100644
58789index 0000000..7a5b2de
58790--- /dev/null
58791+++ b/grsecurity/grsec_sig.c
58792@@ -0,0 +1,207 @@
58793+#include <linux/kernel.h>
58794+#include <linux/sched.h>
58795+#include <linux/delay.h>
58796+#include <linux/grsecurity.h>
58797+#include <linux/grinternal.h>
58798+#include <linux/hardirq.h>
58799+
58800+char *signames[] = {
58801+ [SIGSEGV] = "Segmentation fault",
58802+ [SIGILL] = "Illegal instruction",
58803+ [SIGABRT] = "Abort",
58804+ [SIGBUS] = "Invalid alignment/Bus error"
58805+};
58806+
58807+void
58808+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
58809+{
58810+#ifdef CONFIG_GRKERNSEC_SIGNAL
58811+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
58812+ (sig == SIGABRT) || (sig == SIGBUS))) {
58813+ if (t->pid == current->pid) {
58814+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
58815+ } else {
58816+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
58817+ }
58818+ }
58819+#endif
58820+ return;
58821+}
58822+
58823+int
58824+gr_handle_signal(const struct task_struct *p, const int sig)
58825+{
58826+#ifdef CONFIG_GRKERNSEC
58827+ /* ignore the 0 signal for protected task checks */
58828+ if (current->pid > 1 && sig && gr_check_protected_task(p)) {
58829+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
58830+ return -EPERM;
58831+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
58832+ return -EPERM;
58833+ }
58834+#endif
58835+ return 0;
58836+}
58837+
58838+#ifdef CONFIG_GRKERNSEC
58839+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
58840+
58841+int gr_fake_force_sig(int sig, struct task_struct *t)
58842+{
58843+ unsigned long int flags;
58844+ int ret, blocked, ignored;
58845+ struct k_sigaction *action;
58846+
58847+ spin_lock_irqsave(&t->sighand->siglock, flags);
58848+ action = &t->sighand->action[sig-1];
58849+ ignored = action->sa.sa_handler == SIG_IGN;
58850+ blocked = sigismember(&t->blocked, sig);
58851+ if (blocked || ignored) {
58852+ action->sa.sa_handler = SIG_DFL;
58853+ if (blocked) {
58854+ sigdelset(&t->blocked, sig);
58855+ recalc_sigpending_and_wake(t);
58856+ }
58857+ }
58858+ if (action->sa.sa_handler == SIG_DFL)
58859+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
58860+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
58861+
58862+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
58863+
58864+ return ret;
58865+}
58866+#endif
58867+
58868+#ifdef CONFIG_GRKERNSEC_BRUTE
58869+#define GR_USER_BAN_TIME (15 * 60)
58870+
58871+static int __get_dumpable(unsigned long mm_flags)
58872+{
58873+ int ret;
58874+
58875+ ret = mm_flags & MMF_DUMPABLE_MASK;
58876+ return (ret >= 2) ? 2 : ret;
58877+}
58878+#endif
58879+
58880+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags)
58881+{
58882+#ifdef CONFIG_GRKERNSEC_BRUTE
58883+ uid_t uid = 0;
58884+
58885+ if (!grsec_enable_brute)
58886+ return;
58887+
58888+ rcu_read_lock();
58889+ read_lock(&tasklist_lock);
58890+ read_lock(&grsec_exec_file_lock);
58891+ if (p->real_parent && p->real_parent->exec_file == p->exec_file)
58892+ p->real_parent->brute = 1;
58893+ else {
58894+ const struct cred *cred = __task_cred(p), *cred2;
58895+ struct task_struct *tsk, *tsk2;
58896+
58897+ if (!__get_dumpable(mm_flags) && cred->uid) {
58898+ struct user_struct *user;
58899+
58900+ uid = cred->uid;
58901+
58902+ /* this is put upon execution past expiration */
58903+ user = find_user(uid);
58904+ if (user == NULL)
58905+ goto unlock;
58906+ user->banned = 1;
58907+ user->ban_expires = get_seconds() + GR_USER_BAN_TIME;
58908+ if (user->ban_expires == ~0UL)
58909+ user->ban_expires--;
58910+
58911+ do_each_thread(tsk2, tsk) {
58912+ cred2 = __task_cred(tsk);
58913+ if (tsk != p && cred2->uid == uid)
58914+ gr_fake_force_sig(SIGKILL, tsk);
58915+ } while_each_thread(tsk2, tsk);
58916+ }
58917+ }
58918+unlock:
58919+ read_unlock(&grsec_exec_file_lock);
58920+ read_unlock(&tasklist_lock);
58921+ rcu_read_unlock();
58922+
58923+ if (uid)
58924+ printk(KERN_ALERT "grsec: bruteforce prevention initiated against uid %u, banning for %d minutes\n", uid, GR_USER_BAN_TIME / 60);
58925+
58926+#endif
58927+ return;
58928+}
58929+
58930+void gr_handle_brute_check(void)
58931+{
58932+#ifdef CONFIG_GRKERNSEC_BRUTE
58933+ if (current->brute)
58934+ msleep(30 * 1000);
58935+#endif
58936+ return;
58937+}
58938+
58939+void gr_handle_kernel_exploit(void)
58940+{
58941+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
58942+ const struct cred *cred;
58943+ struct task_struct *tsk, *tsk2;
58944+ struct user_struct *user;
58945+ uid_t uid;
58946+
58947+ if (in_irq() || in_serving_softirq() || in_nmi())
58948+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
58949+
58950+ uid = current_uid();
58951+
58952+ if (uid == 0)
58953+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
58954+ else {
58955+ /* kill all the processes of this user, hold a reference
58956+ to their creds struct, and prevent them from creating
58957+ another process until system reset
58958+ */
58959+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n", uid);
58960+ /* we intentionally leak this ref */
58961+ user = get_uid(current->cred->user);
58962+ if (user) {
58963+ user->banned = 1;
58964+ user->ban_expires = ~0UL;
58965+ }
58966+
58967+ read_lock(&tasklist_lock);
58968+ do_each_thread(tsk2, tsk) {
58969+ cred = __task_cred(tsk);
58970+ if (cred->uid == uid)
58971+ gr_fake_force_sig(SIGKILL, tsk);
58972+ } while_each_thread(tsk2, tsk);
58973+ read_unlock(&tasklist_lock);
58974+ }
58975+#endif
58976+}
58977+
58978+int __gr_process_user_ban(struct user_struct *user)
58979+{
58980+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
58981+ if (unlikely(user->banned)) {
58982+ if (user->ban_expires != ~0UL && time_after_eq(get_seconds(), user->ban_expires)) {
58983+ user->banned = 0;
58984+ user->ban_expires = 0;
58985+ free_uid(user);
58986+ } else
58987+ return -EPERM;
58988+ }
58989+#endif
58990+ return 0;
58991+}
58992+
58993+int gr_process_user_ban(void)
58994+{
58995+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
58996+ return __gr_process_user_ban(current->cred->user);
58997+#endif
58998+ return 0;
58999+}
59000diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
59001new file mode 100644
59002index 0000000..4030d57
59003--- /dev/null
59004+++ b/grsecurity/grsec_sock.c
59005@@ -0,0 +1,244 @@
59006+#include <linux/kernel.h>
59007+#include <linux/module.h>
59008+#include <linux/sched.h>
59009+#include <linux/file.h>
59010+#include <linux/net.h>
59011+#include <linux/in.h>
59012+#include <linux/ip.h>
59013+#include <net/sock.h>
59014+#include <net/inet_sock.h>
59015+#include <linux/grsecurity.h>
59016+#include <linux/grinternal.h>
59017+#include <linux/gracl.h>
59018+
59019+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
59020+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
59021+
59022+EXPORT_SYMBOL(gr_search_udp_recvmsg);
59023+EXPORT_SYMBOL(gr_search_udp_sendmsg);
59024+
59025+#ifdef CONFIG_UNIX_MODULE
59026+EXPORT_SYMBOL(gr_acl_handle_unix);
59027+EXPORT_SYMBOL(gr_acl_handle_mknod);
59028+EXPORT_SYMBOL(gr_handle_chroot_unix);
59029+EXPORT_SYMBOL(gr_handle_create);
59030+#endif
59031+
59032+#ifdef CONFIG_GRKERNSEC
59033+#define gr_conn_table_size 32749
59034+struct conn_table_entry {
59035+ struct conn_table_entry *next;
59036+ struct signal_struct *sig;
59037+};
59038+
59039+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
59040+DEFINE_SPINLOCK(gr_conn_table_lock);
59041+
59042+extern const char * gr_socktype_to_name(unsigned char type);
59043+extern const char * gr_proto_to_name(unsigned char proto);
59044+extern const char * gr_sockfamily_to_name(unsigned char family);
59045+
59046+static __inline__ int
59047+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
59048+{
59049+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
59050+}
59051+
59052+static __inline__ int
59053+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
59054+ __u16 sport, __u16 dport)
59055+{
59056+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
59057+ sig->gr_sport == sport && sig->gr_dport == dport))
59058+ return 1;
59059+ else
59060+ return 0;
59061+}
59062+
59063+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
59064+{
59065+ struct conn_table_entry **match;
59066+ unsigned int index;
59067+
59068+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
59069+ sig->gr_sport, sig->gr_dport,
59070+ gr_conn_table_size);
59071+
59072+ newent->sig = sig;
59073+
59074+ match = &gr_conn_table[index];
59075+ newent->next = *match;
59076+ *match = newent;
59077+
59078+ return;
59079+}
59080+
59081+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
59082+{
59083+ struct conn_table_entry *match, *last = NULL;
59084+ unsigned int index;
59085+
59086+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
59087+ sig->gr_sport, sig->gr_dport,
59088+ gr_conn_table_size);
59089+
59090+ match = gr_conn_table[index];
59091+ while (match && !conn_match(match->sig,
59092+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
59093+ sig->gr_dport)) {
59094+ last = match;
59095+ match = match->next;
59096+ }
59097+
59098+ if (match) {
59099+ if (last)
59100+ last->next = match->next;
59101+ else
59102+ gr_conn_table[index] = NULL;
59103+ kfree(match);
59104+ }
59105+
59106+ return;
59107+}
59108+
59109+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
59110+ __u16 sport, __u16 dport)
59111+{
59112+ struct conn_table_entry *match;
59113+ unsigned int index;
59114+
59115+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
59116+
59117+ match = gr_conn_table[index];
59118+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
59119+ match = match->next;
59120+
59121+ if (match)
59122+ return match->sig;
59123+ else
59124+ return NULL;
59125+}
59126+
59127+#endif
59128+
59129+void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
59130+{
59131+#ifdef CONFIG_GRKERNSEC
59132+ struct signal_struct *sig = task->signal;
59133+ struct conn_table_entry *newent;
59134+
59135+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
59136+ if (newent == NULL)
59137+ return;
59138+ /* no bh lock needed since we are called with bh disabled */
59139+ spin_lock(&gr_conn_table_lock);
59140+ gr_del_task_from_ip_table_nolock(sig);
59141+ sig->gr_saddr = inet->inet_rcv_saddr;
59142+ sig->gr_daddr = inet->inet_daddr;
59143+ sig->gr_sport = inet->inet_sport;
59144+ sig->gr_dport = inet->inet_dport;
59145+ gr_add_to_task_ip_table_nolock(sig, newent);
59146+ spin_unlock(&gr_conn_table_lock);
59147+#endif
59148+ return;
59149+}
59150+
59151+void gr_del_task_from_ip_table(struct task_struct *task)
59152+{
59153+#ifdef CONFIG_GRKERNSEC
59154+ spin_lock_bh(&gr_conn_table_lock);
59155+ gr_del_task_from_ip_table_nolock(task->signal);
59156+ spin_unlock_bh(&gr_conn_table_lock);
59157+#endif
59158+ return;
59159+}
59160+
59161+void
59162+gr_attach_curr_ip(const struct sock *sk)
59163+{
59164+#ifdef CONFIG_GRKERNSEC
59165+ struct signal_struct *p, *set;
59166+ const struct inet_sock *inet = inet_sk(sk);
59167+
59168+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
59169+ return;
59170+
59171+ set = current->signal;
59172+
59173+ spin_lock_bh(&gr_conn_table_lock);
59174+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
59175+ inet->inet_dport, inet->inet_sport);
59176+ if (unlikely(p != NULL)) {
59177+ set->curr_ip = p->curr_ip;
59178+ set->used_accept = 1;
59179+ gr_del_task_from_ip_table_nolock(p);
59180+ spin_unlock_bh(&gr_conn_table_lock);
59181+ return;
59182+ }
59183+ spin_unlock_bh(&gr_conn_table_lock);
59184+
59185+ set->curr_ip = inet->inet_daddr;
59186+ set->used_accept = 1;
59187+#endif
59188+ return;
59189+}
59190+
59191+int
59192+gr_handle_sock_all(const int family, const int type, const int protocol)
59193+{
59194+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
59195+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
59196+ (family != AF_UNIX)) {
59197+ if (family == AF_INET)
59198+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
59199+ else
59200+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
59201+ return -EACCES;
59202+ }
59203+#endif
59204+ return 0;
59205+}
59206+
59207+int
59208+gr_handle_sock_server(const struct sockaddr *sck)
59209+{
59210+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59211+ if (grsec_enable_socket_server &&
59212+ in_group_p(grsec_socket_server_gid) &&
59213+ sck && (sck->sa_family != AF_UNIX) &&
59214+ (sck->sa_family != AF_LOCAL)) {
59215+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
59216+ return -EACCES;
59217+ }
59218+#endif
59219+ return 0;
59220+}
59221+
59222+int
59223+gr_handle_sock_server_other(const struct sock *sck)
59224+{
59225+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59226+ if (grsec_enable_socket_server &&
59227+ in_group_p(grsec_socket_server_gid) &&
59228+ sck && (sck->sk_family != AF_UNIX) &&
59229+ (sck->sk_family != AF_LOCAL)) {
59230+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
59231+ return -EACCES;
59232+ }
59233+#endif
59234+ return 0;
59235+}
59236+
59237+int
59238+gr_handle_sock_client(const struct sockaddr *sck)
59239+{
59240+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
59241+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
59242+ sck && (sck->sa_family != AF_UNIX) &&
59243+ (sck->sa_family != AF_LOCAL)) {
59244+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
59245+ return -EACCES;
59246+ }
59247+#endif
59248+ return 0;
59249+}
59250diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
59251new file mode 100644
59252index 0000000..a1aedd7
59253--- /dev/null
59254+++ b/grsecurity/grsec_sysctl.c
59255@@ -0,0 +1,451 @@
59256+#include <linux/kernel.h>
59257+#include <linux/sched.h>
59258+#include <linux/sysctl.h>
59259+#include <linux/grsecurity.h>
59260+#include <linux/grinternal.h>
59261+
59262+int
59263+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
59264+{
59265+#ifdef CONFIG_GRKERNSEC_SYSCTL
59266+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
59267+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
59268+ return -EACCES;
59269+ }
59270+#endif
59271+ return 0;
59272+}
59273+
59274+#ifdef CONFIG_GRKERNSEC_ROFS
59275+static int __maybe_unused one = 1;
59276+#endif
59277+
59278+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
59279+struct ctl_table grsecurity_table[] = {
59280+#ifdef CONFIG_GRKERNSEC_SYSCTL
59281+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
59282+#ifdef CONFIG_GRKERNSEC_IO
59283+ {
59284+ .procname = "disable_priv_io",
59285+ .data = &grsec_disable_privio,
59286+ .maxlen = sizeof(int),
59287+ .mode = 0600,
59288+ .proc_handler = &proc_dointvec,
59289+ },
59290+#endif
59291+#endif
59292+#ifdef CONFIG_GRKERNSEC_LINK
59293+ {
59294+ .procname = "linking_restrictions",
59295+ .data = &grsec_enable_link,
59296+ .maxlen = sizeof(int),
59297+ .mode = 0600,
59298+ .proc_handler = &proc_dointvec,
59299+ },
59300+#endif
59301+#ifdef CONFIG_GRKERNSEC_BRUTE
59302+ {
59303+ .procname = "deter_bruteforce",
59304+ .data = &grsec_enable_brute,
59305+ .maxlen = sizeof(int),
59306+ .mode = 0600,
59307+ .proc_handler = &proc_dointvec,
59308+ },
59309+#endif
59310+#ifdef CONFIG_GRKERNSEC_FIFO
59311+ {
59312+ .procname = "fifo_restrictions",
59313+ .data = &grsec_enable_fifo,
59314+ .maxlen = sizeof(int),
59315+ .mode = 0600,
59316+ .proc_handler = &proc_dointvec,
59317+ },
59318+#endif
59319+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
59320+ {
59321+ .procname = "ptrace_readexec",
59322+ .data = &grsec_enable_ptrace_readexec,
59323+ .maxlen = sizeof(int),
59324+ .mode = 0600,
59325+ .proc_handler = &proc_dointvec,
59326+ },
59327+#endif
59328+#ifdef CONFIG_GRKERNSEC_SETXID
59329+ {
59330+ .procname = "consistent_setxid",
59331+ .data = &grsec_enable_setxid,
59332+ .maxlen = sizeof(int),
59333+ .mode = 0600,
59334+ .proc_handler = &proc_dointvec,
59335+ },
59336+#endif
59337+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
59338+ {
59339+ .procname = "ip_blackhole",
59340+ .data = &grsec_enable_blackhole,
59341+ .maxlen = sizeof(int),
59342+ .mode = 0600,
59343+ .proc_handler = &proc_dointvec,
59344+ },
59345+ {
59346+ .procname = "lastack_retries",
59347+ .data = &grsec_lastack_retries,
59348+ .maxlen = sizeof(int),
59349+ .mode = 0600,
59350+ .proc_handler = &proc_dointvec,
59351+ },
59352+#endif
59353+#ifdef CONFIG_GRKERNSEC_EXECLOG
59354+ {
59355+ .procname = "exec_logging",
59356+ .data = &grsec_enable_execlog,
59357+ .maxlen = sizeof(int),
59358+ .mode = 0600,
59359+ .proc_handler = &proc_dointvec,
59360+ },
59361+#endif
59362+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59363+ {
59364+ .procname = "rwxmap_logging",
59365+ .data = &grsec_enable_log_rwxmaps,
59366+ .maxlen = sizeof(int),
59367+ .mode = 0600,
59368+ .proc_handler = &proc_dointvec,
59369+ },
59370+#endif
59371+#ifdef CONFIG_GRKERNSEC_SIGNAL
59372+ {
59373+ .procname = "signal_logging",
59374+ .data = &grsec_enable_signal,
59375+ .maxlen = sizeof(int),
59376+ .mode = 0600,
59377+ .proc_handler = &proc_dointvec,
59378+ },
59379+#endif
59380+#ifdef CONFIG_GRKERNSEC_FORKFAIL
59381+ {
59382+ .procname = "forkfail_logging",
59383+ .data = &grsec_enable_forkfail,
59384+ .maxlen = sizeof(int),
59385+ .mode = 0600,
59386+ .proc_handler = &proc_dointvec,
59387+ },
59388+#endif
59389+#ifdef CONFIG_GRKERNSEC_TIME
59390+ {
59391+ .procname = "timechange_logging",
59392+ .data = &grsec_enable_time,
59393+ .maxlen = sizeof(int),
59394+ .mode = 0600,
59395+ .proc_handler = &proc_dointvec,
59396+ },
59397+#endif
59398+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
59399+ {
59400+ .procname = "chroot_deny_shmat",
59401+ .data = &grsec_enable_chroot_shmat,
59402+ .maxlen = sizeof(int),
59403+ .mode = 0600,
59404+ .proc_handler = &proc_dointvec,
59405+ },
59406+#endif
59407+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
59408+ {
59409+ .procname = "chroot_deny_unix",
59410+ .data = &grsec_enable_chroot_unix,
59411+ .maxlen = sizeof(int),
59412+ .mode = 0600,
59413+ .proc_handler = &proc_dointvec,
59414+ },
59415+#endif
59416+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
59417+ {
59418+ .procname = "chroot_deny_mount",
59419+ .data = &grsec_enable_chroot_mount,
59420+ .maxlen = sizeof(int),
59421+ .mode = 0600,
59422+ .proc_handler = &proc_dointvec,
59423+ },
59424+#endif
59425+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
59426+ {
59427+ .procname = "chroot_deny_fchdir",
59428+ .data = &grsec_enable_chroot_fchdir,
59429+ .maxlen = sizeof(int),
59430+ .mode = 0600,
59431+ .proc_handler = &proc_dointvec,
59432+ },
59433+#endif
59434+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
59435+ {
59436+ .procname = "chroot_deny_chroot",
59437+ .data = &grsec_enable_chroot_double,
59438+ .maxlen = sizeof(int),
59439+ .mode = 0600,
59440+ .proc_handler = &proc_dointvec,
59441+ },
59442+#endif
59443+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
59444+ {
59445+ .procname = "chroot_deny_pivot",
59446+ .data = &grsec_enable_chroot_pivot,
59447+ .maxlen = sizeof(int),
59448+ .mode = 0600,
59449+ .proc_handler = &proc_dointvec,
59450+ },
59451+#endif
59452+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
59453+ {
59454+ .procname = "chroot_enforce_chdir",
59455+ .data = &grsec_enable_chroot_chdir,
59456+ .maxlen = sizeof(int),
59457+ .mode = 0600,
59458+ .proc_handler = &proc_dointvec,
59459+ },
59460+#endif
59461+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
59462+ {
59463+ .procname = "chroot_deny_chmod",
59464+ .data = &grsec_enable_chroot_chmod,
59465+ .maxlen = sizeof(int),
59466+ .mode = 0600,
59467+ .proc_handler = &proc_dointvec,
59468+ },
59469+#endif
59470+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
59471+ {
59472+ .procname = "chroot_deny_mknod",
59473+ .data = &grsec_enable_chroot_mknod,
59474+ .maxlen = sizeof(int),
59475+ .mode = 0600,
59476+ .proc_handler = &proc_dointvec,
59477+ },
59478+#endif
59479+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
59480+ {
59481+ .procname = "chroot_restrict_nice",
59482+ .data = &grsec_enable_chroot_nice,
59483+ .maxlen = sizeof(int),
59484+ .mode = 0600,
59485+ .proc_handler = &proc_dointvec,
59486+ },
59487+#endif
59488+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
59489+ {
59490+ .procname = "chroot_execlog",
59491+ .data = &grsec_enable_chroot_execlog,
59492+ .maxlen = sizeof(int),
59493+ .mode = 0600,
59494+ .proc_handler = &proc_dointvec,
59495+ },
59496+#endif
59497+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
59498+ {
59499+ .procname = "chroot_caps",
59500+ .data = &grsec_enable_chroot_caps,
59501+ .maxlen = sizeof(int),
59502+ .mode = 0600,
59503+ .proc_handler = &proc_dointvec,
59504+ },
59505+#endif
59506+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
59507+ {
59508+ .procname = "chroot_deny_sysctl",
59509+ .data = &grsec_enable_chroot_sysctl,
59510+ .maxlen = sizeof(int),
59511+ .mode = 0600,
59512+ .proc_handler = &proc_dointvec,
59513+ },
59514+#endif
59515+#ifdef CONFIG_GRKERNSEC_TPE
59516+ {
59517+ .procname = "tpe",
59518+ .data = &grsec_enable_tpe,
59519+ .maxlen = sizeof(int),
59520+ .mode = 0600,
59521+ .proc_handler = &proc_dointvec,
59522+ },
59523+ {
59524+ .procname = "tpe_gid",
59525+ .data = &grsec_tpe_gid,
59526+ .maxlen = sizeof(int),
59527+ .mode = 0600,
59528+ .proc_handler = &proc_dointvec,
59529+ },
59530+#endif
59531+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59532+ {
59533+ .procname = "tpe_invert",
59534+ .data = &grsec_enable_tpe_invert,
59535+ .maxlen = sizeof(int),
59536+ .mode = 0600,
59537+ .proc_handler = &proc_dointvec,
59538+ },
59539+#endif
59540+#ifdef CONFIG_GRKERNSEC_TPE_ALL
59541+ {
59542+ .procname = "tpe_restrict_all",
59543+ .data = &grsec_enable_tpe_all,
59544+ .maxlen = sizeof(int),
59545+ .mode = 0600,
59546+ .proc_handler = &proc_dointvec,
59547+ },
59548+#endif
59549+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
59550+ {
59551+ .procname = "socket_all",
59552+ .data = &grsec_enable_socket_all,
59553+ .maxlen = sizeof(int),
59554+ .mode = 0600,
59555+ .proc_handler = &proc_dointvec,
59556+ },
59557+ {
59558+ .procname = "socket_all_gid",
59559+ .data = &grsec_socket_all_gid,
59560+ .maxlen = sizeof(int),
59561+ .mode = 0600,
59562+ .proc_handler = &proc_dointvec,
59563+ },
59564+#endif
59565+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
59566+ {
59567+ .procname = "socket_client",
59568+ .data = &grsec_enable_socket_client,
59569+ .maxlen = sizeof(int),
59570+ .mode = 0600,
59571+ .proc_handler = &proc_dointvec,
59572+ },
59573+ {
59574+ .procname = "socket_client_gid",
59575+ .data = &grsec_socket_client_gid,
59576+ .maxlen = sizeof(int),
59577+ .mode = 0600,
59578+ .proc_handler = &proc_dointvec,
59579+ },
59580+#endif
59581+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59582+ {
59583+ .procname = "socket_server",
59584+ .data = &grsec_enable_socket_server,
59585+ .maxlen = sizeof(int),
59586+ .mode = 0600,
59587+ .proc_handler = &proc_dointvec,
59588+ },
59589+ {
59590+ .procname = "socket_server_gid",
59591+ .data = &grsec_socket_server_gid,
59592+ .maxlen = sizeof(int),
59593+ .mode = 0600,
59594+ .proc_handler = &proc_dointvec,
59595+ },
59596+#endif
59597+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
59598+ {
59599+ .procname = "audit_group",
59600+ .data = &grsec_enable_group,
59601+ .maxlen = sizeof(int),
59602+ .mode = 0600,
59603+ .proc_handler = &proc_dointvec,
59604+ },
59605+ {
59606+ .procname = "audit_gid",
59607+ .data = &grsec_audit_gid,
59608+ .maxlen = sizeof(int),
59609+ .mode = 0600,
59610+ .proc_handler = &proc_dointvec,
59611+ },
59612+#endif
59613+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
59614+ {
59615+ .procname = "audit_chdir",
59616+ .data = &grsec_enable_chdir,
59617+ .maxlen = sizeof(int),
59618+ .mode = 0600,
59619+ .proc_handler = &proc_dointvec,
59620+ },
59621+#endif
59622+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
59623+ {
59624+ .procname = "audit_mount",
59625+ .data = &grsec_enable_mount,
59626+ .maxlen = sizeof(int),
59627+ .mode = 0600,
59628+ .proc_handler = &proc_dointvec,
59629+ },
59630+#endif
59631+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
59632+ {
59633+ .procname = "audit_textrel",
59634+ .data = &grsec_enable_audit_textrel,
59635+ .maxlen = sizeof(int),
59636+ .mode = 0600,
59637+ .proc_handler = &proc_dointvec,
59638+ },
59639+#endif
59640+#ifdef CONFIG_GRKERNSEC_DMESG
59641+ {
59642+ .procname = "dmesg",
59643+ .data = &grsec_enable_dmesg,
59644+ .maxlen = sizeof(int),
59645+ .mode = 0600,
59646+ .proc_handler = &proc_dointvec,
59647+ },
59648+#endif
59649+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
59650+ {
59651+ .procname = "chroot_findtask",
59652+ .data = &grsec_enable_chroot_findtask,
59653+ .maxlen = sizeof(int),
59654+ .mode = 0600,
59655+ .proc_handler = &proc_dointvec,
59656+ },
59657+#endif
59658+#ifdef CONFIG_GRKERNSEC_RESLOG
59659+ {
59660+ .procname = "resource_logging",
59661+ .data = &grsec_resource_logging,
59662+ .maxlen = sizeof(int),
59663+ .mode = 0600,
59664+ .proc_handler = &proc_dointvec,
59665+ },
59666+#endif
59667+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
59668+ {
59669+ .procname = "audit_ptrace",
59670+ .data = &grsec_enable_audit_ptrace,
59671+ .maxlen = sizeof(int),
59672+ .mode = 0600,
59673+ .proc_handler = &proc_dointvec,
59674+ },
59675+#endif
59676+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
59677+ {
59678+ .procname = "harden_ptrace",
59679+ .data = &grsec_enable_harden_ptrace,
59680+ .maxlen = sizeof(int),
59681+ .mode = 0600,
59682+ .proc_handler = &proc_dointvec,
59683+ },
59684+#endif
59685+ {
59686+ .procname = "grsec_lock",
59687+ .data = &grsec_lock,
59688+ .maxlen = sizeof(int),
59689+ .mode = 0600,
59690+ .proc_handler = &proc_dointvec,
59691+ },
59692+#endif
59693+#ifdef CONFIG_GRKERNSEC_ROFS
59694+ {
59695+ .procname = "romount_protect",
59696+ .data = &grsec_enable_rofs,
59697+ .maxlen = sizeof(int),
59698+ .mode = 0600,
59699+ .proc_handler = &proc_dointvec_minmax,
59700+ .extra1 = &one,
59701+ .extra2 = &one,
59702+ },
59703+#endif
59704+ { }
59705+};
59706+#endif
59707diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
59708new file mode 100644
59709index 0000000..0dc13c3
59710--- /dev/null
59711+++ b/grsecurity/grsec_time.c
59712@@ -0,0 +1,16 @@
59713+#include <linux/kernel.h>
59714+#include <linux/sched.h>
59715+#include <linux/grinternal.h>
59716+#include <linux/module.h>
59717+
59718+void
59719+gr_log_timechange(void)
59720+{
59721+#ifdef CONFIG_GRKERNSEC_TIME
59722+ if (grsec_enable_time)
59723+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
59724+#endif
59725+ return;
59726+}
59727+
59728+EXPORT_SYMBOL(gr_log_timechange);
59729diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
59730new file mode 100644
59731index 0000000..07e0dc0
59732--- /dev/null
59733+++ b/grsecurity/grsec_tpe.c
59734@@ -0,0 +1,73 @@
59735+#include <linux/kernel.h>
59736+#include <linux/sched.h>
59737+#include <linux/file.h>
59738+#include <linux/fs.h>
59739+#include <linux/grinternal.h>
59740+
59741+extern int gr_acl_tpe_check(void);
59742+
59743+int
59744+gr_tpe_allow(const struct file *file)
59745+{
59746+#ifdef CONFIG_GRKERNSEC
59747+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
59748+ const struct cred *cred = current_cred();
59749+ char *msg = NULL;
59750+ char *msg2 = NULL;
59751+
59752+ // never restrict root
59753+ if (!cred->uid)
59754+ return 1;
59755+
59756+ if (grsec_enable_tpe) {
59757+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59758+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
59759+ msg = "not being in trusted group";
59760+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
59761+ msg = "being in untrusted group";
59762+#else
59763+ if (in_group_p(grsec_tpe_gid))
59764+ msg = "being in untrusted group";
59765+#endif
59766+ }
59767+ if (!msg && gr_acl_tpe_check())
59768+ msg = "being in untrusted role";
59769+
59770+ // not in any affected group/role
59771+ if (!msg)
59772+ goto next_check;
59773+
59774+ if (inode->i_uid)
59775+ msg2 = "file in non-root-owned directory";
59776+ else if (inode->i_mode & S_IWOTH)
59777+ msg2 = "file in world-writable directory";
59778+ else if (inode->i_mode & S_IWGRP)
59779+ msg2 = "file in group-writable directory";
59780+
59781+ if (msg && msg2) {
59782+ char fullmsg[70] = {0};
59783+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
59784+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
59785+ return 0;
59786+ }
59787+ msg = NULL;
59788+next_check:
59789+#ifdef CONFIG_GRKERNSEC_TPE_ALL
59790+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
59791+ return 1;
59792+
59793+ if (inode->i_uid && (inode->i_uid != cred->uid))
59794+ msg = "directory not owned by user";
59795+ else if (inode->i_mode & S_IWOTH)
59796+ msg = "file in world-writable directory";
59797+ else if (inode->i_mode & S_IWGRP)
59798+ msg = "file in group-writable directory";
59799+
59800+ if (msg) {
59801+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
59802+ return 0;
59803+ }
59804+#endif
59805+#endif
59806+ return 1;
59807+}
59808diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
59809new file mode 100644
59810index 0000000..9f7b1ac
59811--- /dev/null
59812+++ b/grsecurity/grsum.c
59813@@ -0,0 +1,61 @@
59814+#include <linux/err.h>
59815+#include <linux/kernel.h>
59816+#include <linux/sched.h>
59817+#include <linux/mm.h>
59818+#include <linux/scatterlist.h>
59819+#include <linux/crypto.h>
59820+#include <linux/gracl.h>
59821+
59822+
59823+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
59824+#error "crypto and sha256 must be built into the kernel"
59825+#endif
59826+
59827+int
59828+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
59829+{
59830+ char *p;
59831+ struct crypto_hash *tfm;
59832+ struct hash_desc desc;
59833+ struct scatterlist sg;
59834+ unsigned char temp_sum[GR_SHA_LEN];
59835+ volatile int retval = 0;
59836+ volatile int dummy = 0;
59837+ unsigned int i;
59838+
59839+ sg_init_table(&sg, 1);
59840+
59841+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
59842+ if (IS_ERR(tfm)) {
59843+ /* should never happen, since sha256 should be built in */
59844+ return 1;
59845+ }
59846+
59847+ desc.tfm = tfm;
59848+ desc.flags = 0;
59849+
59850+ crypto_hash_init(&desc);
59851+
59852+ p = salt;
59853+ sg_set_buf(&sg, p, GR_SALT_LEN);
59854+ crypto_hash_update(&desc, &sg, sg.length);
59855+
59856+ p = entry->pw;
59857+ sg_set_buf(&sg, p, strlen(p));
59858+
59859+ crypto_hash_update(&desc, &sg, sg.length);
59860+
59861+ crypto_hash_final(&desc, temp_sum);
59862+
59863+ memset(entry->pw, 0, GR_PW_LEN);
59864+
59865+ for (i = 0; i < GR_SHA_LEN; i++)
59866+ if (sum[i] != temp_sum[i])
59867+ retval = 1;
59868+ else
59869+ dummy = 1; // waste a cycle
59870+
59871+ crypto_free_hash(tfm);
59872+
59873+ return retval;
59874+}
59875diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
59876index 6cd5b64..f620d2d 100644
59877--- a/include/acpi/acpi_bus.h
59878+++ b/include/acpi/acpi_bus.h
59879@@ -107,7 +107,7 @@ struct acpi_device_ops {
59880 acpi_op_bind bind;
59881 acpi_op_unbind unbind;
59882 acpi_op_notify notify;
59883-};
59884+} __no_const;
59885
59886 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
59887
59888diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
59889index b7babf0..71e4e74 100644
59890--- a/include/asm-generic/atomic-long.h
59891+++ b/include/asm-generic/atomic-long.h
59892@@ -22,6 +22,12 @@
59893
59894 typedef atomic64_t atomic_long_t;
59895
59896+#ifdef CONFIG_PAX_REFCOUNT
59897+typedef atomic64_unchecked_t atomic_long_unchecked_t;
59898+#else
59899+typedef atomic64_t atomic_long_unchecked_t;
59900+#endif
59901+
59902 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
59903
59904 static inline long atomic_long_read(atomic_long_t *l)
59905@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
59906 return (long)atomic64_read(v);
59907 }
59908
59909+#ifdef CONFIG_PAX_REFCOUNT
59910+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
59911+{
59912+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59913+
59914+ return (long)atomic64_read_unchecked(v);
59915+}
59916+#endif
59917+
59918 static inline void atomic_long_set(atomic_long_t *l, long i)
59919 {
59920 atomic64_t *v = (atomic64_t *)l;
59921@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
59922 atomic64_set(v, i);
59923 }
59924
59925+#ifdef CONFIG_PAX_REFCOUNT
59926+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
59927+{
59928+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59929+
59930+ atomic64_set_unchecked(v, i);
59931+}
59932+#endif
59933+
59934 static inline void atomic_long_inc(atomic_long_t *l)
59935 {
59936 atomic64_t *v = (atomic64_t *)l;
59937@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
59938 atomic64_inc(v);
59939 }
59940
59941+#ifdef CONFIG_PAX_REFCOUNT
59942+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
59943+{
59944+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59945+
59946+ atomic64_inc_unchecked(v);
59947+}
59948+#endif
59949+
59950 static inline void atomic_long_dec(atomic_long_t *l)
59951 {
59952 atomic64_t *v = (atomic64_t *)l;
59953@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
59954 atomic64_dec(v);
59955 }
59956
59957+#ifdef CONFIG_PAX_REFCOUNT
59958+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
59959+{
59960+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59961+
59962+ atomic64_dec_unchecked(v);
59963+}
59964+#endif
59965+
59966 static inline void atomic_long_add(long i, atomic_long_t *l)
59967 {
59968 atomic64_t *v = (atomic64_t *)l;
59969@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
59970 atomic64_add(i, v);
59971 }
59972
59973+#ifdef CONFIG_PAX_REFCOUNT
59974+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
59975+{
59976+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59977+
59978+ atomic64_add_unchecked(i, v);
59979+}
59980+#endif
59981+
59982 static inline void atomic_long_sub(long i, atomic_long_t *l)
59983 {
59984 atomic64_t *v = (atomic64_t *)l;
59985@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
59986 atomic64_sub(i, v);
59987 }
59988
59989+#ifdef CONFIG_PAX_REFCOUNT
59990+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
59991+{
59992+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59993+
59994+ atomic64_sub_unchecked(i, v);
59995+}
59996+#endif
59997+
59998 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
59999 {
60000 atomic64_t *v = (atomic64_t *)l;
60001@@ -115,6 +175,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
60002 return (long)atomic64_inc_return(v);
60003 }
60004
60005+#ifdef CONFIG_PAX_REFCOUNT
60006+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
60007+{
60008+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60009+
60010+ return (long)atomic64_inc_return_unchecked(v);
60011+}
60012+#endif
60013+
60014 static inline long atomic_long_dec_return(atomic_long_t *l)
60015 {
60016 atomic64_t *v = (atomic64_t *)l;
60017@@ -140,6 +209,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
60018
60019 typedef atomic_t atomic_long_t;
60020
60021+#ifdef CONFIG_PAX_REFCOUNT
60022+typedef atomic_unchecked_t atomic_long_unchecked_t;
60023+#else
60024+typedef atomic_t atomic_long_unchecked_t;
60025+#endif
60026+
60027 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
60028 static inline long atomic_long_read(atomic_long_t *l)
60029 {
60030@@ -148,6 +223,15 @@ static inline long atomic_long_read(atomic_long_t *l)
60031 return (long)atomic_read(v);
60032 }
60033
60034+#ifdef CONFIG_PAX_REFCOUNT
60035+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
60036+{
60037+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60038+
60039+ return (long)atomic_read_unchecked(v);
60040+}
60041+#endif
60042+
60043 static inline void atomic_long_set(atomic_long_t *l, long i)
60044 {
60045 atomic_t *v = (atomic_t *)l;
60046@@ -155,6 +239,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
60047 atomic_set(v, i);
60048 }
60049
60050+#ifdef CONFIG_PAX_REFCOUNT
60051+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
60052+{
60053+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60054+
60055+ atomic_set_unchecked(v, i);
60056+}
60057+#endif
60058+
60059 static inline void atomic_long_inc(atomic_long_t *l)
60060 {
60061 atomic_t *v = (atomic_t *)l;
60062@@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
60063 atomic_inc(v);
60064 }
60065
60066+#ifdef CONFIG_PAX_REFCOUNT
60067+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
60068+{
60069+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60070+
60071+ atomic_inc_unchecked(v);
60072+}
60073+#endif
60074+
60075 static inline void atomic_long_dec(atomic_long_t *l)
60076 {
60077 atomic_t *v = (atomic_t *)l;
60078@@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
60079 atomic_dec(v);
60080 }
60081
60082+#ifdef CONFIG_PAX_REFCOUNT
60083+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
60084+{
60085+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60086+
60087+ atomic_dec_unchecked(v);
60088+}
60089+#endif
60090+
60091 static inline void atomic_long_add(long i, atomic_long_t *l)
60092 {
60093 atomic_t *v = (atomic_t *)l;
60094@@ -176,6 +287,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
60095 atomic_add(i, v);
60096 }
60097
60098+#ifdef CONFIG_PAX_REFCOUNT
60099+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
60100+{
60101+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60102+
60103+ atomic_add_unchecked(i, v);
60104+}
60105+#endif
60106+
60107 static inline void atomic_long_sub(long i, atomic_long_t *l)
60108 {
60109 atomic_t *v = (atomic_t *)l;
60110@@ -183,6 +303,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
60111 atomic_sub(i, v);
60112 }
60113
60114+#ifdef CONFIG_PAX_REFCOUNT
60115+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
60116+{
60117+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60118+
60119+ atomic_sub_unchecked(i, v);
60120+}
60121+#endif
60122+
60123 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
60124 {
60125 atomic_t *v = (atomic_t *)l;
60126@@ -232,6 +361,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
60127 return (long)atomic_inc_return(v);
60128 }
60129
60130+#ifdef CONFIG_PAX_REFCOUNT
60131+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
60132+{
60133+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60134+
60135+ return (long)atomic_inc_return_unchecked(v);
60136+}
60137+#endif
60138+
60139 static inline long atomic_long_dec_return(atomic_long_t *l)
60140 {
60141 atomic_t *v = (atomic_t *)l;
60142@@ -255,4 +393,49 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
60143
60144 #endif /* BITS_PER_LONG == 64 */
60145
60146+#ifdef CONFIG_PAX_REFCOUNT
60147+static inline void pax_refcount_needs_these_functions(void)
60148+{
60149+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
60150+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
60151+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
60152+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
60153+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
60154+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
60155+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
60156+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
60157+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
60158+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
60159+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
60160+
60161+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
60162+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
60163+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
60164+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
60165+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
60166+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
60167+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
60168+}
60169+#else
60170+#define atomic_read_unchecked(v) atomic_read(v)
60171+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
60172+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
60173+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
60174+#define atomic_inc_unchecked(v) atomic_inc(v)
60175+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
60176+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
60177+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
60178+#define atomic_dec_unchecked(v) atomic_dec(v)
60179+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
60180+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
60181+
60182+#define atomic_long_read_unchecked(v) atomic_long_read(v)
60183+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
60184+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
60185+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
60186+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
60187+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
60188+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
60189+#endif
60190+
60191 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
60192diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
60193index b18ce4f..2ee2843 100644
60194--- a/include/asm-generic/atomic64.h
60195+++ b/include/asm-generic/atomic64.h
60196@@ -16,6 +16,8 @@ typedef struct {
60197 long long counter;
60198 } atomic64_t;
60199
60200+typedef atomic64_t atomic64_unchecked_t;
60201+
60202 #define ATOMIC64_INIT(i) { (i) }
60203
60204 extern long long atomic64_read(const atomic64_t *v);
60205@@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
60206 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
60207 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
60208
60209+#define atomic64_read_unchecked(v) atomic64_read(v)
60210+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
60211+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
60212+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
60213+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
60214+#define atomic64_inc_unchecked(v) atomic64_inc(v)
60215+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
60216+#define atomic64_dec_unchecked(v) atomic64_dec(v)
60217+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
60218+
60219 #endif /* _ASM_GENERIC_ATOMIC64_H */
60220diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
60221index 1bfcfe5..e04c5c9 100644
60222--- a/include/asm-generic/cache.h
60223+++ b/include/asm-generic/cache.h
60224@@ -6,7 +6,7 @@
60225 * cache lines need to provide their own cache.h.
60226 */
60227
60228-#define L1_CACHE_SHIFT 5
60229-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
60230+#define L1_CACHE_SHIFT 5UL
60231+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
60232
60233 #endif /* __ASM_GENERIC_CACHE_H */
60234diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
60235index 0d68a1e..b74a761 100644
60236--- a/include/asm-generic/emergency-restart.h
60237+++ b/include/asm-generic/emergency-restart.h
60238@@ -1,7 +1,7 @@
60239 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
60240 #define _ASM_GENERIC_EMERGENCY_RESTART_H
60241
60242-static inline void machine_emergency_restart(void)
60243+static inline __noreturn void machine_emergency_restart(void)
60244 {
60245 machine_restart(NULL);
60246 }
60247diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
60248index 0232ccb..13d9165 100644
60249--- a/include/asm-generic/kmap_types.h
60250+++ b/include/asm-generic/kmap_types.h
60251@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
60252 KMAP_D(17) KM_NMI,
60253 KMAP_D(18) KM_NMI_PTE,
60254 KMAP_D(19) KM_KDB,
60255+KMAP_D(20) KM_CLEARPAGE,
60256 /*
60257 * Remember to update debug_kmap_atomic() when adding new kmap types!
60258 */
60259-KMAP_D(20) KM_TYPE_NR
60260+KMAP_D(21) KM_TYPE_NR
60261 };
60262
60263 #undef KMAP_D
60264diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
60265index 9ceb03b..2efbcbd 100644
60266--- a/include/asm-generic/local.h
60267+++ b/include/asm-generic/local.h
60268@@ -39,6 +39,7 @@ typedef struct
60269 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
60270 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
60271 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
60272+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
60273
60274 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
60275 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
60276diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
60277index 725612b..9cc513a 100644
60278--- a/include/asm-generic/pgtable-nopmd.h
60279+++ b/include/asm-generic/pgtable-nopmd.h
60280@@ -1,14 +1,19 @@
60281 #ifndef _PGTABLE_NOPMD_H
60282 #define _PGTABLE_NOPMD_H
60283
60284-#ifndef __ASSEMBLY__
60285-
60286 #include <asm-generic/pgtable-nopud.h>
60287
60288-struct mm_struct;
60289-
60290 #define __PAGETABLE_PMD_FOLDED
60291
60292+#define PMD_SHIFT PUD_SHIFT
60293+#define PTRS_PER_PMD 1
60294+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
60295+#define PMD_MASK (~(PMD_SIZE-1))
60296+
60297+#ifndef __ASSEMBLY__
60298+
60299+struct mm_struct;
60300+
60301 /*
60302 * Having the pmd type consist of a pud gets the size right, and allows
60303 * us to conceptually access the pud entry that this pmd is folded into
60304@@ -16,11 +21,6 @@ struct mm_struct;
60305 */
60306 typedef struct { pud_t pud; } pmd_t;
60307
60308-#define PMD_SHIFT PUD_SHIFT
60309-#define PTRS_PER_PMD 1
60310-#define PMD_SIZE (1UL << PMD_SHIFT)
60311-#define PMD_MASK (~(PMD_SIZE-1))
60312-
60313 /*
60314 * The "pud_xxx()" functions here are trivial for a folded two-level
60315 * setup: the pmd is never bad, and a pmd always exists (as it's folded
60316diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
60317index 810431d..ccc3638 100644
60318--- a/include/asm-generic/pgtable-nopud.h
60319+++ b/include/asm-generic/pgtable-nopud.h
60320@@ -1,10 +1,15 @@
60321 #ifndef _PGTABLE_NOPUD_H
60322 #define _PGTABLE_NOPUD_H
60323
60324-#ifndef __ASSEMBLY__
60325-
60326 #define __PAGETABLE_PUD_FOLDED
60327
60328+#define PUD_SHIFT PGDIR_SHIFT
60329+#define PTRS_PER_PUD 1
60330+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
60331+#define PUD_MASK (~(PUD_SIZE-1))
60332+
60333+#ifndef __ASSEMBLY__
60334+
60335 /*
60336 * Having the pud type consist of a pgd gets the size right, and allows
60337 * us to conceptually access the pgd entry that this pud is folded into
60338@@ -12,11 +17,6 @@
60339 */
60340 typedef struct { pgd_t pgd; } pud_t;
60341
60342-#define PUD_SHIFT PGDIR_SHIFT
60343-#define PTRS_PER_PUD 1
60344-#define PUD_SIZE (1UL << PUD_SHIFT)
60345-#define PUD_MASK (~(PUD_SIZE-1))
60346-
60347 /*
60348 * The "pgd_xxx()" functions here are trivial for a folded two-level
60349 * setup: the pud is never bad, and a pud always exists (as it's folded
60350diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
60351index a03c098..7e5b223 100644
60352--- a/include/asm-generic/pgtable.h
60353+++ b/include/asm-generic/pgtable.h
60354@@ -502,6 +502,14 @@ static inline int pmd_trans_unstable(pmd_t *pmd)
60355 #endif
60356 }
60357
60358+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
60359+static inline unsigned long pax_open_kernel(void) { return 0; }
60360+#endif
60361+
60362+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
60363+static inline unsigned long pax_close_kernel(void) { return 0; }
60364+#endif
60365+
60366 #endif /* CONFIG_MMU */
60367
60368 #endif /* !__ASSEMBLY__ */
60369diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
60370index 9788568..510dece 100644
60371--- a/include/asm-generic/uaccess.h
60372+++ b/include/asm-generic/uaccess.h
60373@@ -76,6 +76,8 @@ extern unsigned long search_exception_table(unsigned long);
60374 */
60375 #ifndef __copy_from_user
60376 static inline __must_check long __copy_from_user(void *to,
60377+ const void __user * from, unsigned long n) __size_overflow(3);
60378+static inline __must_check long __copy_from_user(void *to,
60379 const void __user * from, unsigned long n)
60380 {
60381 if (__builtin_constant_p(n)) {
60382@@ -106,6 +108,8 @@ static inline __must_check long __copy_from_user(void *to,
60383
60384 #ifndef __copy_to_user
60385 static inline __must_check long __copy_to_user(void __user *to,
60386+ const void *from, unsigned long n) __size_overflow(3);
60387+static inline __must_check long __copy_to_user(void __user *to,
60388 const void *from, unsigned long n)
60389 {
60390 if (__builtin_constant_p(n)) {
60391@@ -224,6 +228,7 @@ extern int __put_user_bad(void) __attribute__((noreturn));
60392 -EFAULT; \
60393 })
60394
60395+static inline int __get_user_fn(size_t size, const void __user *ptr, void *x) __size_overflow(1);
60396 static inline int __get_user_fn(size_t size, const void __user *ptr, void *x)
60397 {
60398 size = __copy_from_user(x, ptr, size);
60399@@ -240,6 +245,7 @@ extern int __get_user_bad(void) __attribute__((noreturn));
60400 #define __copy_to_user_inatomic __copy_to_user
60401 #endif
60402
60403+static inline long copy_from_user(void *to, const void __user * from, unsigned long n) __size_overflow(3);
60404 static inline long copy_from_user(void *to,
60405 const void __user * from, unsigned long n)
60406 {
60407@@ -250,6 +256,7 @@ static inline long copy_from_user(void *to,
60408 return n;
60409 }
60410
60411+static inline long copy_to_user(void __user *to, const void *from, unsigned long n) __size_overflow(3);
60412 static inline long copy_to_user(void __user *to,
60413 const void *from, unsigned long n)
60414 {
60415@@ -314,6 +321,8 @@ static inline long strlen_user(const char __user *src)
60416 */
60417 #ifndef __clear_user
60418 static inline __must_check unsigned long
60419+__clear_user(void __user *to, unsigned long n) __size_overflow(2);
60420+static inline __must_check unsigned long
60421 __clear_user(void __user *to, unsigned long n)
60422 {
60423 memset((void __force *)to, 0, n);
60424@@ -322,6 +331,8 @@ __clear_user(void __user *to, unsigned long n)
60425 #endif
60426
60427 static inline __must_check unsigned long
60428+clear_user(void __user *to, unsigned long n) __size_overflow(2);
60429+static inline __must_check unsigned long
60430 clear_user(void __user *to, unsigned long n)
60431 {
60432 might_sleep();
60433diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
60434index b5e2e4c..6a5373e 100644
60435--- a/include/asm-generic/vmlinux.lds.h
60436+++ b/include/asm-generic/vmlinux.lds.h
60437@@ -217,6 +217,7 @@
60438 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
60439 VMLINUX_SYMBOL(__start_rodata) = .; \
60440 *(.rodata) *(.rodata.*) \
60441+ *(.data..read_only) \
60442 *(__vermagic) /* Kernel version magic */ \
60443 . = ALIGN(8); \
60444 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
60445@@ -722,17 +723,18 @@
60446 * section in the linker script will go there too. @phdr should have
60447 * a leading colon.
60448 *
60449- * Note that this macros defines __per_cpu_load as an absolute symbol.
60450+ * Note that this macros defines per_cpu_load as an absolute symbol.
60451 * If there is no need to put the percpu section at a predetermined
60452 * address, use PERCPU_SECTION.
60453 */
60454 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
60455- VMLINUX_SYMBOL(__per_cpu_load) = .; \
60456- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
60457+ per_cpu_load = .; \
60458+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
60459 - LOAD_OFFSET) { \
60460+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
60461 PERCPU_INPUT(cacheline) \
60462 } phdr \
60463- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
60464+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
60465
60466 /**
60467 * PERCPU_SECTION - define output section for percpu area, simple version
60468diff --git a/include/drm/drmP.h b/include/drm/drmP.h
60469index 92f0981..d44a37c 100644
60470--- a/include/drm/drmP.h
60471+++ b/include/drm/drmP.h
60472@@ -72,6 +72,7 @@
60473 #include <linux/workqueue.h>
60474 #include <linux/poll.h>
60475 #include <asm/pgalloc.h>
60476+#include <asm/local.h>
60477 #include "drm.h"
60478
60479 #include <linux/idr.h>
60480@@ -1038,7 +1039,7 @@ struct drm_device {
60481
60482 /** \name Usage Counters */
60483 /*@{ */
60484- int open_count; /**< Outstanding files open */
60485+ local_t open_count; /**< Outstanding files open */
60486 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
60487 atomic_t vma_count; /**< Outstanding vma areas open */
60488 int buf_use; /**< Buffers in use -- cannot alloc */
60489@@ -1049,7 +1050,7 @@ struct drm_device {
60490 /*@{ */
60491 unsigned long counters;
60492 enum drm_stat_type types[15];
60493- atomic_t counts[15];
60494+ atomic_unchecked_t counts[15];
60495 /*@} */
60496
60497 struct list_head filelist;
60498diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
60499index 37515d1..34fa8b0 100644
60500--- a/include/drm/drm_crtc_helper.h
60501+++ b/include/drm/drm_crtc_helper.h
60502@@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
60503
60504 /* disable crtc when not in use - more explicit than dpms off */
60505 void (*disable)(struct drm_crtc *crtc);
60506-};
60507+} __no_const;
60508
60509 struct drm_encoder_helper_funcs {
60510 void (*dpms)(struct drm_encoder *encoder, int mode);
60511@@ -95,7 +95,7 @@ struct drm_encoder_helper_funcs {
60512 struct drm_connector *connector);
60513 /* disable encoder when not in use - more explicit than dpms off */
60514 void (*disable)(struct drm_encoder *encoder);
60515-};
60516+} __no_const;
60517
60518 struct drm_connector_helper_funcs {
60519 int (*get_modes)(struct drm_connector *connector);
60520diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
60521index 26c1f78..6722682 100644
60522--- a/include/drm/ttm/ttm_memory.h
60523+++ b/include/drm/ttm/ttm_memory.h
60524@@ -47,7 +47,7 @@
60525
60526 struct ttm_mem_shrink {
60527 int (*do_shrink) (struct ttm_mem_shrink *);
60528-};
60529+} __no_const;
60530
60531 /**
60532 * struct ttm_mem_global - Global memory accounting structure.
60533diff --git a/include/linux/a.out.h b/include/linux/a.out.h
60534index e86dfca..40cc55f 100644
60535--- a/include/linux/a.out.h
60536+++ b/include/linux/a.out.h
60537@@ -39,6 +39,14 @@ enum machine_type {
60538 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
60539 };
60540
60541+/* Constants for the N_FLAGS field */
60542+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
60543+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
60544+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
60545+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
60546+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
60547+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
60548+
60549 #if !defined (N_MAGIC)
60550 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
60551 #endif
60552diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
60553index f4ff882..84b53a6 100644
60554--- a/include/linux/atmdev.h
60555+++ b/include/linux/atmdev.h
60556@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
60557 #endif
60558
60559 struct k_atm_aal_stats {
60560-#define __HANDLE_ITEM(i) atomic_t i
60561+#define __HANDLE_ITEM(i) atomic_unchecked_t i
60562 __AAL_STAT_ITEMS
60563 #undef __HANDLE_ITEM
60564 };
60565diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
60566index 0092102..8a801b4 100644
60567--- a/include/linux/binfmts.h
60568+++ b/include/linux/binfmts.h
60569@@ -89,6 +89,7 @@ struct linux_binfmt {
60570 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
60571 int (*load_shlib)(struct file *);
60572 int (*core_dump)(struct coredump_params *cprm);
60573+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
60574 unsigned long min_coredump; /* minimal dump size */
60575 };
60576
60577diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
60578index 606cf33..b72c577 100644
60579--- a/include/linux/blkdev.h
60580+++ b/include/linux/blkdev.h
60581@@ -1379,7 +1379,7 @@ struct block_device_operations {
60582 /* this callback is with swap_lock and sometimes page table lock held */
60583 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
60584 struct module *owner;
60585-};
60586+} __do_const;
60587
60588 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
60589 unsigned long);
60590diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
60591index 4d1a074..88f929a 100644
60592--- a/include/linux/blktrace_api.h
60593+++ b/include/linux/blktrace_api.h
60594@@ -162,7 +162,7 @@ struct blk_trace {
60595 struct dentry *dir;
60596 struct dentry *dropped_file;
60597 struct dentry *msg_file;
60598- atomic_t dropped;
60599+ atomic_unchecked_t dropped;
60600 };
60601
60602 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
60603diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
60604index 83195fb..0b0f77d 100644
60605--- a/include/linux/byteorder/little_endian.h
60606+++ b/include/linux/byteorder/little_endian.h
60607@@ -42,51 +42,51 @@
60608
60609 static inline __le64 __cpu_to_le64p(const __u64 *p)
60610 {
60611- return (__force __le64)*p;
60612+ return (__force const __le64)*p;
60613 }
60614 static inline __u64 __le64_to_cpup(const __le64 *p)
60615 {
60616- return (__force __u64)*p;
60617+ return (__force const __u64)*p;
60618 }
60619 static inline __le32 __cpu_to_le32p(const __u32 *p)
60620 {
60621- return (__force __le32)*p;
60622+ return (__force const __le32)*p;
60623 }
60624 static inline __u32 __le32_to_cpup(const __le32 *p)
60625 {
60626- return (__force __u32)*p;
60627+ return (__force const __u32)*p;
60628 }
60629 static inline __le16 __cpu_to_le16p(const __u16 *p)
60630 {
60631- return (__force __le16)*p;
60632+ return (__force const __le16)*p;
60633 }
60634 static inline __u16 __le16_to_cpup(const __le16 *p)
60635 {
60636- return (__force __u16)*p;
60637+ return (__force const __u16)*p;
60638 }
60639 static inline __be64 __cpu_to_be64p(const __u64 *p)
60640 {
60641- return (__force __be64)__swab64p(p);
60642+ return (__force const __be64)__swab64p(p);
60643 }
60644 static inline __u64 __be64_to_cpup(const __be64 *p)
60645 {
60646- return __swab64p((__u64 *)p);
60647+ return __swab64p((const __u64 *)p);
60648 }
60649 static inline __be32 __cpu_to_be32p(const __u32 *p)
60650 {
60651- return (__force __be32)__swab32p(p);
60652+ return (__force const __be32)__swab32p(p);
60653 }
60654 static inline __u32 __be32_to_cpup(const __be32 *p)
60655 {
60656- return __swab32p((__u32 *)p);
60657+ return __swab32p((const __u32 *)p);
60658 }
60659 static inline __be16 __cpu_to_be16p(const __u16 *p)
60660 {
60661- return (__force __be16)__swab16p(p);
60662+ return (__force const __be16)__swab16p(p);
60663 }
60664 static inline __u16 __be16_to_cpup(const __be16 *p)
60665 {
60666- return __swab16p((__u16 *)p);
60667+ return __swab16p((const __u16 *)p);
60668 }
60669 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
60670 #define __le64_to_cpus(x) do { (void)(x); } while (0)
60671diff --git a/include/linux/cache.h b/include/linux/cache.h
60672index 4c57065..4307975 100644
60673--- a/include/linux/cache.h
60674+++ b/include/linux/cache.h
60675@@ -16,6 +16,10 @@
60676 #define __read_mostly
60677 #endif
60678
60679+#ifndef __read_only
60680+#define __read_only __read_mostly
60681+#endif
60682+
60683 #ifndef ____cacheline_aligned
60684 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
60685 #endif
60686diff --git a/include/linux/capability.h b/include/linux/capability.h
60687index 12d52de..b5f7fa7 100644
60688--- a/include/linux/capability.h
60689+++ b/include/linux/capability.h
60690@@ -548,6 +548,8 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
60691 extern bool capable(int cap);
60692 extern bool ns_capable(struct user_namespace *ns, int cap);
60693 extern bool nsown_capable(int cap);
60694+extern bool capable_nolog(int cap);
60695+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
60696
60697 /* audit system wants to get cap info from files as well */
60698 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
60699diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
60700index 04ffb2e..6799180 100644
60701--- a/include/linux/cleancache.h
60702+++ b/include/linux/cleancache.h
60703@@ -31,7 +31,7 @@ struct cleancache_ops {
60704 void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
60705 void (*flush_inode)(int, struct cleancache_filekey);
60706 void (*flush_fs)(int);
60707-};
60708+} __no_const;
60709
60710 extern struct cleancache_ops
60711 cleancache_register_ops(struct cleancache_ops *ops);
60712diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
60713index 2f40791..567b215 100644
60714--- a/include/linux/compiler-gcc4.h
60715+++ b/include/linux/compiler-gcc4.h
60716@@ -32,6 +32,15 @@
60717 #define __linktime_error(message) __attribute__((__error__(message)))
60718
60719 #if __GNUC_MINOR__ >= 5
60720+
60721+#ifdef CONSTIFY_PLUGIN
60722+#define __no_const __attribute__((no_const))
60723+#define __do_const __attribute__((do_const))
60724+#endif
60725+
60726+#ifdef SIZE_OVERFLOW_PLUGIN
60727+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
60728+#endif
60729 /*
60730 * Mark a position in code as unreachable. This can be used to
60731 * suppress control flow warnings after asm blocks that transfer
60732@@ -47,6 +56,11 @@
60733 #define __noclone __attribute__((__noclone__))
60734
60735 #endif
60736+
60737+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
60738+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
60739+#define __bos0(ptr) __bos((ptr), 0)
60740+#define __bos1(ptr) __bos((ptr), 1)
60741 #endif
60742
60743 #if __GNUC_MINOR__ > 0
60744diff --git a/include/linux/compiler.h b/include/linux/compiler.h
60745index 4a24354..ecaff7a 100644
60746--- a/include/linux/compiler.h
60747+++ b/include/linux/compiler.h
60748@@ -5,31 +5,62 @@
60749
60750 #ifdef __CHECKER__
60751 # define __user __attribute__((noderef, address_space(1)))
60752+# define __force_user __force __user
60753 # define __kernel __attribute__((address_space(0)))
60754+# define __force_kernel __force __kernel
60755 # define __safe __attribute__((safe))
60756 # define __force __attribute__((force))
60757 # define __nocast __attribute__((nocast))
60758 # define __iomem __attribute__((noderef, address_space(2)))
60759+# define __force_iomem __force __iomem
60760 # define __acquires(x) __attribute__((context(x,0,1)))
60761 # define __releases(x) __attribute__((context(x,1,0)))
60762 # define __acquire(x) __context__(x,1)
60763 # define __release(x) __context__(x,-1)
60764 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
60765 # define __percpu __attribute__((noderef, address_space(3)))
60766+# define __force_percpu __force __percpu
60767 #ifdef CONFIG_SPARSE_RCU_POINTER
60768 # define __rcu __attribute__((noderef, address_space(4)))
60769+# define __force_rcu __force __rcu
60770 #else
60771 # define __rcu
60772+# define __force_rcu
60773 #endif
60774 extern void __chk_user_ptr(const volatile void __user *);
60775 extern void __chk_io_ptr(const volatile void __iomem *);
60776+#elif defined(CHECKER_PLUGIN)
60777+//# define __user
60778+//# define __force_user
60779+//# define __kernel
60780+//# define __force_kernel
60781+# define __safe
60782+# define __force
60783+# define __nocast
60784+# define __iomem
60785+# define __force_iomem
60786+# define __chk_user_ptr(x) (void)0
60787+# define __chk_io_ptr(x) (void)0
60788+# define __builtin_warning(x, y...) (1)
60789+# define __acquires(x)
60790+# define __releases(x)
60791+# define __acquire(x) (void)0
60792+# define __release(x) (void)0
60793+# define __cond_lock(x,c) (c)
60794+# define __percpu
60795+# define __force_percpu
60796+# define __rcu
60797+# define __force_rcu
60798 #else
60799 # define __user
60800+# define __force_user
60801 # define __kernel
60802+# define __force_kernel
60803 # define __safe
60804 # define __force
60805 # define __nocast
60806 # define __iomem
60807+# define __force_iomem
60808 # define __chk_user_ptr(x) (void)0
60809 # define __chk_io_ptr(x) (void)0
60810 # define __builtin_warning(x, y...) (1)
60811@@ -39,7 +70,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
60812 # define __release(x) (void)0
60813 # define __cond_lock(x,c) (c)
60814 # define __percpu
60815+# define __force_percpu
60816 # define __rcu
60817+# define __force_rcu
60818 #endif
60819
60820 #ifdef __KERNEL__
60821@@ -264,6 +297,17 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60822 # define __attribute_const__ /* unimplemented */
60823 #endif
60824
60825+#ifndef __no_const
60826+# define __no_const
60827+#endif
60828+
60829+#ifndef __do_const
60830+# define __do_const
60831+#endif
60832+
60833+#ifndef __size_overflow
60834+# define __size_overflow(...)
60835+#endif
60836 /*
60837 * Tell gcc if a function is cold. The compiler will assume any path
60838 * directly leading to the call is unlikely.
60839@@ -273,6 +317,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60840 #define __cold
60841 #endif
60842
60843+#ifndef __alloc_size
60844+#define __alloc_size(...)
60845+#endif
60846+
60847+#ifndef __bos
60848+#define __bos(ptr, arg)
60849+#endif
60850+
60851+#ifndef __bos0
60852+#define __bos0(ptr)
60853+#endif
60854+
60855+#ifndef __bos1
60856+#define __bos1(ptr)
60857+#endif
60858+
60859 /* Simple shorthand for a section definition */
60860 #ifndef __section
60861 # define __section(S) __attribute__ ((__section__(#S)))
60862@@ -308,6 +368,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60863 * use is to mediate communication between process-level code and irq/NMI
60864 * handlers, all running on the same CPU.
60865 */
60866-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
60867+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
60868+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
60869
60870 #endif /* __LINUX_COMPILER_H */
60871diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
60872index e9eaec5..bfeb9bb 100644
60873--- a/include/linux/cpuset.h
60874+++ b/include/linux/cpuset.h
60875@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void)
60876 * nodemask.
60877 */
60878 smp_mb();
60879- --ACCESS_ONCE(current->mems_allowed_change_disable);
60880+ --ACCESS_ONCE_RW(current->mems_allowed_change_disable);
60881 }
60882
60883 static inline void set_mems_allowed(nodemask_t nodemask)
60884diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h
60885index b936763..48685ee 100644
60886--- a/include/linux/crash_dump.h
60887+++ b/include/linux/crash_dump.h
60888@@ -14,7 +14,7 @@ extern unsigned long long elfcorehdr_addr;
60889 extern unsigned long long elfcorehdr_size;
60890
60891 extern ssize_t copy_oldmem_page(unsigned long, char *, size_t,
60892- unsigned long, int);
60893+ unsigned long, int) __size_overflow(3);
60894
60895 /* Architecture code defines this if there are other possible ELF
60896 * machine types, e.g. on bi-arch capable hardware. */
60897diff --git a/include/linux/cred.h b/include/linux/cred.h
60898index adadf71..6af5560 100644
60899--- a/include/linux/cred.h
60900+++ b/include/linux/cred.h
60901@@ -207,6 +207,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
60902 static inline void validate_process_creds(void)
60903 {
60904 }
60905+static inline void validate_task_creds(struct task_struct *task)
60906+{
60907+}
60908 #endif
60909
60910 /**
60911diff --git a/include/linux/crypto.h b/include/linux/crypto.h
60912index 8a94217..15d49e3 100644
60913--- a/include/linux/crypto.h
60914+++ b/include/linux/crypto.h
60915@@ -365,7 +365,7 @@ struct cipher_tfm {
60916 const u8 *key, unsigned int keylen);
60917 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
60918 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
60919-};
60920+} __no_const;
60921
60922 struct hash_tfm {
60923 int (*init)(struct hash_desc *desc);
60924@@ -386,13 +386,13 @@ struct compress_tfm {
60925 int (*cot_decompress)(struct crypto_tfm *tfm,
60926 const u8 *src, unsigned int slen,
60927 u8 *dst, unsigned int *dlen);
60928-};
60929+} __no_const;
60930
60931 struct rng_tfm {
60932 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
60933 unsigned int dlen);
60934 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
60935-};
60936+} __no_const;
60937
60938 #define crt_ablkcipher crt_u.ablkcipher
60939 #define crt_aead crt_u.aead
60940diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
60941index 7925bf0..d5143d2 100644
60942--- a/include/linux/decompress/mm.h
60943+++ b/include/linux/decompress/mm.h
60944@@ -77,7 +77,7 @@ static void free(void *where)
60945 * warnings when not needed (indeed large_malloc / large_free are not
60946 * needed by inflate */
60947
60948-#define malloc(a) kmalloc(a, GFP_KERNEL)
60949+#define malloc(a) kmalloc((a), GFP_KERNEL)
60950 #define free(a) kfree(a)
60951
60952 #define large_malloc(a) vmalloc(a)
60953diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
60954index e13117c..e9fc938 100644
60955--- a/include/linux/dma-mapping.h
60956+++ b/include/linux/dma-mapping.h
60957@@ -46,7 +46,7 @@ struct dma_map_ops {
60958 u64 (*get_required_mask)(struct device *dev);
60959 #endif
60960 int is_phys;
60961-};
60962+} __do_const;
60963
60964 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
60965
60966diff --git a/include/linux/efi.h b/include/linux/efi.h
60967index 7cce0ea..c2085e4 100644
60968--- a/include/linux/efi.h
60969+++ b/include/linux/efi.h
60970@@ -591,7 +591,7 @@ struct efivar_operations {
60971 efi_get_variable_t *get_variable;
60972 efi_get_next_variable_t *get_next_variable;
60973 efi_set_variable_t *set_variable;
60974-};
60975+} __no_const;
60976
60977 struct efivars {
60978 /*
60979diff --git a/include/linux/elf.h b/include/linux/elf.h
60980index 999b4f5..57753b4 100644
60981--- a/include/linux/elf.h
60982+++ b/include/linux/elf.h
60983@@ -40,6 +40,17 @@ typedef __s64 Elf64_Sxword;
60984 #define PT_GNU_EH_FRAME 0x6474e550
60985
60986 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
60987+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
60988+
60989+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
60990+
60991+/* Constants for the e_flags field */
60992+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
60993+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
60994+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
60995+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
60996+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
60997+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
60998
60999 /*
61000 * Extended Numbering
61001@@ -97,6 +108,8 @@ typedef __s64 Elf64_Sxword;
61002 #define DT_DEBUG 21
61003 #define DT_TEXTREL 22
61004 #define DT_JMPREL 23
61005+#define DT_FLAGS 30
61006+ #define DF_TEXTREL 0x00000004
61007 #define DT_ENCODING 32
61008 #define OLD_DT_LOOS 0x60000000
61009 #define DT_LOOS 0x6000000d
61010@@ -243,6 +256,19 @@ typedef struct elf64_hdr {
61011 #define PF_W 0x2
61012 #define PF_X 0x1
61013
61014+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
61015+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
61016+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
61017+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
61018+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
61019+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
61020+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
61021+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
61022+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
61023+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
61024+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
61025+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
61026+
61027 typedef struct elf32_phdr{
61028 Elf32_Word p_type;
61029 Elf32_Off p_offset;
61030@@ -335,6 +361,8 @@ typedef struct elf64_shdr {
61031 #define EI_OSABI 7
61032 #define EI_PAD 8
61033
61034+#define EI_PAX 14
61035+
61036 #define ELFMAG0 0x7f /* EI_MAG */
61037 #define ELFMAG1 'E'
61038 #define ELFMAG2 'L'
61039@@ -421,6 +449,7 @@ extern Elf32_Dyn _DYNAMIC [];
61040 #define elf_note elf32_note
61041 #define elf_addr_t Elf32_Off
61042 #define Elf_Half Elf32_Half
61043+#define elf_dyn Elf32_Dyn
61044
61045 #else
61046
61047@@ -431,6 +460,7 @@ extern Elf64_Dyn _DYNAMIC [];
61048 #define elf_note elf64_note
61049 #define elf_addr_t Elf64_Off
61050 #define Elf_Half Elf64_Half
61051+#define elf_dyn Elf64_Dyn
61052
61053 #endif
61054
61055diff --git a/include/linux/filter.h b/include/linux/filter.h
61056index 8eeb205..d59bfa2 100644
61057--- a/include/linux/filter.h
61058+++ b/include/linux/filter.h
61059@@ -134,6 +134,7 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */
61060
61061 struct sk_buff;
61062 struct sock;
61063+struct bpf_jit_work;
61064
61065 struct sk_filter
61066 {
61067@@ -141,6 +142,9 @@ struct sk_filter
61068 unsigned int len; /* Number of filter blocks */
61069 unsigned int (*bpf_func)(const struct sk_buff *skb,
61070 const struct sock_filter *filter);
61071+#ifdef CONFIG_BPF_JIT
61072+ struct bpf_jit_work *work;
61073+#endif
61074 struct rcu_head rcu;
61075 struct sock_filter insns[0];
61076 };
61077diff --git a/include/linux/firewire.h b/include/linux/firewire.h
61078index 84ccf8e..2e9b14c 100644
61079--- a/include/linux/firewire.h
61080+++ b/include/linux/firewire.h
61081@@ -428,7 +428,7 @@ struct fw_iso_context {
61082 union {
61083 fw_iso_callback_t sc;
61084 fw_iso_mc_callback_t mc;
61085- } callback;
61086+ } __no_const callback;
61087 void *callback_data;
61088 };
61089
61090diff --git a/include/linux/fs.h b/include/linux/fs.h
61091index f4b6e06..d6ba573 100644
61092--- a/include/linux/fs.h
61093+++ b/include/linux/fs.h
61094@@ -1628,7 +1628,8 @@ struct file_operations {
61095 int (*setlease)(struct file *, long, struct file_lock **);
61096 long (*fallocate)(struct file *file, int mode, loff_t offset,
61097 loff_t len);
61098-};
61099+} __do_const;
61100+typedef struct file_operations __no_const file_operations_no_const;
61101
61102 struct inode_operations {
61103 struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
61104diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
61105index 003dc0f..3c4ea97 100644
61106--- a/include/linux/fs_struct.h
61107+++ b/include/linux/fs_struct.h
61108@@ -6,7 +6,7 @@
61109 #include <linux/seqlock.h>
61110
61111 struct fs_struct {
61112- int users;
61113+ atomic_t users;
61114 spinlock_t lock;
61115 seqcount_t seq;
61116 int umask;
61117diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
61118index ce31408..b1ad003 100644
61119--- a/include/linux/fscache-cache.h
61120+++ b/include/linux/fscache-cache.h
61121@@ -102,7 +102,7 @@ struct fscache_operation {
61122 fscache_operation_release_t release;
61123 };
61124
61125-extern atomic_t fscache_op_debug_id;
61126+extern atomic_unchecked_t fscache_op_debug_id;
61127 extern void fscache_op_work_func(struct work_struct *work);
61128
61129 extern void fscache_enqueue_operation(struct fscache_operation *);
61130@@ -122,7 +122,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
61131 {
61132 INIT_WORK(&op->work, fscache_op_work_func);
61133 atomic_set(&op->usage, 1);
61134- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
61135+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
61136 op->processor = processor;
61137 op->release = release;
61138 INIT_LIST_HEAD(&op->pend_link);
61139diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
61140index 2a53f10..0187fdf 100644
61141--- a/include/linux/fsnotify.h
61142+++ b/include/linux/fsnotify.h
61143@@ -314,7 +314,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
61144 */
61145 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
61146 {
61147- return kstrdup(name, GFP_KERNEL);
61148+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
61149 }
61150
61151 /*
61152diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
61153index 91d0e0a3..035666b 100644
61154--- a/include/linux/fsnotify_backend.h
61155+++ b/include/linux/fsnotify_backend.h
61156@@ -105,6 +105,7 @@ struct fsnotify_ops {
61157 void (*freeing_mark)(struct fsnotify_mark *mark, struct fsnotify_group *group);
61158 void (*free_event_priv)(struct fsnotify_event_private_data *priv);
61159 };
61160+typedef struct fsnotify_ops __no_const fsnotify_ops_no_const;
61161
61162 /*
61163 * A group is a "thing" that wants to receive notification about filesystem
61164diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
61165index c3da42d..c70e0df 100644
61166--- a/include/linux/ftrace_event.h
61167+++ b/include/linux/ftrace_event.h
61168@@ -97,7 +97,7 @@ struct trace_event_functions {
61169 trace_print_func raw;
61170 trace_print_func hex;
61171 trace_print_func binary;
61172-};
61173+} __no_const;
61174
61175 struct trace_event {
61176 struct hlist_node node;
61177@@ -254,7 +254,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
61178 extern int trace_add_event_call(struct ftrace_event_call *call);
61179 extern void trace_remove_event_call(struct ftrace_event_call *call);
61180
61181-#define is_signed_type(type) (((type)(-1)) < 0)
61182+#define is_signed_type(type) (((type)(-1)) < (type)1)
61183
61184 int trace_set_clr_event(const char *system, const char *event, int set);
61185
61186diff --git a/include/linux/genhd.h b/include/linux/genhd.h
61187index e61d319..0da8505 100644
61188--- a/include/linux/genhd.h
61189+++ b/include/linux/genhd.h
61190@@ -185,7 +185,7 @@ struct gendisk {
61191 struct kobject *slave_dir;
61192
61193 struct timer_rand_state *random;
61194- atomic_t sync_io; /* RAID */
61195+ atomic_unchecked_t sync_io; /* RAID */
61196 struct disk_events *ev;
61197 #ifdef CONFIG_BLK_DEV_INTEGRITY
61198 struct blk_integrity *integrity;
61199diff --git a/include/linux/gracl.h b/include/linux/gracl.h
61200new file mode 100644
61201index 0000000..8a130b6
61202--- /dev/null
61203+++ b/include/linux/gracl.h
61204@@ -0,0 +1,319 @@
61205+#ifndef GR_ACL_H
61206+#define GR_ACL_H
61207+
61208+#include <linux/grdefs.h>
61209+#include <linux/resource.h>
61210+#include <linux/capability.h>
61211+#include <linux/dcache.h>
61212+#include <asm/resource.h>
61213+
61214+/* Major status information */
61215+
61216+#define GR_VERSION "grsecurity 2.9"
61217+#define GRSECURITY_VERSION 0x2900
61218+
61219+enum {
61220+ GR_SHUTDOWN = 0,
61221+ GR_ENABLE = 1,
61222+ GR_SPROLE = 2,
61223+ GR_RELOAD = 3,
61224+ GR_SEGVMOD = 4,
61225+ GR_STATUS = 5,
61226+ GR_UNSPROLE = 6,
61227+ GR_PASSSET = 7,
61228+ GR_SPROLEPAM = 8,
61229+};
61230+
61231+/* Password setup definitions
61232+ * kernel/grhash.c */
61233+enum {
61234+ GR_PW_LEN = 128,
61235+ GR_SALT_LEN = 16,
61236+ GR_SHA_LEN = 32,
61237+};
61238+
61239+enum {
61240+ GR_SPROLE_LEN = 64,
61241+};
61242+
61243+enum {
61244+ GR_NO_GLOB = 0,
61245+ GR_REG_GLOB,
61246+ GR_CREATE_GLOB
61247+};
61248+
61249+#define GR_NLIMITS 32
61250+
61251+/* Begin Data Structures */
61252+
61253+struct sprole_pw {
61254+ unsigned char *rolename;
61255+ unsigned char salt[GR_SALT_LEN];
61256+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
61257+};
61258+
61259+struct name_entry {
61260+ __u32 key;
61261+ ino_t inode;
61262+ dev_t device;
61263+ char *name;
61264+ __u16 len;
61265+ __u8 deleted;
61266+ struct name_entry *prev;
61267+ struct name_entry *next;
61268+};
61269+
61270+struct inodev_entry {
61271+ struct name_entry *nentry;
61272+ struct inodev_entry *prev;
61273+ struct inodev_entry *next;
61274+};
61275+
61276+struct acl_role_db {
61277+ struct acl_role_label **r_hash;
61278+ __u32 r_size;
61279+};
61280+
61281+struct inodev_db {
61282+ struct inodev_entry **i_hash;
61283+ __u32 i_size;
61284+};
61285+
61286+struct name_db {
61287+ struct name_entry **n_hash;
61288+ __u32 n_size;
61289+};
61290+
61291+struct crash_uid {
61292+ uid_t uid;
61293+ unsigned long expires;
61294+};
61295+
61296+struct gr_hash_struct {
61297+ void **table;
61298+ void **nametable;
61299+ void *first;
61300+ __u32 table_size;
61301+ __u32 used_size;
61302+ int type;
61303+};
61304+
61305+/* Userspace Grsecurity ACL data structures */
61306+
61307+struct acl_subject_label {
61308+ char *filename;
61309+ ino_t inode;
61310+ dev_t device;
61311+ __u32 mode;
61312+ kernel_cap_t cap_mask;
61313+ kernel_cap_t cap_lower;
61314+ kernel_cap_t cap_invert_audit;
61315+
61316+ struct rlimit res[GR_NLIMITS];
61317+ __u32 resmask;
61318+
61319+ __u8 user_trans_type;
61320+ __u8 group_trans_type;
61321+ uid_t *user_transitions;
61322+ gid_t *group_transitions;
61323+ __u16 user_trans_num;
61324+ __u16 group_trans_num;
61325+
61326+ __u32 sock_families[2];
61327+ __u32 ip_proto[8];
61328+ __u32 ip_type;
61329+ struct acl_ip_label **ips;
61330+ __u32 ip_num;
61331+ __u32 inaddr_any_override;
61332+
61333+ __u32 crashes;
61334+ unsigned long expires;
61335+
61336+ struct acl_subject_label *parent_subject;
61337+ struct gr_hash_struct *hash;
61338+ struct acl_subject_label *prev;
61339+ struct acl_subject_label *next;
61340+
61341+ struct acl_object_label **obj_hash;
61342+ __u32 obj_hash_size;
61343+ __u16 pax_flags;
61344+};
61345+
61346+struct role_allowed_ip {
61347+ __u32 addr;
61348+ __u32 netmask;
61349+
61350+ struct role_allowed_ip *prev;
61351+ struct role_allowed_ip *next;
61352+};
61353+
61354+struct role_transition {
61355+ char *rolename;
61356+
61357+ struct role_transition *prev;
61358+ struct role_transition *next;
61359+};
61360+
61361+struct acl_role_label {
61362+ char *rolename;
61363+ uid_t uidgid;
61364+ __u16 roletype;
61365+
61366+ __u16 auth_attempts;
61367+ unsigned long expires;
61368+
61369+ struct acl_subject_label *root_label;
61370+ struct gr_hash_struct *hash;
61371+
61372+ struct acl_role_label *prev;
61373+ struct acl_role_label *next;
61374+
61375+ struct role_transition *transitions;
61376+ struct role_allowed_ip *allowed_ips;
61377+ uid_t *domain_children;
61378+ __u16 domain_child_num;
61379+
61380+ umode_t umask;
61381+
61382+ struct acl_subject_label **subj_hash;
61383+ __u32 subj_hash_size;
61384+};
61385+
61386+struct user_acl_role_db {
61387+ struct acl_role_label **r_table;
61388+ __u32 num_pointers; /* Number of allocations to track */
61389+ __u32 num_roles; /* Number of roles */
61390+ __u32 num_domain_children; /* Number of domain children */
61391+ __u32 num_subjects; /* Number of subjects */
61392+ __u32 num_objects; /* Number of objects */
61393+};
61394+
61395+struct acl_object_label {
61396+ char *filename;
61397+ ino_t inode;
61398+ dev_t device;
61399+ __u32 mode;
61400+
61401+ struct acl_subject_label *nested;
61402+ struct acl_object_label *globbed;
61403+
61404+ /* next two structures not used */
61405+
61406+ struct acl_object_label *prev;
61407+ struct acl_object_label *next;
61408+};
61409+
61410+struct acl_ip_label {
61411+ char *iface;
61412+ __u32 addr;
61413+ __u32 netmask;
61414+ __u16 low, high;
61415+ __u8 mode;
61416+ __u32 type;
61417+ __u32 proto[8];
61418+
61419+ /* next two structures not used */
61420+
61421+ struct acl_ip_label *prev;
61422+ struct acl_ip_label *next;
61423+};
61424+
61425+struct gr_arg {
61426+ struct user_acl_role_db role_db;
61427+ unsigned char pw[GR_PW_LEN];
61428+ unsigned char salt[GR_SALT_LEN];
61429+ unsigned char sum[GR_SHA_LEN];
61430+ unsigned char sp_role[GR_SPROLE_LEN];
61431+ struct sprole_pw *sprole_pws;
61432+ dev_t segv_device;
61433+ ino_t segv_inode;
61434+ uid_t segv_uid;
61435+ __u16 num_sprole_pws;
61436+ __u16 mode;
61437+};
61438+
61439+struct gr_arg_wrapper {
61440+ struct gr_arg *arg;
61441+ __u32 version;
61442+ __u32 size;
61443+};
61444+
61445+struct subject_map {
61446+ struct acl_subject_label *user;
61447+ struct acl_subject_label *kernel;
61448+ struct subject_map *prev;
61449+ struct subject_map *next;
61450+};
61451+
61452+struct acl_subj_map_db {
61453+ struct subject_map **s_hash;
61454+ __u32 s_size;
61455+};
61456+
61457+/* End Data Structures Section */
61458+
61459+/* Hash functions generated by empirical testing by Brad Spengler
61460+ Makes good use of the low bits of the inode. Generally 0-1 times
61461+ in loop for successful match. 0-3 for unsuccessful match.
61462+ Shift/add algorithm with modulus of table size and an XOR*/
61463+
61464+static __inline__ unsigned int
61465+rhash(const uid_t uid, const __u16 type, const unsigned int sz)
61466+{
61467+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
61468+}
61469+
61470+ static __inline__ unsigned int
61471+shash(const struct acl_subject_label *userp, const unsigned int sz)
61472+{
61473+ return ((const unsigned long)userp % sz);
61474+}
61475+
61476+static __inline__ unsigned int
61477+fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
61478+{
61479+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
61480+}
61481+
61482+static __inline__ unsigned int
61483+nhash(const char *name, const __u16 len, const unsigned int sz)
61484+{
61485+ return full_name_hash((const unsigned char *)name, len) % sz;
61486+}
61487+
61488+#define FOR_EACH_ROLE_START(role) \
61489+ role = role_list; \
61490+ while (role) {
61491+
61492+#define FOR_EACH_ROLE_END(role) \
61493+ role = role->prev; \
61494+ }
61495+
61496+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
61497+ subj = NULL; \
61498+ iter = 0; \
61499+ while (iter < role->subj_hash_size) { \
61500+ if (subj == NULL) \
61501+ subj = role->subj_hash[iter]; \
61502+ if (subj == NULL) { \
61503+ iter++; \
61504+ continue; \
61505+ }
61506+
61507+#define FOR_EACH_SUBJECT_END(subj,iter) \
61508+ subj = subj->next; \
61509+ if (subj == NULL) \
61510+ iter++; \
61511+ }
61512+
61513+
61514+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
61515+ subj = role->hash->first; \
61516+ while (subj != NULL) {
61517+
61518+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
61519+ subj = subj->next; \
61520+ }
61521+
61522+#endif
61523+
61524diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
61525new file mode 100644
61526index 0000000..323ecf2
61527--- /dev/null
61528+++ b/include/linux/gralloc.h
61529@@ -0,0 +1,9 @@
61530+#ifndef __GRALLOC_H
61531+#define __GRALLOC_H
61532+
61533+void acl_free_all(void);
61534+int acl_alloc_stack_init(unsigned long size);
61535+void *acl_alloc(unsigned long len);
61536+void *acl_alloc_num(unsigned long num, unsigned long len);
61537+
61538+#endif
61539diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
61540new file mode 100644
61541index 0000000..b30e9bc
61542--- /dev/null
61543+++ b/include/linux/grdefs.h
61544@@ -0,0 +1,140 @@
61545+#ifndef GRDEFS_H
61546+#define GRDEFS_H
61547+
61548+/* Begin grsecurity status declarations */
61549+
61550+enum {
61551+ GR_READY = 0x01,
61552+ GR_STATUS_INIT = 0x00 // disabled state
61553+};
61554+
61555+/* Begin ACL declarations */
61556+
61557+/* Role flags */
61558+
61559+enum {
61560+ GR_ROLE_USER = 0x0001,
61561+ GR_ROLE_GROUP = 0x0002,
61562+ GR_ROLE_DEFAULT = 0x0004,
61563+ GR_ROLE_SPECIAL = 0x0008,
61564+ GR_ROLE_AUTH = 0x0010,
61565+ GR_ROLE_NOPW = 0x0020,
61566+ GR_ROLE_GOD = 0x0040,
61567+ GR_ROLE_LEARN = 0x0080,
61568+ GR_ROLE_TPE = 0x0100,
61569+ GR_ROLE_DOMAIN = 0x0200,
61570+ GR_ROLE_PAM = 0x0400,
61571+ GR_ROLE_PERSIST = 0x0800
61572+};
61573+
61574+/* ACL Subject and Object mode flags */
61575+enum {
61576+ GR_DELETED = 0x80000000
61577+};
61578+
61579+/* ACL Object-only mode flags */
61580+enum {
61581+ GR_READ = 0x00000001,
61582+ GR_APPEND = 0x00000002,
61583+ GR_WRITE = 0x00000004,
61584+ GR_EXEC = 0x00000008,
61585+ GR_FIND = 0x00000010,
61586+ GR_INHERIT = 0x00000020,
61587+ GR_SETID = 0x00000040,
61588+ GR_CREATE = 0x00000080,
61589+ GR_DELETE = 0x00000100,
61590+ GR_LINK = 0x00000200,
61591+ GR_AUDIT_READ = 0x00000400,
61592+ GR_AUDIT_APPEND = 0x00000800,
61593+ GR_AUDIT_WRITE = 0x00001000,
61594+ GR_AUDIT_EXEC = 0x00002000,
61595+ GR_AUDIT_FIND = 0x00004000,
61596+ GR_AUDIT_INHERIT= 0x00008000,
61597+ GR_AUDIT_SETID = 0x00010000,
61598+ GR_AUDIT_CREATE = 0x00020000,
61599+ GR_AUDIT_DELETE = 0x00040000,
61600+ GR_AUDIT_LINK = 0x00080000,
61601+ GR_PTRACERD = 0x00100000,
61602+ GR_NOPTRACE = 0x00200000,
61603+ GR_SUPPRESS = 0x00400000,
61604+ GR_NOLEARN = 0x00800000,
61605+ GR_INIT_TRANSFER= 0x01000000
61606+};
61607+
61608+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
61609+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
61610+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
61611+
61612+/* ACL subject-only mode flags */
61613+enum {
61614+ GR_KILL = 0x00000001,
61615+ GR_VIEW = 0x00000002,
61616+ GR_PROTECTED = 0x00000004,
61617+ GR_LEARN = 0x00000008,
61618+ GR_OVERRIDE = 0x00000010,
61619+ /* just a placeholder, this mode is only used in userspace */
61620+ GR_DUMMY = 0x00000020,
61621+ GR_PROTSHM = 0x00000040,
61622+ GR_KILLPROC = 0x00000080,
61623+ GR_KILLIPPROC = 0x00000100,
61624+ /* just a placeholder, this mode is only used in userspace */
61625+ GR_NOTROJAN = 0x00000200,
61626+ GR_PROTPROCFD = 0x00000400,
61627+ GR_PROCACCT = 0x00000800,
61628+ GR_RELAXPTRACE = 0x00001000,
61629+ GR_NESTED = 0x00002000,
61630+ GR_INHERITLEARN = 0x00004000,
61631+ GR_PROCFIND = 0x00008000,
61632+ GR_POVERRIDE = 0x00010000,
61633+ GR_KERNELAUTH = 0x00020000,
61634+ GR_ATSECURE = 0x00040000,
61635+ GR_SHMEXEC = 0x00080000
61636+};
61637+
61638+enum {
61639+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
61640+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
61641+ GR_PAX_ENABLE_MPROTECT = 0x0004,
61642+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
61643+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
61644+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
61645+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
61646+ GR_PAX_DISABLE_MPROTECT = 0x0400,
61647+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
61648+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
61649+};
61650+
61651+enum {
61652+ GR_ID_USER = 0x01,
61653+ GR_ID_GROUP = 0x02,
61654+};
61655+
61656+enum {
61657+ GR_ID_ALLOW = 0x01,
61658+ GR_ID_DENY = 0x02,
61659+};
61660+
61661+#define GR_CRASH_RES 31
61662+#define GR_UIDTABLE_MAX 500
61663+
61664+/* begin resource learning section */
61665+enum {
61666+ GR_RLIM_CPU_BUMP = 60,
61667+ GR_RLIM_FSIZE_BUMP = 50000,
61668+ GR_RLIM_DATA_BUMP = 10000,
61669+ GR_RLIM_STACK_BUMP = 1000,
61670+ GR_RLIM_CORE_BUMP = 10000,
61671+ GR_RLIM_RSS_BUMP = 500000,
61672+ GR_RLIM_NPROC_BUMP = 1,
61673+ GR_RLIM_NOFILE_BUMP = 5,
61674+ GR_RLIM_MEMLOCK_BUMP = 50000,
61675+ GR_RLIM_AS_BUMP = 500000,
61676+ GR_RLIM_LOCKS_BUMP = 2,
61677+ GR_RLIM_SIGPENDING_BUMP = 5,
61678+ GR_RLIM_MSGQUEUE_BUMP = 10000,
61679+ GR_RLIM_NICE_BUMP = 1,
61680+ GR_RLIM_RTPRIO_BUMP = 1,
61681+ GR_RLIM_RTTIME_BUMP = 1000000
61682+};
61683+
61684+#endif
61685diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
61686new file mode 100644
61687index 0000000..da390f1
61688--- /dev/null
61689+++ b/include/linux/grinternal.h
61690@@ -0,0 +1,221 @@
61691+#ifndef __GRINTERNAL_H
61692+#define __GRINTERNAL_H
61693+
61694+#ifdef CONFIG_GRKERNSEC
61695+
61696+#include <linux/fs.h>
61697+#include <linux/mnt_namespace.h>
61698+#include <linux/nsproxy.h>
61699+#include <linux/gracl.h>
61700+#include <linux/grdefs.h>
61701+#include <linux/grmsg.h>
61702+
61703+void gr_add_learn_entry(const char *fmt, ...)
61704+ __attribute__ ((format (printf, 1, 2)));
61705+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
61706+ const struct vfsmount *mnt);
61707+__u32 gr_check_create(const struct dentry *new_dentry,
61708+ const struct dentry *parent,
61709+ const struct vfsmount *mnt, const __u32 mode);
61710+int gr_check_protected_task(const struct task_struct *task);
61711+__u32 to_gr_audit(const __u32 reqmode);
61712+int gr_set_acls(const int type);
61713+int gr_apply_subject_to_task(struct task_struct *task);
61714+int gr_acl_is_enabled(void);
61715+char gr_roletype_to_char(void);
61716+
61717+void gr_handle_alertkill(struct task_struct *task);
61718+char *gr_to_filename(const struct dentry *dentry,
61719+ const struct vfsmount *mnt);
61720+char *gr_to_filename1(const struct dentry *dentry,
61721+ const struct vfsmount *mnt);
61722+char *gr_to_filename2(const struct dentry *dentry,
61723+ const struct vfsmount *mnt);
61724+char *gr_to_filename3(const struct dentry *dentry,
61725+ const struct vfsmount *mnt);
61726+
61727+extern int grsec_enable_ptrace_readexec;
61728+extern int grsec_enable_harden_ptrace;
61729+extern int grsec_enable_link;
61730+extern int grsec_enable_fifo;
61731+extern int grsec_enable_execve;
61732+extern int grsec_enable_shm;
61733+extern int grsec_enable_execlog;
61734+extern int grsec_enable_signal;
61735+extern int grsec_enable_audit_ptrace;
61736+extern int grsec_enable_forkfail;
61737+extern int grsec_enable_time;
61738+extern int grsec_enable_rofs;
61739+extern int grsec_enable_chroot_shmat;
61740+extern int grsec_enable_chroot_mount;
61741+extern int grsec_enable_chroot_double;
61742+extern int grsec_enable_chroot_pivot;
61743+extern int grsec_enable_chroot_chdir;
61744+extern int grsec_enable_chroot_chmod;
61745+extern int grsec_enable_chroot_mknod;
61746+extern int grsec_enable_chroot_fchdir;
61747+extern int grsec_enable_chroot_nice;
61748+extern int grsec_enable_chroot_execlog;
61749+extern int grsec_enable_chroot_caps;
61750+extern int grsec_enable_chroot_sysctl;
61751+extern int grsec_enable_chroot_unix;
61752+extern int grsec_enable_tpe;
61753+extern int grsec_tpe_gid;
61754+extern int grsec_enable_tpe_all;
61755+extern int grsec_enable_tpe_invert;
61756+extern int grsec_enable_socket_all;
61757+extern int grsec_socket_all_gid;
61758+extern int grsec_enable_socket_client;
61759+extern int grsec_socket_client_gid;
61760+extern int grsec_enable_socket_server;
61761+extern int grsec_socket_server_gid;
61762+extern int grsec_audit_gid;
61763+extern int grsec_enable_group;
61764+extern int grsec_enable_audit_textrel;
61765+extern int grsec_enable_log_rwxmaps;
61766+extern int grsec_enable_mount;
61767+extern int grsec_enable_chdir;
61768+extern int grsec_resource_logging;
61769+extern int grsec_enable_blackhole;
61770+extern int grsec_lastack_retries;
61771+extern int grsec_enable_brute;
61772+extern int grsec_lock;
61773+
61774+extern spinlock_t grsec_alert_lock;
61775+extern unsigned long grsec_alert_wtime;
61776+extern unsigned long grsec_alert_fyet;
61777+
61778+extern spinlock_t grsec_audit_lock;
61779+
61780+extern rwlock_t grsec_exec_file_lock;
61781+
61782+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
61783+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
61784+ (tsk)->exec_file->f_vfsmnt) : "/")
61785+
61786+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
61787+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
61788+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
61789+
61790+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
61791+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
61792+ (tsk)->exec_file->f_vfsmnt) : "/")
61793+
61794+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
61795+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
61796+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
61797+
61798+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
61799+
61800+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
61801+
61802+#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
61803+ (task)->pid, (cred)->uid, \
61804+ (cred)->euid, (cred)->gid, (cred)->egid, \
61805+ gr_parent_task_fullpath(task), \
61806+ (task)->real_parent->comm, (task)->real_parent->pid, \
61807+ (pcred)->uid, (pcred)->euid, \
61808+ (pcred)->gid, (pcred)->egid
61809+
61810+#define GR_CHROOT_CAPS {{ \
61811+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
61812+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
61813+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
61814+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
61815+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
61816+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
61817+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
61818+
61819+#define security_learn(normal_msg,args...) \
61820+({ \
61821+ read_lock(&grsec_exec_file_lock); \
61822+ gr_add_learn_entry(normal_msg "\n", ## args); \
61823+ read_unlock(&grsec_exec_file_lock); \
61824+})
61825+
61826+enum {
61827+ GR_DO_AUDIT,
61828+ GR_DONT_AUDIT,
61829+ /* used for non-audit messages that we shouldn't kill the task on */
61830+ GR_DONT_AUDIT_GOOD
61831+};
61832+
61833+enum {
61834+ GR_TTYSNIFF,
61835+ GR_RBAC,
61836+ GR_RBAC_STR,
61837+ GR_STR_RBAC,
61838+ GR_RBAC_MODE2,
61839+ GR_RBAC_MODE3,
61840+ GR_FILENAME,
61841+ GR_SYSCTL_HIDDEN,
61842+ GR_NOARGS,
61843+ GR_ONE_INT,
61844+ GR_ONE_INT_TWO_STR,
61845+ GR_ONE_STR,
61846+ GR_STR_INT,
61847+ GR_TWO_STR_INT,
61848+ GR_TWO_INT,
61849+ GR_TWO_U64,
61850+ GR_THREE_INT,
61851+ GR_FIVE_INT_TWO_STR,
61852+ GR_TWO_STR,
61853+ GR_THREE_STR,
61854+ GR_FOUR_STR,
61855+ GR_STR_FILENAME,
61856+ GR_FILENAME_STR,
61857+ GR_FILENAME_TWO_INT,
61858+ GR_FILENAME_TWO_INT_STR,
61859+ GR_TEXTREL,
61860+ GR_PTRACE,
61861+ GR_RESOURCE,
61862+ GR_CAP,
61863+ GR_SIG,
61864+ GR_SIG2,
61865+ GR_CRASH1,
61866+ GR_CRASH2,
61867+ GR_PSACCT,
61868+ GR_RWXMAP
61869+};
61870+
61871+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
61872+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
61873+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
61874+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
61875+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
61876+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
61877+#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)
61878+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
61879+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
61880+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
61881+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
61882+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
61883+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
61884+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
61885+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
61886+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
61887+#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)
61888+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
61889+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
61890+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
61891+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
61892+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
61893+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
61894+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
61895+#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)
61896+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
61897+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
61898+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
61899+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
61900+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
61901+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
61902+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
61903+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
61904+#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)
61905+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
61906+
61907+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
61908+
61909+#endif
61910+
61911+#endif
61912diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
61913new file mode 100644
61914index 0000000..ae576a1
61915--- /dev/null
61916+++ b/include/linux/grmsg.h
61917@@ -0,0 +1,109 @@
61918+#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"
61919+#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"
61920+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
61921+#define GR_STOPMOD_MSG "denied modification of module state by "
61922+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
61923+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
61924+#define GR_IOPERM_MSG "denied use of ioperm() by "
61925+#define GR_IOPL_MSG "denied use of iopl() by "
61926+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
61927+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
61928+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
61929+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
61930+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
61931+#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"
61932+#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"
61933+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
61934+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
61935+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
61936+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
61937+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
61938+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
61939+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
61940+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
61941+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
61942+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
61943+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
61944+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
61945+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
61946+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
61947+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
61948+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
61949+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
61950+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
61951+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
61952+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
61953+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
61954+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
61955+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
61956+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
61957+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
61958+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
61959+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
61960+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
61961+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
61962+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
61963+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
61964+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
61965+#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
61966+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
61967+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
61968+#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"
61969+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
61970+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
61971+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
61972+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
61973+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
61974+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
61975+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
61976+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
61977+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
61978+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
61979+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
61980+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
61981+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
61982+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
61983+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
61984+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
61985+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
61986+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
61987+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
61988+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
61989+#define GR_FAILFORK_MSG "failed fork with errno %s by "
61990+#define GR_NICE_CHROOT_MSG "denied priority change by "
61991+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
61992+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
61993+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
61994+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
61995+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
61996+#define GR_TIME_MSG "time set by "
61997+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
61998+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
61999+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
62000+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
62001+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
62002+#define GR_BIND_MSG "denied bind() by "
62003+#define GR_CONNECT_MSG "denied connect() by "
62004+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
62005+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
62006+#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"
62007+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
62008+#define GR_CAP_ACL_MSG "use of %s denied for "
62009+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
62010+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
62011+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
62012+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
62013+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
62014+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
62015+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
62016+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
62017+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
62018+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
62019+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
62020+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
62021+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
62022+#define GR_VM86_MSG "denied use of vm86 by "
62023+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
62024+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
62025+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
62026+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
62027diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
62028new file mode 100644
62029index 0000000..acd05db
62030--- /dev/null
62031+++ b/include/linux/grsecurity.h
62032@@ -0,0 +1,232 @@
62033+#ifndef GR_SECURITY_H
62034+#define GR_SECURITY_H
62035+#include <linux/fs.h>
62036+#include <linux/fs_struct.h>
62037+#include <linux/binfmts.h>
62038+#include <linux/gracl.h>
62039+
62040+/* notify of brain-dead configs */
62041+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
62042+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
62043+#endif
62044+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
62045+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
62046+#endif
62047+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
62048+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
62049+#endif
62050+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
62051+#error "CONFIG_PAX enabled, but no PaX options are enabled."
62052+#endif
62053+
62054+#include <linux/compat.h>
62055+
62056+struct user_arg_ptr {
62057+#ifdef CONFIG_COMPAT
62058+ bool is_compat;
62059+#endif
62060+ union {
62061+ const char __user *const __user *native;
62062+#ifdef CONFIG_COMPAT
62063+ compat_uptr_t __user *compat;
62064+#endif
62065+ } ptr;
62066+};
62067+
62068+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
62069+void gr_handle_brute_check(void);
62070+void gr_handle_kernel_exploit(void);
62071+int gr_process_user_ban(void);
62072+
62073+char gr_roletype_to_char(void);
62074+
62075+int gr_acl_enable_at_secure(void);
62076+
62077+int gr_check_user_change(int real, int effective, int fs);
62078+int gr_check_group_change(int real, int effective, int fs);
62079+
62080+void gr_del_task_from_ip_table(struct task_struct *p);
62081+
62082+int gr_pid_is_chrooted(struct task_struct *p);
62083+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
62084+int gr_handle_chroot_nice(void);
62085+int gr_handle_chroot_sysctl(const int op);
62086+int gr_handle_chroot_setpriority(struct task_struct *p,
62087+ const int niceval);
62088+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
62089+int gr_handle_chroot_chroot(const struct dentry *dentry,
62090+ const struct vfsmount *mnt);
62091+void gr_handle_chroot_chdir(struct path *path);
62092+int gr_handle_chroot_chmod(const struct dentry *dentry,
62093+ const struct vfsmount *mnt, const int mode);
62094+int gr_handle_chroot_mknod(const struct dentry *dentry,
62095+ const struct vfsmount *mnt, const int mode);
62096+int gr_handle_chroot_mount(const struct dentry *dentry,
62097+ const struct vfsmount *mnt,
62098+ const char *dev_name);
62099+int gr_handle_chroot_pivot(void);
62100+int gr_handle_chroot_unix(const pid_t pid);
62101+
62102+int gr_handle_rawio(const struct inode *inode);
62103+
62104+void gr_handle_ioperm(void);
62105+void gr_handle_iopl(void);
62106+
62107+umode_t gr_acl_umask(void);
62108+
62109+int gr_tpe_allow(const struct file *file);
62110+
62111+void gr_set_chroot_entries(struct task_struct *task, struct path *path);
62112+void gr_clear_chroot_entries(struct task_struct *task);
62113+
62114+void gr_log_forkfail(const int retval);
62115+void gr_log_timechange(void);
62116+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
62117+void gr_log_chdir(const struct dentry *dentry,
62118+ const struct vfsmount *mnt);
62119+void gr_log_chroot_exec(const struct dentry *dentry,
62120+ const struct vfsmount *mnt);
62121+void gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv);
62122+void gr_log_remount(const char *devname, const int retval);
62123+void gr_log_unmount(const char *devname, const int retval);
62124+void gr_log_mount(const char *from, const char *to, const int retval);
62125+void gr_log_textrel(struct vm_area_struct *vma);
62126+void gr_log_rwxmmap(struct file *file);
62127+void gr_log_rwxmprotect(struct file *file);
62128+
62129+int gr_handle_follow_link(const struct inode *parent,
62130+ const struct inode *inode,
62131+ const struct dentry *dentry,
62132+ const struct vfsmount *mnt);
62133+int gr_handle_fifo(const struct dentry *dentry,
62134+ const struct vfsmount *mnt,
62135+ const struct dentry *dir, const int flag,
62136+ const int acc_mode);
62137+int gr_handle_hardlink(const struct dentry *dentry,
62138+ const struct vfsmount *mnt,
62139+ struct inode *inode,
62140+ const int mode, const char *to);
62141+
62142+int gr_is_capable(const int cap);
62143+int gr_is_capable_nolog(const int cap);
62144+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
62145+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
62146+
62147+void gr_learn_resource(const struct task_struct *task, const int limit,
62148+ const unsigned long wanted, const int gt);
62149+void gr_copy_label(struct task_struct *tsk);
62150+void gr_handle_crash(struct task_struct *task, const int sig);
62151+int gr_handle_signal(const struct task_struct *p, const int sig);
62152+int gr_check_crash_uid(const uid_t uid);
62153+int gr_check_protected_task(const struct task_struct *task);
62154+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
62155+int gr_acl_handle_mmap(const struct file *file,
62156+ const unsigned long prot);
62157+int gr_acl_handle_mprotect(const struct file *file,
62158+ const unsigned long prot);
62159+int gr_check_hidden_task(const struct task_struct *tsk);
62160+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
62161+ const struct vfsmount *mnt);
62162+__u32 gr_acl_handle_utime(const struct dentry *dentry,
62163+ const struct vfsmount *mnt);
62164+__u32 gr_acl_handle_access(const struct dentry *dentry,
62165+ const struct vfsmount *mnt, const int fmode);
62166+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
62167+ const struct vfsmount *mnt, umode_t *mode);
62168+__u32 gr_acl_handle_chown(const struct dentry *dentry,
62169+ const struct vfsmount *mnt);
62170+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
62171+ const struct vfsmount *mnt);
62172+int gr_handle_ptrace(struct task_struct *task, const long request);
62173+int gr_handle_proc_ptrace(struct task_struct *task);
62174+__u32 gr_acl_handle_execve(const struct dentry *dentry,
62175+ const struct vfsmount *mnt);
62176+int gr_check_crash_exec(const struct file *filp);
62177+int gr_acl_is_enabled(void);
62178+void gr_set_kernel_label(struct task_struct *task);
62179+void gr_set_role_label(struct task_struct *task, const uid_t uid,
62180+ const gid_t gid);
62181+int gr_set_proc_label(const struct dentry *dentry,
62182+ const struct vfsmount *mnt,
62183+ const int unsafe_flags);
62184+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
62185+ const struct vfsmount *mnt);
62186+__u32 gr_acl_handle_open(const struct dentry *dentry,
62187+ const struct vfsmount *mnt, int acc_mode);
62188+__u32 gr_acl_handle_creat(const struct dentry *dentry,
62189+ const struct dentry *p_dentry,
62190+ const struct vfsmount *p_mnt,
62191+ int open_flags, int acc_mode, const int imode);
62192+void gr_handle_create(const struct dentry *dentry,
62193+ const struct vfsmount *mnt);
62194+void gr_handle_proc_create(const struct dentry *dentry,
62195+ const struct inode *inode);
62196+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
62197+ const struct dentry *parent_dentry,
62198+ const struct vfsmount *parent_mnt,
62199+ const int mode);
62200+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
62201+ const struct dentry *parent_dentry,
62202+ const struct vfsmount *parent_mnt);
62203+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
62204+ const struct vfsmount *mnt);
62205+void gr_handle_delete(const ino_t ino, const dev_t dev);
62206+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
62207+ const struct vfsmount *mnt);
62208+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
62209+ const struct dentry *parent_dentry,
62210+ const struct vfsmount *parent_mnt,
62211+ const char *from);
62212+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
62213+ const struct dentry *parent_dentry,
62214+ const struct vfsmount *parent_mnt,
62215+ const struct dentry *old_dentry,
62216+ const struct vfsmount *old_mnt, const char *to);
62217+int gr_acl_handle_rename(struct dentry *new_dentry,
62218+ struct dentry *parent_dentry,
62219+ const struct vfsmount *parent_mnt,
62220+ struct dentry *old_dentry,
62221+ struct inode *old_parent_inode,
62222+ struct vfsmount *old_mnt, const char *newname);
62223+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
62224+ struct dentry *old_dentry,
62225+ struct dentry *new_dentry,
62226+ struct vfsmount *mnt, const __u8 replace);
62227+__u32 gr_check_link(const struct dentry *new_dentry,
62228+ const struct dentry *parent_dentry,
62229+ const struct vfsmount *parent_mnt,
62230+ const struct dentry *old_dentry,
62231+ const struct vfsmount *old_mnt);
62232+int gr_acl_handle_filldir(const struct file *file, const char *name,
62233+ const unsigned int namelen, const ino_t ino);
62234+
62235+__u32 gr_acl_handle_unix(const struct dentry *dentry,
62236+ const struct vfsmount *mnt);
62237+void gr_acl_handle_exit(void);
62238+void gr_acl_handle_psacct(struct task_struct *task, const long code);
62239+int gr_acl_handle_procpidmem(const struct task_struct *task);
62240+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
62241+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
62242+void gr_audit_ptrace(struct task_struct *task);
62243+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
62244+
62245+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
62246+
62247+#ifdef CONFIG_GRKERNSEC
62248+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
62249+void gr_handle_vm86(void);
62250+void gr_handle_mem_readwrite(u64 from, u64 to);
62251+
62252+void gr_log_badprocpid(const char *entry);
62253+
62254+extern int grsec_enable_dmesg;
62255+extern int grsec_disable_privio;
62256+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
62257+extern int grsec_enable_chroot_findtask;
62258+#endif
62259+#ifdef CONFIG_GRKERNSEC_SETXID
62260+extern int grsec_enable_setxid;
62261+#endif
62262+#endif
62263+
62264+#endif
62265diff --git a/include/linux/grsock.h b/include/linux/grsock.h
62266new file mode 100644
62267index 0000000..e7ffaaf
62268--- /dev/null
62269+++ b/include/linux/grsock.h
62270@@ -0,0 +1,19 @@
62271+#ifndef __GRSOCK_H
62272+#define __GRSOCK_H
62273+
62274+extern void gr_attach_curr_ip(const struct sock *sk);
62275+extern int gr_handle_sock_all(const int family, const int type,
62276+ const int protocol);
62277+extern int gr_handle_sock_server(const struct sockaddr *sck);
62278+extern int gr_handle_sock_server_other(const struct sock *sck);
62279+extern int gr_handle_sock_client(const struct sockaddr *sck);
62280+extern int gr_search_connect(struct socket * sock,
62281+ struct sockaddr_in * addr);
62282+extern int gr_search_bind(struct socket * sock,
62283+ struct sockaddr_in * addr);
62284+extern int gr_search_listen(struct socket * sock);
62285+extern int gr_search_accept(struct socket * sock);
62286+extern int gr_search_socket(const int domain, const int type,
62287+ const int protocol);
62288+
62289+#endif
62290diff --git a/include/linux/hid.h b/include/linux/hid.h
62291index 3a95da6..51986f1 100644
62292--- a/include/linux/hid.h
62293+++ b/include/linux/hid.h
62294@@ -696,7 +696,7 @@ struct hid_ll_driver {
62295 unsigned int code, int value);
62296
62297 int (*parse)(struct hid_device *hdev);
62298-};
62299+} __no_const;
62300
62301 #define PM_HINT_FULLON 1<<5
62302 #define PM_HINT_NORMAL 1<<1
62303diff --git a/include/linux/highmem.h b/include/linux/highmem.h
62304index 3a93f73..b19d0b3 100644
62305--- a/include/linux/highmem.h
62306+++ b/include/linux/highmem.h
62307@@ -185,6 +185,18 @@ static inline void clear_highpage(struct page *page)
62308 kunmap_atomic(kaddr, KM_USER0);
62309 }
62310
62311+static inline void sanitize_highpage(struct page *page)
62312+{
62313+ void *kaddr;
62314+ unsigned long flags;
62315+
62316+ local_irq_save(flags);
62317+ kaddr = kmap_atomic(page, KM_CLEARPAGE);
62318+ clear_page(kaddr);
62319+ kunmap_atomic(kaddr, KM_CLEARPAGE);
62320+ local_irq_restore(flags);
62321+}
62322+
62323 static inline void zero_user_segments(struct page *page,
62324 unsigned start1, unsigned end1,
62325 unsigned start2, unsigned end2)
62326diff --git a/include/linux/i2c.h b/include/linux/i2c.h
62327index 8e25a91..551b161 100644
62328--- a/include/linux/i2c.h
62329+++ b/include/linux/i2c.h
62330@@ -364,6 +364,7 @@ struct i2c_algorithm {
62331 /* To determine what the adapter supports */
62332 u32 (*functionality) (struct i2c_adapter *);
62333 };
62334+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
62335
62336 /*
62337 * i2c_adapter is the structure used to identify a physical i2c bus along
62338diff --git a/include/linux/i2o.h b/include/linux/i2o.h
62339index a6deef4..c56a7f2 100644
62340--- a/include/linux/i2o.h
62341+++ b/include/linux/i2o.h
62342@@ -564,7 +564,7 @@ struct i2o_controller {
62343 struct i2o_device *exec; /* Executive */
62344 #if BITS_PER_LONG == 64
62345 spinlock_t context_list_lock; /* lock for context_list */
62346- atomic_t context_list_counter; /* needed for unique contexts */
62347+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
62348 struct list_head context_list; /* list of context id's
62349 and pointers */
62350 #endif
62351diff --git a/include/linux/if_team.h b/include/linux/if_team.h
62352index 58404b0..439ed95 100644
62353--- a/include/linux/if_team.h
62354+++ b/include/linux/if_team.h
62355@@ -64,6 +64,7 @@ struct team_mode_ops {
62356 void (*port_leave)(struct team *team, struct team_port *port);
62357 void (*port_change_mac)(struct team *team, struct team_port *port);
62358 };
62359+typedef struct team_mode_ops __no_const team_mode_ops_no_const;
62360
62361 enum team_option_type {
62362 TEAM_OPTION_TYPE_U32,
62363@@ -112,7 +113,7 @@ struct team {
62364 struct list_head option_list;
62365
62366 const struct team_mode *mode;
62367- struct team_mode_ops ops;
62368+ team_mode_ops_no_const ops;
62369 long mode_priv[TEAM_MODE_PRIV_LONGS];
62370 };
62371
62372diff --git a/include/linux/init.h b/include/linux/init.h
62373index 6b95109..4aca62c 100644
62374--- a/include/linux/init.h
62375+++ b/include/linux/init.h
62376@@ -294,13 +294,13 @@ void __init parse_early_options(char *cmdline);
62377
62378 /* Each module must use one module_init(). */
62379 #define module_init(initfn) \
62380- static inline initcall_t __inittest(void) \
62381+ static inline __used initcall_t __inittest(void) \
62382 { return initfn; } \
62383 int init_module(void) __attribute__((alias(#initfn)));
62384
62385 /* This is only required if you want to be unloadable. */
62386 #define module_exit(exitfn) \
62387- static inline exitcall_t __exittest(void) \
62388+ static inline __used exitcall_t __exittest(void) \
62389 { return exitfn; } \
62390 void cleanup_module(void) __attribute__((alias(#exitfn)));
62391
62392diff --git a/include/linux/init_task.h b/include/linux/init_task.h
62393index 9c66b1a..a3fdded 100644
62394--- a/include/linux/init_task.h
62395+++ b/include/linux/init_task.h
62396@@ -127,6 +127,12 @@ extern struct cred init_cred;
62397
62398 #define INIT_TASK_COMM "swapper"
62399
62400+#ifdef CONFIG_X86
62401+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
62402+#else
62403+#define INIT_TASK_THREAD_INFO
62404+#endif
62405+
62406 /*
62407 * INIT_TASK is used to set up the first task table, touch at
62408 * your own risk!. Base=0, limit=0x1fffff (=2MB)
62409@@ -165,6 +171,7 @@ extern struct cred init_cred;
62410 RCU_INIT_POINTER(.cred, &init_cred), \
62411 .comm = INIT_TASK_COMM, \
62412 .thread = INIT_THREAD, \
62413+ INIT_TASK_THREAD_INFO \
62414 .fs = &init_fs, \
62415 .files = &init_files, \
62416 .signal = &init_signals, \
62417diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
62418index e6ca56d..8583707 100644
62419--- a/include/linux/intel-iommu.h
62420+++ b/include/linux/intel-iommu.h
62421@@ -296,7 +296,7 @@ struct iommu_flush {
62422 u8 fm, u64 type);
62423 void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
62424 unsigned int size_order, u64 type);
62425-};
62426+} __no_const;
62427
62428 enum {
62429 SR_DMAR_FECTL_REG,
62430diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
62431index a64b00e..464d8bc 100644
62432--- a/include/linux/interrupt.h
62433+++ b/include/linux/interrupt.h
62434@@ -441,7 +441,7 @@ enum
62435 /* map softirq index to softirq name. update 'softirq_to_name' in
62436 * kernel/softirq.c when adding a new softirq.
62437 */
62438-extern char *softirq_to_name[NR_SOFTIRQS];
62439+extern const char * const softirq_to_name[NR_SOFTIRQS];
62440
62441 /* softirq mask and active fields moved to irq_cpustat_t in
62442 * asm/hardirq.h to get better cache usage. KAO
62443@@ -449,12 +449,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
62444
62445 struct softirq_action
62446 {
62447- void (*action)(struct softirq_action *);
62448+ void (*action)(void);
62449 };
62450
62451 asmlinkage void do_softirq(void);
62452 asmlinkage void __do_softirq(void);
62453-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
62454+extern void open_softirq(int nr, void (*action)(void));
62455 extern void softirq_init(void);
62456 static inline void __raise_softirq_irqoff(unsigned int nr)
62457 {
62458diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
62459index 3875719..4cd454c 100644
62460--- a/include/linux/kallsyms.h
62461+++ b/include/linux/kallsyms.h
62462@@ -15,7 +15,8 @@
62463
62464 struct module;
62465
62466-#ifdef CONFIG_KALLSYMS
62467+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
62468+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
62469 /* Lookup the address for a symbol. Returns 0 if not found. */
62470 unsigned long kallsyms_lookup_name(const char *name);
62471
62472@@ -99,6 +100,16 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
62473 /* Stupid that this does nothing, but I didn't create this mess. */
62474 #define __print_symbol(fmt, addr)
62475 #endif /*CONFIG_KALLSYMS*/
62476+#else /* when included by kallsyms.c, vsnprintf.c, or
62477+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
62478+extern void __print_symbol(const char *fmt, unsigned long address);
62479+extern int sprint_backtrace(char *buffer, unsigned long address);
62480+extern int sprint_symbol(char *buffer, unsigned long address);
62481+const char *kallsyms_lookup(unsigned long addr,
62482+ unsigned long *symbolsize,
62483+ unsigned long *offset,
62484+ char **modname, char *namebuf);
62485+#endif
62486
62487 /* This macro allows us to keep printk typechecking */
62488 static __printf(1, 2)
62489diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
62490index c4d2fc1..5df9c19 100644
62491--- a/include/linux/kgdb.h
62492+++ b/include/linux/kgdb.h
62493@@ -53,7 +53,7 @@ extern int kgdb_connected;
62494 extern int kgdb_io_module_registered;
62495
62496 extern atomic_t kgdb_setting_breakpoint;
62497-extern atomic_t kgdb_cpu_doing_single_step;
62498+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
62499
62500 extern struct task_struct *kgdb_usethread;
62501 extern struct task_struct *kgdb_contthread;
62502@@ -252,7 +252,7 @@ struct kgdb_arch {
62503 void (*disable_hw_break)(struct pt_regs *regs);
62504 void (*remove_all_hw_break)(void);
62505 void (*correct_hw_break)(void);
62506-};
62507+} __do_const;
62508
62509 /**
62510 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
62511@@ -277,7 +277,7 @@ struct kgdb_io {
62512 void (*pre_exception) (void);
62513 void (*post_exception) (void);
62514 int is_console;
62515-};
62516+} __do_const;
62517
62518 extern struct kgdb_arch arch_kgdb_ops;
62519
62520diff --git a/include/linux/kmod.h b/include/linux/kmod.h
62521index 0fb48ef..1b680b2 100644
62522--- a/include/linux/kmod.h
62523+++ b/include/linux/kmod.h
62524@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
62525 * usually useless though. */
62526 extern __printf(2, 3)
62527 int __request_module(bool wait, const char *name, ...);
62528+extern __printf(3, 4)
62529+int ___request_module(bool wait, char *param_name, const char *name, ...);
62530 #define request_module(mod...) __request_module(true, mod)
62531 #define request_module_nowait(mod...) __request_module(false, mod)
62532 #define try_then_request_module(x, mod...) \
62533diff --git a/include/linux/kref.h b/include/linux/kref.h
62534index 9c07dce..a92fa71 100644
62535--- a/include/linux/kref.h
62536+++ b/include/linux/kref.h
62537@@ -63,7 +63,7 @@ static inline void kref_get(struct kref *kref)
62538 static inline int kref_sub(struct kref *kref, unsigned int count,
62539 void (*release)(struct kref *kref))
62540 {
62541- WARN_ON(release == NULL);
62542+ BUG_ON(release == NULL);
62543
62544 if (atomic_sub_and_test((int) count, &kref->refcount)) {
62545 release(kref);
62546diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
62547index bc21720..098aefa 100644
62548--- a/include/linux/kvm_host.h
62549+++ b/include/linux/kvm_host.h
62550@@ -326,7 +326,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
62551 void vcpu_load(struct kvm_vcpu *vcpu);
62552 void vcpu_put(struct kvm_vcpu *vcpu);
62553
62554-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
62555+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
62556 struct module *module);
62557 void kvm_exit(void);
62558
62559@@ -416,20 +416,20 @@ void kvm_get_pfn(pfn_t pfn);
62560 int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset,
62561 int len);
62562 int kvm_read_guest_atomic(struct kvm *kvm, gpa_t gpa, void *data,
62563- unsigned long len);
62564-int kvm_read_guest(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len);
62565+ unsigned long len) __size_overflow(4);
62566+int kvm_read_guest(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len) __size_overflow(2,4);
62567 int kvm_read_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62568- void *data, unsigned long len);
62569+ void *data, unsigned long len) __size_overflow(4);
62570 int kvm_write_guest_page(struct kvm *kvm, gfn_t gfn, const void *data,
62571 int offset, int len);
62572 int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data,
62573- unsigned long len);
62574+ unsigned long len) __size_overflow(2,4);
62575 int kvm_write_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62576- void *data, unsigned long len);
62577+ void *data, unsigned long len) __size_overflow(4);
62578 int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62579 gpa_t gpa);
62580 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len);
62581-int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len);
62582+int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len) __size_overflow(2,3);
62583 struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);
62584 int kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn);
62585 unsigned long kvm_host_page_size(struct kvm *kvm, gfn_t gfn);
62586@@ -485,7 +485,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
62587 struct kvm_guest_debug *dbg);
62588 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
62589
62590-int kvm_arch_init(void *opaque);
62591+int kvm_arch_init(const void *opaque);
62592 void kvm_arch_exit(void);
62593
62594 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
62595@@ -727,7 +727,7 @@ int kvm_setup_default_irq_routing(struct kvm *kvm);
62596 int kvm_set_irq_routing(struct kvm *kvm,
62597 const struct kvm_irq_routing_entry *entries,
62598 unsigned nr,
62599- unsigned flags);
62600+ unsigned flags) __size_overflow(3);
62601 void kvm_free_irq_routing(struct kvm *kvm);
62602
62603 #else
62604diff --git a/include/linux/libata.h b/include/linux/libata.h
62605index cafc09a..d7e7829 100644
62606--- a/include/linux/libata.h
62607+++ b/include/linux/libata.h
62608@@ -909,7 +909,7 @@ struct ata_port_operations {
62609 * fields must be pointers.
62610 */
62611 const struct ata_port_operations *inherits;
62612-};
62613+} __do_const;
62614
62615 struct ata_port_info {
62616 unsigned long flags;
62617diff --git a/include/linux/mca.h b/include/linux/mca.h
62618index 3797270..7765ede 100644
62619--- a/include/linux/mca.h
62620+++ b/include/linux/mca.h
62621@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
62622 int region);
62623 void * (*mca_transform_memory)(struct mca_device *,
62624 void *memory);
62625-};
62626+} __no_const;
62627
62628 struct mca_bus {
62629 u64 default_dma_mask;
62630diff --git a/include/linux/memory.h b/include/linux/memory.h
62631index 1ac7f6e..a5794d0 100644
62632--- a/include/linux/memory.h
62633+++ b/include/linux/memory.h
62634@@ -143,7 +143,7 @@ struct memory_accessor {
62635 size_t count);
62636 ssize_t (*write)(struct memory_accessor *, const char *buf,
62637 off_t offset, size_t count);
62638-};
62639+} __no_const;
62640
62641 /*
62642 * Kernel text modification mutex, used for code patching. Users of this lock
62643diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
62644index 9970337..9444122 100644
62645--- a/include/linux/mfd/abx500.h
62646+++ b/include/linux/mfd/abx500.h
62647@@ -188,6 +188,7 @@ struct abx500_ops {
62648 int (*event_registers_startup_state_get) (struct device *, u8 *);
62649 int (*startup_irq_enabled) (struct device *, unsigned int);
62650 };
62651+typedef struct abx500_ops __no_const abx500_ops_no_const;
62652
62653 int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
62654 void abx500_remove_ops(struct device *dev);
62655diff --git a/include/linux/mm.h b/include/linux/mm.h
62656index 17b27cd..baea141 100644
62657--- a/include/linux/mm.h
62658+++ b/include/linux/mm.h
62659@@ -115,7 +115,14 @@ extern unsigned int kobjsize(const void *objp);
62660
62661 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
62662 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
62663+
62664+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
62665+#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
62666+#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
62667+#else
62668 #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
62669+#endif
62670+
62671 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
62672 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
62673
62674@@ -1012,34 +1019,6 @@ int set_page_dirty(struct page *page);
62675 int set_page_dirty_lock(struct page *page);
62676 int clear_page_dirty_for_io(struct page *page);
62677
62678-/* Is the vma a continuation of the stack vma above it? */
62679-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
62680-{
62681- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
62682-}
62683-
62684-static inline int stack_guard_page_start(struct vm_area_struct *vma,
62685- unsigned long addr)
62686-{
62687- return (vma->vm_flags & VM_GROWSDOWN) &&
62688- (vma->vm_start == addr) &&
62689- !vma_growsdown(vma->vm_prev, addr);
62690-}
62691-
62692-/* Is the vma a continuation of the stack vma below it? */
62693-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
62694-{
62695- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
62696-}
62697-
62698-static inline int stack_guard_page_end(struct vm_area_struct *vma,
62699- unsigned long addr)
62700-{
62701- return (vma->vm_flags & VM_GROWSUP) &&
62702- (vma->vm_end == addr) &&
62703- !vma_growsup(vma->vm_next, addr);
62704-}
62705-
62706 extern unsigned long move_page_tables(struct vm_area_struct *vma,
62707 unsigned long old_addr, struct vm_area_struct *new_vma,
62708 unsigned long new_addr, unsigned long len);
62709@@ -1134,6 +1113,15 @@ static inline void sync_mm_rss(struct task_struct *task, struct mm_struct *mm)
62710 }
62711 #endif
62712
62713+#ifdef CONFIG_MMU
62714+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
62715+#else
62716+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
62717+{
62718+ return __pgprot(0);
62719+}
62720+#endif
62721+
62722 int vma_wants_writenotify(struct vm_area_struct *vma);
62723
62724 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
62725@@ -1152,8 +1140,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
62726 {
62727 return 0;
62728 }
62729+
62730+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
62731+ unsigned long address)
62732+{
62733+ return 0;
62734+}
62735 #else
62736 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
62737+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
62738 #endif
62739
62740 #ifdef __PAGETABLE_PMD_FOLDED
62741@@ -1162,8 +1157,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
62742 {
62743 return 0;
62744 }
62745+
62746+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
62747+ unsigned long address)
62748+{
62749+ return 0;
62750+}
62751 #else
62752 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
62753+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
62754 #endif
62755
62756 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
62757@@ -1181,11 +1183,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
62758 NULL: pud_offset(pgd, address);
62759 }
62760
62761+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
62762+{
62763+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
62764+ NULL: pud_offset(pgd, address);
62765+}
62766+
62767 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
62768 {
62769 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
62770 NULL: pmd_offset(pud, address);
62771 }
62772+
62773+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
62774+{
62775+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
62776+ NULL: pmd_offset(pud, address);
62777+}
62778 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
62779
62780 #if USE_SPLIT_PTLOCKS
62781@@ -1409,6 +1423,7 @@ out:
62782 }
62783
62784 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
62785+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
62786
62787 extern unsigned long do_brk(unsigned long, unsigned long);
62788
62789@@ -1466,6 +1481,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
62790 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
62791 struct vm_area_struct **pprev);
62792
62793+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
62794+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
62795+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
62796+
62797 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
62798 NULL if none. Assume start_addr < end_addr. */
62799 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
62800@@ -1494,15 +1513,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
62801 return vma;
62802 }
62803
62804-#ifdef CONFIG_MMU
62805-pgprot_t vm_get_page_prot(unsigned long vm_flags);
62806-#else
62807-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
62808-{
62809- return __pgprot(0);
62810-}
62811-#endif
62812-
62813 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
62814 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
62815 unsigned long pfn, unsigned long size, pgprot_t);
62816@@ -1606,7 +1616,7 @@ extern int unpoison_memory(unsigned long pfn);
62817 extern int sysctl_memory_failure_early_kill;
62818 extern int sysctl_memory_failure_recovery;
62819 extern void shake_page(struct page *p, int access);
62820-extern atomic_long_t mce_bad_pages;
62821+extern atomic_long_unchecked_t mce_bad_pages;
62822 extern int soft_offline_page(struct page *page, int flags);
62823
62824 extern void dump_page(struct page *page);
62825@@ -1637,5 +1647,11 @@ static inline unsigned int debug_guardpage_minorder(void) { return 0; }
62826 static inline bool page_is_guard(struct page *page) { return false; }
62827 #endif /* CONFIG_DEBUG_PAGEALLOC */
62828
62829+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
62830+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
62831+#else
62832+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
62833+#endif
62834+
62835 #endif /* __KERNEL__ */
62836 #endif /* _LINUX_MM_H */
62837diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
62838index 3cc3062..efeaeb7 100644
62839--- a/include/linux/mm_types.h
62840+++ b/include/linux/mm_types.h
62841@@ -252,6 +252,8 @@ struct vm_area_struct {
62842 #ifdef CONFIG_NUMA
62843 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
62844 #endif
62845+
62846+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
62847 };
62848
62849 struct core_thread {
62850@@ -326,7 +328,7 @@ struct mm_struct {
62851 unsigned long def_flags;
62852 unsigned long nr_ptes; /* Page table pages */
62853 unsigned long start_code, end_code, start_data, end_data;
62854- unsigned long start_brk, brk, start_stack;
62855+ unsigned long brk_gap, start_brk, brk, start_stack;
62856 unsigned long arg_start, arg_end, env_start, env_end;
62857
62858 unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */
62859@@ -388,6 +390,24 @@ struct mm_struct {
62860 #ifdef CONFIG_CPUMASK_OFFSTACK
62861 struct cpumask cpumask_allocation;
62862 #endif
62863+
62864+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS) || defined(CONFIG_PAX_HAVE_ACL_FLAGS) || defined(CONFIG_PAX_HOOK_ACL_FLAGS)
62865+ unsigned long pax_flags;
62866+#endif
62867+
62868+#ifdef CONFIG_PAX_DLRESOLVE
62869+ unsigned long call_dl_resolve;
62870+#endif
62871+
62872+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
62873+ unsigned long call_syscall;
62874+#endif
62875+
62876+#ifdef CONFIG_PAX_ASLR
62877+ unsigned long delta_mmap; /* randomized offset */
62878+ unsigned long delta_stack; /* randomized offset */
62879+#endif
62880+
62881 };
62882
62883 static inline void mm_init_cpumask(struct mm_struct *mm)
62884diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
62885index 1d1b1e1..2a13c78 100644
62886--- a/include/linux/mmu_notifier.h
62887+++ b/include/linux/mmu_notifier.h
62888@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
62889 */
62890 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
62891 ({ \
62892- pte_t __pte; \
62893+ pte_t ___pte; \
62894 struct vm_area_struct *___vma = __vma; \
62895 unsigned long ___address = __address; \
62896- __pte = ptep_clear_flush(___vma, ___address, __ptep); \
62897+ ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
62898 mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
62899- __pte; \
62900+ ___pte; \
62901 })
62902
62903 #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
62904diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
62905index 650ba2f..af0a58c 100644
62906--- a/include/linux/mmzone.h
62907+++ b/include/linux/mmzone.h
62908@@ -379,7 +379,7 @@ struct zone {
62909 unsigned long flags; /* zone flags, see below */
62910
62911 /* Zone statistics */
62912- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
62913+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
62914
62915 /*
62916 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
62917diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
62918index 83ac071..2656e0e 100644
62919--- a/include/linux/mod_devicetable.h
62920+++ b/include/linux/mod_devicetable.h
62921@@ -12,7 +12,7 @@
62922 typedef unsigned long kernel_ulong_t;
62923 #endif
62924
62925-#define PCI_ANY_ID (~0)
62926+#define PCI_ANY_ID ((__u16)~0)
62927
62928 struct pci_device_id {
62929 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
62930@@ -131,7 +131,7 @@ struct usb_device_id {
62931 #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100
62932 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
62933
62934-#define HID_ANY_ID (~0)
62935+#define HID_ANY_ID (~0U)
62936
62937 struct hid_device_id {
62938 __u16 bus;
62939diff --git a/include/linux/module.h b/include/linux/module.h
62940index 4598bf0..e069d7f 100644
62941--- a/include/linux/module.h
62942+++ b/include/linux/module.h
62943@@ -17,6 +17,7 @@
62944 #include <linux/moduleparam.h>
62945 #include <linux/tracepoint.h>
62946 #include <linux/export.h>
62947+#include <linux/fs.h>
62948
62949 #include <linux/percpu.h>
62950 #include <asm/module.h>
62951@@ -275,19 +276,16 @@ struct module
62952 int (*init)(void);
62953
62954 /* If this is non-NULL, vfree after init() returns */
62955- void *module_init;
62956+ void *module_init_rx, *module_init_rw;
62957
62958 /* Here is the actual code + data, vfree'd on unload. */
62959- void *module_core;
62960+ void *module_core_rx, *module_core_rw;
62961
62962 /* Here are the sizes of the init and core sections */
62963- unsigned int init_size, core_size;
62964+ unsigned int init_size_rw, core_size_rw;
62965
62966 /* The size of the executable code in each section. */
62967- unsigned int init_text_size, core_text_size;
62968-
62969- /* Size of RO sections of the module (text+rodata) */
62970- unsigned int init_ro_size, core_ro_size;
62971+ unsigned int init_size_rx, core_size_rx;
62972
62973 /* Arch-specific module values */
62974 struct mod_arch_specific arch;
62975@@ -343,6 +341,10 @@ struct module
62976 #ifdef CONFIG_EVENT_TRACING
62977 struct ftrace_event_call **trace_events;
62978 unsigned int num_trace_events;
62979+ struct file_operations trace_id;
62980+ struct file_operations trace_enable;
62981+ struct file_operations trace_format;
62982+ struct file_operations trace_filter;
62983 #endif
62984 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
62985 unsigned int num_ftrace_callsites;
62986@@ -390,16 +392,46 @@ bool is_module_address(unsigned long addr);
62987 bool is_module_percpu_address(unsigned long addr);
62988 bool is_module_text_address(unsigned long addr);
62989
62990+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
62991+{
62992+
62993+#ifdef CONFIG_PAX_KERNEXEC
62994+ if (ktla_ktva(addr) >= (unsigned long)start &&
62995+ ktla_ktva(addr) < (unsigned long)start + size)
62996+ return 1;
62997+#endif
62998+
62999+ return ((void *)addr >= start && (void *)addr < start + size);
63000+}
63001+
63002+static inline int within_module_core_rx(unsigned long addr, struct module *mod)
63003+{
63004+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
63005+}
63006+
63007+static inline int within_module_core_rw(unsigned long addr, struct module *mod)
63008+{
63009+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
63010+}
63011+
63012+static inline int within_module_init_rx(unsigned long addr, struct module *mod)
63013+{
63014+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
63015+}
63016+
63017+static inline int within_module_init_rw(unsigned long addr, struct module *mod)
63018+{
63019+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
63020+}
63021+
63022 static inline int within_module_core(unsigned long addr, struct module *mod)
63023 {
63024- return (unsigned long)mod->module_core <= addr &&
63025- addr < (unsigned long)mod->module_core + mod->core_size;
63026+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
63027 }
63028
63029 static inline int within_module_init(unsigned long addr, struct module *mod)
63030 {
63031- return (unsigned long)mod->module_init <= addr &&
63032- addr < (unsigned long)mod->module_init + mod->init_size;
63033+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
63034 }
63035
63036 /* Search for module by name: must hold module_mutex. */
63037diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
63038index b2be02e..72d2f78 100644
63039--- a/include/linux/moduleloader.h
63040+++ b/include/linux/moduleloader.h
63041@@ -23,11 +23,23 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
63042
63043 /* Allocator used for allocating struct module, core sections and init
63044 sections. Returns NULL on failure. */
63045-void *module_alloc(unsigned long size);
63046+void *module_alloc(unsigned long size) __size_overflow(1);
63047+
63048+#ifdef CONFIG_PAX_KERNEXEC
63049+void *module_alloc_exec(unsigned long size) __size_overflow(1);
63050+#else
63051+#define module_alloc_exec(x) module_alloc(x)
63052+#endif
63053
63054 /* Free memory returned from module_alloc. */
63055 void module_free(struct module *mod, void *module_region);
63056
63057+#ifdef CONFIG_PAX_KERNEXEC
63058+void module_free_exec(struct module *mod, void *module_region);
63059+#else
63060+#define module_free_exec(x, y) module_free((x), (y))
63061+#endif
63062+
63063 /* Apply the given relocation to the (simplified) ELF. Return -error
63064 or 0. */
63065 int apply_relocate(Elf_Shdr *sechdrs,
63066diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
63067index c47f4d6..23f9bdb 100644
63068--- a/include/linux/moduleparam.h
63069+++ b/include/linux/moduleparam.h
63070@@ -260,7 +260,7 @@ static inline void __kernel_param_unlock(void)
63071 * @len is usually just sizeof(string).
63072 */
63073 #define module_param_string(name, string, len, perm) \
63074- static const struct kparam_string __param_string_##name \
63075+ static const struct kparam_string __param_string_##name __used \
63076 = { len, string }; \
63077 __module_param_call(MODULE_PARAM_PREFIX, name, \
63078 &param_ops_string, \
63079@@ -396,7 +396,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
63080 */
63081 #define module_param_array_named(name, array, type, nump, perm) \
63082 param_check_##type(name, &(array)[0]); \
63083- static const struct kparam_array __param_arr_##name \
63084+ static const struct kparam_array __param_arr_##name __used \
63085 = { .max = ARRAY_SIZE(array), .num = nump, \
63086 .ops = &param_ops_##type, \
63087 .elemsize = sizeof(array[0]), .elem = array }; \
63088diff --git a/include/linux/namei.h b/include/linux/namei.h
63089index ffc0213..2c1f2cb 100644
63090--- a/include/linux/namei.h
63091+++ b/include/linux/namei.h
63092@@ -24,7 +24,7 @@ struct nameidata {
63093 unsigned seq;
63094 int last_type;
63095 unsigned depth;
63096- char *saved_names[MAX_NESTED_LINKS + 1];
63097+ const char *saved_names[MAX_NESTED_LINKS + 1];
63098
63099 /* Intent data */
63100 union {
63101@@ -94,12 +94,12 @@ extern int follow_up(struct path *);
63102 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
63103 extern void unlock_rename(struct dentry *, struct dentry *);
63104
63105-static inline void nd_set_link(struct nameidata *nd, char *path)
63106+static inline void nd_set_link(struct nameidata *nd, const char *path)
63107 {
63108 nd->saved_names[nd->depth] = path;
63109 }
63110
63111-static inline char *nd_get_link(struct nameidata *nd)
63112+static inline const char *nd_get_link(const struct nameidata *nd)
63113 {
63114 return nd->saved_names[nd->depth];
63115 }
63116diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
63117index 4f3b01a..8256d1a 100644
63118--- a/include/linux/netdevice.h
63119+++ b/include/linux/netdevice.h
63120@@ -1002,6 +1002,7 @@ struct net_device_ops {
63121 int (*ndo_neigh_construct)(struct neighbour *n);
63122 void (*ndo_neigh_destroy)(struct neighbour *n);
63123 };
63124+typedef struct net_device_ops __no_const net_device_ops_no_const;
63125
63126 /*
63127 * The DEVICE structure.
63128@@ -1063,7 +1064,7 @@ struct net_device {
63129 int iflink;
63130
63131 struct net_device_stats stats;
63132- atomic_long_t rx_dropped; /* dropped packets by core network
63133+ atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
63134 * Do not use this in drivers.
63135 */
63136
63137diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
63138new file mode 100644
63139index 0000000..33f4af8
63140--- /dev/null
63141+++ b/include/linux/netfilter/xt_gradm.h
63142@@ -0,0 +1,9 @@
63143+#ifndef _LINUX_NETFILTER_XT_GRADM_H
63144+#define _LINUX_NETFILTER_XT_GRADM_H 1
63145+
63146+struct xt_gradm_mtinfo {
63147+ __u16 flags;
63148+ __u16 invflags;
63149+};
63150+
63151+#endif
63152diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h
63153index c65a18a..0c05f3a 100644
63154--- a/include/linux/of_pdt.h
63155+++ b/include/linux/of_pdt.h
63156@@ -32,7 +32,7 @@ struct of_pdt_ops {
63157
63158 /* return 0 on success; fill in 'len' with number of bytes in path */
63159 int (*pkg2path)(phandle node, char *buf, const int buflen, int *len);
63160-};
63161+} __no_const;
63162
63163 extern void *prom_early_alloc(unsigned long size);
63164
63165diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
63166index a4c5624..2dabfb7 100644
63167--- a/include/linux/oprofile.h
63168+++ b/include/linux/oprofile.h
63169@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
63170 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
63171 char const * name, ulong * val);
63172
63173-/** Create a file for read-only access to an atomic_t. */
63174+/** Create a file for read-only access to an atomic_unchecked_t. */
63175 int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
63176- char const * name, atomic_t * val);
63177+ char const * name, atomic_unchecked_t * val);
63178
63179 /** create a directory */
63180 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
63181@@ -163,7 +163,7 @@ ssize_t oprofilefs_ulong_to_user(unsigned long val, char __user * buf, size_t co
63182 * Read an ASCII string for a number from a userspace buffer and fill *val on success.
63183 * Returns 0 on success, < 0 on error.
63184 */
63185-int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count);
63186+int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count) __size_overflow(3);
63187
63188 /** lock for read/write safety */
63189 extern raw_spinlock_t oprofilefs_lock;
63190diff --git a/include/linux/padata.h b/include/linux/padata.h
63191index 4633b2f..988bc08 100644
63192--- a/include/linux/padata.h
63193+++ b/include/linux/padata.h
63194@@ -129,7 +129,7 @@ struct parallel_data {
63195 struct padata_instance *pinst;
63196 struct padata_parallel_queue __percpu *pqueue;
63197 struct padata_serial_queue __percpu *squeue;
63198- atomic_t seq_nr;
63199+ atomic_unchecked_t seq_nr;
63200 atomic_t reorder_objects;
63201 atomic_t refcnt;
63202 unsigned int max_seq_nr;
63203diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
63204index abb2776..d8b8e15 100644
63205--- a/include/linux/perf_event.h
63206+++ b/include/linux/perf_event.h
63207@@ -750,8 +750,8 @@ struct perf_event {
63208
63209 enum perf_event_active_state state;
63210 unsigned int attach_state;
63211- local64_t count;
63212- atomic64_t child_count;
63213+ local64_t count; /* PaX: fix it one day */
63214+ atomic64_unchecked_t child_count;
63215
63216 /*
63217 * These are the total time in nanoseconds that the event
63218@@ -802,8 +802,8 @@ struct perf_event {
63219 * These accumulate total time (in nanoseconds) that children
63220 * events have been enabled and running, respectively.
63221 */
63222- atomic64_t child_total_time_enabled;
63223- atomic64_t child_total_time_running;
63224+ atomic64_unchecked_t child_total_time_enabled;
63225+ atomic64_unchecked_t child_total_time_running;
63226
63227 /*
63228 * Protect attach/detach and child_list:
63229diff --git a/include/linux/personality.h b/include/linux/personality.h
63230index 8fc7dd1a..c19d89e 100644
63231--- a/include/linux/personality.h
63232+++ b/include/linux/personality.h
63233@@ -44,6 +44,7 @@ enum {
63234 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
63235 ADDR_NO_RANDOMIZE | \
63236 ADDR_COMPAT_LAYOUT | \
63237+ ADDR_LIMIT_3GB | \
63238 MMAP_PAGE_ZERO)
63239
63240 /*
63241diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
63242index 0072a53..c5dcca5 100644
63243--- a/include/linux/pipe_fs_i.h
63244+++ b/include/linux/pipe_fs_i.h
63245@@ -47,9 +47,9 @@ struct pipe_buffer {
63246 struct pipe_inode_info {
63247 wait_queue_head_t wait;
63248 unsigned int nrbufs, curbuf, buffers;
63249- unsigned int readers;
63250- unsigned int writers;
63251- unsigned int waiting_writers;
63252+ atomic_t readers;
63253+ atomic_t writers;
63254+ atomic_t waiting_writers;
63255 unsigned int r_counter;
63256 unsigned int w_counter;
63257 struct page *tmp_page;
63258diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
63259index 609daae..5392427 100644
63260--- a/include/linux/pm_runtime.h
63261+++ b/include/linux/pm_runtime.h
63262@@ -97,7 +97,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
63263
63264 static inline void pm_runtime_mark_last_busy(struct device *dev)
63265 {
63266- ACCESS_ONCE(dev->power.last_busy) = jiffies;
63267+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
63268 }
63269
63270 #else /* !CONFIG_PM_RUNTIME */
63271diff --git a/include/linux/poison.h b/include/linux/poison.h
63272index 2110a81..13a11bb 100644
63273--- a/include/linux/poison.h
63274+++ b/include/linux/poison.h
63275@@ -19,8 +19,8 @@
63276 * under normal circumstances, used to verify that nobody uses
63277 * non-initialized list entries.
63278 */
63279-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
63280-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
63281+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
63282+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
63283
63284 /********** include/linux/timer.h **********/
63285 /*
63286diff --git a/include/linux/preempt.h b/include/linux/preempt.h
63287index 58969b2..ead129b 100644
63288--- a/include/linux/preempt.h
63289+++ b/include/linux/preempt.h
63290@@ -123,7 +123,7 @@ struct preempt_ops {
63291 void (*sched_in)(struct preempt_notifier *notifier, int cpu);
63292 void (*sched_out)(struct preempt_notifier *notifier,
63293 struct task_struct *next);
63294-};
63295+} __no_const;
63296
63297 /**
63298 * preempt_notifier - key for installing preemption notifiers
63299diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
63300index 85c5073..51fac8b 100644
63301--- a/include/linux/proc_fs.h
63302+++ b/include/linux/proc_fs.h
63303@@ -155,6 +155,18 @@ static inline struct proc_dir_entry *proc_create(const char *name, umode_t mode,
63304 return proc_create_data(name, mode, parent, proc_fops, NULL);
63305 }
63306
63307+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
63308+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
63309+{
63310+#ifdef CONFIG_GRKERNSEC_PROC_USER
63311+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
63312+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63313+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
63314+#else
63315+ return proc_create_data(name, mode, parent, proc_fops, NULL);
63316+#endif
63317+}
63318+
63319 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
63320 umode_t mode, struct proc_dir_entry *base,
63321 read_proc_t *read_proc, void * data)
63322@@ -258,7 +270,7 @@ union proc_op {
63323 int (*proc_show)(struct seq_file *m,
63324 struct pid_namespace *ns, struct pid *pid,
63325 struct task_struct *task);
63326-};
63327+} __no_const;
63328
63329 struct ctl_table_header;
63330 struct ctl_table;
63331diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
63332index c2f1f6a..6fdb196 100644
63333--- a/include/linux/ptrace.h
63334+++ b/include/linux/ptrace.h
63335@@ -199,9 +199,10 @@ static inline void ptrace_event(int event, unsigned long message)
63336 if (unlikely(ptrace_event_enabled(current, event))) {
63337 current->ptrace_message = message;
63338 ptrace_notify((event << 8) | SIGTRAP);
63339- } else if (event == PTRACE_EVENT_EXEC && unlikely(current->ptrace)) {
63340+ } else if (event == PTRACE_EVENT_EXEC) {
63341 /* legacy EXEC report via SIGTRAP */
63342- send_sig(SIGTRAP, current, 0);
63343+ if ((current->ptrace & (PT_PTRACED|PT_SEIZED)) == PT_PTRACED)
63344+ send_sig(SIGTRAP, current, 0);
63345 }
63346 }
63347
63348diff --git a/include/linux/random.h b/include/linux/random.h
63349index 8f74538..02a1012 100644
63350--- a/include/linux/random.h
63351+++ b/include/linux/random.h
63352@@ -69,12 +69,17 @@ void srandom32(u32 seed);
63353
63354 u32 prandom32(struct rnd_state *);
63355
63356+static inline unsigned long pax_get_random_long(void)
63357+{
63358+ return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
63359+}
63360+
63361 /*
63362 * Handle minimum values for seeds
63363 */
63364 static inline u32 __seed(u32 x, u32 m)
63365 {
63366- return (x < m) ? x + m : x;
63367+ return (x <= m) ? x + m + 1 : x;
63368 }
63369
63370 /**
63371diff --git a/include/linux/reboot.h b/include/linux/reboot.h
63372index e0879a7..a12f962 100644
63373--- a/include/linux/reboot.h
63374+++ b/include/linux/reboot.h
63375@@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
63376 * Architecture-specific implementations of sys_reboot commands.
63377 */
63378
63379-extern void machine_restart(char *cmd);
63380-extern void machine_halt(void);
63381-extern void machine_power_off(void);
63382+extern void machine_restart(char *cmd) __noreturn;
63383+extern void machine_halt(void) __noreturn;
63384+extern void machine_power_off(void) __noreturn;
63385
63386 extern void machine_shutdown(void);
63387 struct pt_regs;
63388@@ -65,9 +65,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
63389 */
63390
63391 extern void kernel_restart_prepare(char *cmd);
63392-extern void kernel_restart(char *cmd);
63393-extern void kernel_halt(void);
63394-extern void kernel_power_off(void);
63395+extern void kernel_restart(char *cmd) __noreturn;
63396+extern void kernel_halt(void) __noreturn;
63397+extern void kernel_power_off(void) __noreturn;
63398
63399 extern int C_A_D; /* for sysctl */
63400 void ctrl_alt_del(void);
63401@@ -81,7 +81,7 @@ extern int orderly_poweroff(bool force);
63402 * Emergency restart, callable from an interrupt handler.
63403 */
63404
63405-extern void emergency_restart(void);
63406+extern void emergency_restart(void) __noreturn;
63407 #include <asm/emergency-restart.h>
63408
63409 #endif
63410diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
63411index 2213ddc..650212a 100644
63412--- a/include/linux/reiserfs_fs.h
63413+++ b/include/linux/reiserfs_fs.h
63414@@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
63415 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
63416
63417 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
63418-#define get_generation(s) atomic_read (&fs_generation(s))
63419+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
63420 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
63421 #define __fs_changed(gen,s) (gen != get_generation (s))
63422 #define fs_changed(gen,s) \
63423diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
63424index 8c9e85c..1698e9a 100644
63425--- a/include/linux/reiserfs_fs_sb.h
63426+++ b/include/linux/reiserfs_fs_sb.h
63427@@ -386,7 +386,7 @@ struct reiserfs_sb_info {
63428 /* Comment? -Hans */
63429 wait_queue_head_t s_wait;
63430 /* To be obsoleted soon by per buffer seals.. -Hans */
63431- atomic_t s_generation_counter; // increased by one every time the
63432+ atomic_unchecked_t s_generation_counter; // increased by one every time the
63433 // tree gets re-balanced
63434 unsigned long s_properties; /* File system properties. Currently holds
63435 on-disk FS format */
63436diff --git a/include/linux/relay.h b/include/linux/relay.h
63437index a822fd7..62b70f6 100644
63438--- a/include/linux/relay.h
63439+++ b/include/linux/relay.h
63440@@ -159,7 +159,7 @@ struct rchan_callbacks
63441 * The callback should return 0 if successful, negative if not.
63442 */
63443 int (*remove_buf_file)(struct dentry *dentry);
63444-};
63445+} __no_const;
63446
63447 /*
63448 * CONFIG_RELAY kernel API, kernel/relay.c
63449diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
63450index c6c6084..5bf1212 100644
63451--- a/include/linux/rfkill.h
63452+++ b/include/linux/rfkill.h
63453@@ -147,6 +147,7 @@ struct rfkill_ops {
63454 void (*query)(struct rfkill *rfkill, void *data);
63455 int (*set_block)(void *data, bool blocked);
63456 };
63457+typedef struct rfkill_ops __no_const rfkill_ops_no_const;
63458
63459 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
63460 /**
63461diff --git a/include/linux/rio.h b/include/linux/rio.h
63462index 4d50611..c6858a2 100644
63463--- a/include/linux/rio.h
63464+++ b/include/linux/rio.h
63465@@ -315,7 +315,7 @@ struct rio_ops {
63466 int mbox, void *buffer, size_t len);
63467 int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
63468 void *(*get_inb_message)(struct rio_mport *mport, int mbox);
63469-};
63470+} __no_const;
63471
63472 #define RIO_RESOURCE_MEM 0x00000100
63473 #define RIO_RESOURCE_DOORBELL 0x00000200
63474diff --git a/include/linux/rmap.h b/include/linux/rmap.h
63475index 1cdd62a..e399f0d 100644
63476--- a/include/linux/rmap.h
63477+++ b/include/linux/rmap.h
63478@@ -119,9 +119,9 @@ static inline void anon_vma_unlock(struct anon_vma *anon_vma)
63479 void anon_vma_init(void); /* create anon_vma_cachep */
63480 int anon_vma_prepare(struct vm_area_struct *);
63481 void unlink_anon_vmas(struct vm_area_struct *);
63482-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
63483+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
63484 void anon_vma_moveto_tail(struct vm_area_struct *);
63485-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
63486+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
63487 void __anon_vma_link(struct vm_area_struct *);
63488
63489 static inline void anon_vma_merge(struct vm_area_struct *vma,
63490diff --git a/include/linux/sched.h b/include/linux/sched.h
63491index 0657368..765f70f 100644
63492--- a/include/linux/sched.h
63493+++ b/include/linux/sched.h
63494@@ -101,6 +101,7 @@ struct bio_list;
63495 struct fs_struct;
63496 struct perf_event_context;
63497 struct blk_plug;
63498+struct linux_binprm;
63499
63500 /*
63501 * List of flags we want to share for kernel threads,
63502@@ -382,10 +383,13 @@ struct user_namespace;
63503 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
63504
63505 extern int sysctl_max_map_count;
63506+extern unsigned long sysctl_heap_stack_gap;
63507
63508 #include <linux/aio.h>
63509
63510 #ifdef CONFIG_MMU
63511+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
63512+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
63513 extern void arch_pick_mmap_layout(struct mm_struct *mm);
63514 extern unsigned long
63515 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
63516@@ -631,6 +635,17 @@ struct signal_struct {
63517 #ifdef CONFIG_TASKSTATS
63518 struct taskstats *stats;
63519 #endif
63520+
63521+#ifdef CONFIG_GRKERNSEC
63522+ u32 curr_ip;
63523+ u32 saved_ip;
63524+ u32 gr_saddr;
63525+ u32 gr_daddr;
63526+ u16 gr_sport;
63527+ u16 gr_dport;
63528+ u8 used_accept:1;
63529+#endif
63530+
63531 #ifdef CONFIG_AUDIT
63532 unsigned audit_tty;
63533 struct tty_audit_buf *tty_audit_buf;
63534@@ -714,6 +729,11 @@ struct user_struct {
63535 struct key *session_keyring; /* UID's default session keyring */
63536 #endif
63537
63538+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
63539+ unsigned int banned;
63540+ unsigned long ban_expires;
63541+#endif
63542+
63543 /* Hash table maintenance information */
63544 struct hlist_node uidhash_node;
63545 uid_t uid;
63546@@ -1354,8 +1374,8 @@ struct task_struct {
63547 struct list_head thread_group;
63548
63549 struct completion *vfork_done; /* for vfork() */
63550- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
63551- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63552+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
63553+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63554
63555 cputime_t utime, stime, utimescaled, stimescaled;
63556 cputime_t gtime;
63557@@ -1371,13 +1391,6 @@ struct task_struct {
63558 struct task_cputime cputime_expires;
63559 struct list_head cpu_timers[3];
63560
63561-/* process credentials */
63562- const struct cred __rcu *real_cred; /* objective and real subjective task
63563- * credentials (COW) */
63564- const struct cred __rcu *cred; /* effective (overridable) subjective task
63565- * credentials (COW) */
63566- struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
63567-
63568 char comm[TASK_COMM_LEN]; /* executable name excluding path
63569 - access with [gs]et_task_comm (which lock
63570 it with task_lock())
63571@@ -1394,8 +1407,16 @@ struct task_struct {
63572 #endif
63573 /* CPU-specific state of this task */
63574 struct thread_struct thread;
63575+/* thread_info moved to task_struct */
63576+#ifdef CONFIG_X86
63577+ struct thread_info tinfo;
63578+#endif
63579 /* filesystem information */
63580 struct fs_struct *fs;
63581+
63582+ const struct cred __rcu *cred; /* effective (overridable) subjective task
63583+ * credentials (COW) */
63584+
63585 /* open file information */
63586 struct files_struct *files;
63587 /* namespaces */
63588@@ -1442,6 +1463,11 @@ struct task_struct {
63589 struct rt_mutex_waiter *pi_blocked_on;
63590 #endif
63591
63592+/* process credentials */
63593+ const struct cred __rcu *real_cred; /* objective and real subjective task
63594+ * credentials (COW) */
63595+ struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
63596+
63597 #ifdef CONFIG_DEBUG_MUTEXES
63598 /* mutex deadlock detection */
63599 struct mutex_waiter *blocked_on;
63600@@ -1558,6 +1584,27 @@ struct task_struct {
63601 unsigned long default_timer_slack_ns;
63602
63603 struct list_head *scm_work_list;
63604+
63605+#ifdef CONFIG_GRKERNSEC
63606+ /* grsecurity */
63607+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63608+ u64 exec_id;
63609+#endif
63610+#ifdef CONFIG_GRKERNSEC_SETXID
63611+ const struct cred *delayed_cred;
63612+#endif
63613+ struct dentry *gr_chroot_dentry;
63614+ struct acl_subject_label *acl;
63615+ struct acl_role_label *role;
63616+ struct file *exec_file;
63617+ u16 acl_role_id;
63618+ /* is this the task that authenticated to the special role */
63619+ u8 acl_sp_role;
63620+ u8 is_writable;
63621+ u8 brute;
63622+ u8 gr_is_chrooted;
63623+#endif
63624+
63625 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
63626 /* Index of current stored address in ret_stack */
63627 int curr_ret_stack;
63628@@ -1592,6 +1639,51 @@ struct task_struct {
63629 #endif
63630 };
63631
63632+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
63633+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
63634+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
63635+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
63636+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
63637+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
63638+
63639+#ifdef CONFIG_PAX_SOFTMODE
63640+extern int pax_softmode;
63641+#endif
63642+
63643+extern int pax_check_flags(unsigned long *);
63644+
63645+/* if tsk != current then task_lock must be held on it */
63646+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
63647+static inline unsigned long pax_get_flags(struct task_struct *tsk)
63648+{
63649+ if (likely(tsk->mm))
63650+ return tsk->mm->pax_flags;
63651+ else
63652+ return 0UL;
63653+}
63654+
63655+/* if tsk != current then task_lock must be held on it */
63656+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
63657+{
63658+ if (likely(tsk->mm)) {
63659+ tsk->mm->pax_flags = flags;
63660+ return 0;
63661+ }
63662+ return -EINVAL;
63663+}
63664+#endif
63665+
63666+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
63667+extern void pax_set_initial_flags(struct linux_binprm *bprm);
63668+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
63669+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
63670+#endif
63671+
63672+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
63673+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
63674+extern void pax_report_refcount_overflow(struct pt_regs *regs);
63675+extern __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type);
63676+
63677 /* Future-safe accessor for struct task_struct's cpus_allowed. */
63678 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
63679
63680@@ -2104,7 +2196,9 @@ void yield(void);
63681 extern struct exec_domain default_exec_domain;
63682
63683 union thread_union {
63684+#ifndef CONFIG_X86
63685 struct thread_info thread_info;
63686+#endif
63687 unsigned long stack[THREAD_SIZE/sizeof(long)];
63688 };
63689
63690@@ -2137,6 +2231,7 @@ extern struct pid_namespace init_pid_ns;
63691 */
63692
63693 extern struct task_struct *find_task_by_vpid(pid_t nr);
63694+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
63695 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
63696 struct pid_namespace *ns);
63697
63698@@ -2280,7 +2375,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
63699 extern void exit_itimers(struct signal_struct *);
63700 extern void flush_itimer_signals(void);
63701
63702-extern void do_group_exit(int);
63703+extern __noreturn void do_group_exit(int);
63704
63705 extern void daemonize(const char *, ...);
63706 extern int allow_signal(int);
63707@@ -2478,13 +2573,17 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
63708
63709 #endif
63710
63711-static inline int object_is_on_stack(void *obj)
63712+static inline int object_starts_on_stack(void *obj)
63713 {
63714- void *stack = task_stack_page(current);
63715+ const void *stack = task_stack_page(current);
63716
63717 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
63718 }
63719
63720+#ifdef CONFIG_PAX_USERCOPY
63721+extern int object_is_on_stack(const void *obj, unsigned long len);
63722+#endif
63723+
63724 extern void thread_info_cache_init(void);
63725
63726 #ifdef CONFIG_DEBUG_STACK_USAGE
63727diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
63728index 899fbb4..1cb4138 100644
63729--- a/include/linux/screen_info.h
63730+++ b/include/linux/screen_info.h
63731@@ -43,7 +43,8 @@ struct screen_info {
63732 __u16 pages; /* 0x32 */
63733 __u16 vesa_attributes; /* 0x34 */
63734 __u32 capabilities; /* 0x36 */
63735- __u8 _reserved[6]; /* 0x3a */
63736+ __u16 vesapm_size; /* 0x3a */
63737+ __u8 _reserved[4]; /* 0x3c */
63738 } __attribute__((packed));
63739
63740 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
63741diff --git a/include/linux/security.h b/include/linux/security.h
63742index 83c18e8..2d98860 100644
63743--- a/include/linux/security.h
63744+++ b/include/linux/security.h
63745@@ -37,6 +37,7 @@
63746 #include <linux/xfrm.h>
63747 #include <linux/slab.h>
63748 #include <linux/xattr.h>
63749+#include <linux/grsecurity.h>
63750 #include <net/flow.h>
63751
63752 /* Maximum number of letters for an LSM name string */
63753diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
63754index 44f1514..2bbf6c1 100644
63755--- a/include/linux/seq_file.h
63756+++ b/include/linux/seq_file.h
63757@@ -24,6 +24,9 @@ struct seq_file {
63758 struct mutex lock;
63759 const struct seq_operations *op;
63760 int poll_event;
63761+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63762+ u64 exec_id;
63763+#endif
63764 void *private;
63765 };
63766
63767@@ -33,6 +36,7 @@ struct seq_operations {
63768 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
63769 int (*show) (struct seq_file *m, void *v);
63770 };
63771+typedef struct seq_operations __no_const seq_operations_no_const;
63772
63773 #define SEQ_SKIP 1
63774
63775diff --git a/include/linux/shm.h b/include/linux/shm.h
63776index 92808b8..c28cac4 100644
63777--- a/include/linux/shm.h
63778+++ b/include/linux/shm.h
63779@@ -98,6 +98,10 @@ struct shmid_kernel /* private to the kernel */
63780
63781 /* The task created the shm object. NULL if the task is dead. */
63782 struct task_struct *shm_creator;
63783+#ifdef CONFIG_GRKERNSEC
63784+ time_t shm_createtime;
63785+ pid_t shm_lapid;
63786+#endif
63787 };
63788
63789 /* shm_mode upper byte flags */
63790diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
63791index 42854ce..3b7d3c8 100644
63792--- a/include/linux/skbuff.h
63793+++ b/include/linux/skbuff.h
63794@@ -655,7 +655,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
63795 */
63796 static inline int skb_queue_empty(const struct sk_buff_head *list)
63797 {
63798- return list->next == (struct sk_buff *)list;
63799+ return list->next == (const struct sk_buff *)list;
63800 }
63801
63802 /**
63803@@ -668,7 +668,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
63804 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
63805 const struct sk_buff *skb)
63806 {
63807- return skb->next == (struct sk_buff *)list;
63808+ return skb->next == (const struct sk_buff *)list;
63809 }
63810
63811 /**
63812@@ -681,7 +681,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
63813 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
63814 const struct sk_buff *skb)
63815 {
63816- return skb->prev == (struct sk_buff *)list;
63817+ return skb->prev == (const struct sk_buff *)list;
63818 }
63819
63820 /**
63821@@ -1558,7 +1558,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
63822 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
63823 */
63824 #ifndef NET_SKB_PAD
63825-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
63826+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
63827 #endif
63828
63829 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
63830diff --git a/include/linux/slab.h b/include/linux/slab.h
63831index 573c809..07e1f43 100644
63832--- a/include/linux/slab.h
63833+++ b/include/linux/slab.h
63834@@ -11,12 +11,20 @@
63835
63836 #include <linux/gfp.h>
63837 #include <linux/types.h>
63838+#include <linux/err.h>
63839
63840 /*
63841 * Flags to pass to kmem_cache_create().
63842 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
63843 */
63844 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
63845+
63846+#ifdef CONFIG_PAX_USERCOPY
63847+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
63848+#else
63849+#define SLAB_USERCOPY 0x00000000UL
63850+#endif
63851+
63852 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
63853 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
63854 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
63855@@ -87,10 +95,13 @@
63856 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
63857 * Both make kfree a no-op.
63858 */
63859-#define ZERO_SIZE_PTR ((void *)16)
63860+#define ZERO_SIZE_PTR \
63861+({ \
63862+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
63863+ (void *)(-MAX_ERRNO-1L); \
63864+})
63865
63866-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
63867- (unsigned long)ZERO_SIZE_PTR)
63868+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
63869
63870 /*
63871 * struct kmem_cache related prototypes
63872@@ -156,11 +167,12 @@ unsigned int kmem_cache_size(struct kmem_cache *);
63873 /*
63874 * Common kmalloc functions provided by all allocators
63875 */
63876-void * __must_check __krealloc(const void *, size_t, gfp_t);
63877-void * __must_check krealloc(const void *, size_t, gfp_t);
63878+void * __must_check __krealloc(const void *, size_t, gfp_t) __size_overflow(2);
63879+void * __must_check krealloc(const void *, size_t, gfp_t) __size_overflow(2);
63880 void kfree(const void *);
63881 void kzfree(const void *);
63882 size_t ksize(const void *);
63883+void check_object_size(const void *ptr, unsigned long n, bool to);
63884
63885 /*
63886 * Allocator specific definitions. These are mainly used to establish optimized
63887@@ -287,7 +299,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
63888 */
63889 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
63890 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
63891-extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
63892+extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long) __size_overflow(1);
63893 #define kmalloc_track_caller(size, flags) \
63894 __kmalloc_track_caller(size, flags, _RET_IP_)
63895 #else
63896@@ -306,7 +318,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
63897 */
63898 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
63899 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
63900-extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
63901+extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long) __size_overflow(1);
63902 #define kmalloc_node_track_caller(size, flags, node) \
63903 __kmalloc_node_track_caller(size, flags, node, \
63904 _RET_IP_)
63905diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
63906index fbd1117..c0bd874 100644
63907--- a/include/linux/slab_def.h
63908+++ b/include/linux/slab_def.h
63909@@ -66,10 +66,10 @@ struct kmem_cache {
63910 unsigned long node_allocs;
63911 unsigned long node_frees;
63912 unsigned long node_overflow;
63913- atomic_t allochit;
63914- atomic_t allocmiss;
63915- atomic_t freehit;
63916- atomic_t freemiss;
63917+ atomic_unchecked_t allochit;
63918+ atomic_unchecked_t allocmiss;
63919+ atomic_unchecked_t freehit;
63920+ atomic_unchecked_t freemiss;
63921
63922 /*
63923 * If debugging is enabled, then the allocator can add additional
63924@@ -107,7 +107,7 @@ struct cache_sizes {
63925 extern struct cache_sizes malloc_sizes[];
63926
63927 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
63928-void *__kmalloc(size_t size, gfp_t flags);
63929+void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63930
63931 #ifdef CONFIG_TRACING
63932 extern void *kmem_cache_alloc_trace(size_t size,
63933@@ -125,6 +125,7 @@ static inline size_t slab_buffer_size(struct kmem_cache *cachep)
63934 }
63935 #endif
63936
63937+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63938 static __always_inline void *kmalloc(size_t size, gfp_t flags)
63939 {
63940 struct kmem_cache *cachep;
63941@@ -160,7 +161,7 @@ found:
63942 }
63943
63944 #ifdef CONFIG_NUMA
63945-extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
63946+extern void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63947 extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
63948
63949 #ifdef CONFIG_TRACING
63950@@ -179,6 +180,7 @@ kmem_cache_alloc_node_trace(size_t size,
63951 }
63952 #endif
63953
63954+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63955 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63956 {
63957 struct kmem_cache *cachep;
63958diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
63959index 0ec00b3..65e7e0e 100644
63960--- a/include/linux/slob_def.h
63961+++ b/include/linux/slob_def.h
63962@@ -9,8 +9,9 @@ static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
63963 return kmem_cache_alloc_node(cachep, flags, -1);
63964 }
63965
63966-void *__kmalloc_node(size_t size, gfp_t flags, int node);
63967+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63968
63969+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63970 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63971 {
63972 return __kmalloc_node(size, flags, node);
63973@@ -24,11 +25,13 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63974 * kmalloc is the normal method of allocating memory
63975 * in the kernel.
63976 */
63977+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63978 static __always_inline void *kmalloc(size_t size, gfp_t flags)
63979 {
63980 return __kmalloc_node(size, flags, -1);
63981 }
63982
63983+static __always_inline void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63984 static __always_inline void *__kmalloc(size_t size, gfp_t flags)
63985 {
63986 return kmalloc(size, flags);
63987diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
63988index a32bcfd..d26bd6e 100644
63989--- a/include/linux/slub_def.h
63990+++ b/include/linux/slub_def.h
63991@@ -89,7 +89,7 @@ struct kmem_cache {
63992 struct kmem_cache_order_objects max;
63993 struct kmem_cache_order_objects min;
63994 gfp_t allocflags; /* gfp flags to use on each alloc */
63995- int refcount; /* Refcount for slab cache destroy */
63996+ atomic_t refcount; /* Refcount for slab cache destroy */
63997 void (*ctor)(void *);
63998 int inuse; /* Offset to metadata */
63999 int align; /* Alignment */
64000@@ -204,6 +204,7 @@ static __always_inline int kmalloc_index(size_t size)
64001 * This ought to end up with a global pointer to the right cache
64002 * in kmalloc_caches.
64003 */
64004+static __always_inline struct kmem_cache *kmalloc_slab(size_t size) __size_overflow(1);
64005 static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
64006 {
64007 int index = kmalloc_index(size);
64008@@ -215,9 +216,11 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
64009 }
64010
64011 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
64012-void *__kmalloc(size_t size, gfp_t flags);
64013+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
64014
64015 static __always_inline void *
64016+kmalloc_order(size_t size, gfp_t flags, unsigned int order) __size_overflow(1);
64017+static __always_inline void *
64018 kmalloc_order(size_t size, gfp_t flags, unsigned int order)
64019 {
64020 void *ret = (void *) __get_free_pages(flags | __GFP_COMP, order);
64021@@ -256,12 +259,14 @@ kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order)
64022 }
64023 #endif
64024
64025+static __always_inline void *kmalloc_large(size_t size, gfp_t flags) __size_overflow(1);
64026 static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
64027 {
64028 unsigned int order = get_order(size);
64029 return kmalloc_order_trace(size, flags, order);
64030 }
64031
64032+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
64033 static __always_inline void *kmalloc(size_t size, gfp_t flags)
64034 {
64035 if (__builtin_constant_p(size)) {
64036@@ -281,7 +286,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
64037 }
64038
64039 #ifdef CONFIG_NUMA
64040-void *__kmalloc_node(size_t size, gfp_t flags, int node);
64041+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
64042 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
64043
64044 #ifdef CONFIG_TRACING
64045@@ -298,6 +303,7 @@ kmem_cache_alloc_node_trace(struct kmem_cache *s,
64046 }
64047 #endif
64048
64049+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
64050 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
64051 {
64052 if (__builtin_constant_p(size) &&
64053diff --git a/include/linux/sonet.h b/include/linux/sonet.h
64054index de8832d..0147b46 100644
64055--- a/include/linux/sonet.h
64056+++ b/include/linux/sonet.h
64057@@ -61,7 +61,7 @@ struct sonet_stats {
64058 #include <linux/atomic.h>
64059
64060 struct k_sonet_stats {
64061-#define __HANDLE_ITEM(i) atomic_t i
64062+#define __HANDLE_ITEM(i) atomic_unchecked_t i
64063 __SONET_ITEMS
64064 #undef __HANDLE_ITEM
64065 };
64066diff --git a/include/linux/stddef.h b/include/linux/stddef.h
64067index 6a40c76..1747b67 100644
64068--- a/include/linux/stddef.h
64069+++ b/include/linux/stddef.h
64070@@ -3,14 +3,10 @@
64071
64072 #include <linux/compiler.h>
64073
64074+#ifdef __KERNEL__
64075+
64076 #undef NULL
64077-#if defined(__cplusplus)
64078-#define NULL 0
64079-#else
64080 #define NULL ((void *)0)
64081-#endif
64082-
64083-#ifdef __KERNEL__
64084
64085 enum {
64086 false = 0,
64087diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
64088index 2c5993a..b0e79f0 100644
64089--- a/include/linux/sunrpc/clnt.h
64090+++ b/include/linux/sunrpc/clnt.h
64091@@ -172,9 +172,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
64092 {
64093 switch (sap->sa_family) {
64094 case AF_INET:
64095- return ntohs(((struct sockaddr_in *)sap)->sin_port);
64096+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
64097 case AF_INET6:
64098- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
64099+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
64100 }
64101 return 0;
64102 }
64103@@ -207,7 +207,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
64104 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
64105 const struct sockaddr *src)
64106 {
64107- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
64108+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
64109 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
64110
64111 dsin->sin_family = ssin->sin_family;
64112@@ -310,7 +310,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
64113 if (sa->sa_family != AF_INET6)
64114 return 0;
64115
64116- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
64117+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
64118 }
64119
64120 #endif /* __KERNEL__ */
64121diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
64122index e775689..9e206d9 100644
64123--- a/include/linux/sunrpc/sched.h
64124+++ b/include/linux/sunrpc/sched.h
64125@@ -105,6 +105,7 @@ struct rpc_call_ops {
64126 void (*rpc_call_done)(struct rpc_task *, void *);
64127 void (*rpc_release)(void *);
64128 };
64129+typedef struct rpc_call_ops __no_const rpc_call_ops_no_const;
64130
64131 struct rpc_task_setup {
64132 struct rpc_task *task;
64133diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
64134index c14fe86..393245e 100644
64135--- a/include/linux/sunrpc/svc_rdma.h
64136+++ b/include/linux/sunrpc/svc_rdma.h
64137@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
64138 extern unsigned int svcrdma_max_requests;
64139 extern unsigned int svcrdma_max_req_size;
64140
64141-extern atomic_t rdma_stat_recv;
64142-extern atomic_t rdma_stat_read;
64143-extern atomic_t rdma_stat_write;
64144-extern atomic_t rdma_stat_sq_starve;
64145-extern atomic_t rdma_stat_rq_starve;
64146-extern atomic_t rdma_stat_rq_poll;
64147-extern atomic_t rdma_stat_rq_prod;
64148-extern atomic_t rdma_stat_sq_poll;
64149-extern atomic_t rdma_stat_sq_prod;
64150+extern atomic_unchecked_t rdma_stat_recv;
64151+extern atomic_unchecked_t rdma_stat_read;
64152+extern atomic_unchecked_t rdma_stat_write;
64153+extern atomic_unchecked_t rdma_stat_sq_starve;
64154+extern atomic_unchecked_t rdma_stat_rq_starve;
64155+extern atomic_unchecked_t rdma_stat_rq_poll;
64156+extern atomic_unchecked_t rdma_stat_rq_prod;
64157+extern atomic_unchecked_t rdma_stat_sq_poll;
64158+extern atomic_unchecked_t rdma_stat_sq_prod;
64159
64160 #define RPCRDMA_VERSION 1
64161
64162diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
64163index bb9127d..34ab358 100644
64164--- a/include/linux/sysctl.h
64165+++ b/include/linux/sysctl.h
64166@@ -155,7 +155,11 @@ enum
64167 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
64168 };
64169
64170-
64171+#ifdef CONFIG_PAX_SOFTMODE
64172+enum {
64173+ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
64174+};
64175+#endif
64176
64177 /* CTL_VM names: */
64178 enum
64179@@ -968,6 +972,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
64180
64181 extern int proc_dostring(struct ctl_table *, int,
64182 void __user *, size_t *, loff_t *);
64183+extern int proc_dostring_modpriv(struct ctl_table *, int,
64184+ void __user *, size_t *, loff_t *);
64185 extern int proc_dointvec(struct ctl_table *, int,
64186 void __user *, size_t *, loff_t *);
64187 extern int proc_dointvec_minmax(struct ctl_table *, int,
64188diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
64189index a71a292..51bd91d 100644
64190--- a/include/linux/tracehook.h
64191+++ b/include/linux/tracehook.h
64192@@ -54,12 +54,12 @@ struct linux_binprm;
64193 /*
64194 * ptrace report for syscall entry and exit looks identical.
64195 */
64196-static inline void ptrace_report_syscall(struct pt_regs *regs)
64197+static inline int ptrace_report_syscall(struct pt_regs *regs)
64198 {
64199 int ptrace = current->ptrace;
64200
64201 if (!(ptrace & PT_PTRACED))
64202- return;
64203+ return 0;
64204
64205 ptrace_notify(SIGTRAP | ((ptrace & PT_TRACESYSGOOD) ? 0x80 : 0));
64206
64207@@ -72,6 +72,8 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
64208 send_sig(current->exit_code, current, 1);
64209 current->exit_code = 0;
64210 }
64211+
64212+ return fatal_signal_pending(current);
64213 }
64214
64215 /**
64216@@ -96,8 +98,7 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
64217 static inline __must_check int tracehook_report_syscall_entry(
64218 struct pt_regs *regs)
64219 {
64220- ptrace_report_syscall(regs);
64221- return 0;
64222+ return ptrace_report_syscall(regs);
64223 }
64224
64225 /**
64226diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
64227index ff7dc08..893e1bd 100644
64228--- a/include/linux/tty_ldisc.h
64229+++ b/include/linux/tty_ldisc.h
64230@@ -148,7 +148,7 @@ struct tty_ldisc_ops {
64231
64232 struct module *owner;
64233
64234- int refcount;
64235+ atomic_t refcount;
64236 };
64237
64238 struct tty_ldisc {
64239diff --git a/include/linux/types.h b/include/linux/types.h
64240index e5fa503..df6e8a4 100644
64241--- a/include/linux/types.h
64242+++ b/include/linux/types.h
64243@@ -214,10 +214,26 @@ typedef struct {
64244 int counter;
64245 } atomic_t;
64246
64247+#ifdef CONFIG_PAX_REFCOUNT
64248+typedef struct {
64249+ int counter;
64250+} atomic_unchecked_t;
64251+#else
64252+typedef atomic_t atomic_unchecked_t;
64253+#endif
64254+
64255 #ifdef CONFIG_64BIT
64256 typedef struct {
64257 long counter;
64258 } atomic64_t;
64259+
64260+#ifdef CONFIG_PAX_REFCOUNT
64261+typedef struct {
64262+ long counter;
64263+} atomic64_unchecked_t;
64264+#else
64265+typedef atomic64_t atomic64_unchecked_t;
64266+#endif
64267 #endif
64268
64269 struct list_head {
64270diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
64271index 5ca0951..53a2fff 100644
64272--- a/include/linux/uaccess.h
64273+++ b/include/linux/uaccess.h
64274@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
64275 long ret; \
64276 mm_segment_t old_fs = get_fs(); \
64277 \
64278- set_fs(KERNEL_DS); \
64279 pagefault_disable(); \
64280- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
64281- pagefault_enable(); \
64282+ set_fs(KERNEL_DS); \
64283+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
64284 set_fs(old_fs); \
64285+ pagefault_enable(); \
64286 ret; \
64287 })
64288
64289@@ -105,7 +105,7 @@ extern long __probe_kernel_read(void *dst, const void *src, size_t size);
64290 * Safely write to address @dst from the buffer at @src. If a kernel fault
64291 * happens, handle that and return -EFAULT.
64292 */
64293-extern long notrace probe_kernel_write(void *dst, const void *src, size_t size);
64294+extern long notrace probe_kernel_write(void *dst, const void *src, size_t size) __size_overflow(3);
64295 extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
64296
64297 #endif /* __LINUX_UACCESS_H__ */
64298diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
64299index 99c1b4d..bb94261 100644
64300--- a/include/linux/unaligned/access_ok.h
64301+++ b/include/linux/unaligned/access_ok.h
64302@@ -6,32 +6,32 @@
64303
64304 static inline u16 get_unaligned_le16(const void *p)
64305 {
64306- return le16_to_cpup((__le16 *)p);
64307+ return le16_to_cpup((const __le16 *)p);
64308 }
64309
64310 static inline u32 get_unaligned_le32(const void *p)
64311 {
64312- return le32_to_cpup((__le32 *)p);
64313+ return le32_to_cpup((const __le32 *)p);
64314 }
64315
64316 static inline u64 get_unaligned_le64(const void *p)
64317 {
64318- return le64_to_cpup((__le64 *)p);
64319+ return le64_to_cpup((const __le64 *)p);
64320 }
64321
64322 static inline u16 get_unaligned_be16(const void *p)
64323 {
64324- return be16_to_cpup((__be16 *)p);
64325+ return be16_to_cpup((const __be16 *)p);
64326 }
64327
64328 static inline u32 get_unaligned_be32(const void *p)
64329 {
64330- return be32_to_cpup((__be32 *)p);
64331+ return be32_to_cpup((const __be32 *)p);
64332 }
64333
64334 static inline u64 get_unaligned_be64(const void *p)
64335 {
64336- return be64_to_cpup((__be64 *)p);
64337+ return be64_to_cpup((const __be64 *)p);
64338 }
64339
64340 static inline void put_unaligned_le16(u16 val, void *p)
64341diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
64342index 0d3f988..000f101 100644
64343--- a/include/linux/usb/renesas_usbhs.h
64344+++ b/include/linux/usb/renesas_usbhs.h
64345@@ -39,7 +39,7 @@ enum {
64346 */
64347 struct renesas_usbhs_driver_callback {
64348 int (*notify_hotplug)(struct platform_device *pdev);
64349-};
64350+} __no_const;
64351
64352 /*
64353 * callback functions for platform
64354@@ -97,7 +97,7 @@ struct renesas_usbhs_platform_callback {
64355 * VBUS control is needed for Host
64356 */
64357 int (*set_vbus)(struct platform_device *pdev, int enable);
64358-};
64359+} __no_const;
64360
64361 /*
64362 * parameters for renesas usbhs
64363diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
64364index 6f8fbcf..8259001 100644
64365--- a/include/linux/vermagic.h
64366+++ b/include/linux/vermagic.h
64367@@ -25,9 +25,35 @@
64368 #define MODULE_ARCH_VERMAGIC ""
64369 #endif
64370
64371+#ifdef CONFIG_PAX_REFCOUNT
64372+#define MODULE_PAX_REFCOUNT "REFCOUNT "
64373+#else
64374+#define MODULE_PAX_REFCOUNT ""
64375+#endif
64376+
64377+#ifdef CONSTIFY_PLUGIN
64378+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
64379+#else
64380+#define MODULE_CONSTIFY_PLUGIN ""
64381+#endif
64382+
64383+#ifdef STACKLEAK_PLUGIN
64384+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
64385+#else
64386+#define MODULE_STACKLEAK_PLUGIN ""
64387+#endif
64388+
64389+#ifdef CONFIG_GRKERNSEC
64390+#define MODULE_GRSEC "GRSEC "
64391+#else
64392+#define MODULE_GRSEC ""
64393+#endif
64394+
64395 #define VERMAGIC_STRING \
64396 UTS_RELEASE " " \
64397 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
64398 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
64399- MODULE_ARCH_VERMAGIC
64400+ MODULE_ARCH_VERMAGIC \
64401+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
64402+ MODULE_GRSEC
64403
64404diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
64405index dcdfc2b..cce598d 100644
64406--- a/include/linux/vmalloc.h
64407+++ b/include/linux/vmalloc.h
64408@@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
64409 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
64410 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
64411 #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
64412+
64413+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
64414+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
64415+#endif
64416+
64417 /* bits [20..32] reserved for arch specific ioremap internals */
64418
64419 /*
64420@@ -51,18 +56,18 @@ static inline void vmalloc_init(void)
64421 }
64422 #endif
64423
64424-extern void *vmalloc(unsigned long size);
64425-extern void *vzalloc(unsigned long size);
64426-extern void *vmalloc_user(unsigned long size);
64427-extern void *vmalloc_node(unsigned long size, int node);
64428-extern void *vzalloc_node(unsigned long size, int node);
64429-extern void *vmalloc_exec(unsigned long size);
64430-extern void *vmalloc_32(unsigned long size);
64431-extern void *vmalloc_32_user(unsigned long size);
64432-extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
64433+extern void *vmalloc(unsigned long size) __size_overflow(1);
64434+extern void *vzalloc(unsigned long size) __size_overflow(1);
64435+extern void *vmalloc_user(unsigned long size) __size_overflow(1);
64436+extern void *vmalloc_node(unsigned long size, int node) __size_overflow(1);
64437+extern void *vzalloc_node(unsigned long size, int node) __size_overflow(1);
64438+extern void *vmalloc_exec(unsigned long size) __size_overflow(1);
64439+extern void *vmalloc_32(unsigned long size) __size_overflow(1);
64440+extern void *vmalloc_32_user(unsigned long size) __size_overflow(1);
64441+extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) __size_overflow(1);
64442 extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
64443 unsigned long start, unsigned long end, gfp_t gfp_mask,
64444- pgprot_t prot, int node, void *caller);
64445+ pgprot_t prot, int node, void *caller) __size_overflow(1);
64446 extern void vfree(const void *addr);
64447
64448 extern void *vmap(struct page **pages, unsigned int count,
64449@@ -123,8 +128,8 @@ extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes);
64450 extern void free_vm_area(struct vm_struct *area);
64451
64452 /* for /dev/kmem */
64453-extern long vread(char *buf, char *addr, unsigned long count);
64454-extern long vwrite(char *buf, char *addr, unsigned long count);
64455+extern long vread(char *buf, char *addr, unsigned long count) __size_overflow(3);
64456+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
64457
64458 /*
64459 * Internals. Dont't use..
64460diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
64461index 65efb92..137adbb 100644
64462--- a/include/linux/vmstat.h
64463+++ b/include/linux/vmstat.h
64464@@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(int cpu)
64465 /*
64466 * Zone based page accounting with per cpu differentials.
64467 */
64468-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64469+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64470
64471 static inline void zone_page_state_add(long x, struct zone *zone,
64472 enum zone_stat_item item)
64473 {
64474- atomic_long_add(x, &zone->vm_stat[item]);
64475- atomic_long_add(x, &vm_stat[item]);
64476+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
64477+ atomic_long_add_unchecked(x, &vm_stat[item]);
64478 }
64479
64480 static inline unsigned long global_page_state(enum zone_stat_item item)
64481 {
64482- long x = atomic_long_read(&vm_stat[item]);
64483+ long x = atomic_long_read_unchecked(&vm_stat[item]);
64484 #ifdef CONFIG_SMP
64485 if (x < 0)
64486 x = 0;
64487@@ -109,7 +109,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
64488 static inline unsigned long zone_page_state(struct zone *zone,
64489 enum zone_stat_item item)
64490 {
64491- long x = atomic_long_read(&zone->vm_stat[item]);
64492+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64493 #ifdef CONFIG_SMP
64494 if (x < 0)
64495 x = 0;
64496@@ -126,7 +126,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
64497 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
64498 enum zone_stat_item item)
64499 {
64500- long x = atomic_long_read(&zone->vm_stat[item]);
64501+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64502
64503 #ifdef CONFIG_SMP
64504 int cpu;
64505@@ -221,8 +221,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
64506
64507 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
64508 {
64509- atomic_long_inc(&zone->vm_stat[item]);
64510- atomic_long_inc(&vm_stat[item]);
64511+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
64512+ atomic_long_inc_unchecked(&vm_stat[item]);
64513 }
64514
64515 static inline void __inc_zone_page_state(struct page *page,
64516@@ -233,8 +233,8 @@ static inline void __inc_zone_page_state(struct page *page,
64517
64518 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
64519 {
64520- atomic_long_dec(&zone->vm_stat[item]);
64521- atomic_long_dec(&vm_stat[item]);
64522+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
64523+ atomic_long_dec_unchecked(&vm_stat[item]);
64524 }
64525
64526 static inline void __dec_zone_page_state(struct page *page,
64527diff --git a/include/linux/xattr.h b/include/linux/xattr.h
64528index e5d1220..ef6e406 100644
64529--- a/include/linux/xattr.h
64530+++ b/include/linux/xattr.h
64531@@ -57,6 +57,11 @@
64532 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
64533 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
64534
64535+/* User namespace */
64536+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
64537+#define XATTR_PAX_FLAGS_SUFFIX "flags"
64538+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
64539+
64540 #ifdef __KERNEL__
64541
64542 #include <linux/types.h>
64543diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
64544index 4aeff96..b378cdc 100644
64545--- a/include/media/saa7146_vv.h
64546+++ b/include/media/saa7146_vv.h
64547@@ -163,7 +163,7 @@ struct saa7146_ext_vv
64548 int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
64549
64550 /* the extension can override this */
64551- struct v4l2_ioctl_ops ops;
64552+ v4l2_ioctl_ops_no_const ops;
64553 /* pointer to the saa7146 core ops */
64554 const struct v4l2_ioctl_ops *core_ops;
64555
64556diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
64557index c7c40f1..4f01585 100644
64558--- a/include/media/v4l2-dev.h
64559+++ b/include/media/v4l2-dev.h
64560@@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority local);
64561
64562
64563 struct v4l2_file_operations {
64564- struct module *owner;
64565+ struct module * const owner;
64566 ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
64567 ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
64568 unsigned int (*poll) (struct file *, struct poll_table_struct *);
64569@@ -68,6 +68,7 @@ struct v4l2_file_operations {
64570 int (*open) (struct file *);
64571 int (*release) (struct file *);
64572 };
64573+typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
64574
64575 /*
64576 * Newer version of video_device, handled by videodev2.c
64577diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
64578index 3f5d60f..44210ed 100644
64579--- a/include/media/v4l2-ioctl.h
64580+++ b/include/media/v4l2-ioctl.h
64581@@ -278,7 +278,7 @@ struct v4l2_ioctl_ops {
64582 long (*vidioc_default) (struct file *file, void *fh,
64583 bool valid_prio, int cmd, void *arg);
64584 };
64585-
64586+typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
64587
64588 /* v4l debugging and diagnostics */
64589
64590diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
64591index 8d55251..dfe5b0a 100644
64592--- a/include/net/caif/caif_hsi.h
64593+++ b/include/net/caif/caif_hsi.h
64594@@ -98,7 +98,7 @@ struct cfhsi_drv {
64595 void (*rx_done_cb) (struct cfhsi_drv *drv);
64596 void (*wake_up_cb) (struct cfhsi_drv *drv);
64597 void (*wake_down_cb) (struct cfhsi_drv *drv);
64598-};
64599+} __no_const;
64600
64601 /* Structure implemented by HSI device. */
64602 struct cfhsi_dev {
64603diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
64604index 9e5425b..8136ffc 100644
64605--- a/include/net/caif/cfctrl.h
64606+++ b/include/net/caif/cfctrl.h
64607@@ -52,7 +52,7 @@ struct cfctrl_rsp {
64608 void (*radioset_rsp)(void);
64609 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
64610 struct cflayer *client_layer);
64611-};
64612+} __no_const;
64613
64614 /* Link Setup Parameters for CAIF-Links. */
64615 struct cfctrl_link_param {
64616@@ -101,8 +101,8 @@ struct cfctrl_request_info {
64617 struct cfctrl {
64618 struct cfsrvl serv;
64619 struct cfctrl_rsp res;
64620- atomic_t req_seq_no;
64621- atomic_t rsp_seq_no;
64622+ atomic_unchecked_t req_seq_no;
64623+ atomic_unchecked_t rsp_seq_no;
64624 struct list_head list;
64625 /* Protects from simultaneous access to first_req list */
64626 spinlock_t info_list_lock;
64627diff --git a/include/net/flow.h b/include/net/flow.h
64628index 6c469db..7743b8e 100644
64629--- a/include/net/flow.h
64630+++ b/include/net/flow.h
64631@@ -221,6 +221,6 @@ extern struct flow_cache_object *flow_cache_lookup(
64632
64633 extern void flow_cache_flush(void);
64634 extern void flow_cache_flush_deferred(void);
64635-extern atomic_t flow_cache_genid;
64636+extern atomic_unchecked_t flow_cache_genid;
64637
64638 #endif
64639diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
64640index b94765e..053f68b 100644
64641--- a/include/net/inetpeer.h
64642+++ b/include/net/inetpeer.h
64643@@ -48,8 +48,8 @@ struct inet_peer {
64644 */
64645 union {
64646 struct {
64647- atomic_t rid; /* Frag reception counter */
64648- atomic_t ip_id_count; /* IP ID for the next packet */
64649+ atomic_unchecked_t rid; /* Frag reception counter */
64650+ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
64651 __u32 tcp_ts;
64652 __u32 tcp_ts_stamp;
64653 };
64654@@ -115,11 +115,11 @@ static inline int inet_getid(struct inet_peer *p, int more)
64655 more++;
64656 inet_peer_refcheck(p);
64657 do {
64658- old = atomic_read(&p->ip_id_count);
64659+ old = atomic_read_unchecked(&p->ip_id_count);
64660 new = old + more;
64661 if (!new)
64662 new = 1;
64663- } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
64664+ } while (atomic_cmpxchg_unchecked(&p->ip_id_count, old, new) != old);
64665 return new;
64666 }
64667
64668diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
64669index 10422ef..662570f 100644
64670--- a/include/net/ip_fib.h
64671+++ b/include/net/ip_fib.h
64672@@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
64673
64674 #define FIB_RES_SADDR(net, res) \
64675 ((FIB_RES_NH(res).nh_saddr_genid == \
64676- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
64677+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
64678 FIB_RES_NH(res).nh_saddr : \
64679 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
64680 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
64681diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
64682index ebe517f..1bd286b 100644
64683--- a/include/net/ip_vs.h
64684+++ b/include/net/ip_vs.h
64685@@ -509,7 +509,7 @@ struct ip_vs_conn {
64686 struct ip_vs_conn *control; /* Master control connection */
64687 atomic_t n_control; /* Number of controlled ones */
64688 struct ip_vs_dest *dest; /* real server */
64689- atomic_t in_pkts; /* incoming packet counter */
64690+ atomic_unchecked_t in_pkts; /* incoming packet counter */
64691
64692 /* packet transmitter for different forwarding methods. If it
64693 mangles the packet, it must return NF_DROP or better NF_STOLEN,
64694@@ -647,7 +647,7 @@ struct ip_vs_dest {
64695 __be16 port; /* port number of the server */
64696 union nf_inet_addr addr; /* IP address of the server */
64697 volatile unsigned flags; /* dest status flags */
64698- atomic_t conn_flags; /* flags to copy to conn */
64699+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
64700 atomic_t weight; /* server weight */
64701
64702 atomic_t refcnt; /* reference counter */
64703diff --git a/include/net/irda/ircomm_core.h b/include/net/irda/ircomm_core.h
64704index 69b610a..fe3962c 100644
64705--- a/include/net/irda/ircomm_core.h
64706+++ b/include/net/irda/ircomm_core.h
64707@@ -51,7 +51,7 @@ typedef struct {
64708 int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
64709 int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
64710 struct ircomm_info *);
64711-} call_t;
64712+} __no_const call_t;
64713
64714 struct ircomm_cb {
64715 irda_queue_t queue;
64716diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
64717index 59ba38bc..d515662 100644
64718--- a/include/net/irda/ircomm_tty.h
64719+++ b/include/net/irda/ircomm_tty.h
64720@@ -35,6 +35,7 @@
64721 #include <linux/termios.h>
64722 #include <linux/timer.h>
64723 #include <linux/tty.h> /* struct tty_struct */
64724+#include <asm/local.h>
64725
64726 #include <net/irda/irias_object.h>
64727 #include <net/irda/ircomm_core.h>
64728@@ -105,8 +106,8 @@ struct ircomm_tty_cb {
64729 unsigned short close_delay;
64730 unsigned short closing_wait; /* time to wait before closing */
64731
64732- int open_count;
64733- int blocked_open; /* # of blocked opens */
64734+ local_t open_count;
64735+ local_t blocked_open; /* # of blocked opens */
64736
64737 /* Protect concurent access to :
64738 * o self->open_count
64739diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
64740index 0954ec9..7413562 100644
64741--- a/include/net/iucv/af_iucv.h
64742+++ b/include/net/iucv/af_iucv.h
64743@@ -138,7 +138,7 @@ struct iucv_sock {
64744 struct iucv_sock_list {
64745 struct hlist_head head;
64746 rwlock_t lock;
64747- atomic_t autobind_name;
64748+ atomic_unchecked_t autobind_name;
64749 };
64750
64751 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
64752diff --git a/include/net/neighbour.h b/include/net/neighbour.h
64753index 34c996f..bb3b4d4 100644
64754--- a/include/net/neighbour.h
64755+++ b/include/net/neighbour.h
64756@@ -123,7 +123,7 @@ struct neigh_ops {
64757 void (*error_report)(struct neighbour *, struct sk_buff *);
64758 int (*output)(struct neighbour *, struct sk_buff *);
64759 int (*connected_output)(struct neighbour *, struct sk_buff *);
64760-};
64761+} __do_const;
64762
64763 struct pneigh_entry {
64764 struct pneigh_entry *next;
64765diff --git a/include/net/netlink.h b/include/net/netlink.h
64766index cb1f350..3279d2c 100644
64767--- a/include/net/netlink.h
64768+++ b/include/net/netlink.h
64769@@ -569,7 +569,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
64770 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
64771 {
64772 if (mark)
64773- skb_trim(skb, (unsigned char *) mark - skb->data);
64774+ skb_trim(skb, (const unsigned char *) mark - skb->data);
64775 }
64776
64777 /**
64778diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
64779index bbd023a..97c6d0d 100644
64780--- a/include/net/netns/ipv4.h
64781+++ b/include/net/netns/ipv4.h
64782@@ -57,8 +57,8 @@ struct netns_ipv4 {
64783 unsigned int sysctl_ping_group_range[2];
64784 long sysctl_tcp_mem[3];
64785
64786- atomic_t rt_genid;
64787- atomic_t dev_addr_genid;
64788+ atomic_unchecked_t rt_genid;
64789+ atomic_unchecked_t dev_addr_genid;
64790
64791 #ifdef CONFIG_IP_MROUTE
64792 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
64793diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
64794index d368561..96aaa17 100644
64795--- a/include/net/sctp/sctp.h
64796+++ b/include/net/sctp/sctp.h
64797@@ -318,9 +318,9 @@ do { \
64798
64799 #else /* SCTP_DEBUG */
64800
64801-#define SCTP_DEBUG_PRINTK(whatever...)
64802-#define SCTP_DEBUG_PRINTK_CONT(fmt, args...)
64803-#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
64804+#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
64805+#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0)
64806+#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
64807 #define SCTP_ENABLE_DEBUG
64808 #define SCTP_DISABLE_DEBUG
64809 #define SCTP_ASSERT(expr, str, func)
64810diff --git a/include/net/sock.h b/include/net/sock.h
64811index 91c1c8b..15ae923 100644
64812--- a/include/net/sock.h
64813+++ b/include/net/sock.h
64814@@ -299,7 +299,7 @@ struct sock {
64815 #ifdef CONFIG_RPS
64816 __u32 sk_rxhash;
64817 #endif
64818- atomic_t sk_drops;
64819+ atomic_unchecked_t sk_drops;
64820 int sk_rcvbuf;
64821
64822 struct sk_filter __rcu *sk_filter;
64823@@ -1660,7 +1660,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
64824 }
64825
64826 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
64827- char __user *from, char *to,
64828+ char __user *from, unsigned char *to,
64829 int copy, int offset)
64830 {
64831 if (skb->ip_summed == CHECKSUM_NONE) {
64832diff --git a/include/net/tcp.h b/include/net/tcp.h
64833index 2d80c29..aa07caf 100644
64834--- a/include/net/tcp.h
64835+++ b/include/net/tcp.h
64836@@ -1426,7 +1426,7 @@ struct tcp_seq_afinfo {
64837 char *name;
64838 sa_family_t family;
64839 const struct file_operations *seq_fops;
64840- struct seq_operations seq_ops;
64841+ seq_operations_no_const seq_ops;
64842 };
64843
64844 struct tcp_iter_state {
64845diff --git a/include/net/udp.h b/include/net/udp.h
64846index e39592f..fef9680 100644
64847--- a/include/net/udp.h
64848+++ b/include/net/udp.h
64849@@ -243,7 +243,7 @@ struct udp_seq_afinfo {
64850 sa_family_t family;
64851 struct udp_table *udp_table;
64852 const struct file_operations *seq_fops;
64853- struct seq_operations seq_ops;
64854+ seq_operations_no_const seq_ops;
64855 };
64856
64857 struct udp_iter_state {
64858diff --git a/include/net/xfrm.h b/include/net/xfrm.h
64859index 89174e2..1f82598 100644
64860--- a/include/net/xfrm.h
64861+++ b/include/net/xfrm.h
64862@@ -505,7 +505,7 @@ struct xfrm_policy {
64863 struct timer_list timer;
64864
64865 struct flow_cache_object flo;
64866- atomic_t genid;
64867+ atomic_unchecked_t genid;
64868 u32 priority;
64869 u32 index;
64870 struct xfrm_mark mark;
64871diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
64872index 1a046b1..ee0bef0 100644
64873--- a/include/rdma/iw_cm.h
64874+++ b/include/rdma/iw_cm.h
64875@@ -122,7 +122,7 @@ struct iw_cm_verbs {
64876 int backlog);
64877
64878 int (*destroy_listen)(struct iw_cm_id *cm_id);
64879-};
64880+} __no_const;
64881
64882 /**
64883 * iw_create_cm_id - Create an IW CM identifier.
64884diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
64885index 6a3922f..0b73022 100644
64886--- a/include/scsi/libfc.h
64887+++ b/include/scsi/libfc.h
64888@@ -748,6 +748,7 @@ struct libfc_function_template {
64889 */
64890 void (*disc_stop_final) (struct fc_lport *);
64891 };
64892+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
64893
64894 /**
64895 * struct fc_disc - Discovery context
64896@@ -851,7 +852,7 @@ struct fc_lport {
64897 struct fc_vport *vport;
64898
64899 /* Operational Information */
64900- struct libfc_function_template tt;
64901+ libfc_function_template_no_const tt;
64902 u8 link_up;
64903 u8 qfull;
64904 enum fc_lport_state state;
64905diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
64906index 77273f2..dd4031f 100644
64907--- a/include/scsi/scsi_device.h
64908+++ b/include/scsi/scsi_device.h
64909@@ -161,9 +161,9 @@ struct scsi_device {
64910 unsigned int max_device_blocked; /* what device_blocked counts down from */
64911 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
64912
64913- atomic_t iorequest_cnt;
64914- atomic_t iodone_cnt;
64915- atomic_t ioerr_cnt;
64916+ atomic_unchecked_t iorequest_cnt;
64917+ atomic_unchecked_t iodone_cnt;
64918+ atomic_unchecked_t ioerr_cnt;
64919
64920 struct device sdev_gendev,
64921 sdev_dev;
64922diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
64923index 2a65167..91e01f8 100644
64924--- a/include/scsi/scsi_transport_fc.h
64925+++ b/include/scsi/scsi_transport_fc.h
64926@@ -711,7 +711,7 @@ struct fc_function_template {
64927 unsigned long show_host_system_hostname:1;
64928
64929 unsigned long disable_target_scan:1;
64930-};
64931+} __do_const;
64932
64933
64934 /**
64935diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
64936index 030b87c..98a6954 100644
64937--- a/include/sound/ak4xxx-adda.h
64938+++ b/include/sound/ak4xxx-adda.h
64939@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
64940 void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
64941 unsigned char val);
64942 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
64943-};
64944+} __no_const;
64945
64946 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
64947
64948diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
64949index 8c05e47..2b5df97 100644
64950--- a/include/sound/hwdep.h
64951+++ b/include/sound/hwdep.h
64952@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
64953 struct snd_hwdep_dsp_status *status);
64954 int (*dsp_load)(struct snd_hwdep *hw,
64955 struct snd_hwdep_dsp_image *image);
64956-};
64957+} __no_const;
64958
64959 struct snd_hwdep {
64960 struct snd_card *card;
64961diff --git a/include/sound/info.h b/include/sound/info.h
64962index 9ca1a49..aba1728 100644
64963--- a/include/sound/info.h
64964+++ b/include/sound/info.h
64965@@ -44,7 +44,7 @@ struct snd_info_entry_text {
64966 struct snd_info_buffer *buffer);
64967 void (*write)(struct snd_info_entry *entry,
64968 struct snd_info_buffer *buffer);
64969-};
64970+} __no_const;
64971
64972 struct snd_info_entry_ops {
64973 int (*open)(struct snd_info_entry *entry,
64974diff --git a/include/sound/pcm.h b/include/sound/pcm.h
64975index 0cf91b2..b70cae4 100644
64976--- a/include/sound/pcm.h
64977+++ b/include/sound/pcm.h
64978@@ -81,6 +81,7 @@ struct snd_pcm_ops {
64979 int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
64980 int (*ack)(struct snd_pcm_substream *substream);
64981 };
64982+typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
64983
64984 /*
64985 *
64986diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h
64987index af1b49e..a5d55a5 100644
64988--- a/include/sound/sb16_csp.h
64989+++ b/include/sound/sb16_csp.h
64990@@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
64991 int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
64992 int (*csp_stop) (struct snd_sb_csp * p);
64993 int (*csp_qsound_transfer) (struct snd_sb_csp * p);
64994-};
64995+} __no_const;
64996
64997 /*
64998 * CSP private data
64999diff --git a/include/sound/soc.h b/include/sound/soc.h
65000index 0992dff..bb366fe 100644
65001--- a/include/sound/soc.h
65002+++ b/include/sound/soc.h
65003@@ -682,7 +682,7 @@ struct snd_soc_platform_driver {
65004 /* platform IO - used for platform DAPM */
65005 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
65006 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
65007-};
65008+} __do_const;
65009
65010 struct snd_soc_platform {
65011 const char *name;
65012@@ -852,7 +852,7 @@ struct snd_soc_pcm_runtime {
65013 struct snd_soc_dai_link *dai_link;
65014 struct mutex pcm_mutex;
65015 enum snd_soc_pcm_subclass pcm_subclass;
65016- struct snd_pcm_ops ops;
65017+ snd_pcm_ops_no_const ops;
65018
65019 unsigned int complete:1;
65020 unsigned int dev_registered:1;
65021diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
65022index 444cd6b..3327cc5 100644
65023--- a/include/sound/ymfpci.h
65024+++ b/include/sound/ymfpci.h
65025@@ -358,7 +358,7 @@ struct snd_ymfpci {
65026 spinlock_t reg_lock;
65027 spinlock_t voice_lock;
65028 wait_queue_head_t interrupt_sleep;
65029- atomic_t interrupt_sleep_count;
65030+ atomic_unchecked_t interrupt_sleep_count;
65031 struct snd_info_entry *proc_entry;
65032 const struct firmware *dsp_microcode;
65033 const struct firmware *controller_microcode;
65034diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
65035index fe73eb8..56388b1 100644
65036--- a/include/target/target_core_base.h
65037+++ b/include/target/target_core_base.h
65038@@ -443,7 +443,7 @@ struct t10_reservation_ops {
65039 int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
65040 int (*t10_pr_register)(struct se_cmd *);
65041 int (*t10_pr_clear)(struct se_cmd *);
65042-};
65043+} __no_const;
65044
65045 struct t10_reservation {
65046 /* Reservation effects all target ports */
65047@@ -561,8 +561,8 @@ struct se_cmd {
65048 atomic_t t_se_count;
65049 atomic_t t_task_cdbs_left;
65050 atomic_t t_task_cdbs_ex_left;
65051- atomic_t t_task_cdbs_sent;
65052- atomic_t t_transport_aborted;
65053+ atomic_unchecked_t t_task_cdbs_sent;
65054+ atomic_unchecked_t t_transport_aborted;
65055 atomic_t t_transport_active;
65056 atomic_t t_transport_complete;
65057 atomic_t t_transport_queue_active;
65058@@ -799,7 +799,7 @@ struct se_device {
65059 spinlock_t stats_lock;
65060 /* Active commands on this virtual SE device */
65061 atomic_t simple_cmds;
65062- atomic_t dev_ordered_id;
65063+ atomic_unchecked_t dev_ordered_id;
65064 atomic_t execute_tasks;
65065 atomic_t dev_ordered_sync;
65066 atomic_t dev_qf_count;
65067diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
65068index 1c09820..7f5ec79 100644
65069--- a/include/trace/events/irq.h
65070+++ b/include/trace/events/irq.h
65071@@ -36,7 +36,7 @@ struct softirq_action;
65072 */
65073 TRACE_EVENT(irq_handler_entry,
65074
65075- TP_PROTO(int irq, struct irqaction *action),
65076+ TP_PROTO(int irq, const struct irqaction *action),
65077
65078 TP_ARGS(irq, action),
65079
65080@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
65081 */
65082 TRACE_EVENT(irq_handler_exit,
65083
65084- TP_PROTO(int irq, struct irqaction *action, int ret),
65085+ TP_PROTO(int irq, const struct irqaction *action, int ret),
65086
65087 TP_ARGS(irq, action, ret),
65088
65089diff --git a/include/video/udlfb.h b/include/video/udlfb.h
65090index c41f308..6918de3 100644
65091--- a/include/video/udlfb.h
65092+++ b/include/video/udlfb.h
65093@@ -52,10 +52,10 @@ struct dlfb_data {
65094 u32 pseudo_palette[256];
65095 int blank_mode; /*one of FB_BLANK_ */
65096 /* blit-only rendering path metrics, exposed through sysfs */
65097- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
65098- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
65099- atomic_t bytes_sent; /* to usb, after compression including overhead */
65100- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
65101+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
65102+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
65103+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
65104+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
65105 };
65106
65107 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
65108diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
65109index 0993a22..32ba2fe 100644
65110--- a/include/video/uvesafb.h
65111+++ b/include/video/uvesafb.h
65112@@ -177,6 +177,7 @@ struct uvesafb_par {
65113 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
65114 u8 pmi_setpal; /* PMI for palette changes */
65115 u16 *pmi_base; /* protected mode interface location */
65116+ u8 *pmi_code; /* protected mode code location */
65117 void *pmi_start;
65118 void *pmi_pal;
65119 u8 *vbe_state_orig; /*
65120diff --git a/init/Kconfig b/init/Kconfig
65121index 3f42cd6..613f41d 100644
65122--- a/init/Kconfig
65123+++ b/init/Kconfig
65124@@ -799,6 +799,7 @@ endif # CGROUPS
65125
65126 config CHECKPOINT_RESTORE
65127 bool "Checkpoint/restore support" if EXPERT
65128+ depends on !GRKERNSEC
65129 default n
65130 help
65131 Enables additional kernel features in a sake of checkpoint/restore.
65132@@ -1249,7 +1250,7 @@ config SLUB_DEBUG
65133
65134 config COMPAT_BRK
65135 bool "Disable heap randomization"
65136- default y
65137+ default n
65138 help
65139 Randomizing heap placement makes heap exploits harder, but it
65140 also breaks ancient binaries (including anything libc5 based).
65141diff --git a/init/do_mounts.c b/init/do_mounts.c
65142index 2974c8b..0b863ae 100644
65143--- a/init/do_mounts.c
65144+++ b/init/do_mounts.c
65145@@ -326,11 +326,11 @@ static void __init get_fs_names(char *page)
65146 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
65147 {
65148 struct super_block *s;
65149- int err = sys_mount(name, "/root", fs, flags, data);
65150+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
65151 if (err)
65152 return err;
65153
65154- sys_chdir((const char __user __force *)"/root");
65155+ sys_chdir((const char __force_user *)"/root");
65156 s = current->fs->pwd.dentry->d_sb;
65157 ROOT_DEV = s->s_dev;
65158 printk(KERN_INFO
65159@@ -450,18 +450,18 @@ void __init change_floppy(char *fmt, ...)
65160 va_start(args, fmt);
65161 vsprintf(buf, fmt, args);
65162 va_end(args);
65163- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
65164+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
65165 if (fd >= 0) {
65166 sys_ioctl(fd, FDEJECT, 0);
65167 sys_close(fd);
65168 }
65169 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
65170- fd = sys_open("/dev/console", O_RDWR, 0);
65171+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
65172 if (fd >= 0) {
65173 sys_ioctl(fd, TCGETS, (long)&termios);
65174 termios.c_lflag &= ~ICANON;
65175 sys_ioctl(fd, TCSETSF, (long)&termios);
65176- sys_read(fd, &c, 1);
65177+ sys_read(fd, (char __user *)&c, 1);
65178 termios.c_lflag |= ICANON;
65179 sys_ioctl(fd, TCSETSF, (long)&termios);
65180 sys_close(fd);
65181@@ -555,6 +555,6 @@ void __init prepare_namespace(void)
65182 mount_root();
65183 out:
65184 devtmpfs_mount("dev");
65185- sys_mount(".", "/", NULL, MS_MOVE, NULL);
65186- sys_chroot((const char __user __force *)".");
65187+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
65188+ sys_chroot((const char __force_user *)".");
65189 }
65190diff --git a/init/do_mounts.h b/init/do_mounts.h
65191index f5b978a..69dbfe8 100644
65192--- a/init/do_mounts.h
65193+++ b/init/do_mounts.h
65194@@ -15,15 +15,15 @@ extern int root_mountflags;
65195
65196 static inline int create_dev(char *name, dev_t dev)
65197 {
65198- sys_unlink(name);
65199- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
65200+ sys_unlink((char __force_user *)name);
65201+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
65202 }
65203
65204 #if BITS_PER_LONG == 32
65205 static inline u32 bstat(char *name)
65206 {
65207 struct stat64 stat;
65208- if (sys_stat64(name, &stat) != 0)
65209+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
65210 return 0;
65211 if (!S_ISBLK(stat.st_mode))
65212 return 0;
65213@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
65214 static inline u32 bstat(char *name)
65215 {
65216 struct stat stat;
65217- if (sys_newstat(name, &stat) != 0)
65218+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
65219 return 0;
65220 if (!S_ISBLK(stat.st_mode))
65221 return 0;
65222diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
65223index 3098a38..253064e 100644
65224--- a/init/do_mounts_initrd.c
65225+++ b/init/do_mounts_initrd.c
65226@@ -44,13 +44,13 @@ static void __init handle_initrd(void)
65227 create_dev("/dev/root.old", Root_RAM0);
65228 /* mount initrd on rootfs' /root */
65229 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
65230- sys_mkdir("/old", 0700);
65231- root_fd = sys_open("/", 0, 0);
65232- old_fd = sys_open("/old", 0, 0);
65233+ sys_mkdir((const char __force_user *)"/old", 0700);
65234+ root_fd = sys_open((const char __force_user *)"/", 0, 0);
65235+ old_fd = sys_open((const char __force_user *)"/old", 0, 0);
65236 /* move initrd over / and chdir/chroot in initrd root */
65237- sys_chdir("/root");
65238- sys_mount(".", "/", NULL, MS_MOVE, NULL);
65239- sys_chroot(".");
65240+ sys_chdir((const char __force_user *)"/root");
65241+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
65242+ sys_chroot((const char __force_user *)".");
65243
65244 /*
65245 * In case that a resume from disk is carried out by linuxrc or one of
65246@@ -67,15 +67,15 @@ static void __init handle_initrd(void)
65247
65248 /* move initrd to rootfs' /old */
65249 sys_fchdir(old_fd);
65250- sys_mount("/", ".", NULL, MS_MOVE, NULL);
65251+ sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
65252 /* switch root and cwd back to / of rootfs */
65253 sys_fchdir(root_fd);
65254- sys_chroot(".");
65255+ sys_chroot((const char __force_user *)".");
65256 sys_close(old_fd);
65257 sys_close(root_fd);
65258
65259 if (new_decode_dev(real_root_dev) == Root_RAM0) {
65260- sys_chdir("/old");
65261+ sys_chdir((const char __force_user *)"/old");
65262 return;
65263 }
65264
65265@@ -83,17 +83,17 @@ static void __init handle_initrd(void)
65266 mount_root();
65267
65268 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
65269- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
65270+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
65271 if (!error)
65272 printk("okay\n");
65273 else {
65274- int fd = sys_open("/dev/root.old", O_RDWR, 0);
65275+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
65276 if (error == -ENOENT)
65277 printk("/initrd does not exist. Ignored.\n");
65278 else
65279 printk("failed\n");
65280 printk(KERN_NOTICE "Unmounting old root\n");
65281- sys_umount("/old", MNT_DETACH);
65282+ sys_umount((char __force_user *)"/old", MNT_DETACH);
65283 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
65284 if (fd < 0) {
65285 error = fd;
65286@@ -116,11 +116,11 @@ int __init initrd_load(void)
65287 * mounted in the normal path.
65288 */
65289 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
65290- sys_unlink("/initrd.image");
65291+ sys_unlink((const char __force_user *)"/initrd.image");
65292 handle_initrd();
65293 return 1;
65294 }
65295 }
65296- sys_unlink("/initrd.image");
65297+ sys_unlink((const char __force_user *)"/initrd.image");
65298 return 0;
65299 }
65300diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
65301index 32c4799..c27ee74 100644
65302--- a/init/do_mounts_md.c
65303+++ b/init/do_mounts_md.c
65304@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
65305 partitioned ? "_d" : "", minor,
65306 md_setup_args[ent].device_names);
65307
65308- fd = sys_open(name, 0, 0);
65309+ fd = sys_open((char __force_user *)name, 0, 0);
65310 if (fd < 0) {
65311 printk(KERN_ERR "md: open failed - cannot start "
65312 "array %s\n", name);
65313@@ -233,7 +233,7 @@ static void __init md_setup_drive(void)
65314 * array without it
65315 */
65316 sys_close(fd);
65317- fd = sys_open(name, 0, 0);
65318+ fd = sys_open((char __force_user *)name, 0, 0);
65319 sys_ioctl(fd, BLKRRPART, 0);
65320 }
65321 sys_close(fd);
65322@@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
65323
65324 wait_for_device_probe();
65325
65326- fd = sys_open((const char __user __force *) "/dev/md0", 0, 0);
65327+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
65328 if (fd >= 0) {
65329 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
65330 sys_close(fd);
65331diff --git a/init/initramfs.c b/init/initramfs.c
65332index 8216c30..25e8e32 100644
65333--- a/init/initramfs.c
65334+++ b/init/initramfs.c
65335@@ -74,7 +74,7 @@ static void __init free_hash(void)
65336 }
65337 }
65338
65339-static long __init do_utime(char __user *filename, time_t mtime)
65340+static long __init do_utime(__force char __user *filename, time_t mtime)
65341 {
65342 struct timespec t[2];
65343
65344@@ -109,7 +109,7 @@ static void __init dir_utime(void)
65345 struct dir_entry *de, *tmp;
65346 list_for_each_entry_safe(de, tmp, &dir_list, list) {
65347 list_del(&de->list);
65348- do_utime(de->name, de->mtime);
65349+ do_utime((char __force_user *)de->name, de->mtime);
65350 kfree(de->name);
65351 kfree(de);
65352 }
65353@@ -271,7 +271,7 @@ static int __init maybe_link(void)
65354 if (nlink >= 2) {
65355 char *old = find_link(major, minor, ino, mode, collected);
65356 if (old)
65357- return (sys_link(old, collected) < 0) ? -1 : 1;
65358+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
65359 }
65360 return 0;
65361 }
65362@@ -280,11 +280,11 @@ static void __init clean_path(char *path, umode_t mode)
65363 {
65364 struct stat st;
65365
65366- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
65367+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
65368 if (S_ISDIR(st.st_mode))
65369- sys_rmdir(path);
65370+ sys_rmdir((char __force_user *)path);
65371 else
65372- sys_unlink(path);
65373+ sys_unlink((char __force_user *)path);
65374 }
65375 }
65376
65377@@ -305,7 +305,7 @@ static int __init do_name(void)
65378 int openflags = O_WRONLY|O_CREAT;
65379 if (ml != 1)
65380 openflags |= O_TRUNC;
65381- wfd = sys_open(collected, openflags, mode);
65382+ wfd = sys_open((char __force_user *)collected, openflags, mode);
65383
65384 if (wfd >= 0) {
65385 sys_fchown(wfd, uid, gid);
65386@@ -317,17 +317,17 @@ static int __init do_name(void)
65387 }
65388 }
65389 } else if (S_ISDIR(mode)) {
65390- sys_mkdir(collected, mode);
65391- sys_chown(collected, uid, gid);
65392- sys_chmod(collected, mode);
65393+ sys_mkdir((char __force_user *)collected, mode);
65394+ sys_chown((char __force_user *)collected, uid, gid);
65395+ sys_chmod((char __force_user *)collected, mode);
65396 dir_add(collected, mtime);
65397 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
65398 S_ISFIFO(mode) || S_ISSOCK(mode)) {
65399 if (maybe_link() == 0) {
65400- sys_mknod(collected, mode, rdev);
65401- sys_chown(collected, uid, gid);
65402- sys_chmod(collected, mode);
65403- do_utime(collected, mtime);
65404+ sys_mknod((char __force_user *)collected, mode, rdev);
65405+ sys_chown((char __force_user *)collected, uid, gid);
65406+ sys_chmod((char __force_user *)collected, mode);
65407+ do_utime((char __force_user *)collected, mtime);
65408 }
65409 }
65410 return 0;
65411@@ -336,15 +336,15 @@ static int __init do_name(void)
65412 static int __init do_copy(void)
65413 {
65414 if (count >= body_len) {
65415- sys_write(wfd, victim, body_len);
65416+ sys_write(wfd, (char __force_user *)victim, body_len);
65417 sys_close(wfd);
65418- do_utime(vcollected, mtime);
65419+ do_utime((char __force_user *)vcollected, mtime);
65420 kfree(vcollected);
65421 eat(body_len);
65422 state = SkipIt;
65423 return 0;
65424 } else {
65425- sys_write(wfd, victim, count);
65426+ sys_write(wfd, (char __force_user *)victim, count);
65427 body_len -= count;
65428 eat(count);
65429 return 1;
65430@@ -355,9 +355,9 @@ static int __init do_symlink(void)
65431 {
65432 collected[N_ALIGN(name_len) + body_len] = '\0';
65433 clean_path(collected, 0);
65434- sys_symlink(collected + N_ALIGN(name_len), collected);
65435- sys_lchown(collected, uid, gid);
65436- do_utime(collected, mtime);
65437+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
65438+ sys_lchown((char __force_user *)collected, uid, gid);
65439+ do_utime((char __force_user *)collected, mtime);
65440 state = SkipIt;
65441 next_state = Reset;
65442 return 0;
65443diff --git a/init/main.c b/init/main.c
65444index ff49a6d..5fa0429 100644
65445--- a/init/main.c
65446+++ b/init/main.c
65447@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) { }
65448 extern void tc_init(void);
65449 #endif
65450
65451+extern void grsecurity_init(void);
65452+
65453 /*
65454 * Debug helper: via this flag we know that we are in 'early bootup code'
65455 * where only the boot processor is running with IRQ disabled. This means
65456@@ -149,6 +151,49 @@ static int __init set_reset_devices(char *str)
65457
65458 __setup("reset_devices", set_reset_devices);
65459
65460+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
65461+extern char pax_enter_kernel_user[];
65462+extern char pax_exit_kernel_user[];
65463+extern pgdval_t clone_pgd_mask;
65464+#endif
65465+
65466+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
65467+static int __init setup_pax_nouderef(char *str)
65468+{
65469+#ifdef CONFIG_X86_32
65470+ unsigned int cpu;
65471+ struct desc_struct *gdt;
65472+
65473+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
65474+ gdt = get_cpu_gdt_table(cpu);
65475+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
65476+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
65477+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
65478+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
65479+ }
65480+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
65481+#else
65482+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
65483+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
65484+ clone_pgd_mask = ~(pgdval_t)0UL;
65485+#endif
65486+
65487+ return 0;
65488+}
65489+early_param("pax_nouderef", setup_pax_nouderef);
65490+#endif
65491+
65492+#ifdef CONFIG_PAX_SOFTMODE
65493+int pax_softmode;
65494+
65495+static int __init setup_pax_softmode(char *str)
65496+{
65497+ get_option(&str, &pax_softmode);
65498+ return 1;
65499+}
65500+__setup("pax_softmode=", setup_pax_softmode);
65501+#endif
65502+
65503 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
65504 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
65505 static const char *panic_later, *panic_param;
65506@@ -675,6 +720,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
65507 {
65508 int count = preempt_count();
65509 int ret;
65510+ const char *msg1 = "", *msg2 = "";
65511
65512 if (initcall_debug)
65513 ret = do_one_initcall_debug(fn);
65514@@ -687,15 +733,15 @@ int __init_or_module do_one_initcall(initcall_t fn)
65515 sprintf(msgbuf, "error code %d ", ret);
65516
65517 if (preempt_count() != count) {
65518- strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
65519+ msg1 = " preemption imbalance";
65520 preempt_count() = count;
65521 }
65522 if (irqs_disabled()) {
65523- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
65524+ msg2 = " disabled interrupts";
65525 local_irq_enable();
65526 }
65527- if (msgbuf[0]) {
65528- printk("initcall %pF returned with %s\n", fn, msgbuf);
65529+ if (msgbuf[0] || *msg1 || *msg2) {
65530+ printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
65531 }
65532
65533 return ret;
65534@@ -814,7 +860,7 @@ static int __init kernel_init(void * unused)
65535 do_basic_setup();
65536
65537 /* Open the /dev/console on the rootfs, this should never fail */
65538- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
65539+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
65540 printk(KERN_WARNING "Warning: unable to open an initial console.\n");
65541
65542 (void) sys_dup(0);
65543@@ -827,11 +873,13 @@ static int __init kernel_init(void * unused)
65544 if (!ramdisk_execute_command)
65545 ramdisk_execute_command = "/init";
65546
65547- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
65548+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
65549 ramdisk_execute_command = NULL;
65550 prepare_namespace();
65551 }
65552
65553+ grsecurity_init();
65554+
65555 /*
65556 * Ok, we have completed the initial bootup, and
65557 * we're essentially up and running. Get rid of the
65558diff --git a/ipc/mqueue.c b/ipc/mqueue.c
65559index 86ee272..773d937 100644
65560--- a/ipc/mqueue.c
65561+++ b/ipc/mqueue.c
65562@@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
65563 mq_bytes = (mq_msg_tblsz +
65564 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
65565
65566+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
65567 spin_lock(&mq_lock);
65568 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
65569 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
65570diff --git a/ipc/msg.c b/ipc/msg.c
65571index 7385de2..a8180e08 100644
65572--- a/ipc/msg.c
65573+++ b/ipc/msg.c
65574@@ -309,18 +309,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
65575 return security_msg_queue_associate(msq, msgflg);
65576 }
65577
65578+static struct ipc_ops msg_ops = {
65579+ .getnew = newque,
65580+ .associate = msg_security,
65581+ .more_checks = NULL
65582+};
65583+
65584 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
65585 {
65586 struct ipc_namespace *ns;
65587- struct ipc_ops msg_ops;
65588 struct ipc_params msg_params;
65589
65590 ns = current->nsproxy->ipc_ns;
65591
65592- msg_ops.getnew = newque;
65593- msg_ops.associate = msg_security;
65594- msg_ops.more_checks = NULL;
65595-
65596 msg_params.key = key;
65597 msg_params.flg = msgflg;
65598
65599diff --git a/ipc/sem.c b/ipc/sem.c
65600index 5215a81..cfc0cac 100644
65601--- a/ipc/sem.c
65602+++ b/ipc/sem.c
65603@@ -364,10 +364,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
65604 return 0;
65605 }
65606
65607+static struct ipc_ops sem_ops = {
65608+ .getnew = newary,
65609+ .associate = sem_security,
65610+ .more_checks = sem_more_checks
65611+};
65612+
65613 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
65614 {
65615 struct ipc_namespace *ns;
65616- struct ipc_ops sem_ops;
65617 struct ipc_params sem_params;
65618
65619 ns = current->nsproxy->ipc_ns;
65620@@ -375,10 +380,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
65621 if (nsems < 0 || nsems > ns->sc_semmsl)
65622 return -EINVAL;
65623
65624- sem_ops.getnew = newary;
65625- sem_ops.associate = sem_security;
65626- sem_ops.more_checks = sem_more_checks;
65627-
65628 sem_params.key = key;
65629 sem_params.flg = semflg;
65630 sem_params.u.nsems = nsems;
65631diff --git a/ipc/shm.c b/ipc/shm.c
65632index b76be5b..859e750 100644
65633--- a/ipc/shm.c
65634+++ b/ipc/shm.c
65635@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
65636 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
65637 #endif
65638
65639+#ifdef CONFIG_GRKERNSEC
65640+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
65641+ const time_t shm_createtime, const uid_t cuid,
65642+ const int shmid);
65643+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
65644+ const time_t shm_createtime);
65645+#endif
65646+
65647 void shm_init_ns(struct ipc_namespace *ns)
65648 {
65649 ns->shm_ctlmax = SHMMAX;
65650@@ -508,6 +516,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
65651 shp->shm_lprid = 0;
65652 shp->shm_atim = shp->shm_dtim = 0;
65653 shp->shm_ctim = get_seconds();
65654+#ifdef CONFIG_GRKERNSEC
65655+ {
65656+ struct timespec timeval;
65657+ do_posix_clock_monotonic_gettime(&timeval);
65658+
65659+ shp->shm_createtime = timeval.tv_sec;
65660+ }
65661+#endif
65662 shp->shm_segsz = size;
65663 shp->shm_nattch = 0;
65664 shp->shm_file = file;
65665@@ -559,18 +575,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
65666 return 0;
65667 }
65668
65669+static struct ipc_ops shm_ops = {
65670+ .getnew = newseg,
65671+ .associate = shm_security,
65672+ .more_checks = shm_more_checks
65673+};
65674+
65675 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
65676 {
65677 struct ipc_namespace *ns;
65678- struct ipc_ops shm_ops;
65679 struct ipc_params shm_params;
65680
65681 ns = current->nsproxy->ipc_ns;
65682
65683- shm_ops.getnew = newseg;
65684- shm_ops.associate = shm_security;
65685- shm_ops.more_checks = shm_more_checks;
65686-
65687 shm_params.key = key;
65688 shm_params.flg = shmflg;
65689 shm_params.u.size = size;
65690@@ -988,6 +1005,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
65691 f_mode = FMODE_READ | FMODE_WRITE;
65692 }
65693 if (shmflg & SHM_EXEC) {
65694+
65695+#ifdef CONFIG_PAX_MPROTECT
65696+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
65697+ goto out;
65698+#endif
65699+
65700 prot |= PROT_EXEC;
65701 acc_mode |= S_IXUGO;
65702 }
65703@@ -1011,9 +1034,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
65704 if (err)
65705 goto out_unlock;
65706
65707+#ifdef CONFIG_GRKERNSEC
65708+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
65709+ shp->shm_perm.cuid, shmid) ||
65710+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
65711+ err = -EACCES;
65712+ goto out_unlock;
65713+ }
65714+#endif
65715+
65716 path = shp->shm_file->f_path;
65717 path_get(&path);
65718 shp->shm_nattch++;
65719+#ifdef CONFIG_GRKERNSEC
65720+ shp->shm_lapid = current->pid;
65721+#endif
65722 size = i_size_read(path.dentry->d_inode);
65723 shm_unlock(shp);
65724
65725diff --git a/kernel/acct.c b/kernel/acct.c
65726index 02e6167..54824f7 100644
65727--- a/kernel/acct.c
65728+++ b/kernel/acct.c
65729@@ -550,7 +550,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
65730 */
65731 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
65732 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
65733- file->f_op->write(file, (char *)&ac,
65734+ file->f_op->write(file, (char __force_user *)&ac,
65735 sizeof(acct_t), &file->f_pos);
65736 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
65737 set_fs(fs);
65738diff --git a/kernel/audit.c b/kernel/audit.c
65739index bb0eb5b..cf2a03a 100644
65740--- a/kernel/audit.c
65741+++ b/kernel/audit.c
65742@@ -115,7 +115,7 @@ u32 audit_sig_sid = 0;
65743 3) suppressed due to audit_rate_limit
65744 4) suppressed due to audit_backlog_limit
65745 */
65746-static atomic_t audit_lost = ATOMIC_INIT(0);
65747+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
65748
65749 /* The netlink socket. */
65750 static struct sock *audit_sock;
65751@@ -237,7 +237,7 @@ void audit_log_lost(const char *message)
65752 unsigned long now;
65753 int print;
65754
65755- atomic_inc(&audit_lost);
65756+ atomic_inc_unchecked(&audit_lost);
65757
65758 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
65759
65760@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
65761 printk(KERN_WARNING
65762 "audit: audit_lost=%d audit_rate_limit=%d "
65763 "audit_backlog_limit=%d\n",
65764- atomic_read(&audit_lost),
65765+ atomic_read_unchecked(&audit_lost),
65766 audit_rate_limit,
65767 audit_backlog_limit);
65768 audit_panic(message);
65769@@ -689,7 +689,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
65770 status_set.pid = audit_pid;
65771 status_set.rate_limit = audit_rate_limit;
65772 status_set.backlog_limit = audit_backlog_limit;
65773- status_set.lost = atomic_read(&audit_lost);
65774+ status_set.lost = atomic_read_unchecked(&audit_lost);
65775 status_set.backlog = skb_queue_len(&audit_skb_queue);
65776 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
65777 &status_set, sizeof(status_set));
65778diff --git a/kernel/auditsc.c b/kernel/auditsc.c
65779index af1de0f..06dfe57 100644
65780--- a/kernel/auditsc.c
65781+++ b/kernel/auditsc.c
65782@@ -2288,7 +2288,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
65783 }
65784
65785 /* global counter which is incremented every time something logs in */
65786-static atomic_t session_id = ATOMIC_INIT(0);
65787+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
65788
65789 /**
65790 * audit_set_loginuid - set current task's audit_context loginuid
65791@@ -2312,7 +2312,7 @@ int audit_set_loginuid(uid_t loginuid)
65792 return -EPERM;
65793 #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
65794
65795- sessionid = atomic_inc_return(&session_id);
65796+ sessionid = atomic_inc_return_unchecked(&session_id);
65797 if (context && context->in_syscall) {
65798 struct audit_buffer *ab;
65799
65800diff --git a/kernel/capability.c b/kernel/capability.c
65801index 3f1adb6..c564db0 100644
65802--- a/kernel/capability.c
65803+++ b/kernel/capability.c
65804@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
65805 * before modification is attempted and the application
65806 * fails.
65807 */
65808+ if (tocopy > ARRAY_SIZE(kdata))
65809+ return -EFAULT;
65810+
65811 if (copy_to_user(dataptr, kdata, tocopy
65812 * sizeof(struct __user_cap_data_struct))) {
65813 return -EFAULT;
65814@@ -303,10 +306,11 @@ bool has_ns_capability(struct task_struct *t,
65815 int ret;
65816
65817 rcu_read_lock();
65818- ret = security_capable(__task_cred(t), ns, cap);
65819+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
65820+ gr_task_is_capable(t, __task_cred(t), cap);
65821 rcu_read_unlock();
65822
65823- return (ret == 0);
65824+ return ret;
65825 }
65826
65827 /**
65828@@ -343,10 +347,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
65829 int ret;
65830
65831 rcu_read_lock();
65832- ret = security_capable_noaudit(__task_cred(t), ns, cap);
65833+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
65834 rcu_read_unlock();
65835
65836- return (ret == 0);
65837+ return ret;
65838 }
65839
65840 /**
65841@@ -384,7 +388,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
65842 BUG();
65843 }
65844
65845- if (security_capable(current_cred(), ns, cap) == 0) {
65846+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
65847 current->flags |= PF_SUPERPRIV;
65848 return true;
65849 }
65850@@ -392,6 +396,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
65851 }
65852 EXPORT_SYMBOL(ns_capable);
65853
65854+bool ns_capable_nolog(struct user_namespace *ns, int cap)
65855+{
65856+ if (unlikely(!cap_valid(cap))) {
65857+ printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
65858+ BUG();
65859+ }
65860+
65861+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
65862+ current->flags |= PF_SUPERPRIV;
65863+ return true;
65864+ }
65865+ return false;
65866+}
65867+EXPORT_SYMBOL(ns_capable_nolog);
65868+
65869 /**
65870 * capable - Determine if the current task has a superior capability in effect
65871 * @cap: The capability to be tested for
65872@@ -408,6 +427,12 @@ bool capable(int cap)
65873 }
65874 EXPORT_SYMBOL(capable);
65875
65876+bool capable_nolog(int cap)
65877+{
65878+ return ns_capable_nolog(&init_user_ns, cap);
65879+}
65880+EXPORT_SYMBOL(capable_nolog);
65881+
65882 /**
65883 * nsown_capable - Check superior capability to one's own user_ns
65884 * @cap: The capability in question
65885diff --git a/kernel/compat.c b/kernel/compat.c
65886index f346ced..aa2b1f4 100644
65887--- a/kernel/compat.c
65888+++ b/kernel/compat.c
65889@@ -13,6 +13,7 @@
65890
65891 #include <linux/linkage.h>
65892 #include <linux/compat.h>
65893+#include <linux/module.h>
65894 #include <linux/errno.h>
65895 #include <linux/time.h>
65896 #include <linux/signal.h>
65897@@ -168,7 +169,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
65898 mm_segment_t oldfs;
65899 long ret;
65900
65901- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
65902+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
65903 oldfs = get_fs();
65904 set_fs(KERNEL_DS);
65905 ret = hrtimer_nanosleep_restart(restart);
65906@@ -200,7 +201,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
65907 oldfs = get_fs();
65908 set_fs(KERNEL_DS);
65909 ret = hrtimer_nanosleep(&tu,
65910- rmtp ? (struct timespec __user *)&rmt : NULL,
65911+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
65912 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
65913 set_fs(oldfs);
65914
65915@@ -309,7 +310,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
65916 mm_segment_t old_fs = get_fs();
65917
65918 set_fs(KERNEL_DS);
65919- ret = sys_sigpending((old_sigset_t __user *) &s);
65920+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
65921 set_fs(old_fs);
65922 if (ret == 0)
65923 ret = put_user(s, set);
65924@@ -332,8 +333,8 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set,
65925 old_fs = get_fs();
65926 set_fs(KERNEL_DS);
65927 ret = sys_sigprocmask(how,
65928- set ? (old_sigset_t __user *) &s : NULL,
65929- oset ? (old_sigset_t __user *) &s : NULL);
65930+ set ? (old_sigset_t __force_user *) &s : NULL,
65931+ oset ? (old_sigset_t __force_user *) &s : NULL);
65932 set_fs(old_fs);
65933 if (ret == 0)
65934 if (oset)
65935@@ -370,7 +371,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
65936 mm_segment_t old_fs = get_fs();
65937
65938 set_fs(KERNEL_DS);
65939- ret = sys_old_getrlimit(resource, &r);
65940+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
65941 set_fs(old_fs);
65942
65943 if (!ret) {
65944@@ -442,7 +443,7 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
65945 mm_segment_t old_fs = get_fs();
65946
65947 set_fs(KERNEL_DS);
65948- ret = sys_getrusage(who, (struct rusage __user *) &r);
65949+ ret = sys_getrusage(who, (struct rusage __force_user *) &r);
65950 set_fs(old_fs);
65951
65952 if (ret)
65953@@ -469,8 +470,8 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
65954 set_fs (KERNEL_DS);
65955 ret = sys_wait4(pid,
65956 (stat_addr ?
65957- (unsigned int __user *) &status : NULL),
65958- options, (struct rusage __user *) &r);
65959+ (unsigned int __force_user *) &status : NULL),
65960+ options, (struct rusage __force_user *) &r);
65961 set_fs (old_fs);
65962
65963 if (ret > 0) {
65964@@ -495,8 +496,8 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,
65965 memset(&info, 0, sizeof(info));
65966
65967 set_fs(KERNEL_DS);
65968- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
65969- uru ? (struct rusage __user *)&ru : NULL);
65970+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
65971+ uru ? (struct rusage __force_user *)&ru : NULL);
65972 set_fs(old_fs);
65973
65974 if ((ret < 0) || (info.si_signo == 0))
65975@@ -626,8 +627,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
65976 oldfs = get_fs();
65977 set_fs(KERNEL_DS);
65978 err = sys_timer_settime(timer_id, flags,
65979- (struct itimerspec __user *) &newts,
65980- (struct itimerspec __user *) &oldts);
65981+ (struct itimerspec __force_user *) &newts,
65982+ (struct itimerspec __force_user *) &oldts);
65983 set_fs(oldfs);
65984 if (!err && old && put_compat_itimerspec(old, &oldts))
65985 return -EFAULT;
65986@@ -644,7 +645,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
65987 oldfs = get_fs();
65988 set_fs(KERNEL_DS);
65989 err = sys_timer_gettime(timer_id,
65990- (struct itimerspec __user *) &ts);
65991+ (struct itimerspec __force_user *) &ts);
65992 set_fs(oldfs);
65993 if (!err && put_compat_itimerspec(setting, &ts))
65994 return -EFAULT;
65995@@ -663,7 +664,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
65996 oldfs = get_fs();
65997 set_fs(KERNEL_DS);
65998 err = sys_clock_settime(which_clock,
65999- (struct timespec __user *) &ts);
66000+ (struct timespec __force_user *) &ts);
66001 set_fs(oldfs);
66002 return err;
66003 }
66004@@ -678,7 +679,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
66005 oldfs = get_fs();
66006 set_fs(KERNEL_DS);
66007 err = sys_clock_gettime(which_clock,
66008- (struct timespec __user *) &ts);
66009+ (struct timespec __force_user *) &ts);
66010 set_fs(oldfs);
66011 if (!err && put_compat_timespec(&ts, tp))
66012 return -EFAULT;
66013@@ -698,7 +699,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
66014
66015 oldfs = get_fs();
66016 set_fs(KERNEL_DS);
66017- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
66018+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
66019 set_fs(oldfs);
66020
66021 err = compat_put_timex(utp, &txc);
66022@@ -718,7 +719,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
66023 oldfs = get_fs();
66024 set_fs(KERNEL_DS);
66025 err = sys_clock_getres(which_clock,
66026- (struct timespec __user *) &ts);
66027+ (struct timespec __force_user *) &ts);
66028 set_fs(oldfs);
66029 if (!err && tp && put_compat_timespec(&ts, tp))
66030 return -EFAULT;
66031@@ -730,9 +731,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
66032 long err;
66033 mm_segment_t oldfs;
66034 struct timespec tu;
66035- struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
66036+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
66037
66038- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
66039+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
66040 oldfs = get_fs();
66041 set_fs(KERNEL_DS);
66042 err = clock_nanosleep_restart(restart);
66043@@ -764,8 +765,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
66044 oldfs = get_fs();
66045 set_fs(KERNEL_DS);
66046 err = sys_clock_nanosleep(which_clock, flags,
66047- (struct timespec __user *) &in,
66048- (struct timespec __user *) &out);
66049+ (struct timespec __force_user *) &in,
66050+ (struct timespec __force_user *) &out);
66051 set_fs(oldfs);
66052
66053 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
66054diff --git a/kernel/configs.c b/kernel/configs.c
66055index 42e8fa0..9e7406b 100644
66056--- a/kernel/configs.c
66057+++ b/kernel/configs.c
66058@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
66059 struct proc_dir_entry *entry;
66060
66061 /* create the current config file */
66062+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
66063+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
66064+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
66065+ &ikconfig_file_ops);
66066+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66067+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
66068+ &ikconfig_file_ops);
66069+#endif
66070+#else
66071 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
66072 &ikconfig_file_ops);
66073+#endif
66074+
66075 if (!entry)
66076 return -ENOMEM;
66077
66078diff --git a/kernel/cred.c b/kernel/cred.c
66079index 48c6fd3..3342f00 100644
66080--- a/kernel/cred.c
66081+++ b/kernel/cred.c
66082@@ -204,6 +204,15 @@ void exit_creds(struct task_struct *tsk)
66083 validate_creds(cred);
66084 put_cred(cred);
66085 }
66086+
66087+#ifdef CONFIG_GRKERNSEC_SETXID
66088+ cred = (struct cred *) tsk->delayed_cred;
66089+ if (cred) {
66090+ tsk->delayed_cred = NULL;
66091+ validate_creds(cred);
66092+ put_cred(cred);
66093+ }
66094+#endif
66095 }
66096
66097 /**
66098@@ -472,7 +481,7 @@ error_put:
66099 * Always returns 0 thus allowing this function to be tail-called at the end
66100 * of, say, sys_setgid().
66101 */
66102-int commit_creds(struct cred *new)
66103+static int __commit_creds(struct cred *new)
66104 {
66105 struct task_struct *task = current;
66106 const struct cred *old = task->real_cred;
66107@@ -491,6 +500,8 @@ int commit_creds(struct cred *new)
66108
66109 get_cred(new); /* we will require a ref for the subj creds too */
66110
66111+ gr_set_role_label(task, new->uid, new->gid);
66112+
66113 /* dumpability changes */
66114 if (old->euid != new->euid ||
66115 old->egid != new->egid ||
66116@@ -540,6 +551,92 @@ int commit_creds(struct cred *new)
66117 put_cred(old);
66118 return 0;
66119 }
66120+#ifdef CONFIG_GRKERNSEC_SETXID
66121+extern int set_user(struct cred *new);
66122+
66123+void gr_delayed_cred_worker(void)
66124+{
66125+ const struct cred *new = current->delayed_cred;
66126+ struct cred *ncred;
66127+
66128+ current->delayed_cred = NULL;
66129+
66130+ if (current_uid() && new != NULL) {
66131+ // from doing get_cred on it when queueing this
66132+ put_cred(new);
66133+ return;
66134+ } else if (new == NULL)
66135+ return;
66136+
66137+ ncred = prepare_creds();
66138+ if (!ncred)
66139+ goto die;
66140+ // uids
66141+ ncred->uid = new->uid;
66142+ ncred->euid = new->euid;
66143+ ncred->suid = new->suid;
66144+ ncred->fsuid = new->fsuid;
66145+ // gids
66146+ ncred->gid = new->gid;
66147+ ncred->egid = new->egid;
66148+ ncred->sgid = new->sgid;
66149+ ncred->fsgid = new->fsgid;
66150+ // groups
66151+ if (set_groups(ncred, new->group_info) < 0) {
66152+ abort_creds(ncred);
66153+ goto die;
66154+ }
66155+ // caps
66156+ ncred->securebits = new->securebits;
66157+ ncred->cap_inheritable = new->cap_inheritable;
66158+ ncred->cap_permitted = new->cap_permitted;
66159+ ncred->cap_effective = new->cap_effective;
66160+ ncred->cap_bset = new->cap_bset;
66161+
66162+ if (set_user(ncred)) {
66163+ abort_creds(ncred);
66164+ goto die;
66165+ }
66166+
66167+ // from doing get_cred on it when queueing this
66168+ put_cred(new);
66169+
66170+ __commit_creds(ncred);
66171+ return;
66172+die:
66173+ // from doing get_cred on it when queueing this
66174+ put_cred(new);
66175+ do_group_exit(SIGKILL);
66176+}
66177+#endif
66178+
66179+int commit_creds(struct cred *new)
66180+{
66181+#ifdef CONFIG_GRKERNSEC_SETXID
66182+ struct task_struct *t;
66183+
66184+ /* we won't get called with tasklist_lock held for writing
66185+ and interrupts disabled as the cred struct in that case is
66186+ init_cred
66187+ */
66188+ if (grsec_enable_setxid && !current_is_single_threaded() &&
66189+ !current_uid() && new->uid) {
66190+ rcu_read_lock();
66191+ read_lock(&tasklist_lock);
66192+ for (t = next_thread(current); t != current;
66193+ t = next_thread(t)) {
66194+ if (t->delayed_cred == NULL) {
66195+ t->delayed_cred = get_cred(new);
66196+ set_tsk_need_resched(t);
66197+ }
66198+ }
66199+ read_unlock(&tasklist_lock);
66200+ rcu_read_unlock();
66201+ }
66202+#endif
66203+ return __commit_creds(new);
66204+}
66205+
66206 EXPORT_SYMBOL(commit_creds);
66207
66208 /**
66209diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
66210index 7fda904..59f620c 100644
66211--- a/kernel/debug/debug_core.c
66212+++ b/kernel/debug/debug_core.c
66213@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
66214 */
66215 static atomic_t masters_in_kgdb;
66216 static atomic_t slaves_in_kgdb;
66217-static atomic_t kgdb_break_tasklet_var;
66218+static atomic_unchecked_t kgdb_break_tasklet_var;
66219 atomic_t kgdb_setting_breakpoint;
66220
66221 struct task_struct *kgdb_usethread;
66222@@ -129,7 +129,7 @@ int kgdb_single_step;
66223 static pid_t kgdb_sstep_pid;
66224
66225 /* to keep track of the CPU which is doing the single stepping*/
66226-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
66227+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
66228
66229 /*
66230 * If you are debugging a problem where roundup (the collection of
66231@@ -537,7 +537,7 @@ return_normal:
66232 * kernel will only try for the value of sstep_tries before
66233 * giving up and continuing on.
66234 */
66235- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
66236+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
66237 (kgdb_info[cpu].task &&
66238 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
66239 atomic_set(&kgdb_active, -1);
66240@@ -631,8 +631,8 @@ cpu_master_loop:
66241 }
66242
66243 kgdb_restore:
66244- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
66245- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
66246+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
66247+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
66248 if (kgdb_info[sstep_cpu].task)
66249 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
66250 else
66251@@ -829,18 +829,18 @@ static void kgdb_unregister_callbacks(void)
66252 static void kgdb_tasklet_bpt(unsigned long ing)
66253 {
66254 kgdb_breakpoint();
66255- atomic_set(&kgdb_break_tasklet_var, 0);
66256+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
66257 }
66258
66259 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
66260
66261 void kgdb_schedule_breakpoint(void)
66262 {
66263- if (atomic_read(&kgdb_break_tasklet_var) ||
66264+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
66265 atomic_read(&kgdb_active) != -1 ||
66266 atomic_read(&kgdb_setting_breakpoint))
66267 return;
66268- atomic_inc(&kgdb_break_tasklet_var);
66269+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
66270 tasklet_schedule(&kgdb_tasklet_breakpoint);
66271 }
66272 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
66273diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
66274index e2ae734..08a4c5c 100644
66275--- a/kernel/debug/kdb/kdb_main.c
66276+++ b/kernel/debug/kdb/kdb_main.c
66277@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const char **argv)
66278 list_for_each_entry(mod, kdb_modules, list) {
66279
66280 kdb_printf("%-20s%8u 0x%p ", mod->name,
66281- mod->core_size, (void *)mod);
66282+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
66283 #ifdef CONFIG_MODULE_UNLOAD
66284 kdb_printf("%4ld ", module_refcount(mod));
66285 #endif
66286@@ -1990,7 +1990,7 @@ static int kdb_lsmod(int argc, const char **argv)
66287 kdb_printf(" (Loading)");
66288 else
66289 kdb_printf(" (Live)");
66290- kdb_printf(" 0x%p", mod->module_core);
66291+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
66292
66293 #ifdef CONFIG_MODULE_UNLOAD
66294 {
66295diff --git a/kernel/events/core.c b/kernel/events/core.c
66296index 1b5c081..c375f83 100644
66297--- a/kernel/events/core.c
66298+++ b/kernel/events/core.c
66299@@ -173,7 +173,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
66300 return 0;
66301 }
66302
66303-static atomic64_t perf_event_id;
66304+static atomic64_unchecked_t perf_event_id;
66305
66306 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
66307 enum event_type_t event_type);
66308@@ -2581,7 +2581,7 @@ static void __perf_event_read(void *info)
66309
66310 static inline u64 perf_event_count(struct perf_event *event)
66311 {
66312- return local64_read(&event->count) + atomic64_read(&event->child_count);
66313+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
66314 }
66315
66316 static u64 perf_event_read(struct perf_event *event)
66317@@ -2897,9 +2897,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
66318 mutex_lock(&event->child_mutex);
66319 total += perf_event_read(event);
66320 *enabled += event->total_time_enabled +
66321- atomic64_read(&event->child_total_time_enabled);
66322+ atomic64_read_unchecked(&event->child_total_time_enabled);
66323 *running += event->total_time_running +
66324- atomic64_read(&event->child_total_time_running);
66325+ atomic64_read_unchecked(&event->child_total_time_running);
66326
66327 list_for_each_entry(child, &event->child_list, child_list) {
66328 total += perf_event_read(child);
66329@@ -3306,10 +3306,10 @@ void perf_event_update_userpage(struct perf_event *event)
66330 userpg->offset -= local64_read(&event->hw.prev_count);
66331
66332 userpg->time_enabled = enabled +
66333- atomic64_read(&event->child_total_time_enabled);
66334+ atomic64_read_unchecked(&event->child_total_time_enabled);
66335
66336 userpg->time_running = running +
66337- atomic64_read(&event->child_total_time_running);
66338+ atomic64_read_unchecked(&event->child_total_time_running);
66339
66340 barrier();
66341 ++userpg->lock;
66342@@ -3738,11 +3738,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
66343 values[n++] = perf_event_count(event);
66344 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
66345 values[n++] = enabled +
66346- atomic64_read(&event->child_total_time_enabled);
66347+ atomic64_read_unchecked(&event->child_total_time_enabled);
66348 }
66349 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
66350 values[n++] = running +
66351- atomic64_read(&event->child_total_time_running);
66352+ atomic64_read_unchecked(&event->child_total_time_running);
66353 }
66354 if (read_format & PERF_FORMAT_ID)
66355 values[n++] = primary_event_id(event);
66356@@ -4393,12 +4393,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
66357 * need to add enough zero bytes after the string to handle
66358 * the 64bit alignment we do later.
66359 */
66360- buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
66361+ buf = kzalloc(PATH_MAX, GFP_KERNEL);
66362 if (!buf) {
66363 name = strncpy(tmp, "//enomem", sizeof(tmp));
66364 goto got_name;
66365 }
66366- name = d_path(&file->f_path, buf, PATH_MAX);
66367+ name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
66368 if (IS_ERR(name)) {
66369 name = strncpy(tmp, "//toolong", sizeof(tmp));
66370 goto got_name;
66371@@ -5765,7 +5765,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
66372 event->parent = parent_event;
66373
66374 event->ns = get_pid_ns(current->nsproxy->pid_ns);
66375- event->id = atomic64_inc_return(&perf_event_id);
66376+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
66377
66378 event->state = PERF_EVENT_STATE_INACTIVE;
66379
66380@@ -6287,10 +6287,10 @@ static void sync_child_event(struct perf_event *child_event,
66381 /*
66382 * Add back the child's count to the parent's count:
66383 */
66384- atomic64_add(child_val, &parent_event->child_count);
66385- atomic64_add(child_event->total_time_enabled,
66386+ atomic64_add_unchecked(child_val, &parent_event->child_count);
66387+ atomic64_add_unchecked(child_event->total_time_enabled,
66388 &parent_event->child_total_time_enabled);
66389- atomic64_add(child_event->total_time_running,
66390+ atomic64_add_unchecked(child_event->total_time_running,
66391 &parent_event->child_total_time_running);
66392
66393 /*
66394diff --git a/kernel/exit.c b/kernel/exit.c
66395index 46c8b14..d868958 100644
66396--- a/kernel/exit.c
66397+++ b/kernel/exit.c
66398@@ -58,6 +58,10 @@
66399 #include <asm/pgtable.h>
66400 #include <asm/mmu_context.h>
66401
66402+#ifdef CONFIG_GRKERNSEC
66403+extern rwlock_t grsec_exec_file_lock;
66404+#endif
66405+
66406 static void exit_mm(struct task_struct * tsk);
66407
66408 static void __unhash_process(struct task_struct *p, bool group_dead)
66409@@ -169,6 +173,10 @@ void release_task(struct task_struct * p)
66410 struct task_struct *leader;
66411 int zap_leader;
66412 repeat:
66413+#ifdef CONFIG_NET
66414+ gr_del_task_from_ip_table(p);
66415+#endif
66416+
66417 /* don't need to get the RCU readlock here - the process is dead and
66418 * can't be modifying its own credentials. But shut RCU-lockdep up */
66419 rcu_read_lock();
66420@@ -381,7 +389,7 @@ int allow_signal(int sig)
66421 * know it'll be handled, so that they don't get converted to
66422 * SIGKILL or just silently dropped.
66423 */
66424- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
66425+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
66426 recalc_sigpending();
66427 spin_unlock_irq(&current->sighand->siglock);
66428 return 0;
66429@@ -417,6 +425,17 @@ void daemonize(const char *name, ...)
66430 vsnprintf(current->comm, sizeof(current->comm), name, args);
66431 va_end(args);
66432
66433+#ifdef CONFIG_GRKERNSEC
66434+ write_lock(&grsec_exec_file_lock);
66435+ if (current->exec_file) {
66436+ fput(current->exec_file);
66437+ current->exec_file = NULL;
66438+ }
66439+ write_unlock(&grsec_exec_file_lock);
66440+#endif
66441+
66442+ gr_set_kernel_label(current);
66443+
66444 /*
66445 * If we were started as result of loading a module, close all of the
66446 * user space pages. We don't need them, and if we didn't close them
66447@@ -873,6 +892,8 @@ void do_exit(long code)
66448 struct task_struct *tsk = current;
66449 int group_dead;
66450
66451+ set_fs(USER_DS);
66452+
66453 profile_task_exit(tsk);
66454
66455 WARN_ON(blk_needs_flush_plug(tsk));
66456@@ -889,7 +910,6 @@ void do_exit(long code)
66457 * mm_release()->clear_child_tid() from writing to a user-controlled
66458 * kernel address.
66459 */
66460- set_fs(USER_DS);
66461
66462 ptrace_event(PTRACE_EVENT_EXIT, code);
66463
66464@@ -950,6 +970,9 @@ void do_exit(long code)
66465 tsk->exit_code = code;
66466 taskstats_exit(tsk, group_dead);
66467
66468+ gr_acl_handle_psacct(tsk, code);
66469+ gr_acl_handle_exit();
66470+
66471 exit_mm(tsk);
66472
66473 if (group_dead)
66474@@ -1066,7 +1089,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
66475 * Take down every thread in the group. This is called by fatal signals
66476 * as well as by sys_exit_group (below).
66477 */
66478-void
66479+__noreturn void
66480 do_group_exit(int exit_code)
66481 {
66482 struct signal_struct *sig = current->signal;
66483diff --git a/kernel/fork.c b/kernel/fork.c
66484index 26a7a67..a1053f9 100644
66485--- a/kernel/fork.c
66486+++ b/kernel/fork.c
66487@@ -284,7 +284,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
66488 *stackend = STACK_END_MAGIC; /* for overflow detection */
66489
66490 #ifdef CONFIG_CC_STACKPROTECTOR
66491- tsk->stack_canary = get_random_int();
66492+ tsk->stack_canary = pax_get_random_long();
66493 #endif
66494
66495 /*
66496@@ -308,13 +308,77 @@ out:
66497 }
66498
66499 #ifdef CONFIG_MMU
66500+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct vm_area_struct *mpnt)
66501+{
66502+ struct vm_area_struct *tmp;
66503+ unsigned long charge;
66504+ struct mempolicy *pol;
66505+ struct file *file;
66506+
66507+ charge = 0;
66508+ if (mpnt->vm_flags & VM_ACCOUNT) {
66509+ unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
66510+ if (security_vm_enough_memory(len))
66511+ goto fail_nomem;
66512+ charge = len;
66513+ }
66514+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
66515+ if (!tmp)
66516+ goto fail_nomem;
66517+ *tmp = *mpnt;
66518+ tmp->vm_mm = mm;
66519+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
66520+ pol = mpol_dup(vma_policy(mpnt));
66521+ if (IS_ERR(pol))
66522+ goto fail_nomem_policy;
66523+ vma_set_policy(tmp, pol);
66524+ if (anon_vma_fork(tmp, mpnt))
66525+ goto fail_nomem_anon_vma_fork;
66526+ tmp->vm_flags &= ~VM_LOCKED;
66527+ tmp->vm_next = tmp->vm_prev = NULL;
66528+ tmp->vm_mirror = NULL;
66529+ file = tmp->vm_file;
66530+ if (file) {
66531+ struct inode *inode = file->f_path.dentry->d_inode;
66532+ struct address_space *mapping = file->f_mapping;
66533+
66534+ get_file(file);
66535+ if (tmp->vm_flags & VM_DENYWRITE)
66536+ atomic_dec(&inode->i_writecount);
66537+ mutex_lock(&mapping->i_mmap_mutex);
66538+ if (tmp->vm_flags & VM_SHARED)
66539+ mapping->i_mmap_writable++;
66540+ flush_dcache_mmap_lock(mapping);
66541+ /* insert tmp into the share list, just after mpnt */
66542+ vma_prio_tree_add(tmp, mpnt);
66543+ flush_dcache_mmap_unlock(mapping);
66544+ mutex_unlock(&mapping->i_mmap_mutex);
66545+ }
66546+
66547+ /*
66548+ * Clear hugetlb-related page reserves for children. This only
66549+ * affects MAP_PRIVATE mappings. Faults generated by the child
66550+ * are not guaranteed to succeed, even if read-only
66551+ */
66552+ if (is_vm_hugetlb_page(tmp))
66553+ reset_vma_resv_huge_pages(tmp);
66554+
66555+ return tmp;
66556+
66557+fail_nomem_anon_vma_fork:
66558+ mpol_put(pol);
66559+fail_nomem_policy:
66560+ kmem_cache_free(vm_area_cachep, tmp);
66561+fail_nomem:
66562+ vm_unacct_memory(charge);
66563+ return NULL;
66564+}
66565+
66566 static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66567 {
66568 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
66569 struct rb_node **rb_link, *rb_parent;
66570 int retval;
66571- unsigned long charge;
66572- struct mempolicy *pol;
66573
66574 down_write(&oldmm->mmap_sem);
66575 flush_cache_dup_mm(oldmm);
66576@@ -326,8 +390,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66577 mm->locked_vm = 0;
66578 mm->mmap = NULL;
66579 mm->mmap_cache = NULL;
66580- mm->free_area_cache = oldmm->mmap_base;
66581- mm->cached_hole_size = ~0UL;
66582+ mm->free_area_cache = oldmm->free_area_cache;
66583+ mm->cached_hole_size = oldmm->cached_hole_size;
66584 mm->map_count = 0;
66585 cpumask_clear(mm_cpumask(mm));
66586 mm->mm_rb = RB_ROOT;
66587@@ -343,8 +407,6 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66588
66589 prev = NULL;
66590 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
66591- struct file *file;
66592-
66593 if (mpnt->vm_flags & VM_DONTCOPY) {
66594 long pages = vma_pages(mpnt);
66595 mm->total_vm -= pages;
66596@@ -352,53 +414,11 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66597 -pages);
66598 continue;
66599 }
66600- charge = 0;
66601- if (mpnt->vm_flags & VM_ACCOUNT) {
66602- unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
66603- if (security_vm_enough_memory(len))
66604- goto fail_nomem;
66605- charge = len;
66606+ tmp = dup_vma(mm, mpnt);
66607+ if (!tmp) {
66608+ retval = -ENOMEM;
66609+ goto out;
66610 }
66611- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
66612- if (!tmp)
66613- goto fail_nomem;
66614- *tmp = *mpnt;
66615- INIT_LIST_HEAD(&tmp->anon_vma_chain);
66616- pol = mpol_dup(vma_policy(mpnt));
66617- retval = PTR_ERR(pol);
66618- if (IS_ERR(pol))
66619- goto fail_nomem_policy;
66620- vma_set_policy(tmp, pol);
66621- tmp->vm_mm = mm;
66622- if (anon_vma_fork(tmp, mpnt))
66623- goto fail_nomem_anon_vma_fork;
66624- tmp->vm_flags &= ~VM_LOCKED;
66625- tmp->vm_next = tmp->vm_prev = NULL;
66626- file = tmp->vm_file;
66627- if (file) {
66628- struct inode *inode = file->f_path.dentry->d_inode;
66629- struct address_space *mapping = file->f_mapping;
66630-
66631- get_file(file);
66632- if (tmp->vm_flags & VM_DENYWRITE)
66633- atomic_dec(&inode->i_writecount);
66634- mutex_lock(&mapping->i_mmap_mutex);
66635- if (tmp->vm_flags & VM_SHARED)
66636- mapping->i_mmap_writable++;
66637- flush_dcache_mmap_lock(mapping);
66638- /* insert tmp into the share list, just after mpnt */
66639- vma_prio_tree_add(tmp, mpnt);
66640- flush_dcache_mmap_unlock(mapping);
66641- mutex_unlock(&mapping->i_mmap_mutex);
66642- }
66643-
66644- /*
66645- * Clear hugetlb-related page reserves for children. This only
66646- * affects MAP_PRIVATE mappings. Faults generated by the child
66647- * are not guaranteed to succeed, even if read-only
66648- */
66649- if (is_vm_hugetlb_page(tmp))
66650- reset_vma_resv_huge_pages(tmp);
66651
66652 /*
66653 * Link in the new vma and copy the page table entries.
66654@@ -421,6 +441,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66655 if (retval)
66656 goto out;
66657 }
66658+
66659+#ifdef CONFIG_PAX_SEGMEXEC
66660+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
66661+ struct vm_area_struct *mpnt_m;
66662+
66663+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
66664+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
66665+
66666+ if (!mpnt->vm_mirror)
66667+ continue;
66668+
66669+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
66670+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
66671+ mpnt->vm_mirror = mpnt_m;
66672+ } else {
66673+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
66674+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
66675+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
66676+ mpnt->vm_mirror->vm_mirror = mpnt;
66677+ }
66678+ }
66679+ BUG_ON(mpnt_m);
66680+ }
66681+#endif
66682+
66683 /* a new mm has just been created */
66684 arch_dup_mmap(oldmm, mm);
66685 retval = 0;
66686@@ -429,14 +474,6 @@ out:
66687 flush_tlb_mm(oldmm);
66688 up_write(&oldmm->mmap_sem);
66689 return retval;
66690-fail_nomem_anon_vma_fork:
66691- mpol_put(pol);
66692-fail_nomem_policy:
66693- kmem_cache_free(vm_area_cachep, tmp);
66694-fail_nomem:
66695- retval = -ENOMEM;
66696- vm_unacct_memory(charge);
66697- goto out;
66698 }
66699
66700 static inline int mm_alloc_pgd(struct mm_struct *mm)
66701@@ -658,8 +695,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
66702 return ERR_PTR(err);
66703
66704 mm = get_task_mm(task);
66705- if (mm && mm != current->mm &&
66706- !ptrace_may_access(task, mode)) {
66707+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
66708+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
66709 mmput(mm);
66710 mm = ERR_PTR(-EACCES);
66711 }
66712@@ -881,13 +918,14 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
66713 spin_unlock(&fs->lock);
66714 return -EAGAIN;
66715 }
66716- fs->users++;
66717+ atomic_inc(&fs->users);
66718 spin_unlock(&fs->lock);
66719 return 0;
66720 }
66721 tsk->fs = copy_fs_struct(fs);
66722 if (!tsk->fs)
66723 return -ENOMEM;
66724+ gr_set_chroot_entries(tsk, &tsk->fs->root);
66725 return 0;
66726 }
66727
66728@@ -1151,6 +1189,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
66729 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
66730 #endif
66731 retval = -EAGAIN;
66732+
66733+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
66734+
66735 if (atomic_read(&p->real_cred->user->processes) >=
66736 task_rlimit(p, RLIMIT_NPROC)) {
66737 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
66738@@ -1306,6 +1347,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
66739 if (clone_flags & CLONE_THREAD)
66740 p->tgid = current->tgid;
66741
66742+ gr_copy_label(p);
66743+
66744 p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
66745 /*
66746 * Clear TID on mm_release()?
66747@@ -1472,6 +1515,8 @@ bad_fork_cleanup_count:
66748 bad_fork_free:
66749 free_task(p);
66750 fork_out:
66751+ gr_log_forkfail(retval);
66752+
66753 return ERR_PTR(retval);
66754 }
66755
66756@@ -1572,6 +1617,8 @@ long do_fork(unsigned long clone_flags,
66757 if (clone_flags & CLONE_PARENT_SETTID)
66758 put_user(nr, parent_tidptr);
66759
66760+ gr_handle_brute_check();
66761+
66762 if (clone_flags & CLONE_VFORK) {
66763 p->vfork_done = &vfork;
66764 init_completion(&vfork);
66765@@ -1670,7 +1717,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
66766 return 0;
66767
66768 /* don't need lock here; in the worst case we'll do useless copy */
66769- if (fs->users == 1)
66770+ if (atomic_read(&fs->users) == 1)
66771 return 0;
66772
66773 *new_fsp = copy_fs_struct(fs);
66774@@ -1759,7 +1806,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
66775 fs = current->fs;
66776 spin_lock(&fs->lock);
66777 current->fs = new_fs;
66778- if (--fs->users)
66779+ gr_set_chroot_entries(current, &current->fs->root);
66780+ if (atomic_dec_return(&fs->users))
66781 new_fs = NULL;
66782 else
66783 new_fs = fs;
66784diff --git a/kernel/futex.c b/kernel/futex.c
66785index 866c9d5..5c5f828 100644
66786--- a/kernel/futex.c
66787+++ b/kernel/futex.c
66788@@ -54,6 +54,7 @@
66789 #include <linux/mount.h>
66790 #include <linux/pagemap.h>
66791 #include <linux/syscalls.h>
66792+#include <linux/ptrace.h>
66793 #include <linux/signal.h>
66794 #include <linux/export.h>
66795 #include <linux/magic.h>
66796@@ -239,6 +240,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
66797 struct page *page, *page_head;
66798 int err, ro = 0;
66799
66800+#ifdef CONFIG_PAX_SEGMEXEC
66801+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
66802+ return -EFAULT;
66803+#endif
66804+
66805 /*
66806 * The futex address must be "naturally" aligned.
66807 */
66808@@ -2721,6 +2727,7 @@ static int __init futex_init(void)
66809 {
66810 u32 curval;
66811 int i;
66812+ mm_segment_t oldfs;
66813
66814 /*
66815 * This will fail and we want it. Some arch implementations do
66816@@ -2732,8 +2739,11 @@ static int __init futex_init(void)
66817 * implementation, the non-functional ones will return
66818 * -ENOSYS.
66819 */
66820+ oldfs = get_fs();
66821+ set_fs(USER_DS);
66822 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
66823 futex_cmpxchg_enabled = 1;
66824+ set_fs(oldfs);
66825
66826 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
66827 plist_head_init(&futex_queues[i].chain);
66828diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
66829index 9b22d03..6295b62 100644
66830--- a/kernel/gcov/base.c
66831+++ b/kernel/gcov/base.c
66832@@ -102,11 +102,6 @@ void gcov_enable_events(void)
66833 }
66834
66835 #ifdef CONFIG_MODULES
66836-static inline int within(void *addr, void *start, unsigned long size)
66837-{
66838- return ((addr >= start) && (addr < start + size));
66839-}
66840-
66841 /* Update list and generate events when modules are unloaded. */
66842 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
66843 void *data)
66844@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
66845 prev = NULL;
66846 /* Remove entries located in module from linked list. */
66847 for (info = gcov_info_head; info; info = info->next) {
66848- if (within(info, mod->module_core, mod->core_size)) {
66849+ if (within_module_core_rw((unsigned long)info, mod)) {
66850 if (prev)
66851 prev->next = info->next;
66852 else
66853diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
66854index ae34bf5..4e2f3d0 100644
66855--- a/kernel/hrtimer.c
66856+++ b/kernel/hrtimer.c
66857@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
66858 local_irq_restore(flags);
66859 }
66860
66861-static void run_hrtimer_softirq(struct softirq_action *h)
66862+static void run_hrtimer_softirq(void)
66863 {
66864 hrtimer_peek_ahead_timers();
66865 }
66866diff --git a/kernel/jump_label.c b/kernel/jump_label.c
66867index 01d3b70..9e4d098 100644
66868--- a/kernel/jump_label.c
66869+++ b/kernel/jump_label.c
66870@@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
66871
66872 size = (((unsigned long)stop - (unsigned long)start)
66873 / sizeof(struct jump_entry));
66874+ pax_open_kernel();
66875 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
66876+ pax_close_kernel();
66877 }
66878
66879 static void jump_label_update(struct jump_label_key *key, int enable);
66880@@ -340,10 +342,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
66881 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
66882 struct jump_entry *iter;
66883
66884+ pax_open_kernel();
66885 for (iter = iter_start; iter < iter_stop; iter++) {
66886 if (within_module_init(iter->code, mod))
66887 iter->code = 0;
66888 }
66889+ pax_close_kernel();
66890 }
66891
66892 static int
66893diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
66894index 079f1d3..a407562 100644
66895--- a/kernel/kallsyms.c
66896+++ b/kernel/kallsyms.c
66897@@ -11,6 +11,9 @@
66898 * Changed the compression method from stem compression to "table lookup"
66899 * compression (see scripts/kallsyms.c for a more complete description)
66900 */
66901+#ifdef CONFIG_GRKERNSEC_HIDESYM
66902+#define __INCLUDED_BY_HIDESYM 1
66903+#endif
66904 #include <linux/kallsyms.h>
66905 #include <linux/module.h>
66906 #include <linux/init.h>
66907@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
66908
66909 static inline int is_kernel_inittext(unsigned long addr)
66910 {
66911+ if (system_state != SYSTEM_BOOTING)
66912+ return 0;
66913+
66914 if (addr >= (unsigned long)_sinittext
66915 && addr <= (unsigned long)_einittext)
66916 return 1;
66917 return 0;
66918 }
66919
66920+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66921+#ifdef CONFIG_MODULES
66922+static inline int is_module_text(unsigned long addr)
66923+{
66924+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
66925+ return 1;
66926+
66927+ addr = ktla_ktva(addr);
66928+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
66929+}
66930+#else
66931+static inline int is_module_text(unsigned long addr)
66932+{
66933+ return 0;
66934+}
66935+#endif
66936+#endif
66937+
66938 static inline int is_kernel_text(unsigned long addr)
66939 {
66940 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
66941@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
66942
66943 static inline int is_kernel(unsigned long addr)
66944 {
66945+
66946+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66947+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
66948+ return 1;
66949+
66950+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
66951+#else
66952 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
66953+#endif
66954+
66955 return 1;
66956 return in_gate_area_no_mm(addr);
66957 }
66958
66959 static int is_ksym_addr(unsigned long addr)
66960 {
66961+
66962+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66963+ if (is_module_text(addr))
66964+ return 0;
66965+#endif
66966+
66967 if (all_var)
66968 return is_kernel(addr);
66969
66970@@ -454,7 +493,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
66971
66972 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
66973 {
66974- iter->name[0] = '\0';
66975 iter->nameoff = get_symbol_offset(new_pos);
66976 iter->pos = new_pos;
66977 }
66978@@ -502,6 +540,11 @@ static int s_show(struct seq_file *m, void *p)
66979 {
66980 struct kallsym_iter *iter = m->private;
66981
66982+#ifdef CONFIG_GRKERNSEC_HIDESYM
66983+ if (current_uid())
66984+ return 0;
66985+#endif
66986+
66987 /* Some debugging symbols have no name. Ignore them. */
66988 if (!iter->name[0])
66989 return 0;
66990@@ -540,7 +583,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
66991 struct kallsym_iter *iter;
66992 int ret;
66993
66994- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
66995+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
66996 if (!iter)
66997 return -ENOMEM;
66998 reset_iter(iter, 0);
66999diff --git a/kernel/kexec.c b/kernel/kexec.c
67000index 7b08867..3bac516 100644
67001--- a/kernel/kexec.c
67002+++ b/kernel/kexec.c
67003@@ -1047,7 +1047,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
67004 unsigned long flags)
67005 {
67006 struct compat_kexec_segment in;
67007- struct kexec_segment out, __user *ksegments;
67008+ struct kexec_segment out;
67009+ struct kexec_segment __user *ksegments;
67010 unsigned long i, result;
67011
67012 /* Don't allow clients that don't understand the native
67013diff --git a/kernel/kmod.c b/kernel/kmod.c
67014index a3a46cb..f2e42f8 100644
67015--- a/kernel/kmod.c
67016+++ b/kernel/kmod.c
67017@@ -75,13 +75,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe";
67018 * If module auto-loading support is disabled then this function
67019 * becomes a no-operation.
67020 */
67021-int __request_module(bool wait, const char *fmt, ...)
67022+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
67023 {
67024- va_list args;
67025 char module_name[MODULE_NAME_LEN];
67026 unsigned int max_modprobes;
67027 int ret;
67028- char *argv[] = { modprobe_path, "-q", "--", module_name, NULL };
67029+ char *argv[] = { modprobe_path, "-q", "--", module_name, module_param, NULL };
67030 static char *envp[] = { "HOME=/",
67031 "TERM=linux",
67032 "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
67033@@ -90,9 +89,7 @@ int __request_module(bool wait, const char *fmt, ...)
67034 #define MAX_KMOD_CONCURRENT 50 /* Completely arbitrary value - KAO */
67035 static int kmod_loop_msg;
67036
67037- va_start(args, fmt);
67038- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
67039- va_end(args);
67040+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
67041 if (ret >= MODULE_NAME_LEN)
67042 return -ENAMETOOLONG;
67043
67044@@ -100,6 +97,20 @@ int __request_module(bool wait, const char *fmt, ...)
67045 if (ret)
67046 return ret;
67047
67048+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67049+ if (!current_uid()) {
67050+ /* hack to workaround consolekit/udisks stupidity */
67051+ read_lock(&tasklist_lock);
67052+ if (!strcmp(current->comm, "mount") &&
67053+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
67054+ read_unlock(&tasklist_lock);
67055+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
67056+ return -EPERM;
67057+ }
67058+ read_unlock(&tasklist_lock);
67059+ }
67060+#endif
67061+
67062 /* If modprobe needs a service that is in a module, we get a recursive
67063 * loop. Limit the number of running kmod threads to max_threads/2 or
67064 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
67065@@ -135,6 +146,47 @@ int __request_module(bool wait, const char *fmt, ...)
67066 atomic_dec(&kmod_concurrent);
67067 return ret;
67068 }
67069+
67070+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
67071+{
67072+ va_list args;
67073+ int ret;
67074+
67075+ va_start(args, fmt);
67076+ ret = ____request_module(wait, module_param, fmt, args);
67077+ va_end(args);
67078+
67079+ return ret;
67080+}
67081+
67082+int __request_module(bool wait, const char *fmt, ...)
67083+{
67084+ va_list args;
67085+ int ret;
67086+
67087+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67088+ if (current_uid()) {
67089+ char module_param[MODULE_NAME_LEN];
67090+
67091+ memset(module_param, 0, sizeof(module_param));
67092+
67093+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", current_uid());
67094+
67095+ va_start(args, fmt);
67096+ ret = ____request_module(wait, module_param, fmt, args);
67097+ va_end(args);
67098+
67099+ return ret;
67100+ }
67101+#endif
67102+
67103+ va_start(args, fmt);
67104+ ret = ____request_module(wait, NULL, fmt, args);
67105+ va_end(args);
67106+
67107+ return ret;
67108+}
67109+
67110 EXPORT_SYMBOL(__request_module);
67111 #endif /* CONFIG_MODULES */
67112
67113@@ -224,7 +276,7 @@ static int wait_for_helper(void *data)
67114 *
67115 * Thus the __user pointer cast is valid here.
67116 */
67117- sys_wait4(pid, (int __user *)&ret, 0, NULL);
67118+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
67119
67120 /*
67121 * If ret is 0, either ____call_usermodehelper failed and the
67122diff --git a/kernel/kprobes.c b/kernel/kprobes.c
67123index c62b854..cb67968 100644
67124--- a/kernel/kprobes.c
67125+++ b/kernel/kprobes.c
67126@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
67127 * kernel image and loaded module images reside. This is required
67128 * so x86_64 can correctly handle the %rip-relative fixups.
67129 */
67130- kip->insns = module_alloc(PAGE_SIZE);
67131+ kip->insns = module_alloc_exec(PAGE_SIZE);
67132 if (!kip->insns) {
67133 kfree(kip);
67134 return NULL;
67135@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
67136 */
67137 if (!list_is_singular(&kip->list)) {
67138 list_del(&kip->list);
67139- module_free(NULL, kip->insns);
67140+ module_free_exec(NULL, kip->insns);
67141 kfree(kip);
67142 }
67143 return 1;
67144@@ -1955,7 +1955,7 @@ static int __init init_kprobes(void)
67145 {
67146 int i, err = 0;
67147 unsigned long offset = 0, size = 0;
67148- char *modname, namebuf[128];
67149+ char *modname, namebuf[KSYM_NAME_LEN];
67150 const char *symbol_name;
67151 void *addr;
67152 struct kprobe_blackpoint *kb;
67153@@ -2081,7 +2081,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
67154 const char *sym = NULL;
67155 unsigned int i = *(loff_t *) v;
67156 unsigned long offset = 0;
67157- char *modname, namebuf[128];
67158+ char *modname, namebuf[KSYM_NAME_LEN];
67159
67160 head = &kprobe_table[i];
67161 preempt_disable();
67162diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
67163index 4e316e1..5501eef 100644
67164--- a/kernel/ksysfs.c
67165+++ b/kernel/ksysfs.c
67166@@ -47,6 +47,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
67167 {
67168 if (count+1 > UEVENT_HELPER_PATH_LEN)
67169 return -ENOENT;
67170+ if (!capable(CAP_SYS_ADMIN))
67171+ return -EPERM;
67172 memcpy(uevent_helper, buf, count);
67173 uevent_helper[count] = '\0';
67174 if (count && uevent_helper[count-1] == '\n')
67175diff --git a/kernel/lockdep.c b/kernel/lockdep.c
67176index 8889f7d..95319b7 100644
67177--- a/kernel/lockdep.c
67178+++ b/kernel/lockdep.c
67179@@ -590,6 +590,10 @@ static int static_obj(void *obj)
67180 end = (unsigned long) &_end,
67181 addr = (unsigned long) obj;
67182
67183+#ifdef CONFIG_PAX_KERNEXEC
67184+ start = ktla_ktva(start);
67185+#endif
67186+
67187 /*
67188 * static variable?
67189 */
67190@@ -730,6 +734,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
67191 if (!static_obj(lock->key)) {
67192 debug_locks_off();
67193 printk("INFO: trying to register non-static key.\n");
67194+ printk("lock:%pS key:%pS.\n", lock, lock->key);
67195 printk("the code is fine but needs lockdep annotation.\n");
67196 printk("turning off the locking correctness validator.\n");
67197 dump_stack();
67198@@ -3042,7 +3047,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
67199 if (!class)
67200 return 0;
67201 }
67202- atomic_inc((atomic_t *)&class->ops);
67203+ atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
67204 if (very_verbose(class)) {
67205 printk("\nacquire class [%p] %s", class->key, class->name);
67206 if (class->name_version > 1)
67207diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
67208index 91c32a0..b2c71c5 100644
67209--- a/kernel/lockdep_proc.c
67210+++ b/kernel/lockdep_proc.c
67211@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
67212
67213 static void print_name(struct seq_file *m, struct lock_class *class)
67214 {
67215- char str[128];
67216+ char str[KSYM_NAME_LEN];
67217 const char *name = class->name;
67218
67219 if (!name) {
67220diff --git a/kernel/module.c b/kernel/module.c
67221index 3d56b6f..2a22bd0 100644
67222--- a/kernel/module.c
67223+++ b/kernel/module.c
67224@@ -58,6 +58,7 @@
67225 #include <linux/jump_label.h>
67226 #include <linux/pfn.h>
67227 #include <linux/bsearch.h>
67228+#include <linux/grsecurity.h>
67229
67230 #define CREATE_TRACE_POINTS
67231 #include <trace/events/module.h>
67232@@ -113,7 +114,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
67233
67234 /* Bounds of module allocation, for speeding __module_address.
67235 * Protected by module_mutex. */
67236-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
67237+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
67238+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
67239
67240 int register_module_notifier(struct notifier_block * nb)
67241 {
67242@@ -277,7 +279,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
67243 return true;
67244
67245 list_for_each_entry_rcu(mod, &modules, list) {
67246- struct symsearch arr[] = {
67247+ struct symsearch modarr[] = {
67248 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
67249 NOT_GPL_ONLY, false },
67250 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
67251@@ -299,7 +301,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
67252 #endif
67253 };
67254
67255- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
67256+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
67257 return true;
67258 }
67259 return false;
67260@@ -431,7 +433,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
67261 static int percpu_modalloc(struct module *mod,
67262 unsigned long size, unsigned long align)
67263 {
67264- if (align > PAGE_SIZE) {
67265+ if (align-1 >= PAGE_SIZE) {
67266 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
67267 mod->name, align, PAGE_SIZE);
67268 align = PAGE_SIZE;
67269@@ -1001,7 +1003,7 @@ struct module_attribute module_uevent =
67270 static ssize_t show_coresize(struct module_attribute *mattr,
67271 struct module_kobject *mk, char *buffer)
67272 {
67273- return sprintf(buffer, "%u\n", mk->mod->core_size);
67274+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
67275 }
67276
67277 static struct module_attribute modinfo_coresize =
67278@@ -1010,7 +1012,7 @@ static struct module_attribute modinfo_coresize =
67279 static ssize_t show_initsize(struct module_attribute *mattr,
67280 struct module_kobject *mk, char *buffer)
67281 {
67282- return sprintf(buffer, "%u\n", mk->mod->init_size);
67283+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
67284 }
67285
67286 static struct module_attribute modinfo_initsize =
67287@@ -1224,7 +1226,7 @@ resolve_symbol_wait(struct module *mod,
67288 */
67289 #ifdef CONFIG_SYSFS
67290
67291-#ifdef CONFIG_KALLSYMS
67292+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
67293 static inline bool sect_empty(const Elf_Shdr *sect)
67294 {
67295 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
67296@@ -1690,21 +1692,21 @@ static void set_section_ro_nx(void *base,
67297
67298 static void unset_module_core_ro_nx(struct module *mod)
67299 {
67300- set_page_attributes(mod->module_core + mod->core_text_size,
67301- mod->module_core + mod->core_size,
67302+ set_page_attributes(mod->module_core_rw,
67303+ mod->module_core_rw + mod->core_size_rw,
67304 set_memory_x);
67305- set_page_attributes(mod->module_core,
67306- mod->module_core + mod->core_ro_size,
67307+ set_page_attributes(mod->module_core_rx,
67308+ mod->module_core_rx + mod->core_size_rx,
67309 set_memory_rw);
67310 }
67311
67312 static void unset_module_init_ro_nx(struct module *mod)
67313 {
67314- set_page_attributes(mod->module_init + mod->init_text_size,
67315- mod->module_init + mod->init_size,
67316+ set_page_attributes(mod->module_init_rw,
67317+ mod->module_init_rw + mod->init_size_rw,
67318 set_memory_x);
67319- set_page_attributes(mod->module_init,
67320- mod->module_init + mod->init_ro_size,
67321+ set_page_attributes(mod->module_init_rx,
67322+ mod->module_init_rx + mod->init_size_rx,
67323 set_memory_rw);
67324 }
67325
67326@@ -1715,14 +1717,14 @@ void set_all_modules_text_rw(void)
67327
67328 mutex_lock(&module_mutex);
67329 list_for_each_entry_rcu(mod, &modules, list) {
67330- if ((mod->module_core) && (mod->core_text_size)) {
67331- set_page_attributes(mod->module_core,
67332- mod->module_core + mod->core_text_size,
67333+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
67334+ set_page_attributes(mod->module_core_rx,
67335+ mod->module_core_rx + mod->core_size_rx,
67336 set_memory_rw);
67337 }
67338- if ((mod->module_init) && (mod->init_text_size)) {
67339- set_page_attributes(mod->module_init,
67340- mod->module_init + mod->init_text_size,
67341+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
67342+ set_page_attributes(mod->module_init_rx,
67343+ mod->module_init_rx + mod->init_size_rx,
67344 set_memory_rw);
67345 }
67346 }
67347@@ -1736,14 +1738,14 @@ void set_all_modules_text_ro(void)
67348
67349 mutex_lock(&module_mutex);
67350 list_for_each_entry_rcu(mod, &modules, list) {
67351- if ((mod->module_core) && (mod->core_text_size)) {
67352- set_page_attributes(mod->module_core,
67353- mod->module_core + mod->core_text_size,
67354+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
67355+ set_page_attributes(mod->module_core_rx,
67356+ mod->module_core_rx + mod->core_size_rx,
67357 set_memory_ro);
67358 }
67359- if ((mod->module_init) && (mod->init_text_size)) {
67360- set_page_attributes(mod->module_init,
67361- mod->module_init + mod->init_text_size,
67362+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
67363+ set_page_attributes(mod->module_init_rx,
67364+ mod->module_init_rx + mod->init_size_rx,
67365 set_memory_ro);
67366 }
67367 }
67368@@ -1789,16 +1791,19 @@ static void free_module(struct module *mod)
67369
67370 /* This may be NULL, but that's OK */
67371 unset_module_init_ro_nx(mod);
67372- module_free(mod, mod->module_init);
67373+ module_free(mod, mod->module_init_rw);
67374+ module_free_exec(mod, mod->module_init_rx);
67375 kfree(mod->args);
67376 percpu_modfree(mod);
67377
67378 /* Free lock-classes: */
67379- lockdep_free_key_range(mod->module_core, mod->core_size);
67380+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
67381+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
67382
67383 /* Finally, free the core (containing the module structure) */
67384 unset_module_core_ro_nx(mod);
67385- module_free(mod, mod->module_core);
67386+ module_free_exec(mod, mod->module_core_rx);
67387+ module_free(mod, mod->module_core_rw);
67388
67389 #ifdef CONFIG_MPU
67390 update_protections(current->mm);
67391@@ -1867,10 +1872,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67392 unsigned int i;
67393 int ret = 0;
67394 const struct kernel_symbol *ksym;
67395+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67396+ int is_fs_load = 0;
67397+ int register_filesystem_found = 0;
67398+ char *p;
67399+
67400+ p = strstr(mod->args, "grsec_modharden_fs");
67401+ if (p) {
67402+ char *endptr = p + strlen("grsec_modharden_fs");
67403+ /* copy \0 as well */
67404+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
67405+ is_fs_load = 1;
67406+ }
67407+#endif
67408
67409 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
67410 const char *name = info->strtab + sym[i].st_name;
67411
67412+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67413+ /* it's a real shame this will never get ripped and copied
67414+ upstream! ;(
67415+ */
67416+ if (is_fs_load && !strcmp(name, "register_filesystem"))
67417+ register_filesystem_found = 1;
67418+#endif
67419+
67420 switch (sym[i].st_shndx) {
67421 case SHN_COMMON:
67422 /* We compiled with -fno-common. These are not
67423@@ -1891,7 +1917,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67424 ksym = resolve_symbol_wait(mod, info, name);
67425 /* Ok if resolved. */
67426 if (ksym && !IS_ERR(ksym)) {
67427+ pax_open_kernel();
67428 sym[i].st_value = ksym->value;
67429+ pax_close_kernel();
67430 break;
67431 }
67432
67433@@ -1910,11 +1938,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67434 secbase = (unsigned long)mod_percpu(mod);
67435 else
67436 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
67437+ pax_open_kernel();
67438 sym[i].st_value += secbase;
67439+ pax_close_kernel();
67440 break;
67441 }
67442 }
67443
67444+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67445+ if (is_fs_load && !register_filesystem_found) {
67446+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
67447+ ret = -EPERM;
67448+ }
67449+#endif
67450+
67451 return ret;
67452 }
67453
67454@@ -2018,22 +2055,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
67455 || s->sh_entsize != ~0UL
67456 || strstarts(sname, ".init"))
67457 continue;
67458- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
67459+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67460+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
67461+ else
67462+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
67463 pr_debug("\t%s\n", sname);
67464 }
67465- switch (m) {
67466- case 0: /* executable */
67467- mod->core_size = debug_align(mod->core_size);
67468- mod->core_text_size = mod->core_size;
67469- break;
67470- case 1: /* RO: text and ro-data */
67471- mod->core_size = debug_align(mod->core_size);
67472- mod->core_ro_size = mod->core_size;
67473- break;
67474- case 3: /* whole core */
67475- mod->core_size = debug_align(mod->core_size);
67476- break;
67477- }
67478 }
67479
67480 pr_debug("Init section allocation order:\n");
67481@@ -2047,23 +2074,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
67482 || s->sh_entsize != ~0UL
67483 || !strstarts(sname, ".init"))
67484 continue;
67485- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
67486- | INIT_OFFSET_MASK);
67487+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67488+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
67489+ else
67490+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
67491+ s->sh_entsize |= INIT_OFFSET_MASK;
67492 pr_debug("\t%s\n", sname);
67493 }
67494- switch (m) {
67495- case 0: /* executable */
67496- mod->init_size = debug_align(mod->init_size);
67497- mod->init_text_size = mod->init_size;
67498- break;
67499- case 1: /* RO: text and ro-data */
67500- mod->init_size = debug_align(mod->init_size);
67501- mod->init_ro_size = mod->init_size;
67502- break;
67503- case 3: /* whole init */
67504- mod->init_size = debug_align(mod->init_size);
67505- break;
67506- }
67507 }
67508 }
67509
67510@@ -2235,7 +2252,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
67511
67512 /* Put symbol section at end of init part of module. */
67513 symsect->sh_flags |= SHF_ALLOC;
67514- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
67515+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
67516 info->index.sym) | INIT_OFFSET_MASK;
67517 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
67518
67519@@ -2250,13 +2267,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
67520 }
67521
67522 /* Append room for core symbols at end of core part. */
67523- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
67524- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
67525- mod->core_size += strtab_size;
67526+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
67527+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
67528+ mod->core_size_rx += strtab_size;
67529
67530 /* Put string table section at end of init part of module. */
67531 strsect->sh_flags |= SHF_ALLOC;
67532- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
67533+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
67534 info->index.str) | INIT_OFFSET_MASK;
67535 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
67536 }
67537@@ -2274,12 +2291,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
67538 /* Make sure we get permanent strtab: don't use info->strtab. */
67539 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
67540
67541+ pax_open_kernel();
67542+
67543 /* Set types up while we still have access to sections. */
67544 for (i = 0; i < mod->num_symtab; i++)
67545 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
67546
67547- mod->core_symtab = dst = mod->module_core + info->symoffs;
67548- mod->core_strtab = s = mod->module_core + info->stroffs;
67549+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
67550+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
67551 src = mod->symtab;
67552 *dst = *src;
67553 *s++ = 0;
67554@@ -2292,6 +2311,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
67555 s += strlcpy(s, &mod->strtab[src->st_name], KSYM_NAME_LEN) + 1;
67556 }
67557 mod->core_num_syms = ndst;
67558+
67559+ pax_close_kernel();
67560 }
67561 #else
67562 static inline void layout_symtab(struct module *mod, struct load_info *info)
67563@@ -2325,17 +2346,33 @@ void * __weak module_alloc(unsigned long size)
67564 return size == 0 ? NULL : vmalloc_exec(size);
67565 }
67566
67567-static void *module_alloc_update_bounds(unsigned long size)
67568+static void *module_alloc_update_bounds_rw(unsigned long size)
67569 {
67570 void *ret = module_alloc(size);
67571
67572 if (ret) {
67573 mutex_lock(&module_mutex);
67574 /* Update module bounds. */
67575- if ((unsigned long)ret < module_addr_min)
67576- module_addr_min = (unsigned long)ret;
67577- if ((unsigned long)ret + size > module_addr_max)
67578- module_addr_max = (unsigned long)ret + size;
67579+ if ((unsigned long)ret < module_addr_min_rw)
67580+ module_addr_min_rw = (unsigned long)ret;
67581+ if ((unsigned long)ret + size > module_addr_max_rw)
67582+ module_addr_max_rw = (unsigned long)ret + size;
67583+ mutex_unlock(&module_mutex);
67584+ }
67585+ return ret;
67586+}
67587+
67588+static void *module_alloc_update_bounds_rx(unsigned long size)
67589+{
67590+ void *ret = module_alloc_exec(size);
67591+
67592+ if (ret) {
67593+ mutex_lock(&module_mutex);
67594+ /* Update module bounds. */
67595+ if ((unsigned long)ret < module_addr_min_rx)
67596+ module_addr_min_rx = (unsigned long)ret;
67597+ if ((unsigned long)ret + size > module_addr_max_rx)
67598+ module_addr_max_rx = (unsigned long)ret + size;
67599 mutex_unlock(&module_mutex);
67600 }
67601 return ret;
67602@@ -2512,8 +2549,14 @@ static struct module *setup_load_info(struct load_info *info)
67603 static int check_modinfo(struct module *mod, struct load_info *info)
67604 {
67605 const char *modmagic = get_modinfo(info, "vermagic");
67606+ const char *license = get_modinfo(info, "license");
67607 int err;
67608
67609+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
67610+ if (!license || !license_is_gpl_compatible(license))
67611+ return -ENOEXEC;
67612+#endif
67613+
67614 /* This is allowed: modprobe --force will invalidate it. */
67615 if (!modmagic) {
67616 err = try_to_force_load(mod, "bad vermagic");
67617@@ -2536,7 +2579,7 @@ static int check_modinfo(struct module *mod, struct load_info *info)
67618 }
67619
67620 /* Set up license info based on the info section */
67621- set_license(mod, get_modinfo(info, "license"));
67622+ set_license(mod, license);
67623
67624 return 0;
67625 }
67626@@ -2630,7 +2673,7 @@ static int move_module(struct module *mod, struct load_info *info)
67627 void *ptr;
67628
67629 /* Do the allocs. */
67630- ptr = module_alloc_update_bounds(mod->core_size);
67631+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
67632 /*
67633 * The pointer to this block is stored in the module structure
67634 * which is inside the block. Just mark it as not being a
67635@@ -2640,23 +2683,50 @@ static int move_module(struct module *mod, struct load_info *info)
67636 if (!ptr)
67637 return -ENOMEM;
67638
67639- memset(ptr, 0, mod->core_size);
67640- mod->module_core = ptr;
67641+ memset(ptr, 0, mod->core_size_rw);
67642+ mod->module_core_rw = ptr;
67643
67644- ptr = module_alloc_update_bounds(mod->init_size);
67645+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
67646 /*
67647 * The pointer to this block is stored in the module structure
67648 * which is inside the block. This block doesn't need to be
67649 * scanned as it contains data and code that will be freed
67650 * after the module is initialized.
67651 */
67652- kmemleak_ignore(ptr);
67653- if (!ptr && mod->init_size) {
67654- module_free(mod, mod->module_core);
67655+ kmemleak_not_leak(ptr);
67656+ if (!ptr && mod->init_size_rw) {
67657+ module_free(mod, mod->module_core_rw);
67658 return -ENOMEM;
67659 }
67660- memset(ptr, 0, mod->init_size);
67661- mod->module_init = ptr;
67662+ memset(ptr, 0, mod->init_size_rw);
67663+ mod->module_init_rw = ptr;
67664+
67665+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
67666+ kmemleak_not_leak(ptr);
67667+ if (!ptr) {
67668+ module_free(mod, mod->module_init_rw);
67669+ module_free(mod, mod->module_core_rw);
67670+ return -ENOMEM;
67671+ }
67672+
67673+ pax_open_kernel();
67674+ memset(ptr, 0, mod->core_size_rx);
67675+ pax_close_kernel();
67676+ mod->module_core_rx = ptr;
67677+
67678+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
67679+ kmemleak_not_leak(ptr);
67680+ if (!ptr && mod->init_size_rx) {
67681+ module_free_exec(mod, mod->module_core_rx);
67682+ module_free(mod, mod->module_init_rw);
67683+ module_free(mod, mod->module_core_rw);
67684+ return -ENOMEM;
67685+ }
67686+
67687+ pax_open_kernel();
67688+ memset(ptr, 0, mod->init_size_rx);
67689+ pax_close_kernel();
67690+ mod->module_init_rx = ptr;
67691
67692 /* Transfer each section which specifies SHF_ALLOC */
67693 pr_debug("final section addresses:\n");
67694@@ -2667,16 +2737,45 @@ static int move_module(struct module *mod, struct load_info *info)
67695 if (!(shdr->sh_flags & SHF_ALLOC))
67696 continue;
67697
67698- if (shdr->sh_entsize & INIT_OFFSET_MASK)
67699- dest = mod->module_init
67700- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67701- else
67702- dest = mod->module_core + shdr->sh_entsize;
67703+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
67704+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
67705+ dest = mod->module_init_rw
67706+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67707+ else
67708+ dest = mod->module_init_rx
67709+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67710+ } else {
67711+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
67712+ dest = mod->module_core_rw + shdr->sh_entsize;
67713+ else
67714+ dest = mod->module_core_rx + shdr->sh_entsize;
67715+ }
67716+
67717+ if (shdr->sh_type != SHT_NOBITS) {
67718+
67719+#ifdef CONFIG_PAX_KERNEXEC
67720+#ifdef CONFIG_X86_64
67721+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
67722+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
67723+#endif
67724+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
67725+ pax_open_kernel();
67726+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
67727+ pax_close_kernel();
67728+ } else
67729+#endif
67730
67731- if (shdr->sh_type != SHT_NOBITS)
67732 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
67733+ }
67734 /* Update sh_addr to point to copy in image. */
67735- shdr->sh_addr = (unsigned long)dest;
67736+
67737+#ifdef CONFIG_PAX_KERNEXEC
67738+ if (shdr->sh_flags & SHF_EXECINSTR)
67739+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
67740+ else
67741+#endif
67742+
67743+ shdr->sh_addr = (unsigned long)dest;
67744 pr_debug("\t0x%lx %s\n",
67745 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
67746 }
67747@@ -2727,12 +2826,12 @@ static void flush_module_icache(const struct module *mod)
67748 * Do it before processing of module parameters, so the module
67749 * can provide parameter accessor functions of its own.
67750 */
67751- if (mod->module_init)
67752- flush_icache_range((unsigned long)mod->module_init,
67753- (unsigned long)mod->module_init
67754- + mod->init_size);
67755- flush_icache_range((unsigned long)mod->module_core,
67756- (unsigned long)mod->module_core + mod->core_size);
67757+ if (mod->module_init_rx)
67758+ flush_icache_range((unsigned long)mod->module_init_rx,
67759+ (unsigned long)mod->module_init_rx
67760+ + mod->init_size_rx);
67761+ flush_icache_range((unsigned long)mod->module_core_rx,
67762+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
67763
67764 set_fs(old_fs);
67765 }
67766@@ -2802,8 +2901,10 @@ out:
67767 static void module_deallocate(struct module *mod, struct load_info *info)
67768 {
67769 percpu_modfree(mod);
67770- module_free(mod, mod->module_init);
67771- module_free(mod, mod->module_core);
67772+ module_free_exec(mod, mod->module_init_rx);
67773+ module_free_exec(mod, mod->module_core_rx);
67774+ module_free(mod, mod->module_init_rw);
67775+ module_free(mod, mod->module_core_rw);
67776 }
67777
67778 int __weak module_finalize(const Elf_Ehdr *hdr,
67779@@ -2867,9 +2968,38 @@ static struct module *load_module(void __user *umod,
67780 if (err)
67781 goto free_unload;
67782
67783+ /* Now copy in args */
67784+ mod->args = strndup_user(uargs, ~0UL >> 1);
67785+ if (IS_ERR(mod->args)) {
67786+ err = PTR_ERR(mod->args);
67787+ goto free_unload;
67788+ }
67789+
67790 /* Set up MODINFO_ATTR fields */
67791 setup_modinfo(mod, &info);
67792
67793+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67794+ {
67795+ char *p, *p2;
67796+
67797+ if (strstr(mod->args, "grsec_modharden_netdev")) {
67798+ 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);
67799+ err = -EPERM;
67800+ goto free_modinfo;
67801+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
67802+ p += strlen("grsec_modharden_normal");
67803+ p2 = strstr(p, "_");
67804+ if (p2) {
67805+ *p2 = '\0';
67806+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
67807+ *p2 = '_';
67808+ }
67809+ err = -EPERM;
67810+ goto free_modinfo;
67811+ }
67812+ }
67813+#endif
67814+
67815 /* Fix up syms, so that st_value is a pointer to location. */
67816 err = simplify_symbols(mod, &info);
67817 if (err < 0)
67818@@ -2885,13 +3015,6 @@ static struct module *load_module(void __user *umod,
67819
67820 flush_module_icache(mod);
67821
67822- /* Now copy in args */
67823- mod->args = strndup_user(uargs, ~0UL >> 1);
67824- if (IS_ERR(mod->args)) {
67825- err = PTR_ERR(mod->args);
67826- goto free_arch_cleanup;
67827- }
67828-
67829 /* Mark state as coming so strong_try_module_get() ignores us. */
67830 mod->state = MODULE_STATE_COMING;
67831
67832@@ -2948,11 +3071,10 @@ static struct module *load_module(void __user *umod,
67833 unlock:
67834 mutex_unlock(&module_mutex);
67835 synchronize_sched();
67836- kfree(mod->args);
67837- free_arch_cleanup:
67838 module_arch_cleanup(mod);
67839 free_modinfo:
67840 free_modinfo(mod);
67841+ kfree(mod->args);
67842 free_unload:
67843 module_unload_free(mod);
67844 free_module:
67845@@ -2993,16 +3115,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
67846 MODULE_STATE_COMING, mod);
67847
67848 /* Set RO and NX regions for core */
67849- set_section_ro_nx(mod->module_core,
67850- mod->core_text_size,
67851- mod->core_ro_size,
67852- mod->core_size);
67853+ set_section_ro_nx(mod->module_core_rx,
67854+ mod->core_size_rx,
67855+ mod->core_size_rx,
67856+ mod->core_size_rx);
67857
67858 /* Set RO and NX regions for init */
67859- set_section_ro_nx(mod->module_init,
67860- mod->init_text_size,
67861- mod->init_ro_size,
67862- mod->init_size);
67863+ set_section_ro_nx(mod->module_init_rx,
67864+ mod->init_size_rx,
67865+ mod->init_size_rx,
67866+ mod->init_size_rx);
67867
67868 do_mod_ctors(mod);
67869 /* Start the module */
67870@@ -3048,11 +3170,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
67871 mod->strtab = mod->core_strtab;
67872 #endif
67873 unset_module_init_ro_nx(mod);
67874- module_free(mod, mod->module_init);
67875- mod->module_init = NULL;
67876- mod->init_size = 0;
67877- mod->init_ro_size = 0;
67878- mod->init_text_size = 0;
67879+ module_free(mod, mod->module_init_rw);
67880+ module_free_exec(mod, mod->module_init_rx);
67881+ mod->module_init_rw = NULL;
67882+ mod->module_init_rx = NULL;
67883+ mod->init_size_rw = 0;
67884+ mod->init_size_rx = 0;
67885 mutex_unlock(&module_mutex);
67886
67887 return 0;
67888@@ -3083,10 +3206,16 @@ static const char *get_ksymbol(struct module *mod,
67889 unsigned long nextval;
67890
67891 /* At worse, next value is at end of module */
67892- if (within_module_init(addr, mod))
67893- nextval = (unsigned long)mod->module_init+mod->init_text_size;
67894+ if (within_module_init_rx(addr, mod))
67895+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
67896+ else if (within_module_init_rw(addr, mod))
67897+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
67898+ else if (within_module_core_rx(addr, mod))
67899+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
67900+ else if (within_module_core_rw(addr, mod))
67901+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
67902 else
67903- nextval = (unsigned long)mod->module_core+mod->core_text_size;
67904+ return NULL;
67905
67906 /* Scan for closest preceding symbol, and next symbol. (ELF
67907 starts real symbols at 1). */
67908@@ -3321,7 +3450,7 @@ static int m_show(struct seq_file *m, void *p)
67909 char buf[8];
67910
67911 seq_printf(m, "%s %u",
67912- mod->name, mod->init_size + mod->core_size);
67913+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
67914 print_unload_info(m, mod);
67915
67916 /* Informative for users. */
67917@@ -3330,7 +3459,7 @@ static int m_show(struct seq_file *m, void *p)
67918 mod->state == MODULE_STATE_COMING ? "Loading":
67919 "Live");
67920 /* Used by oprofile and other similar tools. */
67921- seq_printf(m, " 0x%pK", mod->module_core);
67922+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
67923
67924 /* Taints info */
67925 if (mod->taints)
67926@@ -3366,7 +3495,17 @@ static const struct file_operations proc_modules_operations = {
67927
67928 static int __init proc_modules_init(void)
67929 {
67930+#ifndef CONFIG_GRKERNSEC_HIDESYM
67931+#ifdef CONFIG_GRKERNSEC_PROC_USER
67932+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
67933+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67934+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
67935+#else
67936 proc_create("modules", 0, NULL, &proc_modules_operations);
67937+#endif
67938+#else
67939+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
67940+#endif
67941 return 0;
67942 }
67943 module_init(proc_modules_init);
67944@@ -3425,12 +3564,12 @@ struct module *__module_address(unsigned long addr)
67945 {
67946 struct module *mod;
67947
67948- if (addr < module_addr_min || addr > module_addr_max)
67949+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
67950+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
67951 return NULL;
67952
67953 list_for_each_entry_rcu(mod, &modules, list)
67954- if (within_module_core(addr, mod)
67955- || within_module_init(addr, mod))
67956+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
67957 return mod;
67958 return NULL;
67959 }
67960@@ -3464,11 +3603,20 @@ bool is_module_text_address(unsigned long addr)
67961 */
67962 struct module *__module_text_address(unsigned long addr)
67963 {
67964- struct module *mod = __module_address(addr);
67965+ struct module *mod;
67966+
67967+#ifdef CONFIG_X86_32
67968+ addr = ktla_ktva(addr);
67969+#endif
67970+
67971+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
67972+ return NULL;
67973+
67974+ mod = __module_address(addr);
67975+
67976 if (mod) {
67977 /* Make sure it's within the text section. */
67978- if (!within(addr, mod->module_init, mod->init_text_size)
67979- && !within(addr, mod->module_core, mod->core_text_size))
67980+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
67981 mod = NULL;
67982 }
67983 return mod;
67984diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
67985index 7e3443f..b2a1e6b 100644
67986--- a/kernel/mutex-debug.c
67987+++ b/kernel/mutex-debug.c
67988@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
67989 }
67990
67991 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
67992- struct thread_info *ti)
67993+ struct task_struct *task)
67994 {
67995 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
67996
67997 /* Mark the current thread as blocked on the lock: */
67998- ti->task->blocked_on = waiter;
67999+ task->blocked_on = waiter;
68000 }
68001
68002 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
68003- struct thread_info *ti)
68004+ struct task_struct *task)
68005 {
68006 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
68007- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
68008- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
68009- ti->task->blocked_on = NULL;
68010+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
68011+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
68012+ task->blocked_on = NULL;
68013
68014 list_del_init(&waiter->list);
68015 waiter->task = NULL;
68016diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
68017index 0799fd3..d06ae3b 100644
68018--- a/kernel/mutex-debug.h
68019+++ b/kernel/mutex-debug.h
68020@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
68021 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
68022 extern void debug_mutex_add_waiter(struct mutex *lock,
68023 struct mutex_waiter *waiter,
68024- struct thread_info *ti);
68025+ struct task_struct *task);
68026 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
68027- struct thread_info *ti);
68028+ struct task_struct *task);
68029 extern void debug_mutex_unlock(struct mutex *lock);
68030 extern void debug_mutex_init(struct mutex *lock, const char *name,
68031 struct lock_class_key *key);
68032diff --git a/kernel/mutex.c b/kernel/mutex.c
68033index 89096dd..f91ebc5 100644
68034--- a/kernel/mutex.c
68035+++ b/kernel/mutex.c
68036@@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
68037 spin_lock_mutex(&lock->wait_lock, flags);
68038
68039 debug_mutex_lock_common(lock, &waiter);
68040- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
68041+ debug_mutex_add_waiter(lock, &waiter, task);
68042
68043 /* add waiting tasks to the end of the waitqueue (FIFO): */
68044 list_add_tail(&waiter.list, &lock->wait_list);
68045@@ -227,8 +227,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
68046 * TASK_UNINTERRUPTIBLE case.)
68047 */
68048 if (unlikely(signal_pending_state(state, task))) {
68049- mutex_remove_waiter(lock, &waiter,
68050- task_thread_info(task));
68051+ mutex_remove_waiter(lock, &waiter, task);
68052 mutex_release(&lock->dep_map, 1, ip);
68053 spin_unlock_mutex(&lock->wait_lock, flags);
68054
68055@@ -249,7 +248,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
68056 done:
68057 lock_acquired(&lock->dep_map, ip);
68058 /* got the lock - rejoice! */
68059- mutex_remove_waiter(lock, &waiter, current_thread_info());
68060+ mutex_remove_waiter(lock, &waiter, task);
68061 mutex_set_owner(lock);
68062
68063 /* set it to 0 if there are no waiters left: */
68064diff --git a/kernel/padata.c b/kernel/padata.c
68065index b452599..5d68f4e 100644
68066--- a/kernel/padata.c
68067+++ b/kernel/padata.c
68068@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_instance *pinst,
68069 padata->pd = pd;
68070 padata->cb_cpu = cb_cpu;
68071
68072- if (unlikely(atomic_read(&pd->seq_nr) == pd->max_seq_nr))
68073- atomic_set(&pd->seq_nr, -1);
68074+ if (unlikely(atomic_read_unchecked(&pd->seq_nr) == pd->max_seq_nr))
68075+ atomic_set_unchecked(&pd->seq_nr, -1);
68076
68077- padata->seq_nr = atomic_inc_return(&pd->seq_nr);
68078+ padata->seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
68079
68080 target_cpu = padata_cpu_hash(padata);
68081 queue = per_cpu_ptr(pd->pqueue, target_cpu);
68082@@ -444,7 +444,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
68083 padata_init_pqueues(pd);
68084 padata_init_squeues(pd);
68085 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
68086- atomic_set(&pd->seq_nr, -1);
68087+ atomic_set_unchecked(&pd->seq_nr, -1);
68088 atomic_set(&pd->reorder_objects, 0);
68089 atomic_set(&pd->refcnt, 0);
68090 pd->pinst = pinst;
68091diff --git a/kernel/panic.c b/kernel/panic.c
68092index 8ed89a1..e83856a 100644
68093--- a/kernel/panic.c
68094+++ b/kernel/panic.c
68095@@ -402,7 +402,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
68096 const char *board;
68097
68098 printk(KERN_WARNING "------------[ cut here ]------------\n");
68099- printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
68100+ printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
68101 board = dmi_get_system_info(DMI_PRODUCT_NAME);
68102 if (board)
68103 printk(KERN_WARNING "Hardware name: %s\n", board);
68104@@ -457,7 +457,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
68105 */
68106 void __stack_chk_fail(void)
68107 {
68108- panic("stack-protector: Kernel stack is corrupted in: %p\n",
68109+ dump_stack();
68110+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
68111 __builtin_return_address(0));
68112 }
68113 EXPORT_SYMBOL(__stack_chk_fail);
68114diff --git a/kernel/pid.c b/kernel/pid.c
68115index 9f08dfa..6765c40 100644
68116--- a/kernel/pid.c
68117+++ b/kernel/pid.c
68118@@ -33,6 +33,7 @@
68119 #include <linux/rculist.h>
68120 #include <linux/bootmem.h>
68121 #include <linux/hash.h>
68122+#include <linux/security.h>
68123 #include <linux/pid_namespace.h>
68124 #include <linux/init_task.h>
68125 #include <linux/syscalls.h>
68126@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
68127
68128 int pid_max = PID_MAX_DEFAULT;
68129
68130-#define RESERVED_PIDS 300
68131+#define RESERVED_PIDS 500
68132
68133 int pid_max_min = RESERVED_PIDS + 1;
68134 int pid_max_max = PID_MAX_LIMIT;
68135@@ -420,10 +421,18 @@ EXPORT_SYMBOL(pid_task);
68136 */
68137 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
68138 {
68139+ struct task_struct *task;
68140+
68141 rcu_lockdep_assert(rcu_read_lock_held(),
68142 "find_task_by_pid_ns() needs rcu_read_lock()"
68143 " protection");
68144- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
68145+
68146+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
68147+
68148+ if (gr_pid_is_chrooted(task))
68149+ return NULL;
68150+
68151+ return task;
68152 }
68153
68154 struct task_struct *find_task_by_vpid(pid_t vnr)
68155@@ -431,6 +440,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
68156 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
68157 }
68158
68159+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
68160+{
68161+ rcu_lockdep_assert(rcu_read_lock_held(),
68162+ "find_task_by_pid_ns() needs rcu_read_lock()"
68163+ " protection");
68164+ return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
68165+}
68166+
68167 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
68168 {
68169 struct pid *pid;
68170diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
68171index 125cb67..a4d1c30 100644
68172--- a/kernel/posix-cpu-timers.c
68173+++ b/kernel/posix-cpu-timers.c
68174@@ -6,6 +6,7 @@
68175 #include <linux/posix-timers.h>
68176 #include <linux/errno.h>
68177 #include <linux/math64.h>
68178+#include <linux/security.h>
68179 #include <asm/uaccess.h>
68180 #include <linux/kernel_stat.h>
68181 #include <trace/events/timer.h>
68182@@ -1578,14 +1579,14 @@ struct k_clock clock_posix_cpu = {
68183
68184 static __init int init_posix_cpu_timers(void)
68185 {
68186- struct k_clock process = {
68187+ static struct k_clock process = {
68188 .clock_getres = process_cpu_clock_getres,
68189 .clock_get = process_cpu_clock_get,
68190 .timer_create = process_cpu_timer_create,
68191 .nsleep = process_cpu_nsleep,
68192 .nsleep_restart = process_cpu_nsleep_restart,
68193 };
68194- struct k_clock thread = {
68195+ static struct k_clock thread = {
68196 .clock_getres = thread_cpu_clock_getres,
68197 .clock_get = thread_cpu_clock_get,
68198 .timer_create = thread_cpu_timer_create,
68199diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
68200index 69185ae..cc2847a 100644
68201--- a/kernel/posix-timers.c
68202+++ b/kernel/posix-timers.c
68203@@ -43,6 +43,7 @@
68204 #include <linux/idr.h>
68205 #include <linux/posix-clock.h>
68206 #include <linux/posix-timers.h>
68207+#include <linux/grsecurity.h>
68208 #include <linux/syscalls.h>
68209 #include <linux/wait.h>
68210 #include <linux/workqueue.h>
68211@@ -129,7 +130,7 @@ static DEFINE_SPINLOCK(idr_lock);
68212 * which we beg off on and pass to do_sys_settimeofday().
68213 */
68214
68215-static struct k_clock posix_clocks[MAX_CLOCKS];
68216+static struct k_clock *posix_clocks[MAX_CLOCKS];
68217
68218 /*
68219 * These ones are defined below.
68220@@ -227,7 +228,7 @@ static int posix_get_boottime(const clockid_t which_clock, struct timespec *tp)
68221 */
68222 static __init int init_posix_timers(void)
68223 {
68224- struct k_clock clock_realtime = {
68225+ static struct k_clock clock_realtime = {
68226 .clock_getres = hrtimer_get_res,
68227 .clock_get = posix_clock_realtime_get,
68228 .clock_set = posix_clock_realtime_set,
68229@@ -239,7 +240,7 @@ static __init int init_posix_timers(void)
68230 .timer_get = common_timer_get,
68231 .timer_del = common_timer_del,
68232 };
68233- struct k_clock clock_monotonic = {
68234+ static struct k_clock clock_monotonic = {
68235 .clock_getres = hrtimer_get_res,
68236 .clock_get = posix_ktime_get_ts,
68237 .nsleep = common_nsleep,
68238@@ -249,19 +250,19 @@ static __init int init_posix_timers(void)
68239 .timer_get = common_timer_get,
68240 .timer_del = common_timer_del,
68241 };
68242- struct k_clock clock_monotonic_raw = {
68243+ static struct k_clock clock_monotonic_raw = {
68244 .clock_getres = hrtimer_get_res,
68245 .clock_get = posix_get_monotonic_raw,
68246 };
68247- struct k_clock clock_realtime_coarse = {
68248+ static struct k_clock clock_realtime_coarse = {
68249 .clock_getres = posix_get_coarse_res,
68250 .clock_get = posix_get_realtime_coarse,
68251 };
68252- struct k_clock clock_monotonic_coarse = {
68253+ static struct k_clock clock_monotonic_coarse = {
68254 .clock_getres = posix_get_coarse_res,
68255 .clock_get = posix_get_monotonic_coarse,
68256 };
68257- struct k_clock clock_boottime = {
68258+ static struct k_clock clock_boottime = {
68259 .clock_getres = hrtimer_get_res,
68260 .clock_get = posix_get_boottime,
68261 .nsleep = common_nsleep,
68262@@ -473,7 +474,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
68263 return;
68264 }
68265
68266- posix_clocks[clock_id] = *new_clock;
68267+ posix_clocks[clock_id] = new_clock;
68268 }
68269 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
68270
68271@@ -519,9 +520,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
68272 return (id & CLOCKFD_MASK) == CLOCKFD ?
68273 &clock_posix_dynamic : &clock_posix_cpu;
68274
68275- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
68276+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
68277 return NULL;
68278- return &posix_clocks[id];
68279+ return posix_clocks[id];
68280 }
68281
68282 static int common_timer_create(struct k_itimer *new_timer)
68283@@ -959,6 +960,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
68284 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
68285 return -EFAULT;
68286
68287+ /* only the CLOCK_REALTIME clock can be set, all other clocks
68288+ have their clock_set fptr set to a nosettime dummy function
68289+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
68290+ call common_clock_set, which calls do_sys_settimeofday, which
68291+ we hook
68292+ */
68293+
68294 return kc->clock_set(which_clock, &new_tp);
68295 }
68296
68297diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
68298index d523593..68197a4 100644
68299--- a/kernel/power/poweroff.c
68300+++ b/kernel/power/poweroff.c
68301@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = {
68302 .enable_mask = SYSRQ_ENABLE_BOOT,
68303 };
68304
68305-static int pm_sysrq_init(void)
68306+static int __init pm_sysrq_init(void)
68307 {
68308 register_sysrq_key('o', &sysrq_poweroff_op);
68309 return 0;
68310diff --git a/kernel/power/process.c b/kernel/power/process.c
68311index 7aac07a..2d3c6dc 100644
68312--- a/kernel/power/process.c
68313+++ b/kernel/power/process.c
68314@@ -33,6 +33,7 @@ static int try_to_freeze_tasks(bool user_only)
68315 u64 elapsed_csecs64;
68316 unsigned int elapsed_csecs;
68317 bool wakeup = false;
68318+ bool timedout = false;
68319
68320 do_gettimeofday(&start);
68321
68322@@ -43,6 +44,8 @@ static int try_to_freeze_tasks(bool user_only)
68323
68324 while (true) {
68325 todo = 0;
68326+ if (time_after(jiffies, end_time))
68327+ timedout = true;
68328 read_lock(&tasklist_lock);
68329 do_each_thread(g, p) {
68330 if (p == current || !freeze_task(p))
68331@@ -60,9 +63,13 @@ static int try_to_freeze_tasks(bool user_only)
68332 * try_to_stop() after schedule() in ptrace/signal
68333 * stop sees TIF_FREEZE.
68334 */
68335- if (!task_is_stopped_or_traced(p) &&
68336- !freezer_should_skip(p))
68337+ if (!task_is_stopped_or_traced(p) && !freezer_should_skip(p)) {
68338 todo++;
68339+ if (timedout) {
68340+ printk(KERN_ERR "Task refusing to freeze:\n");
68341+ sched_show_task(p);
68342+ }
68343+ }
68344 } while_each_thread(g, p);
68345 read_unlock(&tasklist_lock);
68346
68347@@ -71,7 +78,7 @@ static int try_to_freeze_tasks(bool user_only)
68348 todo += wq_busy;
68349 }
68350
68351- if (!todo || time_after(jiffies, end_time))
68352+ if (!todo || timedout)
68353 break;
68354
68355 if (pm_wakeup_pending()) {
68356diff --git a/kernel/printk.c b/kernel/printk.c
68357index 32690a0..cd7c798 100644
68358--- a/kernel/printk.c
68359+++ b/kernel/printk.c
68360@@ -313,6 +313,11 @@ static int check_syslog_permissions(int type, bool from_file)
68361 if (from_file && type != SYSLOG_ACTION_OPEN)
68362 return 0;
68363
68364+#ifdef CONFIG_GRKERNSEC_DMESG
68365+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
68366+ return -EPERM;
68367+#endif
68368+
68369 if (syslog_action_restricted(type)) {
68370 if (capable(CAP_SYSLOG))
68371 return 0;
68372diff --git a/kernel/profile.c b/kernel/profile.c
68373index 76b8e77..a2930e8 100644
68374--- a/kernel/profile.c
68375+++ b/kernel/profile.c
68376@@ -39,7 +39,7 @@ struct profile_hit {
68377 /* Oprofile timer tick hook */
68378 static int (*timer_hook)(struct pt_regs *) __read_mostly;
68379
68380-static atomic_t *prof_buffer;
68381+static atomic_unchecked_t *prof_buffer;
68382 static unsigned long prof_len, prof_shift;
68383
68384 int prof_on __read_mostly;
68385@@ -281,7 +281,7 @@ static void profile_flip_buffers(void)
68386 hits[i].pc = 0;
68387 continue;
68388 }
68389- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
68390+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68391 hits[i].hits = hits[i].pc = 0;
68392 }
68393 }
68394@@ -342,9 +342,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
68395 * Add the current hit(s) and flush the write-queue out
68396 * to the global buffer:
68397 */
68398- atomic_add(nr_hits, &prof_buffer[pc]);
68399+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
68400 for (i = 0; i < NR_PROFILE_HIT; ++i) {
68401- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
68402+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68403 hits[i].pc = hits[i].hits = 0;
68404 }
68405 out:
68406@@ -419,7 +419,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
68407 {
68408 unsigned long pc;
68409 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
68410- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68411+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68412 }
68413 #endif /* !CONFIG_SMP */
68414
68415@@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
68416 return -EFAULT;
68417 buf++; p++; count--; read++;
68418 }
68419- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
68420+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
68421 if (copy_to_user(buf, (void *)pnt, count))
68422 return -EFAULT;
68423 read += count;
68424@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
68425 }
68426 #endif
68427 profile_discard_flip_buffers();
68428- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
68429+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
68430 return count;
68431 }
68432
68433diff --git a/kernel/ptrace.c b/kernel/ptrace.c
68434index 00ab2ca..d237f61 100644
68435--- a/kernel/ptrace.c
68436+++ b/kernel/ptrace.c
68437@@ -285,7 +285,7 @@ static int ptrace_attach(struct task_struct *task, long request,
68438 task->ptrace = PT_PTRACED;
68439 if (seize)
68440 task->ptrace |= PT_SEIZED;
68441- if (ns_capable(task_user_ns(task), CAP_SYS_PTRACE))
68442+ if (ns_capable_nolog(task_user_ns(task), CAP_SYS_PTRACE))
68443 task->ptrace |= PT_PTRACE_CAP;
68444
68445 __ptrace_link(task, current);
68446@@ -491,7 +491,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
68447 break;
68448 return -EIO;
68449 }
68450- if (copy_to_user(dst, buf, retval))
68451+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
68452 return -EFAULT;
68453 copied += retval;
68454 src += retval;
68455@@ -688,7 +688,7 @@ int ptrace_request(struct task_struct *child, long request,
68456 bool seized = child->ptrace & PT_SEIZED;
68457 int ret = -EIO;
68458 siginfo_t siginfo, *si;
68459- void __user *datavp = (void __user *) data;
68460+ void __user *datavp = (__force void __user *) data;
68461 unsigned long __user *datalp = datavp;
68462 unsigned long flags;
68463
68464@@ -890,14 +890,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
68465 goto out;
68466 }
68467
68468+ if (gr_handle_ptrace(child, request)) {
68469+ ret = -EPERM;
68470+ goto out_put_task_struct;
68471+ }
68472+
68473 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
68474 ret = ptrace_attach(child, request, data);
68475 /*
68476 * Some architectures need to do book-keeping after
68477 * a ptrace attach.
68478 */
68479- if (!ret)
68480+ if (!ret) {
68481 arch_ptrace_attach(child);
68482+ gr_audit_ptrace(child);
68483+ }
68484 goto out_put_task_struct;
68485 }
68486
68487@@ -923,7 +930,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
68488 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
68489 if (copied != sizeof(tmp))
68490 return -EIO;
68491- return put_user(tmp, (unsigned long __user *)data);
68492+ return put_user(tmp, (__force unsigned long __user *)data);
68493 }
68494
68495 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
68496@@ -1033,14 +1040,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
68497 goto out;
68498 }
68499
68500+ if (gr_handle_ptrace(child, request)) {
68501+ ret = -EPERM;
68502+ goto out_put_task_struct;
68503+ }
68504+
68505 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
68506 ret = ptrace_attach(child, request, data);
68507 /*
68508 * Some architectures need to do book-keeping after
68509 * a ptrace attach.
68510 */
68511- if (!ret)
68512+ if (!ret) {
68513 arch_ptrace_attach(child);
68514+ gr_audit_ptrace(child);
68515+ }
68516 goto out_put_task_struct;
68517 }
68518
68519diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
68520index 977296d..c4744dc 100644
68521--- a/kernel/rcutiny.c
68522+++ b/kernel/rcutiny.c
68523@@ -46,7 +46,7 @@
68524 struct rcu_ctrlblk;
68525 static void invoke_rcu_callbacks(void);
68526 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
68527-static void rcu_process_callbacks(struct softirq_action *unused);
68528+static void rcu_process_callbacks(void);
68529 static void __call_rcu(struct rcu_head *head,
68530 void (*func)(struct rcu_head *rcu),
68531 struct rcu_ctrlblk *rcp);
68532@@ -297,7 +297,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
68533 rcu_is_callbacks_kthread()));
68534 }
68535
68536-static void rcu_process_callbacks(struct softirq_action *unused)
68537+static void rcu_process_callbacks(void)
68538 {
68539 __rcu_process_callbacks(&rcu_sched_ctrlblk);
68540 __rcu_process_callbacks(&rcu_bh_ctrlblk);
68541diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h
68542index 9cb1ae4..aac7d3e 100644
68543--- a/kernel/rcutiny_plugin.h
68544+++ b/kernel/rcutiny_plugin.h
68545@@ -920,7 +920,7 @@ static int rcu_kthread(void *arg)
68546 have_rcu_kthread_work = morework;
68547 local_irq_restore(flags);
68548 if (work)
68549- rcu_process_callbacks(NULL);
68550+ rcu_process_callbacks();
68551 schedule_timeout_interruptible(1); /* Leave CPU for others. */
68552 }
68553
68554diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
68555index a58ac28..196a3d8 100644
68556--- a/kernel/rcutorture.c
68557+++ b/kernel/rcutorture.c
68558@@ -148,12 +148,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
68559 { 0 };
68560 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
68561 { 0 };
68562-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
68563-static atomic_t n_rcu_torture_alloc;
68564-static atomic_t n_rcu_torture_alloc_fail;
68565-static atomic_t n_rcu_torture_free;
68566-static atomic_t n_rcu_torture_mberror;
68567-static atomic_t n_rcu_torture_error;
68568+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
68569+static atomic_unchecked_t n_rcu_torture_alloc;
68570+static atomic_unchecked_t n_rcu_torture_alloc_fail;
68571+static atomic_unchecked_t n_rcu_torture_free;
68572+static atomic_unchecked_t n_rcu_torture_mberror;
68573+static atomic_unchecked_t n_rcu_torture_error;
68574 static long n_rcu_torture_boost_ktrerror;
68575 static long n_rcu_torture_boost_rterror;
68576 static long n_rcu_torture_boost_failure;
68577@@ -243,11 +243,11 @@ rcu_torture_alloc(void)
68578
68579 spin_lock_bh(&rcu_torture_lock);
68580 if (list_empty(&rcu_torture_freelist)) {
68581- atomic_inc(&n_rcu_torture_alloc_fail);
68582+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
68583 spin_unlock_bh(&rcu_torture_lock);
68584 return NULL;
68585 }
68586- atomic_inc(&n_rcu_torture_alloc);
68587+ atomic_inc_unchecked(&n_rcu_torture_alloc);
68588 p = rcu_torture_freelist.next;
68589 list_del_init(p);
68590 spin_unlock_bh(&rcu_torture_lock);
68591@@ -260,7 +260,7 @@ rcu_torture_alloc(void)
68592 static void
68593 rcu_torture_free(struct rcu_torture *p)
68594 {
68595- atomic_inc(&n_rcu_torture_free);
68596+ atomic_inc_unchecked(&n_rcu_torture_free);
68597 spin_lock_bh(&rcu_torture_lock);
68598 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
68599 spin_unlock_bh(&rcu_torture_lock);
68600@@ -380,7 +380,7 @@ rcu_torture_cb(struct rcu_head *p)
68601 i = rp->rtort_pipe_count;
68602 if (i > RCU_TORTURE_PIPE_LEN)
68603 i = RCU_TORTURE_PIPE_LEN;
68604- atomic_inc(&rcu_torture_wcount[i]);
68605+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68606 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
68607 rp->rtort_mbtest = 0;
68608 rcu_torture_free(rp);
68609@@ -427,7 +427,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
68610 i = rp->rtort_pipe_count;
68611 if (i > RCU_TORTURE_PIPE_LEN)
68612 i = RCU_TORTURE_PIPE_LEN;
68613- atomic_inc(&rcu_torture_wcount[i]);
68614+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68615 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
68616 rp->rtort_mbtest = 0;
68617 list_del(&rp->rtort_free);
68618@@ -916,7 +916,7 @@ rcu_torture_writer(void *arg)
68619 i = old_rp->rtort_pipe_count;
68620 if (i > RCU_TORTURE_PIPE_LEN)
68621 i = RCU_TORTURE_PIPE_LEN;
68622- atomic_inc(&rcu_torture_wcount[i]);
68623+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68624 old_rp->rtort_pipe_count++;
68625 cur_ops->deferred_free(old_rp);
68626 }
68627@@ -997,7 +997,7 @@ static void rcu_torture_timer(unsigned long unused)
68628 return;
68629 }
68630 if (p->rtort_mbtest == 0)
68631- atomic_inc(&n_rcu_torture_mberror);
68632+ atomic_inc_unchecked(&n_rcu_torture_mberror);
68633 spin_lock(&rand_lock);
68634 cur_ops->read_delay(&rand);
68635 n_rcu_torture_timers++;
68636@@ -1061,7 +1061,7 @@ rcu_torture_reader(void *arg)
68637 continue;
68638 }
68639 if (p->rtort_mbtest == 0)
68640- atomic_inc(&n_rcu_torture_mberror);
68641+ atomic_inc_unchecked(&n_rcu_torture_mberror);
68642 cur_ops->read_delay(&rand);
68643 preempt_disable();
68644 pipe_count = p->rtort_pipe_count;
68645@@ -1123,10 +1123,10 @@ rcu_torture_printk(char *page)
68646 rcu_torture_current,
68647 rcu_torture_current_version,
68648 list_empty(&rcu_torture_freelist),
68649- atomic_read(&n_rcu_torture_alloc),
68650- atomic_read(&n_rcu_torture_alloc_fail),
68651- atomic_read(&n_rcu_torture_free),
68652- atomic_read(&n_rcu_torture_mberror),
68653+ atomic_read_unchecked(&n_rcu_torture_alloc),
68654+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
68655+ atomic_read_unchecked(&n_rcu_torture_free),
68656+ atomic_read_unchecked(&n_rcu_torture_mberror),
68657 n_rcu_torture_boost_ktrerror,
68658 n_rcu_torture_boost_rterror,
68659 n_rcu_torture_boost_failure,
68660@@ -1136,7 +1136,7 @@ rcu_torture_printk(char *page)
68661 n_online_attempts,
68662 n_offline_successes,
68663 n_offline_attempts);
68664- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
68665+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
68666 n_rcu_torture_boost_ktrerror != 0 ||
68667 n_rcu_torture_boost_rterror != 0 ||
68668 n_rcu_torture_boost_failure != 0)
68669@@ -1144,7 +1144,7 @@ rcu_torture_printk(char *page)
68670 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
68671 if (i > 1) {
68672 cnt += sprintf(&page[cnt], "!!! ");
68673- atomic_inc(&n_rcu_torture_error);
68674+ atomic_inc_unchecked(&n_rcu_torture_error);
68675 WARN_ON_ONCE(1);
68676 }
68677 cnt += sprintf(&page[cnt], "Reader Pipe: ");
68678@@ -1158,7 +1158,7 @@ rcu_torture_printk(char *page)
68679 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
68680 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
68681 cnt += sprintf(&page[cnt], " %d",
68682- atomic_read(&rcu_torture_wcount[i]));
68683+ atomic_read_unchecked(&rcu_torture_wcount[i]));
68684 }
68685 cnt += sprintf(&page[cnt], "\n");
68686 if (cur_ops->stats)
68687@@ -1600,7 +1600,7 @@ rcu_torture_cleanup(void)
68688
68689 if (cur_ops->cleanup)
68690 cur_ops->cleanup();
68691- if (atomic_read(&n_rcu_torture_error))
68692+ if (atomic_read_unchecked(&n_rcu_torture_error))
68693 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
68694 else
68695 rcu_torture_print_module_parms(cur_ops, "End of test: SUCCESS");
68696@@ -1664,17 +1664,17 @@ rcu_torture_init(void)
68697
68698 rcu_torture_current = NULL;
68699 rcu_torture_current_version = 0;
68700- atomic_set(&n_rcu_torture_alloc, 0);
68701- atomic_set(&n_rcu_torture_alloc_fail, 0);
68702- atomic_set(&n_rcu_torture_free, 0);
68703- atomic_set(&n_rcu_torture_mberror, 0);
68704- atomic_set(&n_rcu_torture_error, 0);
68705+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
68706+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
68707+ atomic_set_unchecked(&n_rcu_torture_free, 0);
68708+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
68709+ atomic_set_unchecked(&n_rcu_torture_error, 0);
68710 n_rcu_torture_boost_ktrerror = 0;
68711 n_rcu_torture_boost_rterror = 0;
68712 n_rcu_torture_boost_failure = 0;
68713 n_rcu_torture_boosts = 0;
68714 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
68715- atomic_set(&rcu_torture_wcount[i], 0);
68716+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
68717 for_each_possible_cpu(cpu) {
68718 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
68719 per_cpu(rcu_torture_count, cpu)[i] = 0;
68720diff --git a/kernel/rcutree.c b/kernel/rcutree.c
68721index 6c4a672..70f3202 100644
68722--- a/kernel/rcutree.c
68723+++ b/kernel/rcutree.c
68724@@ -363,9 +363,9 @@ static void rcu_idle_enter_common(struct rcu_dynticks *rdtp, long long oldval)
68725 rcu_prepare_for_idle(smp_processor_id());
68726 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
68727 smp_mb__before_atomic_inc(); /* See above. */
68728- atomic_inc(&rdtp->dynticks);
68729+ atomic_inc_unchecked(&rdtp->dynticks);
68730 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
68731- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
68732+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
68733 }
68734
68735 /**
68736@@ -438,10 +438,10 @@ void rcu_irq_exit(void)
68737 static void rcu_idle_exit_common(struct rcu_dynticks *rdtp, long long oldval)
68738 {
68739 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
68740- atomic_inc(&rdtp->dynticks);
68741+ atomic_inc_unchecked(&rdtp->dynticks);
68742 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
68743 smp_mb__after_atomic_inc(); /* See above. */
68744- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
68745+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
68746 rcu_cleanup_after_idle(smp_processor_id());
68747 trace_rcu_dyntick("End", oldval, rdtp->dynticks_nesting);
68748 if (!is_idle_task(current)) {
68749@@ -531,14 +531,14 @@ void rcu_nmi_enter(void)
68750 struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
68751
68752 if (rdtp->dynticks_nmi_nesting == 0 &&
68753- (atomic_read(&rdtp->dynticks) & 0x1))
68754+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
68755 return;
68756 rdtp->dynticks_nmi_nesting++;
68757 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
68758- atomic_inc(&rdtp->dynticks);
68759+ atomic_inc_unchecked(&rdtp->dynticks);
68760 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
68761 smp_mb__after_atomic_inc(); /* See above. */
68762- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
68763+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
68764 }
68765
68766 /**
68767@@ -557,9 +557,9 @@ void rcu_nmi_exit(void)
68768 return;
68769 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
68770 smp_mb__before_atomic_inc(); /* See above. */
68771- atomic_inc(&rdtp->dynticks);
68772+ atomic_inc_unchecked(&rdtp->dynticks);
68773 smp_mb__after_atomic_inc(); /* Force delay to next write. */
68774- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
68775+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
68776 }
68777
68778 #ifdef CONFIG_PROVE_RCU
68779@@ -575,7 +575,7 @@ int rcu_is_cpu_idle(void)
68780 int ret;
68781
68782 preempt_disable();
68783- ret = (atomic_read(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
68784+ ret = (atomic_read_unchecked(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
68785 preempt_enable();
68786 return ret;
68787 }
68788@@ -604,7 +604,7 @@ int rcu_is_cpu_rrupt_from_idle(void)
68789 */
68790 static int dyntick_save_progress_counter(struct rcu_data *rdp)
68791 {
68792- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
68793+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
68794 return (rdp->dynticks_snap & 0x1) == 0;
68795 }
68796
68797@@ -619,7 +619,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
68798 unsigned int curr;
68799 unsigned int snap;
68800
68801- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
68802+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
68803 snap = (unsigned int)rdp->dynticks_snap;
68804
68805 /*
68806@@ -1667,7 +1667,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
68807 /*
68808 * Do RCU core processing for the current CPU.
68809 */
68810-static void rcu_process_callbacks(struct softirq_action *unused)
68811+static void rcu_process_callbacks(void)
68812 {
68813 trace_rcu_utilization("Start RCU core");
68814 __rcu_process_callbacks(&rcu_sched_state,
68815@@ -2030,7 +2030,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
68816 rdp->qlen = 0;
68817 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
68818 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_NESTING);
68819- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
68820+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
68821 rdp->cpu = cpu;
68822 rdp->rsp = rsp;
68823 raw_spin_unlock_irqrestore(&rnp->lock, flags);
68824@@ -2058,8 +2058,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
68825 rdp->n_force_qs_snap = rsp->n_force_qs;
68826 rdp->blimit = blimit;
68827 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_NESTING;
68828- atomic_set(&rdp->dynticks->dynticks,
68829- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
68830+ atomic_set_unchecked(&rdp->dynticks->dynticks,
68831+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
68832 rcu_prepare_for_idle_init(cpu);
68833 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
68834
68835diff --git a/kernel/rcutree.h b/kernel/rcutree.h
68836index fddff92..2c08359 100644
68837--- a/kernel/rcutree.h
68838+++ b/kernel/rcutree.h
68839@@ -87,7 +87,7 @@ struct rcu_dynticks {
68840 long long dynticks_nesting; /* Track irq/process nesting level. */
68841 /* Process level is worth LLONG_MAX/2. */
68842 int dynticks_nmi_nesting; /* Track NMI nesting level. */
68843- atomic_t dynticks; /* Even value for idle, else odd. */
68844+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
68845 };
68846
68847 /* RCU's kthread states for tracing. */
68848diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
68849index 8bb35d7..6ea0a463 100644
68850--- a/kernel/rcutree_plugin.h
68851+++ b/kernel/rcutree_plugin.h
68852@@ -850,7 +850,7 @@ void synchronize_rcu_expedited(void)
68853
68854 /* Clean up and exit. */
68855 smp_mb(); /* ensure expedited GP seen before counter increment. */
68856- ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
68857+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
68858 unlock_mb_ret:
68859 mutex_unlock(&sync_rcu_preempt_exp_mutex);
68860 mb_ret:
68861@@ -1833,8 +1833,8 @@ EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
68862
68863 #else /* #ifndef CONFIG_SMP */
68864
68865-static atomic_t sync_sched_expedited_started = ATOMIC_INIT(0);
68866-static atomic_t sync_sched_expedited_done = ATOMIC_INIT(0);
68867+static atomic_unchecked_t sync_sched_expedited_started = ATOMIC_INIT(0);
68868+static atomic_unchecked_t sync_sched_expedited_done = ATOMIC_INIT(0);
68869
68870 static int synchronize_sched_expedited_cpu_stop(void *data)
68871 {
68872@@ -1889,7 +1889,7 @@ void synchronize_sched_expedited(void)
68873 int firstsnap, s, snap, trycount = 0;
68874
68875 /* Note that atomic_inc_return() implies full memory barrier. */
68876- firstsnap = snap = atomic_inc_return(&sync_sched_expedited_started);
68877+ firstsnap = snap = atomic_inc_return_unchecked(&sync_sched_expedited_started);
68878 get_online_cpus();
68879
68880 /*
68881@@ -1910,7 +1910,7 @@ void synchronize_sched_expedited(void)
68882 }
68883
68884 /* Check to see if someone else did our work for us. */
68885- s = atomic_read(&sync_sched_expedited_done);
68886+ s = atomic_read_unchecked(&sync_sched_expedited_done);
68887 if (UINT_CMP_GE((unsigned)s, (unsigned)firstsnap)) {
68888 smp_mb(); /* ensure test happens before caller kfree */
68889 return;
68890@@ -1925,7 +1925,7 @@ void synchronize_sched_expedited(void)
68891 * grace period works for us.
68892 */
68893 get_online_cpus();
68894- snap = atomic_read(&sync_sched_expedited_started);
68895+ snap = atomic_read_unchecked(&sync_sched_expedited_started);
68896 smp_mb(); /* ensure read is before try_stop_cpus(). */
68897 }
68898
68899@@ -1936,12 +1936,12 @@ void synchronize_sched_expedited(void)
68900 * than we did beat us to the punch.
68901 */
68902 do {
68903- s = atomic_read(&sync_sched_expedited_done);
68904+ s = atomic_read_unchecked(&sync_sched_expedited_done);
68905 if (UINT_CMP_GE((unsigned)s, (unsigned)snap)) {
68906 smp_mb(); /* ensure test happens before caller kfree */
68907 break;
68908 }
68909- } while (atomic_cmpxchg(&sync_sched_expedited_done, s, snap) != s);
68910+ } while (atomic_cmpxchg_unchecked(&sync_sched_expedited_done, s, snap) != s);
68911
68912 put_online_cpus();
68913 }
68914diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
68915index 654cfe6..c0b28e2 100644
68916--- a/kernel/rcutree_trace.c
68917+++ b/kernel/rcutree_trace.c
68918@@ -68,7 +68,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
68919 rdp->passed_quiesce, rdp->passed_quiesce_gpnum,
68920 rdp->qs_pending);
68921 seq_printf(m, " dt=%d/%llx/%d df=%lu",
68922- atomic_read(&rdp->dynticks->dynticks),
68923+ atomic_read_unchecked(&rdp->dynticks->dynticks),
68924 rdp->dynticks->dynticks_nesting,
68925 rdp->dynticks->dynticks_nmi_nesting,
68926 rdp->dynticks_fqs);
68927@@ -140,7 +140,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp)
68928 rdp->passed_quiesce, rdp->passed_quiesce_gpnum,
68929 rdp->qs_pending);
68930 seq_printf(m, ",%d,%llx,%d,%lu",
68931- atomic_read(&rdp->dynticks->dynticks),
68932+ atomic_read_unchecked(&rdp->dynticks->dynticks),
68933 rdp->dynticks->dynticks_nesting,
68934 rdp->dynticks->dynticks_nmi_nesting,
68935 rdp->dynticks_fqs);
68936diff --git a/kernel/resource.c b/kernel/resource.c
68937index 7640b3a..5879283 100644
68938--- a/kernel/resource.c
68939+++ b/kernel/resource.c
68940@@ -141,8 +141,18 @@ static const struct file_operations proc_iomem_operations = {
68941
68942 static int __init ioresources_init(void)
68943 {
68944+#ifdef CONFIG_GRKERNSEC_PROC_ADD
68945+#ifdef CONFIG_GRKERNSEC_PROC_USER
68946+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
68947+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
68948+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
68949+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
68950+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
68951+#endif
68952+#else
68953 proc_create("ioports", 0, NULL, &proc_ioports_operations);
68954 proc_create("iomem", 0, NULL, &proc_iomem_operations);
68955+#endif
68956 return 0;
68957 }
68958 __initcall(ioresources_init);
68959diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
68960index 98ec494..4241d6d 100644
68961--- a/kernel/rtmutex-tester.c
68962+++ b/kernel/rtmutex-tester.c
68963@@ -20,7 +20,7 @@
68964 #define MAX_RT_TEST_MUTEXES 8
68965
68966 static spinlock_t rttest_lock;
68967-static atomic_t rttest_event;
68968+static atomic_unchecked_t rttest_event;
68969
68970 struct test_thread_data {
68971 int opcode;
68972@@ -61,7 +61,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68973
68974 case RTTEST_LOCKCONT:
68975 td->mutexes[td->opdata] = 1;
68976- td->event = atomic_add_return(1, &rttest_event);
68977+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68978 return 0;
68979
68980 case RTTEST_RESET:
68981@@ -74,7 +74,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68982 return 0;
68983
68984 case RTTEST_RESETEVENT:
68985- atomic_set(&rttest_event, 0);
68986+ atomic_set_unchecked(&rttest_event, 0);
68987 return 0;
68988
68989 default:
68990@@ -91,9 +91,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68991 return ret;
68992
68993 td->mutexes[id] = 1;
68994- td->event = atomic_add_return(1, &rttest_event);
68995+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68996 rt_mutex_lock(&mutexes[id]);
68997- td->event = atomic_add_return(1, &rttest_event);
68998+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68999 td->mutexes[id] = 4;
69000 return 0;
69001
69002@@ -104,9 +104,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
69003 return ret;
69004
69005 td->mutexes[id] = 1;
69006- td->event = atomic_add_return(1, &rttest_event);
69007+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69008 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
69009- td->event = atomic_add_return(1, &rttest_event);
69010+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69011 td->mutexes[id] = ret ? 0 : 4;
69012 return ret ? -EINTR : 0;
69013
69014@@ -115,9 +115,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
69015 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
69016 return ret;
69017
69018- td->event = atomic_add_return(1, &rttest_event);
69019+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69020 rt_mutex_unlock(&mutexes[id]);
69021- td->event = atomic_add_return(1, &rttest_event);
69022+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69023 td->mutexes[id] = 0;
69024 return 0;
69025
69026@@ -164,7 +164,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
69027 break;
69028
69029 td->mutexes[dat] = 2;
69030- td->event = atomic_add_return(1, &rttest_event);
69031+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69032 break;
69033
69034 default:
69035@@ -184,7 +184,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
69036 return;
69037
69038 td->mutexes[dat] = 3;
69039- td->event = atomic_add_return(1, &rttest_event);
69040+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69041 break;
69042
69043 case RTTEST_LOCKNOWAIT:
69044@@ -196,7 +196,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
69045 return;
69046
69047 td->mutexes[dat] = 1;
69048- td->event = atomic_add_return(1, &rttest_event);
69049+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69050 return;
69051
69052 default:
69053diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
69054index e8a1f83..363d17d 100644
69055--- a/kernel/sched/auto_group.c
69056+++ b/kernel/sched/auto_group.c
69057@@ -11,7 +11,7 @@
69058
69059 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
69060 static struct autogroup autogroup_default;
69061-static atomic_t autogroup_seq_nr;
69062+static atomic_unchecked_t autogroup_seq_nr;
69063
69064 void __init autogroup_init(struct task_struct *init_task)
69065 {
69066@@ -78,7 +78,7 @@ static inline struct autogroup *autogroup_create(void)
69067
69068 kref_init(&ag->kref);
69069 init_rwsem(&ag->lock);
69070- ag->id = atomic_inc_return(&autogroup_seq_nr);
69071+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
69072 ag->tg = tg;
69073 #ifdef CONFIG_RT_GROUP_SCHED
69074 /*
69075diff --git a/kernel/sched/core.c b/kernel/sched/core.c
69076index 478a04c..6970d99 100644
69077--- a/kernel/sched/core.c
69078+++ b/kernel/sched/core.c
69079@@ -3142,6 +3142,19 @@ pick_next_task(struct rq *rq)
69080 BUG(); /* the idle class will always have a runnable task */
69081 }
69082
69083+#ifdef CONFIG_GRKERNSEC_SETXID
69084+extern void gr_delayed_cred_worker(void);
69085+static inline void gr_cred_schedule(void)
69086+{
69087+ if (unlikely(current->delayed_cred))
69088+ gr_delayed_cred_worker();
69089+}
69090+#else
69091+static inline void gr_cred_schedule(void)
69092+{
69093+}
69094+#endif
69095+
69096 /*
69097 * __schedule() is the main scheduler function.
69098 */
69099@@ -3161,6 +3174,8 @@ need_resched:
69100
69101 schedule_debug(prev);
69102
69103+ gr_cred_schedule();
69104+
69105 if (sched_feat(HRTICK))
69106 hrtick_clear(rq);
69107
69108@@ -3851,6 +3866,8 @@ int can_nice(const struct task_struct *p, const int nice)
69109 /* convert nice value [19,-20] to rlimit style value [1,40] */
69110 int nice_rlim = 20 - nice;
69111
69112+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
69113+
69114 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
69115 capable(CAP_SYS_NICE));
69116 }
69117@@ -3884,7 +3901,8 @@ SYSCALL_DEFINE1(nice, int, increment)
69118 if (nice > 19)
69119 nice = 19;
69120
69121- if (increment < 0 && !can_nice(current, nice))
69122+ if (increment < 0 && (!can_nice(current, nice) ||
69123+ gr_handle_chroot_nice()))
69124 return -EPERM;
69125
69126 retval = security_task_setnice(current, nice);
69127@@ -4041,6 +4059,7 @@ recheck:
69128 unsigned long rlim_rtprio =
69129 task_rlimit(p, RLIMIT_RTPRIO);
69130
69131+ gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
69132 /* can't set/change the rt policy */
69133 if (policy != p->policy && !rlim_rtprio)
69134 return -EPERM;
69135diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
69136index aca16b8..8e3acc4 100644
69137--- a/kernel/sched/fair.c
69138+++ b/kernel/sched/fair.c
69139@@ -5147,7 +5147,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
69140 * run_rebalance_domains is triggered when needed from the scheduler tick.
69141 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
69142 */
69143-static void run_rebalance_domains(struct softirq_action *h)
69144+static void run_rebalance_domains(void)
69145 {
69146 int this_cpu = smp_processor_id();
69147 struct rq *this_rq = cpu_rq(this_cpu);
69148diff --git a/kernel/signal.c b/kernel/signal.c
69149index b09cf3b..b291c66 100644
69150--- a/kernel/signal.c
69151+++ b/kernel/signal.c
69152@@ -46,12 +46,12 @@ static struct kmem_cache *sigqueue_cachep;
69153
69154 int print_fatal_signals __read_mostly;
69155
69156-static void __user *sig_handler(struct task_struct *t, int sig)
69157+static __sighandler_t sig_handler(struct task_struct *t, int sig)
69158 {
69159 return t->sighand->action[sig - 1].sa.sa_handler;
69160 }
69161
69162-static int sig_handler_ignored(void __user *handler, int sig)
69163+static int sig_handler_ignored(__sighandler_t handler, int sig)
69164 {
69165 /* Is it explicitly or implicitly ignored? */
69166 return handler == SIG_IGN ||
69167@@ -61,7 +61,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
69168 static int sig_task_ignored(struct task_struct *t, int sig,
69169 int from_ancestor_ns)
69170 {
69171- void __user *handler;
69172+ __sighandler_t handler;
69173
69174 handler = sig_handler(t, sig);
69175
69176@@ -365,6 +365,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
69177 atomic_inc(&user->sigpending);
69178 rcu_read_unlock();
69179
69180+ if (!override_rlimit)
69181+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
69182+
69183 if (override_rlimit ||
69184 atomic_read(&user->sigpending) <=
69185 task_rlimit(t, RLIMIT_SIGPENDING)) {
69186@@ -489,7 +492,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
69187
69188 int unhandled_signal(struct task_struct *tsk, int sig)
69189 {
69190- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
69191+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
69192 if (is_global_init(tsk))
69193 return 1;
69194 if (handler != SIG_IGN && handler != SIG_DFL)
69195@@ -816,6 +819,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
69196 }
69197 }
69198
69199+ /* allow glibc communication via tgkill to other threads in our
69200+ thread group */
69201+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
69202+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
69203+ && gr_handle_signal(t, sig))
69204+ return -EPERM;
69205+
69206 return security_task_kill(t, info, sig, 0);
69207 }
69208
69209@@ -1197,7 +1207,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
69210 return send_signal(sig, info, p, 1);
69211 }
69212
69213-static int
69214+int
69215 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69216 {
69217 return send_signal(sig, info, t, 0);
69218@@ -1234,6 +1244,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69219 unsigned long int flags;
69220 int ret, blocked, ignored;
69221 struct k_sigaction *action;
69222+ int is_unhandled = 0;
69223
69224 spin_lock_irqsave(&t->sighand->siglock, flags);
69225 action = &t->sighand->action[sig-1];
69226@@ -1248,9 +1259,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69227 }
69228 if (action->sa.sa_handler == SIG_DFL)
69229 t->signal->flags &= ~SIGNAL_UNKILLABLE;
69230+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
69231+ is_unhandled = 1;
69232 ret = specific_send_sig_info(sig, info, t);
69233 spin_unlock_irqrestore(&t->sighand->siglock, flags);
69234
69235+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
69236+ normal operation */
69237+ if (is_unhandled) {
69238+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
69239+ gr_handle_crash(t, sig);
69240+ }
69241+
69242 return ret;
69243 }
69244
69245@@ -1317,8 +1337,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
69246 ret = check_kill_permission(sig, info, p);
69247 rcu_read_unlock();
69248
69249- if (!ret && sig)
69250+ if (!ret && sig) {
69251 ret = do_send_sig_info(sig, info, p, true);
69252+ if (!ret)
69253+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
69254+ }
69255
69256 return ret;
69257 }
69258@@ -2829,7 +2852,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
69259 int error = -ESRCH;
69260
69261 rcu_read_lock();
69262- p = find_task_by_vpid(pid);
69263+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
69264+ /* allow glibc communication via tgkill to other threads in our
69265+ thread group */
69266+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
69267+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
69268+ p = find_task_by_vpid_unrestricted(pid);
69269+ else
69270+#endif
69271+ p = find_task_by_vpid(pid);
69272 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
69273 error = check_kill_permission(sig, info, p);
69274 /*
69275diff --git a/kernel/smp.c b/kernel/smp.c
69276index db197d6..17aef0b 100644
69277--- a/kernel/smp.c
69278+++ b/kernel/smp.c
69279@@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
69280 }
69281 EXPORT_SYMBOL(smp_call_function);
69282
69283-void ipi_call_lock(void)
69284+void ipi_call_lock(void) __acquires(call_function.lock)
69285 {
69286 raw_spin_lock(&call_function.lock);
69287 }
69288
69289-void ipi_call_unlock(void)
69290+void ipi_call_unlock(void) __releases(call_function.lock)
69291 {
69292 raw_spin_unlock(&call_function.lock);
69293 }
69294
69295-void ipi_call_lock_irq(void)
69296+void ipi_call_lock_irq(void) __acquires(call_function.lock)
69297 {
69298 raw_spin_lock_irq(&call_function.lock);
69299 }
69300
69301-void ipi_call_unlock_irq(void)
69302+void ipi_call_unlock_irq(void) __releases(call_function.lock)
69303 {
69304 raw_spin_unlock_irq(&call_function.lock);
69305 }
69306diff --git a/kernel/softirq.c b/kernel/softirq.c
69307index 4eb3a0f..6f1fa81 100644
69308--- a/kernel/softirq.c
69309+++ b/kernel/softirq.c
69310@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
69311
69312 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
69313
69314-char *softirq_to_name[NR_SOFTIRQS] = {
69315+const char * const softirq_to_name[NR_SOFTIRQS] = {
69316 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
69317 "TASKLET", "SCHED", "HRTIMER", "RCU"
69318 };
69319@@ -235,7 +235,7 @@ restart:
69320 kstat_incr_softirqs_this_cpu(vec_nr);
69321
69322 trace_softirq_entry(vec_nr);
69323- h->action(h);
69324+ h->action();
69325 trace_softirq_exit(vec_nr);
69326 if (unlikely(prev_count != preempt_count())) {
69327 printk(KERN_ERR "huh, entered softirq %u %s %p"
69328@@ -385,9 +385,11 @@ void raise_softirq(unsigned int nr)
69329 local_irq_restore(flags);
69330 }
69331
69332-void open_softirq(int nr, void (*action)(struct softirq_action *))
69333+void open_softirq(int nr, void (*action)(void))
69334 {
69335- softirq_vec[nr].action = action;
69336+ pax_open_kernel();
69337+ *(void **)&softirq_vec[nr].action = action;
69338+ pax_close_kernel();
69339 }
69340
69341 /*
69342@@ -441,7 +443,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
69343
69344 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
69345
69346-static void tasklet_action(struct softirq_action *a)
69347+static void tasklet_action(void)
69348 {
69349 struct tasklet_struct *list;
69350
69351@@ -476,7 +478,7 @@ static void tasklet_action(struct softirq_action *a)
69352 }
69353 }
69354
69355-static void tasklet_hi_action(struct softirq_action *a)
69356+static void tasklet_hi_action(void)
69357 {
69358 struct tasklet_struct *list;
69359
69360diff --git a/kernel/sys.c b/kernel/sys.c
69361index 888d227..f04b318 100644
69362--- a/kernel/sys.c
69363+++ b/kernel/sys.c
69364@@ -158,6 +158,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
69365 error = -EACCES;
69366 goto out;
69367 }
69368+
69369+ if (gr_handle_chroot_setpriority(p, niceval)) {
69370+ error = -EACCES;
69371+ goto out;
69372+ }
69373+
69374 no_nice = security_task_setnice(p, niceval);
69375 if (no_nice) {
69376 error = no_nice;
69377@@ -572,6 +578,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
69378 goto error;
69379 }
69380
69381+ if (gr_check_group_change(new->gid, new->egid, -1))
69382+ goto error;
69383+
69384 if (rgid != (gid_t) -1 ||
69385 (egid != (gid_t) -1 && egid != old->gid))
69386 new->sgid = new->egid;
69387@@ -601,6 +610,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
69388 old = current_cred();
69389
69390 retval = -EPERM;
69391+
69392+ if (gr_check_group_change(gid, gid, gid))
69393+ goto error;
69394+
69395 if (nsown_capable(CAP_SETGID))
69396 new->gid = new->egid = new->sgid = new->fsgid = gid;
69397 else if (gid == old->gid || gid == old->sgid)
69398@@ -618,7 +631,7 @@ error:
69399 /*
69400 * change the user struct in a credentials set to match the new UID
69401 */
69402-static int set_user(struct cred *new)
69403+int set_user(struct cred *new)
69404 {
69405 struct user_struct *new_user;
69406
69407@@ -688,6 +701,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
69408 goto error;
69409 }
69410
69411+ if (gr_check_user_change(new->uid, new->euid, -1))
69412+ goto error;
69413+
69414 if (new->uid != old->uid) {
69415 retval = set_user(new);
69416 if (retval < 0)
69417@@ -732,6 +748,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
69418 old = current_cred();
69419
69420 retval = -EPERM;
69421+
69422+ if (gr_check_crash_uid(uid))
69423+ goto error;
69424+ if (gr_check_user_change(uid, uid, uid))
69425+ goto error;
69426+
69427 if (nsown_capable(CAP_SETUID)) {
69428 new->suid = new->uid = uid;
69429 if (uid != old->uid) {
69430@@ -786,6 +808,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
69431 goto error;
69432 }
69433
69434+ if (gr_check_user_change(ruid, euid, -1))
69435+ goto error;
69436+
69437 if (ruid != (uid_t) -1) {
69438 new->uid = ruid;
69439 if (ruid != old->uid) {
69440@@ -850,6 +875,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
69441 goto error;
69442 }
69443
69444+ if (gr_check_group_change(rgid, egid, -1))
69445+ goto error;
69446+
69447 if (rgid != (gid_t) -1)
69448 new->gid = rgid;
69449 if (egid != (gid_t) -1)
69450@@ -896,6 +924,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
69451 old = current_cred();
69452 old_fsuid = old->fsuid;
69453
69454+ if (gr_check_user_change(-1, -1, uid))
69455+ goto error;
69456+
69457 if (uid == old->uid || uid == old->euid ||
69458 uid == old->suid || uid == old->fsuid ||
69459 nsown_capable(CAP_SETUID)) {
69460@@ -906,6 +937,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
69461 }
69462 }
69463
69464+error:
69465 abort_creds(new);
69466 return old_fsuid;
69467
69468@@ -932,12 +964,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
69469 if (gid == old->gid || gid == old->egid ||
69470 gid == old->sgid || gid == old->fsgid ||
69471 nsown_capable(CAP_SETGID)) {
69472+ if (gr_check_group_change(-1, -1, gid))
69473+ goto error;
69474+
69475 if (gid != old_fsgid) {
69476 new->fsgid = gid;
69477 goto change_okay;
69478 }
69479 }
69480
69481+error:
69482 abort_creds(new);
69483 return old_fsgid;
69484
69485@@ -1189,7 +1225,10 @@ static int override_release(char __user *release, int len)
69486 }
69487 v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40;
69488 snprintf(buf, len, "2.6.%u%s", v, rest);
69489- ret = copy_to_user(release, buf, len);
69490+ if (len > sizeof(buf))
69491+ ret = -EFAULT;
69492+ else
69493+ ret = copy_to_user(release, buf, len);
69494 }
69495 return ret;
69496 }
69497@@ -1243,19 +1282,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
69498 return -EFAULT;
69499
69500 down_read(&uts_sem);
69501- error = __copy_to_user(&name->sysname, &utsname()->sysname,
69502+ error = __copy_to_user(name->sysname, &utsname()->sysname,
69503 __OLD_UTS_LEN);
69504 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
69505- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
69506+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
69507 __OLD_UTS_LEN);
69508 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
69509- error |= __copy_to_user(&name->release, &utsname()->release,
69510+ error |= __copy_to_user(name->release, &utsname()->release,
69511 __OLD_UTS_LEN);
69512 error |= __put_user(0, name->release + __OLD_UTS_LEN);
69513- error |= __copy_to_user(&name->version, &utsname()->version,
69514+ error |= __copy_to_user(name->version, &utsname()->version,
69515 __OLD_UTS_LEN);
69516 error |= __put_user(0, name->version + __OLD_UTS_LEN);
69517- error |= __copy_to_user(&name->machine, &utsname()->machine,
69518+ error |= __copy_to_user(name->machine, &utsname()->machine,
69519 __OLD_UTS_LEN);
69520 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
69521 up_read(&uts_sem);
69522@@ -1838,7 +1877,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
69523 error = get_dumpable(me->mm);
69524 break;
69525 case PR_SET_DUMPABLE:
69526- if (arg2 < 0 || arg2 > 1) {
69527+ if (arg2 > 1) {
69528 error = -EINVAL;
69529 break;
69530 }
69531diff --git a/kernel/sysctl.c b/kernel/sysctl.c
69532index f03a6ef..5fcc8af 100644
69533--- a/kernel/sysctl.c
69534+++ b/kernel/sysctl.c
69535@@ -86,6 +86,13 @@
69536
69537
69538 #if defined(CONFIG_SYSCTL)
69539+#include <linux/grsecurity.h>
69540+#include <linux/grinternal.h>
69541+
69542+extern __u32 gr_handle_sysctl(const ctl_table *table, const int op);
69543+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
69544+ const int op);
69545+extern int gr_handle_chroot_sysctl(const int op);
69546
69547 /* External variables not in a header file. */
69548 extern int sysctl_overcommit_memory;
69549@@ -191,6 +198,7 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
69550 }
69551
69552 #endif
69553+extern struct ctl_table grsecurity_table[];
69554
69555 static struct ctl_table root_table[];
69556 static struct ctl_table_root sysctl_table_root;
69557@@ -220,6 +228,20 @@ extern struct ctl_table epoll_table[];
69558 int sysctl_legacy_va_layout;
69559 #endif
69560
69561+#ifdef CONFIG_PAX_SOFTMODE
69562+static ctl_table pax_table[] = {
69563+ {
69564+ .procname = "softmode",
69565+ .data = &pax_softmode,
69566+ .maxlen = sizeof(unsigned int),
69567+ .mode = 0600,
69568+ .proc_handler = &proc_dointvec,
69569+ },
69570+
69571+ { }
69572+};
69573+#endif
69574+
69575 /* The default sysctl tables: */
69576
69577 static struct ctl_table root_table[] = {
69578@@ -266,6 +288,22 @@ static int max_extfrag_threshold = 1000;
69579 #endif
69580
69581 static struct ctl_table kern_table[] = {
69582+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
69583+ {
69584+ .procname = "grsecurity",
69585+ .mode = 0500,
69586+ .child = grsecurity_table,
69587+ },
69588+#endif
69589+
69590+#ifdef CONFIG_PAX_SOFTMODE
69591+ {
69592+ .procname = "pax",
69593+ .mode = 0500,
69594+ .child = pax_table,
69595+ },
69596+#endif
69597+
69598 {
69599 .procname = "sched_child_runs_first",
69600 .data = &sysctl_sched_child_runs_first,
69601@@ -550,7 +588,7 @@ static struct ctl_table kern_table[] = {
69602 .data = &modprobe_path,
69603 .maxlen = KMOD_PATH_LEN,
69604 .mode = 0644,
69605- .proc_handler = proc_dostring,
69606+ .proc_handler = proc_dostring_modpriv,
69607 },
69608 {
69609 .procname = "modules_disabled",
69610@@ -717,16 +755,20 @@ static struct ctl_table kern_table[] = {
69611 .extra1 = &zero,
69612 .extra2 = &one,
69613 },
69614+#endif
69615 {
69616 .procname = "kptr_restrict",
69617 .data = &kptr_restrict,
69618 .maxlen = sizeof(int),
69619 .mode = 0644,
69620 .proc_handler = proc_dointvec_minmax_sysadmin,
69621+#ifdef CONFIG_GRKERNSEC_HIDESYM
69622+ .extra1 = &two,
69623+#else
69624 .extra1 = &zero,
69625+#endif
69626 .extra2 = &two,
69627 },
69628-#endif
69629 {
69630 .procname = "ngroups_max",
69631 .data = &ngroups_max,
69632@@ -1225,6 +1267,13 @@ static struct ctl_table vm_table[] = {
69633 .proc_handler = proc_dointvec_minmax,
69634 .extra1 = &zero,
69635 },
69636+ {
69637+ .procname = "heap_stack_gap",
69638+ .data = &sysctl_heap_stack_gap,
69639+ .maxlen = sizeof(sysctl_heap_stack_gap),
69640+ .mode = 0644,
69641+ .proc_handler = proc_doulongvec_minmax,
69642+ },
69643 #else
69644 {
69645 .procname = "nr_trim_pages",
69646@@ -1729,6 +1778,17 @@ static int test_perm(int mode, int op)
69647 int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
69648 {
69649 int mode;
69650+ int error;
69651+
69652+ if (table->parent != NULL && table->parent->procname != NULL &&
69653+ table->procname != NULL &&
69654+ gr_handle_sysctl_mod(table->parent->procname, table->procname, op))
69655+ return -EACCES;
69656+ if (gr_handle_chroot_sysctl(op))
69657+ return -EACCES;
69658+ error = gr_handle_sysctl(table, op);
69659+ if (error)
69660+ return error;
69661
69662 if (root->permissions)
69663 mode = root->permissions(root, current->nsproxy, table);
69664@@ -2133,6 +2193,16 @@ int proc_dostring(struct ctl_table *table, int write,
69665 buffer, lenp, ppos);
69666 }
69667
69668+int proc_dostring_modpriv(struct ctl_table *table, int write,
69669+ void __user *buffer, size_t *lenp, loff_t *ppos)
69670+{
69671+ if (write && !capable(CAP_SYS_MODULE))
69672+ return -EPERM;
69673+
69674+ return _proc_do_string(table->data, table->maxlen, write,
69675+ buffer, lenp, ppos);
69676+}
69677+
69678 static size_t proc_skip_spaces(char **buf)
69679 {
69680 size_t ret;
69681@@ -2238,6 +2308,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
69682 len = strlen(tmp);
69683 if (len > *size)
69684 len = *size;
69685+ if (len > sizeof(tmp))
69686+ len = sizeof(tmp);
69687 if (copy_to_user(*buf, tmp, len))
69688 return -EFAULT;
69689 *size -= len;
69690@@ -2554,8 +2626,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
69691 *i = val;
69692 } else {
69693 val = convdiv * (*i) / convmul;
69694- if (!first)
69695+ if (!first) {
69696 err = proc_put_char(&buffer, &left, '\t');
69697+ if (err)
69698+ break;
69699+ }
69700 err = proc_put_long(&buffer, &left, val, false);
69701 if (err)
69702 break;
69703@@ -2950,6 +3025,12 @@ int proc_dostring(struct ctl_table *table, int write,
69704 return -ENOSYS;
69705 }
69706
69707+int proc_dostring_modpriv(struct ctl_table *table, int write,
69708+ void __user *buffer, size_t *lenp, loff_t *ppos)
69709+{
69710+ return -ENOSYS;
69711+}
69712+
69713 int proc_dointvec(struct ctl_table *table, int write,
69714 void __user *buffer, size_t *lenp, loff_t *ppos)
69715 {
69716@@ -3006,6 +3087,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
69717 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
69718 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
69719 EXPORT_SYMBOL(proc_dostring);
69720+EXPORT_SYMBOL(proc_dostring_modpriv);
69721 EXPORT_SYMBOL(proc_doulongvec_minmax);
69722 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
69723 EXPORT_SYMBOL(register_sysctl_table);
69724diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
69725index a650694..aaeeb20 100644
69726--- a/kernel/sysctl_binary.c
69727+++ b/kernel/sysctl_binary.c
69728@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *file,
69729 int i;
69730
69731 set_fs(KERNEL_DS);
69732- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
69733+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
69734 set_fs(old_fs);
69735 if (result < 0)
69736 goto out_kfree;
69737@@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *file,
69738 }
69739
69740 set_fs(KERNEL_DS);
69741- result = vfs_write(file, buffer, str - buffer, &pos);
69742+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
69743 set_fs(old_fs);
69744 if (result < 0)
69745 goto out_kfree;
69746@@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file *file,
69747 int i;
69748
69749 set_fs(KERNEL_DS);
69750- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
69751+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
69752 set_fs(old_fs);
69753 if (result < 0)
69754 goto out_kfree;
69755@@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file *file,
69756 }
69757
69758 set_fs(KERNEL_DS);
69759- result = vfs_write(file, buffer, str - buffer, &pos);
69760+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
69761 set_fs(old_fs);
69762 if (result < 0)
69763 goto out_kfree;
69764@@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *file,
69765 int i;
69766
69767 set_fs(KERNEL_DS);
69768- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
69769+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
69770 set_fs(old_fs);
69771 if (result < 0)
69772 goto out;
69773@@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struct file *file,
69774 __le16 dnaddr;
69775
69776 set_fs(KERNEL_DS);
69777- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
69778+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
69779 set_fs(old_fs);
69780 if (result < 0)
69781 goto out;
69782@@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struct file *file,
69783 le16_to_cpu(dnaddr) & 0x3ff);
69784
69785 set_fs(KERNEL_DS);
69786- result = vfs_write(file, buf, len, &pos);
69787+ result = vfs_write(file, (const char __force_user *)buf, len, &pos);
69788 set_fs(old_fs);
69789 if (result < 0)
69790 goto out;
69791diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
69792index 362da65..ab8ef8c 100644
69793--- a/kernel/sysctl_check.c
69794+++ b/kernel/sysctl_check.c
69795@@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
69796 set_fail(&fail, table, "Directory with extra2");
69797 } else {
69798 if ((table->proc_handler == proc_dostring) ||
69799+ (table->proc_handler == proc_dostring_modpriv) ||
69800 (table->proc_handler == proc_dointvec) ||
69801 (table->proc_handler == proc_dointvec_minmax) ||
69802 (table->proc_handler == proc_dointvec_jiffies) ||
69803diff --git a/kernel/taskstats.c b/kernel/taskstats.c
69804index e660464..c8b9e67 100644
69805--- a/kernel/taskstats.c
69806+++ b/kernel/taskstats.c
69807@@ -27,9 +27,12 @@
69808 #include <linux/cgroup.h>
69809 #include <linux/fs.h>
69810 #include <linux/file.h>
69811+#include <linux/grsecurity.h>
69812 #include <net/genetlink.h>
69813 #include <linux/atomic.h>
69814
69815+extern int gr_is_taskstats_denied(int pid);
69816+
69817 /*
69818 * Maximum length of a cpumask that can be specified in
69819 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
69820@@ -556,6 +559,9 @@ err:
69821
69822 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
69823 {
69824+ if (gr_is_taskstats_denied(current->pid))
69825+ return -EACCES;
69826+
69827 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
69828 return cmd_attr_register_cpumask(info);
69829 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
69830diff --git a/kernel/time.c b/kernel/time.c
69831index 73e416d..cfc6f69 100644
69832--- a/kernel/time.c
69833+++ b/kernel/time.c
69834@@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
69835 return error;
69836
69837 if (tz) {
69838+ /* we log in do_settimeofday called below, so don't log twice
69839+ */
69840+ if (!tv)
69841+ gr_log_timechange();
69842+
69843 /* SMP safe, global irq locking makes it work. */
69844 sys_tz = *tz;
69845 update_vsyscall_tz();
69846diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
69847index 8a46f5d..bbe6f9c 100644
69848--- a/kernel/time/alarmtimer.c
69849+++ b/kernel/time/alarmtimer.c
69850@@ -773,7 +773,7 @@ static int __init alarmtimer_init(void)
69851 struct platform_device *pdev;
69852 int error = 0;
69853 int i;
69854- struct k_clock alarm_clock = {
69855+ static struct k_clock alarm_clock = {
69856 .clock_getres = alarm_clock_getres,
69857 .clock_get = alarm_clock_get,
69858 .timer_create = alarm_timer_create,
69859diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
69860index fd4a7b1..fae5c2a 100644
69861--- a/kernel/time/tick-broadcast.c
69862+++ b/kernel/time/tick-broadcast.c
69863@@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
69864 * then clear the broadcast bit.
69865 */
69866 if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
69867- int cpu = smp_processor_id();
69868+ cpu = smp_processor_id();
69869
69870 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
69871 tick_broadcast_clear_oneshot(cpu);
69872diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
69873index 0c63581..e25dcb6 100644
69874--- a/kernel/time/timekeeping.c
69875+++ b/kernel/time/timekeeping.c
69876@@ -14,6 +14,7 @@
69877 #include <linux/init.h>
69878 #include <linux/mm.h>
69879 #include <linux/sched.h>
69880+#include <linux/grsecurity.h>
69881 #include <linux/syscore_ops.h>
69882 #include <linux/clocksource.h>
69883 #include <linux/jiffies.h>
69884@@ -365,6 +366,8 @@ int do_settimeofday(const struct timespec *tv)
69885 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
69886 return -EINVAL;
69887
69888+ gr_log_timechange();
69889+
69890 write_seqlock_irqsave(&xtime_lock, flags);
69891
69892 timekeeping_forward_now();
69893diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
69894index 3258455..f35227d 100644
69895--- a/kernel/time/timer_list.c
69896+++ b/kernel/time/timer_list.c
69897@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
69898
69899 static void print_name_offset(struct seq_file *m, void *sym)
69900 {
69901+#ifdef CONFIG_GRKERNSEC_HIDESYM
69902+ SEQ_printf(m, "<%p>", NULL);
69903+#else
69904 char symname[KSYM_NAME_LEN];
69905
69906 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
69907 SEQ_printf(m, "<%pK>", sym);
69908 else
69909 SEQ_printf(m, "%s", symname);
69910+#endif
69911 }
69912
69913 static void
69914@@ -112,7 +116,11 @@ next_one:
69915 static void
69916 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
69917 {
69918+#ifdef CONFIG_GRKERNSEC_HIDESYM
69919+ SEQ_printf(m, " .base: %p\n", NULL);
69920+#else
69921 SEQ_printf(m, " .base: %pK\n", base);
69922+#endif
69923 SEQ_printf(m, " .index: %d\n",
69924 base->index);
69925 SEQ_printf(m, " .resolution: %Lu nsecs\n",
69926@@ -293,7 +301,11 @@ static int __init init_timer_list_procfs(void)
69927 {
69928 struct proc_dir_entry *pe;
69929
69930+#ifdef CONFIG_GRKERNSEC_PROC_ADD
69931+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
69932+#else
69933 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
69934+#endif
69935 if (!pe)
69936 return -ENOMEM;
69937 return 0;
69938diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
69939index 0b537f2..9e71eca 100644
69940--- a/kernel/time/timer_stats.c
69941+++ b/kernel/time/timer_stats.c
69942@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
69943 static unsigned long nr_entries;
69944 static struct entry entries[MAX_ENTRIES];
69945
69946-static atomic_t overflow_count;
69947+static atomic_unchecked_t overflow_count;
69948
69949 /*
69950 * The entries are in a hash-table, for fast lookup:
69951@@ -140,7 +140,7 @@ static void reset_entries(void)
69952 nr_entries = 0;
69953 memset(entries, 0, sizeof(entries));
69954 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
69955- atomic_set(&overflow_count, 0);
69956+ atomic_set_unchecked(&overflow_count, 0);
69957 }
69958
69959 static struct entry *alloc_entry(void)
69960@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
69961 if (likely(entry))
69962 entry->count++;
69963 else
69964- atomic_inc(&overflow_count);
69965+ atomic_inc_unchecked(&overflow_count);
69966
69967 out_unlock:
69968 raw_spin_unlock_irqrestore(lock, flags);
69969@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
69970
69971 static void print_name_offset(struct seq_file *m, unsigned long addr)
69972 {
69973+#ifdef CONFIG_GRKERNSEC_HIDESYM
69974+ seq_printf(m, "<%p>", NULL);
69975+#else
69976 char symname[KSYM_NAME_LEN];
69977
69978 if (lookup_symbol_name(addr, symname) < 0)
69979 seq_printf(m, "<%p>", (void *)addr);
69980 else
69981 seq_printf(m, "%s", symname);
69982+#endif
69983 }
69984
69985 static int tstats_show(struct seq_file *m, void *v)
69986@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
69987
69988 seq_puts(m, "Timer Stats Version: v0.2\n");
69989 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
69990- if (atomic_read(&overflow_count))
69991+ if (atomic_read_unchecked(&overflow_count))
69992 seq_printf(m, "Overflow: %d entries\n",
69993- atomic_read(&overflow_count));
69994+ atomic_read_unchecked(&overflow_count));
69995
69996 for (i = 0; i < nr_entries; i++) {
69997 entry = entries + i;
69998@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
69999 {
70000 struct proc_dir_entry *pe;
70001
70002+#ifdef CONFIG_GRKERNSEC_PROC_ADD
70003+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
70004+#else
70005 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
70006+#endif
70007 if (!pe)
70008 return -ENOMEM;
70009 return 0;
70010diff --git a/kernel/timer.c b/kernel/timer.c
70011index a297ffc..5e16b0b 100644
70012--- a/kernel/timer.c
70013+++ b/kernel/timer.c
70014@@ -1354,7 +1354,7 @@ void update_process_times(int user_tick)
70015 /*
70016 * This function runs timers and the timer-tq in bottom half context.
70017 */
70018-static void run_timer_softirq(struct softirq_action *h)
70019+static void run_timer_softirq(void)
70020 {
70021 struct tvec_base *base = __this_cpu_read(tvec_bases);
70022
70023diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
70024index cdea7b5..9b820d4 100644
70025--- a/kernel/trace/blktrace.c
70026+++ b/kernel/trace/blktrace.c
70027@@ -324,7 +324,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
70028 struct blk_trace *bt = filp->private_data;
70029 char buf[16];
70030
70031- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
70032+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
70033
70034 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
70035 }
70036@@ -389,7 +389,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
70037 return 1;
70038
70039 bt = buf->chan->private_data;
70040- atomic_inc(&bt->dropped);
70041+ atomic_inc_unchecked(&bt->dropped);
70042 return 0;
70043 }
70044
70045@@ -490,7 +490,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
70046
70047 bt->dir = dir;
70048 bt->dev = dev;
70049- atomic_set(&bt->dropped, 0);
70050+ atomic_set_unchecked(&bt->dropped, 0);
70051
70052 ret = -EIO;
70053 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
70054diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
70055index 683d559..d70d914 100644
70056--- a/kernel/trace/ftrace.c
70057+++ b/kernel/trace/ftrace.c
70058@@ -1726,12 +1726,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
70059 if (unlikely(ftrace_disabled))
70060 return 0;
70061
70062+ ret = ftrace_arch_code_modify_prepare();
70063+ FTRACE_WARN_ON(ret);
70064+ if (ret)
70065+ return 0;
70066+
70067 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
70068+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
70069 if (ret) {
70070 ftrace_bug(ret, ip);
70071- return 0;
70072 }
70073- return 1;
70074+ return ret ? 0 : 1;
70075 }
70076
70077 /*
70078@@ -2843,7 +2848,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp)
70079
70080 int
70081 register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
70082- void *data)
70083+ void *data)
70084 {
70085 struct ftrace_func_probe *entry;
70086 struct ftrace_page *pg;
70087diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
70088index c4579f1..6a439da 100644
70089--- a/kernel/trace/trace.c
70090+++ b/kernel/trace/trace.c
70091@@ -4258,10 +4258,9 @@ static const struct file_operations tracing_dyn_info_fops = {
70092 };
70093 #endif
70094
70095-static struct dentry *d_tracer;
70096-
70097 struct dentry *tracing_init_dentry(void)
70098 {
70099+ static struct dentry *d_tracer;
70100 static int once;
70101
70102 if (d_tracer)
70103@@ -4281,10 +4280,9 @@ struct dentry *tracing_init_dentry(void)
70104 return d_tracer;
70105 }
70106
70107-static struct dentry *d_percpu;
70108-
70109 struct dentry *tracing_dentry_percpu(void)
70110 {
70111+ static struct dentry *d_percpu;
70112 static int once;
70113 struct dentry *d_tracer;
70114
70115diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
70116index c212a7f..7b02394 100644
70117--- a/kernel/trace/trace_events.c
70118+++ b/kernel/trace/trace_events.c
70119@@ -1299,10 +1299,6 @@ static LIST_HEAD(ftrace_module_file_list);
70120 struct ftrace_module_file_ops {
70121 struct list_head list;
70122 struct module *mod;
70123- struct file_operations id;
70124- struct file_operations enable;
70125- struct file_operations format;
70126- struct file_operations filter;
70127 };
70128
70129 static struct ftrace_module_file_ops *
70130@@ -1323,17 +1319,12 @@ trace_create_file_ops(struct module *mod)
70131
70132 file_ops->mod = mod;
70133
70134- file_ops->id = ftrace_event_id_fops;
70135- file_ops->id.owner = mod;
70136-
70137- file_ops->enable = ftrace_enable_fops;
70138- file_ops->enable.owner = mod;
70139-
70140- file_ops->filter = ftrace_event_filter_fops;
70141- file_ops->filter.owner = mod;
70142-
70143- file_ops->format = ftrace_event_format_fops;
70144- file_ops->format.owner = mod;
70145+ pax_open_kernel();
70146+ *(void **)&mod->trace_id.owner = mod;
70147+ *(void **)&mod->trace_enable.owner = mod;
70148+ *(void **)&mod->trace_filter.owner = mod;
70149+ *(void **)&mod->trace_format.owner = mod;
70150+ pax_close_kernel();
70151
70152 list_add(&file_ops->list, &ftrace_module_file_list);
70153
70154@@ -1357,8 +1348,8 @@ static void trace_module_add_events(struct module *mod)
70155
70156 for_each_event(call, start, end) {
70157 __trace_add_event_call(*call, mod,
70158- &file_ops->id, &file_ops->enable,
70159- &file_ops->filter, &file_ops->format);
70160+ &mod->trace_id, &mod->trace_enable,
70161+ &mod->trace_filter, &mod->trace_format);
70162 }
70163 }
70164
70165diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
70166index 00d527c..7c5b1a3 100644
70167--- a/kernel/trace/trace_kprobe.c
70168+++ b/kernel/trace/trace_kprobe.c
70169@@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
70170 long ret;
70171 int maxlen = get_rloc_len(*(u32 *)dest);
70172 u8 *dst = get_rloc_data(dest);
70173- u8 *src = addr;
70174+ const u8 __user *src = (const u8 __force_user *)addr;
70175 mm_segment_t old_fs = get_fs();
70176 if (!maxlen)
70177 return;
70178@@ -229,7 +229,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
70179 pagefault_disable();
70180 do
70181 ret = __copy_from_user_inatomic(dst++, src++, 1);
70182- while (dst[-1] && ret == 0 && src - (u8 *)addr < maxlen);
70183+ while (dst[-1] && ret == 0 && src - (const u8 __force_user *)addr < maxlen);
70184 dst[-1] = '\0';
70185 pagefault_enable();
70186 set_fs(old_fs);
70187@@ -238,7 +238,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
70188 ((u8 *)get_rloc_data(dest))[0] = '\0';
70189 *(u32 *)dest = make_data_rloc(0, get_rloc_offs(*(u32 *)dest));
70190 } else
70191- *(u32 *)dest = make_data_rloc(src - (u8 *)addr,
70192+ *(u32 *)dest = make_data_rloc(src - (const u8 __force_user *)addr,
70193 get_rloc_offs(*(u32 *)dest));
70194 }
70195 /* Return the length of string -- including null terminal byte */
70196@@ -252,7 +252,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string_size)(struct pt_regs *regs,
70197 set_fs(KERNEL_DS);
70198 pagefault_disable();
70199 do {
70200- ret = __copy_from_user_inatomic(&c, (u8 *)addr + len, 1);
70201+ ret = __copy_from_user_inatomic(&c, (const u8 __force_user *)addr + len, 1);
70202 len++;
70203 } while (c && ret == 0 && len < MAX_STRING_SIZE);
70204 pagefault_enable();
70205diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
70206index fd3c8aa..5f324a6 100644
70207--- a/kernel/trace/trace_mmiotrace.c
70208+++ b/kernel/trace/trace_mmiotrace.c
70209@@ -24,7 +24,7 @@ struct header_iter {
70210 static struct trace_array *mmio_trace_array;
70211 static bool overrun_detected;
70212 static unsigned long prev_overruns;
70213-static atomic_t dropped_count;
70214+static atomic_unchecked_t dropped_count;
70215
70216 static void mmio_reset_data(struct trace_array *tr)
70217 {
70218@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
70219
70220 static unsigned long count_overruns(struct trace_iterator *iter)
70221 {
70222- unsigned long cnt = atomic_xchg(&dropped_count, 0);
70223+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
70224 unsigned long over = ring_buffer_overruns(iter->tr->buffer);
70225
70226 if (over > prev_overruns)
70227@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
70228 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
70229 sizeof(*entry), 0, pc);
70230 if (!event) {
70231- atomic_inc(&dropped_count);
70232+ atomic_inc_unchecked(&dropped_count);
70233 return;
70234 }
70235 entry = ring_buffer_event_data(event);
70236@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
70237 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
70238 sizeof(*entry), 0, pc);
70239 if (!event) {
70240- atomic_inc(&dropped_count);
70241+ atomic_inc_unchecked(&dropped_count);
70242 return;
70243 }
70244 entry = ring_buffer_event_data(event);
70245diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
70246index d9c07f0..c1eeceb 100644
70247--- a/kernel/trace/trace_output.c
70248+++ b/kernel/trace/trace_output.c
70249@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, struct path *path)
70250
70251 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
70252 if (!IS_ERR(p)) {
70253- p = mangle_path(s->buffer + s->len, p, "\n");
70254+ p = mangle_path(s->buffer + s->len, p, "\n\\");
70255 if (p) {
70256 s->len = p - s->buffer;
70257 return 1;
70258diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
70259index d4545f4..a9010a1 100644
70260--- a/kernel/trace/trace_stack.c
70261+++ b/kernel/trace/trace_stack.c
70262@@ -53,7 +53,7 @@ static inline void check_stack(void)
70263 return;
70264
70265 /* we do not handle interrupt stacks yet */
70266- if (!object_is_on_stack(&this_size))
70267+ if (!object_starts_on_stack(&this_size))
70268 return;
70269
70270 local_irq_save(flags);
70271diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
70272index 209b379..7f76423 100644
70273--- a/kernel/trace/trace_workqueue.c
70274+++ b/kernel/trace/trace_workqueue.c
70275@@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
70276 int cpu;
70277 pid_t pid;
70278 /* Can be inserted from interrupt or user context, need to be atomic */
70279- atomic_t inserted;
70280+ atomic_unchecked_t inserted;
70281 /*
70282 * Don't need to be atomic, works are serialized in a single workqueue thread
70283 * on a single CPU.
70284@@ -60,7 +60,7 @@ probe_workqueue_insertion(void *ignore,
70285 spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags);
70286 list_for_each_entry(node, &workqueue_cpu_stat(cpu)->list, list) {
70287 if (node->pid == wq_thread->pid) {
70288- atomic_inc(&node->inserted);
70289+ atomic_inc_unchecked(&node->inserted);
70290 goto found;
70291 }
70292 }
70293@@ -210,7 +210,7 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
70294 tsk = get_pid_task(pid, PIDTYPE_PID);
70295 if (tsk) {
70296 seq_printf(s, "%3d %6d %6u %s\n", cws->cpu,
70297- atomic_read(&cws->inserted), cws->executed,
70298+ atomic_read_unchecked(&cws->inserted), cws->executed,
70299 tsk->comm);
70300 put_task_struct(tsk);
70301 }
70302diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
70303index 8745ac7..d144e37 100644
70304--- a/lib/Kconfig.debug
70305+++ b/lib/Kconfig.debug
70306@@ -1103,6 +1103,7 @@ config LATENCYTOP
70307 depends on DEBUG_KERNEL
70308 depends on STACKTRACE_SUPPORT
70309 depends on PROC_FS
70310+ depends on !GRKERNSEC_HIDESYM
70311 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND
70312 select KALLSYMS
70313 select KALLSYMS_ALL
70314diff --git a/lib/bitmap.c b/lib/bitmap.c
70315index 0d4a127..33a06c7 100644
70316--- a/lib/bitmap.c
70317+++ b/lib/bitmap.c
70318@@ -419,7 +419,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
70319 {
70320 int c, old_c, totaldigits, ndigits, nchunks, nbits;
70321 u32 chunk;
70322- const char __user __force *ubuf = (const char __user __force *)buf;
70323+ const char __user *ubuf = (const char __force_user *)buf;
70324
70325 bitmap_zero(maskp, nmaskbits);
70326
70327@@ -504,7 +504,7 @@ int bitmap_parse_user(const char __user *ubuf,
70328 {
70329 if (!access_ok(VERIFY_READ, ubuf, ulen))
70330 return -EFAULT;
70331- return __bitmap_parse((const char __force *)ubuf,
70332+ return __bitmap_parse((const char __force_kernel *)ubuf,
70333 ulen, 1, maskp, nmaskbits);
70334
70335 }
70336@@ -596,7 +596,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
70337 {
70338 unsigned a, b;
70339 int c, old_c, totaldigits;
70340- const char __user __force *ubuf = (const char __user __force *)buf;
70341+ const char __user *ubuf = (const char __force_user *)buf;
70342 int exp_digit, in_range;
70343
70344 totaldigits = c = 0;
70345@@ -696,7 +696,7 @@ int bitmap_parselist_user(const char __user *ubuf,
70346 {
70347 if (!access_ok(VERIFY_READ, ubuf, ulen))
70348 return -EFAULT;
70349- return __bitmap_parselist((const char __force *)ubuf,
70350+ return __bitmap_parselist((const char __force_kernel *)ubuf,
70351 ulen, 1, maskp, nmaskbits);
70352 }
70353 EXPORT_SYMBOL(bitmap_parselist_user);
70354diff --git a/lib/bug.c b/lib/bug.c
70355index a28c141..2bd3d95 100644
70356--- a/lib/bug.c
70357+++ b/lib/bug.c
70358@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
70359 return BUG_TRAP_TYPE_NONE;
70360
70361 bug = find_bug(bugaddr);
70362+ if (!bug)
70363+ return BUG_TRAP_TYPE_NONE;
70364
70365 file = NULL;
70366 line = 0;
70367diff --git a/lib/debugobjects.c b/lib/debugobjects.c
70368index 0ab9ae8..f01ceca 100644
70369--- a/lib/debugobjects.c
70370+++ b/lib/debugobjects.c
70371@@ -288,7 +288,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
70372 if (limit > 4)
70373 return;
70374
70375- is_on_stack = object_is_on_stack(addr);
70376+ is_on_stack = object_starts_on_stack(addr);
70377 if (is_on_stack == onstack)
70378 return;
70379
70380diff --git a/lib/devres.c b/lib/devres.c
70381index 9676617..5149e15 100644
70382--- a/lib/devres.c
70383+++ b/lib/devres.c
70384@@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
70385 void devm_iounmap(struct device *dev, void __iomem *addr)
70386 {
70387 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
70388- (void *)addr));
70389+ (void __force *)addr));
70390 iounmap(addr);
70391 }
70392 EXPORT_SYMBOL(devm_iounmap);
70393@@ -192,7 +192,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
70394 {
70395 ioport_unmap(addr);
70396 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
70397- devm_ioport_map_match, (void *)addr));
70398+ devm_ioport_map_match, (void __force *)addr));
70399 }
70400 EXPORT_SYMBOL(devm_ioport_unmap);
70401
70402diff --git a/lib/dma-debug.c b/lib/dma-debug.c
70403index fea790a..ebb0e82 100644
70404--- a/lib/dma-debug.c
70405+++ b/lib/dma-debug.c
70406@@ -925,7 +925,7 @@ out:
70407
70408 static void check_for_stack(struct device *dev, void *addr)
70409 {
70410- if (object_is_on_stack(addr))
70411+ if (object_starts_on_stack(addr))
70412 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
70413 "stack [addr=%p]\n", addr);
70414 }
70415diff --git a/lib/extable.c b/lib/extable.c
70416index 4cac81e..63e9b8f 100644
70417--- a/lib/extable.c
70418+++ b/lib/extable.c
70419@@ -13,6 +13,7 @@
70420 #include <linux/init.h>
70421 #include <linux/sort.h>
70422 #include <asm/uaccess.h>
70423+#include <asm/pgtable.h>
70424
70425 #ifndef ARCH_HAS_SORT_EXTABLE
70426 /*
70427@@ -36,8 +37,10 @@ static int cmp_ex(const void *a, const void *b)
70428 void sort_extable(struct exception_table_entry *start,
70429 struct exception_table_entry *finish)
70430 {
70431+ pax_open_kernel();
70432 sort(start, finish - start, sizeof(struct exception_table_entry),
70433 cmp_ex, NULL);
70434+ pax_close_kernel();
70435 }
70436
70437 #ifdef CONFIG_MODULES
70438diff --git a/lib/inflate.c b/lib/inflate.c
70439index 013a761..c28f3fc 100644
70440--- a/lib/inflate.c
70441+++ b/lib/inflate.c
70442@@ -269,7 +269,7 @@ static void free(void *where)
70443 malloc_ptr = free_mem_ptr;
70444 }
70445 #else
70446-#define malloc(a) kmalloc(a, GFP_KERNEL)
70447+#define malloc(a) kmalloc((a), GFP_KERNEL)
70448 #define free(a) kfree(a)
70449 #endif
70450
70451diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
70452index bd2bea9..6b3c95e 100644
70453--- a/lib/is_single_threaded.c
70454+++ b/lib/is_single_threaded.c
70455@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
70456 struct task_struct *p, *t;
70457 bool ret;
70458
70459+ if (!mm)
70460+ return true;
70461+
70462 if (atomic_read(&task->signal->live) != 1)
70463 return false;
70464
70465diff --git a/lib/radix-tree.c b/lib/radix-tree.c
70466index dc63d08..95ae14a 100644
70467--- a/lib/radix-tree.c
70468+++ b/lib/radix-tree.c
70469@@ -78,7 +78,7 @@ struct radix_tree_preload {
70470 int nr;
70471 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
70472 };
70473-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
70474+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
70475
70476 static inline void *ptr_to_indirect(void *ptr)
70477 {
70478diff --git a/lib/vsprintf.c b/lib/vsprintf.c
70479index 38e612e..4fb99a8 100644
70480--- a/lib/vsprintf.c
70481+++ b/lib/vsprintf.c
70482@@ -16,6 +16,9 @@
70483 * - scnprintf and vscnprintf
70484 */
70485
70486+#ifdef CONFIG_GRKERNSEC_HIDESYM
70487+#define __INCLUDED_BY_HIDESYM 1
70488+#endif
70489 #include <stdarg.h>
70490 #include <linux/module.h>
70491 #include <linux/types.h>
70492@@ -413,7 +416,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
70493 char sym[KSYM_SYMBOL_LEN];
70494 if (ext == 'B')
70495 sprint_backtrace(sym, value);
70496- else if (ext != 'f' && ext != 's')
70497+ else if (ext != 'f' && ext != 's' && ext != 'a')
70498 sprint_symbol(sym, value);
70499 else
70500 kallsyms_lookup(value, NULL, NULL, NULL, sym);
70501@@ -789,7 +792,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
70502 return number(buf, end, *(const netdev_features_t *)addr, spec);
70503 }
70504
70505+#ifdef CONFIG_GRKERNSEC_HIDESYM
70506+int kptr_restrict __read_mostly = 2;
70507+#else
70508 int kptr_restrict __read_mostly;
70509+#endif
70510
70511 /*
70512 * Show a '%p' thing. A kernel extension is that the '%p' is followed
70513@@ -803,6 +810,8 @@ int kptr_restrict __read_mostly;
70514 * - 'S' For symbolic direct pointers with offset
70515 * - 's' For symbolic direct pointers without offset
70516 * - 'B' For backtraced symbolic direct pointers with offset
70517+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
70518+ * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
70519 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
70520 * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
70521 * - 'M' For a 6-byte MAC address, it prints the address in the
70522@@ -848,12 +857,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70523 {
70524 if (!ptr && *fmt != 'K') {
70525 /*
70526- * Print (null) with the same width as a pointer so it makes
70527+ * Print (nil) with the same width as a pointer so it makes
70528 * tabular output look nice.
70529 */
70530 if (spec.field_width == -1)
70531 spec.field_width = 2 * sizeof(void *);
70532- return string(buf, end, "(null)", spec);
70533+ return string(buf, end, "(nil)", spec);
70534 }
70535
70536 switch (*fmt) {
70537@@ -863,6 +872,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70538 /* Fallthrough */
70539 case 'S':
70540 case 's':
70541+#ifdef CONFIG_GRKERNSEC_HIDESYM
70542+ break;
70543+#else
70544+ return symbol_string(buf, end, ptr, spec, *fmt);
70545+#endif
70546+ case 'A':
70547+ case 'a':
70548 case 'B':
70549 return symbol_string(buf, end, ptr, spec, *fmt);
70550 case 'R':
70551@@ -1633,11 +1649,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
70552 typeof(type) value; \
70553 if (sizeof(type) == 8) { \
70554 args = PTR_ALIGN(args, sizeof(u32)); \
70555- *(u32 *)&value = *(u32 *)args; \
70556- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
70557+ *(u32 *)&value = *(const u32 *)args; \
70558+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
70559 } else { \
70560 args = PTR_ALIGN(args, sizeof(type)); \
70561- value = *(typeof(type) *)args; \
70562+ value = *(const typeof(type) *)args; \
70563 } \
70564 args += sizeof(type); \
70565 value; \
70566@@ -1700,7 +1716,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
70567 case FORMAT_TYPE_STR: {
70568 const char *str_arg = args;
70569 args += strlen(str_arg) + 1;
70570- str = string(str, end, (char *)str_arg, spec);
70571+ str = string(str, end, str_arg, spec);
70572 break;
70573 }
70574
70575diff --git a/localversion-grsec b/localversion-grsec
70576new file mode 100644
70577index 0000000..7cd6065
70578--- /dev/null
70579+++ b/localversion-grsec
70580@@ -0,0 +1 @@
70581+-grsec
70582diff --git a/mm/Kconfig b/mm/Kconfig
70583index e338407..49b5b7a 100644
70584--- a/mm/Kconfig
70585+++ b/mm/Kconfig
70586@@ -247,10 +247,10 @@ config KSM
70587 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
70588
70589 config DEFAULT_MMAP_MIN_ADDR
70590- int "Low address space to protect from user allocation"
70591+ int "Low address space to protect from user allocation"
70592 depends on MMU
70593- default 4096
70594- help
70595+ default 65536
70596+ help
70597 This is the portion of low virtual memory which should be protected
70598 from userspace allocation. Keeping a user from writing to low pages
70599 can help reduce the impact of kernel NULL pointer bugs.
70600diff --git a/mm/filemap.c b/mm/filemap.c
70601index b662757..3081ddd 100644
70602--- a/mm/filemap.c
70603+++ b/mm/filemap.c
70604@@ -1770,7 +1770,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
70605 struct address_space *mapping = file->f_mapping;
70606
70607 if (!mapping->a_ops->readpage)
70608- return -ENOEXEC;
70609+ return -ENODEV;
70610 file_accessed(file);
70611 vma->vm_ops = &generic_file_vm_ops;
70612 vma->vm_flags |= VM_CAN_NONLINEAR;
70613@@ -2176,6 +2176,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
70614 *pos = i_size_read(inode);
70615
70616 if (limit != RLIM_INFINITY) {
70617+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
70618 if (*pos >= limit) {
70619 send_sig(SIGXFSZ, current, 0);
70620 return -EFBIG;
70621diff --git a/mm/fremap.c b/mm/fremap.c
70622index 9ed4fd4..c42648d 100644
70623--- a/mm/fremap.c
70624+++ b/mm/fremap.c
70625@@ -155,6 +155,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
70626 retry:
70627 vma = find_vma(mm, start);
70628
70629+#ifdef CONFIG_PAX_SEGMEXEC
70630+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
70631+ goto out;
70632+#endif
70633+
70634 /*
70635 * Make sure the vma is shared, that it supports prefaulting,
70636 * and that the remapped range is valid and fully within
70637diff --git a/mm/highmem.c b/mm/highmem.c
70638index 57d82c6..e9e0552 100644
70639--- a/mm/highmem.c
70640+++ b/mm/highmem.c
70641@@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
70642 * So no dangers, even with speculative execution.
70643 */
70644 page = pte_page(pkmap_page_table[i]);
70645+ pax_open_kernel();
70646 pte_clear(&init_mm, (unsigned long)page_address(page),
70647 &pkmap_page_table[i]);
70648-
70649+ pax_close_kernel();
70650 set_page_address(page, NULL);
70651 need_flush = 1;
70652 }
70653@@ -186,9 +187,11 @@ start:
70654 }
70655 }
70656 vaddr = PKMAP_ADDR(last_pkmap_nr);
70657+
70658+ pax_open_kernel();
70659 set_pte_at(&init_mm, vaddr,
70660 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
70661-
70662+ pax_close_kernel();
70663 pkmap_count[last_pkmap_nr] = 1;
70664 set_page_address(page, (void *)vaddr);
70665
70666diff --git a/mm/huge_memory.c b/mm/huge_memory.c
70667index 8f7fc39..69bf1e9 100644
70668--- a/mm/huge_memory.c
70669+++ b/mm/huge_memory.c
70670@@ -733,7 +733,7 @@ out:
70671 * run pte_offset_map on the pmd, if an huge pmd could
70672 * materialize from under us from a different thread.
70673 */
70674- if (unlikely(__pte_alloc(mm, vma, pmd, address)))
70675+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
70676 return VM_FAULT_OOM;
70677 /* if an huge pmd materialized from under us just retry later */
70678 if (unlikely(pmd_trans_huge(*pmd)))
70679diff --git a/mm/hugetlb.c b/mm/hugetlb.c
70680index a7cf829..d60e0e1 100644
70681--- a/mm/hugetlb.c
70682+++ b/mm/hugetlb.c
70683@@ -2346,6 +2346,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
70684 return 1;
70685 }
70686
70687+#ifdef CONFIG_PAX_SEGMEXEC
70688+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
70689+{
70690+ struct mm_struct *mm = vma->vm_mm;
70691+ struct vm_area_struct *vma_m;
70692+ unsigned long address_m;
70693+ pte_t *ptep_m;
70694+
70695+ vma_m = pax_find_mirror_vma(vma);
70696+ if (!vma_m)
70697+ return;
70698+
70699+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
70700+ address_m = address + SEGMEXEC_TASK_SIZE;
70701+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
70702+ get_page(page_m);
70703+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
70704+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
70705+}
70706+#endif
70707+
70708 /*
70709 * Hugetlb_cow() should be called with page lock of the original hugepage held.
70710 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
70711@@ -2459,6 +2480,11 @@ retry_avoidcopy:
70712 make_huge_pte(vma, new_page, 1));
70713 page_remove_rmap(old_page);
70714 hugepage_add_new_anon_rmap(new_page, vma, address);
70715+
70716+#ifdef CONFIG_PAX_SEGMEXEC
70717+ pax_mirror_huge_pte(vma, address, new_page);
70718+#endif
70719+
70720 /* Make the old page be freed below */
70721 new_page = old_page;
70722 mmu_notifier_invalidate_range_end(mm,
70723@@ -2613,6 +2639,10 @@ retry:
70724 && (vma->vm_flags & VM_SHARED)));
70725 set_huge_pte_at(mm, address, ptep, new_pte);
70726
70727+#ifdef CONFIG_PAX_SEGMEXEC
70728+ pax_mirror_huge_pte(vma, address, page);
70729+#endif
70730+
70731 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
70732 /* Optimization, do the COW without a second fault */
70733 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
70734@@ -2642,6 +2672,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
70735 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
70736 struct hstate *h = hstate_vma(vma);
70737
70738+#ifdef CONFIG_PAX_SEGMEXEC
70739+ struct vm_area_struct *vma_m;
70740+#endif
70741+
70742 address &= huge_page_mask(h);
70743
70744 ptep = huge_pte_offset(mm, address);
70745@@ -2655,6 +2689,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
70746 VM_FAULT_SET_HINDEX(h - hstates);
70747 }
70748
70749+#ifdef CONFIG_PAX_SEGMEXEC
70750+ vma_m = pax_find_mirror_vma(vma);
70751+ if (vma_m) {
70752+ unsigned long address_m;
70753+
70754+ if (vma->vm_start > vma_m->vm_start) {
70755+ address_m = address;
70756+ address -= SEGMEXEC_TASK_SIZE;
70757+ vma = vma_m;
70758+ h = hstate_vma(vma);
70759+ } else
70760+ address_m = address + SEGMEXEC_TASK_SIZE;
70761+
70762+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
70763+ return VM_FAULT_OOM;
70764+ address_m &= HPAGE_MASK;
70765+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
70766+ }
70767+#endif
70768+
70769 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
70770 if (!ptep)
70771 return VM_FAULT_OOM;
70772diff --git a/mm/internal.h b/mm/internal.h
70773index 2189af4..f2ca332 100644
70774--- a/mm/internal.h
70775+++ b/mm/internal.h
70776@@ -95,6 +95,7 @@ extern void putback_lru_page(struct page *page);
70777 * in mm/page_alloc.c
70778 */
70779 extern void __free_pages_bootmem(struct page *page, unsigned int order);
70780+extern void free_compound_page(struct page *page);
70781 extern void prep_compound_page(struct page *page, unsigned long order);
70782 #ifdef CONFIG_MEMORY_FAILURE
70783 extern bool is_free_buddy_page(struct page *page);
70784diff --git a/mm/kmemleak.c b/mm/kmemleak.c
70785index 45eb621..6ccd8ea 100644
70786--- a/mm/kmemleak.c
70787+++ b/mm/kmemleak.c
70788@@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq,
70789
70790 for (i = 0; i < object->trace_len; i++) {
70791 void *ptr = (void *)object->trace[i];
70792- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
70793+ seq_printf(seq, " [<%p>] %pA\n", ptr, ptr);
70794 }
70795 }
70796
70797diff --git a/mm/maccess.c b/mm/maccess.c
70798index d53adf9..03a24bf 100644
70799--- a/mm/maccess.c
70800+++ b/mm/maccess.c
70801@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
70802 set_fs(KERNEL_DS);
70803 pagefault_disable();
70804 ret = __copy_from_user_inatomic(dst,
70805- (__force const void __user *)src, size);
70806+ (const void __force_user *)src, size);
70807 pagefault_enable();
70808 set_fs(old_fs);
70809
70810@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
70811
70812 set_fs(KERNEL_DS);
70813 pagefault_disable();
70814- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
70815+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
70816 pagefault_enable();
70817 set_fs(old_fs);
70818
70819diff --git a/mm/madvise.c b/mm/madvise.c
70820index 74bf193..feb6fd3 100644
70821--- a/mm/madvise.c
70822+++ b/mm/madvise.c
70823@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
70824 pgoff_t pgoff;
70825 unsigned long new_flags = vma->vm_flags;
70826
70827+#ifdef CONFIG_PAX_SEGMEXEC
70828+ struct vm_area_struct *vma_m;
70829+#endif
70830+
70831 switch (behavior) {
70832 case MADV_NORMAL:
70833 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
70834@@ -110,6 +114,13 @@ success:
70835 /*
70836 * vm_flags is protected by the mmap_sem held in write mode.
70837 */
70838+
70839+#ifdef CONFIG_PAX_SEGMEXEC
70840+ vma_m = pax_find_mirror_vma(vma);
70841+ if (vma_m)
70842+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
70843+#endif
70844+
70845 vma->vm_flags = new_flags;
70846
70847 out:
70848@@ -168,6 +179,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
70849 struct vm_area_struct ** prev,
70850 unsigned long start, unsigned long end)
70851 {
70852+
70853+#ifdef CONFIG_PAX_SEGMEXEC
70854+ struct vm_area_struct *vma_m;
70855+#endif
70856+
70857 *prev = vma;
70858 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
70859 return -EINVAL;
70860@@ -180,6 +196,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
70861 zap_page_range(vma, start, end - start, &details);
70862 } else
70863 zap_page_range(vma, start, end - start, NULL);
70864+
70865+#ifdef CONFIG_PAX_SEGMEXEC
70866+ vma_m = pax_find_mirror_vma(vma);
70867+ if (vma_m) {
70868+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
70869+ struct zap_details details = {
70870+ .nonlinear_vma = vma_m,
70871+ .last_index = ULONG_MAX,
70872+ };
70873+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
70874+ } else
70875+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
70876+ }
70877+#endif
70878+
70879 return 0;
70880 }
70881
70882@@ -376,6 +407,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
70883 if (end < start)
70884 goto out;
70885
70886+#ifdef CONFIG_PAX_SEGMEXEC
70887+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
70888+ if (end > SEGMEXEC_TASK_SIZE)
70889+ goto out;
70890+ } else
70891+#endif
70892+
70893+ if (end > TASK_SIZE)
70894+ goto out;
70895+
70896 error = 0;
70897 if (end == start)
70898 goto out;
70899diff --git a/mm/memory-failure.c b/mm/memory-failure.c
70900index 56080ea..115071e 100644
70901--- a/mm/memory-failure.c
70902+++ b/mm/memory-failure.c
70903@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
70904
70905 int sysctl_memory_failure_recovery __read_mostly = 1;
70906
70907-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
70908+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
70909
70910 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
70911
70912@@ -202,7 +202,7 @@ static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno,
70913 si.si_signo = SIGBUS;
70914 si.si_errno = 0;
70915 si.si_code = BUS_MCEERR_AO;
70916- si.si_addr = (void *)addr;
70917+ si.si_addr = (void __user *)addr;
70918 #ifdef __ARCH_SI_TRAPNO
70919 si.si_trapno = trapno;
70920 #endif
70921@@ -1010,7 +1010,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70922 }
70923
70924 nr_pages = 1 << compound_trans_order(hpage);
70925- atomic_long_add(nr_pages, &mce_bad_pages);
70926+ atomic_long_add_unchecked(nr_pages, &mce_bad_pages);
70927
70928 /*
70929 * We need/can do nothing about count=0 pages.
70930@@ -1040,7 +1040,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70931 if (!PageHWPoison(hpage)
70932 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
70933 || (p != hpage && TestSetPageHWPoison(hpage))) {
70934- atomic_long_sub(nr_pages, &mce_bad_pages);
70935+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70936 return 0;
70937 }
70938 set_page_hwpoison_huge_page(hpage);
70939@@ -1098,7 +1098,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70940 }
70941 if (hwpoison_filter(p)) {
70942 if (TestClearPageHWPoison(p))
70943- atomic_long_sub(nr_pages, &mce_bad_pages);
70944+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70945 unlock_page(hpage);
70946 put_page(hpage);
70947 return 0;
70948@@ -1315,7 +1315,7 @@ int unpoison_memory(unsigned long pfn)
70949 return 0;
70950 }
70951 if (TestClearPageHWPoison(p))
70952- atomic_long_sub(nr_pages, &mce_bad_pages);
70953+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70954 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
70955 return 0;
70956 }
70957@@ -1329,7 +1329,7 @@ int unpoison_memory(unsigned long pfn)
70958 */
70959 if (TestClearPageHWPoison(page)) {
70960 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
70961- atomic_long_sub(nr_pages, &mce_bad_pages);
70962+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70963 freeit = 1;
70964 if (PageHuge(page))
70965 clear_page_hwpoison_huge_page(page);
70966@@ -1442,7 +1442,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
70967 }
70968 done:
70969 if (!PageHWPoison(hpage))
70970- atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
70971+ atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages);
70972 set_page_hwpoison_huge_page(hpage);
70973 dequeue_hwpoisoned_huge_page(hpage);
70974 /* keep elevated page count for bad page */
70975@@ -1573,7 +1573,7 @@ int soft_offline_page(struct page *page, int flags)
70976 return ret;
70977
70978 done:
70979- atomic_long_add(1, &mce_bad_pages);
70980+ atomic_long_add_unchecked(1, &mce_bad_pages);
70981 SetPageHWPoison(page);
70982 /* keep elevated page count for bad page */
70983 return ret;
70984diff --git a/mm/memory.c b/mm/memory.c
70985index 10b4dda..b1f60ad 100644
70986--- a/mm/memory.c
70987+++ b/mm/memory.c
70988@@ -457,8 +457,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
70989 return;
70990
70991 pmd = pmd_offset(pud, start);
70992+
70993+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
70994 pud_clear(pud);
70995 pmd_free_tlb(tlb, pmd, start);
70996+#endif
70997+
70998 }
70999
71000 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
71001@@ -489,9 +493,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
71002 if (end - 1 > ceiling - 1)
71003 return;
71004
71005+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
71006 pud = pud_offset(pgd, start);
71007 pgd_clear(pgd);
71008 pud_free_tlb(tlb, pud, start);
71009+#endif
71010+
71011 }
71012
71013 /*
71014@@ -1593,12 +1600,6 @@ no_page_table:
71015 return page;
71016 }
71017
71018-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
71019-{
71020- return stack_guard_page_start(vma, addr) ||
71021- stack_guard_page_end(vma, addr+PAGE_SIZE);
71022-}
71023-
71024 /**
71025 * __get_user_pages() - pin user pages in memory
71026 * @tsk: task_struct of target task
71027@@ -1671,10 +1672,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
71028 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
71029 i = 0;
71030
71031- do {
71032+ while (nr_pages) {
71033 struct vm_area_struct *vma;
71034
71035- vma = find_extend_vma(mm, start);
71036+ vma = find_vma(mm, start);
71037 if (!vma && in_gate_area(mm, start)) {
71038 unsigned long pg = start & PAGE_MASK;
71039 pgd_t *pgd;
71040@@ -1722,7 +1723,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
71041 goto next_page;
71042 }
71043
71044- if (!vma ||
71045+ if (!vma || start < vma->vm_start ||
71046 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
71047 !(vm_flags & vma->vm_flags))
71048 return i ? : -EFAULT;
71049@@ -1749,11 +1750,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
71050 int ret;
71051 unsigned int fault_flags = 0;
71052
71053- /* For mlock, just skip the stack guard page. */
71054- if (foll_flags & FOLL_MLOCK) {
71055- if (stack_guard_page(vma, start))
71056- goto next_page;
71057- }
71058 if (foll_flags & FOLL_WRITE)
71059 fault_flags |= FAULT_FLAG_WRITE;
71060 if (nonblocking)
71061@@ -1827,7 +1823,7 @@ next_page:
71062 start += PAGE_SIZE;
71063 nr_pages--;
71064 } while (nr_pages && start < vma->vm_end);
71065- } while (nr_pages);
71066+ }
71067 return i;
71068 }
71069 EXPORT_SYMBOL(__get_user_pages);
71070@@ -2034,6 +2030,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
71071 page_add_file_rmap(page);
71072 set_pte_at(mm, addr, pte, mk_pte(page, prot));
71073
71074+#ifdef CONFIG_PAX_SEGMEXEC
71075+ pax_mirror_file_pte(vma, addr, page, ptl);
71076+#endif
71077+
71078 retval = 0;
71079 pte_unmap_unlock(pte, ptl);
71080 return retval;
71081@@ -2068,10 +2068,22 @@ out:
71082 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
71083 struct page *page)
71084 {
71085+
71086+#ifdef CONFIG_PAX_SEGMEXEC
71087+ struct vm_area_struct *vma_m;
71088+#endif
71089+
71090 if (addr < vma->vm_start || addr >= vma->vm_end)
71091 return -EFAULT;
71092 if (!page_count(page))
71093 return -EINVAL;
71094+
71095+#ifdef CONFIG_PAX_SEGMEXEC
71096+ vma_m = pax_find_mirror_vma(vma);
71097+ if (vma_m)
71098+ vma_m->vm_flags |= VM_INSERTPAGE;
71099+#endif
71100+
71101 vma->vm_flags |= VM_INSERTPAGE;
71102 return insert_page(vma, addr, page, vma->vm_page_prot);
71103 }
71104@@ -2157,6 +2169,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
71105 unsigned long pfn)
71106 {
71107 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
71108+ BUG_ON(vma->vm_mirror);
71109
71110 if (addr < vma->vm_start || addr >= vma->vm_end)
71111 return -EFAULT;
71112@@ -2472,6 +2485,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
71113 copy_user_highpage(dst, src, va, vma);
71114 }
71115
71116+#ifdef CONFIG_PAX_SEGMEXEC
71117+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
71118+{
71119+ struct mm_struct *mm = vma->vm_mm;
71120+ spinlock_t *ptl;
71121+ pte_t *pte, entry;
71122+
71123+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
71124+ entry = *pte;
71125+ if (!pte_present(entry)) {
71126+ if (!pte_none(entry)) {
71127+ BUG_ON(pte_file(entry));
71128+ free_swap_and_cache(pte_to_swp_entry(entry));
71129+ pte_clear_not_present_full(mm, address, pte, 0);
71130+ }
71131+ } else {
71132+ struct page *page;
71133+
71134+ flush_cache_page(vma, address, pte_pfn(entry));
71135+ entry = ptep_clear_flush(vma, address, pte);
71136+ BUG_ON(pte_dirty(entry));
71137+ page = vm_normal_page(vma, address, entry);
71138+ if (page) {
71139+ update_hiwater_rss(mm);
71140+ if (PageAnon(page))
71141+ dec_mm_counter_fast(mm, MM_ANONPAGES);
71142+ else
71143+ dec_mm_counter_fast(mm, MM_FILEPAGES);
71144+ page_remove_rmap(page);
71145+ page_cache_release(page);
71146+ }
71147+ }
71148+ pte_unmap_unlock(pte, ptl);
71149+}
71150+
71151+/* PaX: if vma is mirrored, synchronize the mirror's PTE
71152+ *
71153+ * the ptl of the lower mapped page is held on entry and is not released on exit
71154+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
71155+ */
71156+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
71157+{
71158+ struct mm_struct *mm = vma->vm_mm;
71159+ unsigned long address_m;
71160+ spinlock_t *ptl_m;
71161+ struct vm_area_struct *vma_m;
71162+ pmd_t *pmd_m;
71163+ pte_t *pte_m, entry_m;
71164+
71165+ BUG_ON(!page_m || !PageAnon(page_m));
71166+
71167+ vma_m = pax_find_mirror_vma(vma);
71168+ if (!vma_m)
71169+ return;
71170+
71171+ BUG_ON(!PageLocked(page_m));
71172+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71173+ address_m = address + SEGMEXEC_TASK_SIZE;
71174+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71175+ pte_m = pte_offset_map(pmd_m, address_m);
71176+ ptl_m = pte_lockptr(mm, pmd_m);
71177+ if (ptl != ptl_m) {
71178+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71179+ if (!pte_none(*pte_m))
71180+ goto out;
71181+ }
71182+
71183+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
71184+ page_cache_get(page_m);
71185+ page_add_anon_rmap(page_m, vma_m, address_m);
71186+ inc_mm_counter_fast(mm, MM_ANONPAGES);
71187+ set_pte_at(mm, address_m, pte_m, entry_m);
71188+ update_mmu_cache(vma_m, address_m, entry_m);
71189+out:
71190+ if (ptl != ptl_m)
71191+ spin_unlock(ptl_m);
71192+ pte_unmap(pte_m);
71193+ unlock_page(page_m);
71194+}
71195+
71196+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
71197+{
71198+ struct mm_struct *mm = vma->vm_mm;
71199+ unsigned long address_m;
71200+ spinlock_t *ptl_m;
71201+ struct vm_area_struct *vma_m;
71202+ pmd_t *pmd_m;
71203+ pte_t *pte_m, entry_m;
71204+
71205+ BUG_ON(!page_m || PageAnon(page_m));
71206+
71207+ vma_m = pax_find_mirror_vma(vma);
71208+ if (!vma_m)
71209+ return;
71210+
71211+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71212+ address_m = address + SEGMEXEC_TASK_SIZE;
71213+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71214+ pte_m = pte_offset_map(pmd_m, address_m);
71215+ ptl_m = pte_lockptr(mm, pmd_m);
71216+ if (ptl != ptl_m) {
71217+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71218+ if (!pte_none(*pte_m))
71219+ goto out;
71220+ }
71221+
71222+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
71223+ page_cache_get(page_m);
71224+ page_add_file_rmap(page_m);
71225+ inc_mm_counter_fast(mm, MM_FILEPAGES);
71226+ set_pte_at(mm, address_m, pte_m, entry_m);
71227+ update_mmu_cache(vma_m, address_m, entry_m);
71228+out:
71229+ if (ptl != ptl_m)
71230+ spin_unlock(ptl_m);
71231+ pte_unmap(pte_m);
71232+}
71233+
71234+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
71235+{
71236+ struct mm_struct *mm = vma->vm_mm;
71237+ unsigned long address_m;
71238+ spinlock_t *ptl_m;
71239+ struct vm_area_struct *vma_m;
71240+ pmd_t *pmd_m;
71241+ pte_t *pte_m, entry_m;
71242+
71243+ vma_m = pax_find_mirror_vma(vma);
71244+ if (!vma_m)
71245+ return;
71246+
71247+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71248+ address_m = address + SEGMEXEC_TASK_SIZE;
71249+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71250+ pte_m = pte_offset_map(pmd_m, address_m);
71251+ ptl_m = pte_lockptr(mm, pmd_m);
71252+ if (ptl != ptl_m) {
71253+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71254+ if (!pte_none(*pte_m))
71255+ goto out;
71256+ }
71257+
71258+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
71259+ set_pte_at(mm, address_m, pte_m, entry_m);
71260+out:
71261+ if (ptl != ptl_m)
71262+ spin_unlock(ptl_m);
71263+ pte_unmap(pte_m);
71264+}
71265+
71266+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
71267+{
71268+ struct page *page_m;
71269+ pte_t entry;
71270+
71271+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
71272+ goto out;
71273+
71274+ entry = *pte;
71275+ page_m = vm_normal_page(vma, address, entry);
71276+ if (!page_m)
71277+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
71278+ else if (PageAnon(page_m)) {
71279+ if (pax_find_mirror_vma(vma)) {
71280+ pte_unmap_unlock(pte, ptl);
71281+ lock_page(page_m);
71282+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
71283+ if (pte_same(entry, *pte))
71284+ pax_mirror_anon_pte(vma, address, page_m, ptl);
71285+ else
71286+ unlock_page(page_m);
71287+ }
71288+ } else
71289+ pax_mirror_file_pte(vma, address, page_m, ptl);
71290+
71291+out:
71292+ pte_unmap_unlock(pte, ptl);
71293+}
71294+#endif
71295+
71296 /*
71297 * This routine handles present pages, when users try to write
71298 * to a shared page. It is done by copying the page to a new address
71299@@ -2683,6 +2876,12 @@ gotten:
71300 */
71301 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
71302 if (likely(pte_same(*page_table, orig_pte))) {
71303+
71304+#ifdef CONFIG_PAX_SEGMEXEC
71305+ if (pax_find_mirror_vma(vma))
71306+ BUG_ON(!trylock_page(new_page));
71307+#endif
71308+
71309 if (old_page) {
71310 if (!PageAnon(old_page)) {
71311 dec_mm_counter_fast(mm, MM_FILEPAGES);
71312@@ -2734,6 +2933,10 @@ gotten:
71313 page_remove_rmap(old_page);
71314 }
71315
71316+#ifdef CONFIG_PAX_SEGMEXEC
71317+ pax_mirror_anon_pte(vma, address, new_page, ptl);
71318+#endif
71319+
71320 /* Free the old page.. */
71321 new_page = old_page;
71322 ret |= VM_FAULT_WRITE;
71323@@ -3013,6 +3216,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
71324 swap_free(entry);
71325 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
71326 try_to_free_swap(page);
71327+
71328+#ifdef CONFIG_PAX_SEGMEXEC
71329+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
71330+#endif
71331+
71332 unlock_page(page);
71333 if (swapcache) {
71334 /*
71335@@ -3036,6 +3244,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
71336
71337 /* No need to invalidate - it was non-present before */
71338 update_mmu_cache(vma, address, page_table);
71339+
71340+#ifdef CONFIG_PAX_SEGMEXEC
71341+ pax_mirror_anon_pte(vma, address, page, ptl);
71342+#endif
71343+
71344 unlock:
71345 pte_unmap_unlock(page_table, ptl);
71346 out:
71347@@ -3055,40 +3268,6 @@ out_release:
71348 }
71349
71350 /*
71351- * This is like a special single-page "expand_{down|up}wards()",
71352- * except we must first make sure that 'address{-|+}PAGE_SIZE'
71353- * doesn't hit another vma.
71354- */
71355-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
71356-{
71357- address &= PAGE_MASK;
71358- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
71359- struct vm_area_struct *prev = vma->vm_prev;
71360-
71361- /*
71362- * Is there a mapping abutting this one below?
71363- *
71364- * That's only ok if it's the same stack mapping
71365- * that has gotten split..
71366- */
71367- if (prev && prev->vm_end == address)
71368- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
71369-
71370- expand_downwards(vma, address - PAGE_SIZE);
71371- }
71372- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
71373- struct vm_area_struct *next = vma->vm_next;
71374-
71375- /* As VM_GROWSDOWN but s/below/above/ */
71376- if (next && next->vm_start == address + PAGE_SIZE)
71377- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
71378-
71379- expand_upwards(vma, address + PAGE_SIZE);
71380- }
71381- return 0;
71382-}
71383-
71384-/*
71385 * We enter with non-exclusive mmap_sem (to exclude vma changes,
71386 * but allow concurrent faults), and pte mapped but not yet locked.
71387 * We return with mmap_sem still held, but pte unmapped and unlocked.
71388@@ -3097,27 +3276,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
71389 unsigned long address, pte_t *page_table, pmd_t *pmd,
71390 unsigned int flags)
71391 {
71392- struct page *page;
71393+ struct page *page = NULL;
71394 spinlock_t *ptl;
71395 pte_t entry;
71396
71397- pte_unmap(page_table);
71398-
71399- /* Check if we need to add a guard page to the stack */
71400- if (check_stack_guard_page(vma, address) < 0)
71401- return VM_FAULT_SIGBUS;
71402-
71403- /* Use the zero-page for reads */
71404 if (!(flags & FAULT_FLAG_WRITE)) {
71405 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
71406 vma->vm_page_prot));
71407- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
71408+ ptl = pte_lockptr(mm, pmd);
71409+ spin_lock(ptl);
71410 if (!pte_none(*page_table))
71411 goto unlock;
71412 goto setpte;
71413 }
71414
71415 /* Allocate our own private page. */
71416+ pte_unmap(page_table);
71417+
71418 if (unlikely(anon_vma_prepare(vma)))
71419 goto oom;
71420 page = alloc_zeroed_user_highpage_movable(vma, address);
71421@@ -3136,6 +3311,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
71422 if (!pte_none(*page_table))
71423 goto release;
71424
71425+#ifdef CONFIG_PAX_SEGMEXEC
71426+ if (pax_find_mirror_vma(vma))
71427+ BUG_ON(!trylock_page(page));
71428+#endif
71429+
71430 inc_mm_counter_fast(mm, MM_ANONPAGES);
71431 page_add_new_anon_rmap(page, vma, address);
71432 setpte:
71433@@ -3143,6 +3323,12 @@ setpte:
71434
71435 /* No need to invalidate - it was non-present before */
71436 update_mmu_cache(vma, address, page_table);
71437+
71438+#ifdef CONFIG_PAX_SEGMEXEC
71439+ if (page)
71440+ pax_mirror_anon_pte(vma, address, page, ptl);
71441+#endif
71442+
71443 unlock:
71444 pte_unmap_unlock(page_table, ptl);
71445 return 0;
71446@@ -3286,6 +3472,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71447 */
71448 /* Only go through if we didn't race with anybody else... */
71449 if (likely(pte_same(*page_table, orig_pte))) {
71450+
71451+#ifdef CONFIG_PAX_SEGMEXEC
71452+ if (anon && pax_find_mirror_vma(vma))
71453+ BUG_ON(!trylock_page(page));
71454+#endif
71455+
71456 flush_icache_page(vma, page);
71457 entry = mk_pte(page, vma->vm_page_prot);
71458 if (flags & FAULT_FLAG_WRITE)
71459@@ -3305,6 +3497,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71460
71461 /* no need to invalidate: a not-present page won't be cached */
71462 update_mmu_cache(vma, address, page_table);
71463+
71464+#ifdef CONFIG_PAX_SEGMEXEC
71465+ if (anon)
71466+ pax_mirror_anon_pte(vma, address, page, ptl);
71467+ else
71468+ pax_mirror_file_pte(vma, address, page, ptl);
71469+#endif
71470+
71471 } else {
71472 if (cow_page)
71473 mem_cgroup_uncharge_page(cow_page);
71474@@ -3458,6 +3658,12 @@ int handle_pte_fault(struct mm_struct *mm,
71475 if (flags & FAULT_FLAG_WRITE)
71476 flush_tlb_fix_spurious_fault(vma, address);
71477 }
71478+
71479+#ifdef CONFIG_PAX_SEGMEXEC
71480+ pax_mirror_pte(vma, address, pte, pmd, ptl);
71481+ return 0;
71482+#endif
71483+
71484 unlock:
71485 pte_unmap_unlock(pte, ptl);
71486 return 0;
71487@@ -3474,6 +3680,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71488 pmd_t *pmd;
71489 pte_t *pte;
71490
71491+#ifdef CONFIG_PAX_SEGMEXEC
71492+ struct vm_area_struct *vma_m;
71493+#endif
71494+
71495 __set_current_state(TASK_RUNNING);
71496
71497 count_vm_event(PGFAULT);
71498@@ -3485,6 +3695,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71499 if (unlikely(is_vm_hugetlb_page(vma)))
71500 return hugetlb_fault(mm, vma, address, flags);
71501
71502+#ifdef CONFIG_PAX_SEGMEXEC
71503+ vma_m = pax_find_mirror_vma(vma);
71504+ if (vma_m) {
71505+ unsigned long address_m;
71506+ pgd_t *pgd_m;
71507+ pud_t *pud_m;
71508+ pmd_t *pmd_m;
71509+
71510+ if (vma->vm_start > vma_m->vm_start) {
71511+ address_m = address;
71512+ address -= SEGMEXEC_TASK_SIZE;
71513+ vma = vma_m;
71514+ } else
71515+ address_m = address + SEGMEXEC_TASK_SIZE;
71516+
71517+ pgd_m = pgd_offset(mm, address_m);
71518+ pud_m = pud_alloc(mm, pgd_m, address_m);
71519+ if (!pud_m)
71520+ return VM_FAULT_OOM;
71521+ pmd_m = pmd_alloc(mm, pud_m, address_m);
71522+ if (!pmd_m)
71523+ return VM_FAULT_OOM;
71524+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
71525+ return VM_FAULT_OOM;
71526+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
71527+ }
71528+#endif
71529+
71530 pgd = pgd_offset(mm, address);
71531 pud = pud_alloc(mm, pgd, address);
71532 if (!pud)
71533@@ -3514,7 +3752,7 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71534 * run pte_offset_map on the pmd, if an huge pmd could
71535 * materialize from under us from a different thread.
71536 */
71537- if (unlikely(pmd_none(*pmd)) && __pte_alloc(mm, vma, pmd, address))
71538+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
71539 return VM_FAULT_OOM;
71540 /* if an huge pmd materialized from under us just retry later */
71541 if (unlikely(pmd_trans_huge(*pmd)))
71542@@ -3551,6 +3789,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
71543 spin_unlock(&mm->page_table_lock);
71544 return 0;
71545 }
71546+
71547+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
71548+{
71549+ pud_t *new = pud_alloc_one(mm, address);
71550+ if (!new)
71551+ return -ENOMEM;
71552+
71553+ smp_wmb(); /* See comment in __pte_alloc */
71554+
71555+ spin_lock(&mm->page_table_lock);
71556+ if (pgd_present(*pgd)) /* Another has populated it */
71557+ pud_free(mm, new);
71558+ else
71559+ pgd_populate_kernel(mm, pgd, new);
71560+ spin_unlock(&mm->page_table_lock);
71561+ return 0;
71562+}
71563 #endif /* __PAGETABLE_PUD_FOLDED */
71564
71565 #ifndef __PAGETABLE_PMD_FOLDED
71566@@ -3581,6 +3836,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
71567 spin_unlock(&mm->page_table_lock);
71568 return 0;
71569 }
71570+
71571+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
71572+{
71573+ pmd_t *new = pmd_alloc_one(mm, address);
71574+ if (!new)
71575+ return -ENOMEM;
71576+
71577+ smp_wmb(); /* See comment in __pte_alloc */
71578+
71579+ spin_lock(&mm->page_table_lock);
71580+#ifndef __ARCH_HAS_4LEVEL_HACK
71581+ if (pud_present(*pud)) /* Another has populated it */
71582+ pmd_free(mm, new);
71583+ else
71584+ pud_populate_kernel(mm, pud, new);
71585+#else
71586+ if (pgd_present(*pud)) /* Another has populated it */
71587+ pmd_free(mm, new);
71588+ else
71589+ pgd_populate_kernel(mm, pud, new);
71590+#endif /* __ARCH_HAS_4LEVEL_HACK */
71591+ spin_unlock(&mm->page_table_lock);
71592+ return 0;
71593+}
71594 #endif /* __PAGETABLE_PMD_FOLDED */
71595
71596 int make_pages_present(unsigned long addr, unsigned long end)
71597@@ -3618,7 +3897,7 @@ static int __init gate_vma_init(void)
71598 gate_vma.vm_start = FIXADDR_USER_START;
71599 gate_vma.vm_end = FIXADDR_USER_END;
71600 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
71601- gate_vma.vm_page_prot = __P101;
71602+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
71603 /*
71604 * Make sure the vDSO gets into every core dump.
71605 * Dumping its contents makes post-mortem fully interpretable later
71606diff --git a/mm/mempolicy.c b/mm/mempolicy.c
71607index 0a37570..2048346 100644
71608--- a/mm/mempolicy.c
71609+++ b/mm/mempolicy.c
71610@@ -640,6 +640,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
71611 unsigned long vmstart;
71612 unsigned long vmend;
71613
71614+#ifdef CONFIG_PAX_SEGMEXEC
71615+ struct vm_area_struct *vma_m;
71616+#endif
71617+
71618 vma = find_vma(mm, start);
71619 if (!vma || vma->vm_start > start)
71620 return -EFAULT;
71621@@ -679,6 +683,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
71622 err = policy_vma(vma, new_pol);
71623 if (err)
71624 goto out;
71625+
71626+#ifdef CONFIG_PAX_SEGMEXEC
71627+ vma_m = pax_find_mirror_vma(vma);
71628+ if (vma_m) {
71629+ err = policy_vma(vma_m, new_pol);
71630+ if (err)
71631+ goto out;
71632+ }
71633+#endif
71634+
71635 }
71636
71637 out:
71638@@ -1112,6 +1126,17 @@ static long do_mbind(unsigned long start, unsigned long len,
71639
71640 if (end < start)
71641 return -EINVAL;
71642+
71643+#ifdef CONFIG_PAX_SEGMEXEC
71644+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
71645+ if (end > SEGMEXEC_TASK_SIZE)
71646+ return -EINVAL;
71647+ } else
71648+#endif
71649+
71650+ if (end > TASK_SIZE)
71651+ return -EINVAL;
71652+
71653 if (end == start)
71654 return 0;
71655
71656@@ -1330,6 +1355,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
71657 if (!mm)
71658 goto out;
71659
71660+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
71661+ if (mm != current->mm &&
71662+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
71663+ err = -EPERM;
71664+ goto out;
71665+ }
71666+#endif
71667+
71668 /*
71669 * Check if this process has the right to modify the specified
71670 * process. The right exists if the process has administrative
71671@@ -1339,8 +1372,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
71672 rcu_read_lock();
71673 tcred = __task_cred(task);
71674 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
71675- cred->uid != tcred->suid && cred->uid != tcred->uid &&
71676- !capable(CAP_SYS_NICE)) {
71677+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
71678 rcu_read_unlock();
71679 err = -EPERM;
71680 goto out;
71681diff --git a/mm/migrate.c b/mm/migrate.c
71682index 1503b6b..156c672 100644
71683--- a/mm/migrate.c
71684+++ b/mm/migrate.c
71685@@ -1370,6 +1370,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
71686 if (!mm)
71687 return -EINVAL;
71688
71689+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
71690+ if (mm != current->mm &&
71691+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
71692+ err = -EPERM;
71693+ goto out;
71694+ }
71695+#endif
71696+
71697 /*
71698 * Check if this process has the right to modify the specified
71699 * process. The right exists if the process has administrative
71700@@ -1379,8 +1387,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
71701 rcu_read_lock();
71702 tcred = __task_cred(task);
71703 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
71704- cred->uid != tcred->suid && cred->uid != tcred->uid &&
71705- !capable(CAP_SYS_NICE)) {
71706+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
71707 rcu_read_unlock();
71708 err = -EPERM;
71709 goto out;
71710diff --git a/mm/mlock.c b/mm/mlock.c
71711index ef726e8..13e0901 100644
71712--- a/mm/mlock.c
71713+++ b/mm/mlock.c
71714@@ -13,6 +13,7 @@
71715 #include <linux/pagemap.h>
71716 #include <linux/mempolicy.h>
71717 #include <linux/syscalls.h>
71718+#include <linux/security.h>
71719 #include <linux/sched.h>
71720 #include <linux/export.h>
71721 #include <linux/rmap.h>
71722@@ -385,6 +386,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
71723 return -EINVAL;
71724 if (end == start)
71725 return 0;
71726+ if (end > TASK_SIZE)
71727+ return -EINVAL;
71728+
71729 vma = find_vma(current->mm, start);
71730 if (!vma || vma->vm_start > start)
71731 return -ENOMEM;
71732@@ -396,6 +400,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
71733 for (nstart = start ; ; ) {
71734 vm_flags_t newflags;
71735
71736+#ifdef CONFIG_PAX_SEGMEXEC
71737+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
71738+ break;
71739+#endif
71740+
71741 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
71742
71743 newflags = vma->vm_flags | VM_LOCKED;
71744@@ -501,6 +510,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
71745 lock_limit >>= PAGE_SHIFT;
71746
71747 /* check against resource limits */
71748+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
71749 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
71750 error = do_mlock(start, len, 1);
71751 up_write(&current->mm->mmap_sem);
71752@@ -524,17 +534,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
71753 static int do_mlockall(int flags)
71754 {
71755 struct vm_area_struct * vma, * prev = NULL;
71756- unsigned int def_flags = 0;
71757
71758 if (flags & MCL_FUTURE)
71759- def_flags = VM_LOCKED;
71760- current->mm->def_flags = def_flags;
71761+ current->mm->def_flags |= VM_LOCKED;
71762+ else
71763+ current->mm->def_flags &= ~VM_LOCKED;
71764 if (flags == MCL_FUTURE)
71765 goto out;
71766
71767 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
71768 vm_flags_t newflags;
71769
71770+#ifdef CONFIG_PAX_SEGMEXEC
71771+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
71772+ break;
71773+#endif
71774+
71775+ BUG_ON(vma->vm_end > TASK_SIZE);
71776 newflags = vma->vm_flags | VM_LOCKED;
71777 if (!(flags & MCL_CURRENT))
71778 newflags &= ~VM_LOCKED;
71779@@ -567,6 +583,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
71780 lock_limit >>= PAGE_SHIFT;
71781
71782 ret = -ENOMEM;
71783+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
71784 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
71785 capable(CAP_IPC_LOCK))
71786 ret = do_mlockall(flags);
71787diff --git a/mm/mmap.c b/mm/mmap.c
71788index da15a79..314aef3 100644
71789--- a/mm/mmap.c
71790+++ b/mm/mmap.c
71791@@ -46,6 +46,16 @@
71792 #define arch_rebalance_pgtables(addr, len) (addr)
71793 #endif
71794
71795+static inline void verify_mm_writelocked(struct mm_struct *mm)
71796+{
71797+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
71798+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
71799+ up_read(&mm->mmap_sem);
71800+ BUG();
71801+ }
71802+#endif
71803+}
71804+
71805 static void unmap_region(struct mm_struct *mm,
71806 struct vm_area_struct *vma, struct vm_area_struct *prev,
71807 unsigned long start, unsigned long end);
71808@@ -71,22 +81,32 @@ static void unmap_region(struct mm_struct *mm,
71809 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
71810 *
71811 */
71812-pgprot_t protection_map[16] = {
71813+pgprot_t protection_map[16] __read_only = {
71814 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
71815 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
71816 };
71817
71818-pgprot_t vm_get_page_prot(unsigned long vm_flags)
71819+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
71820 {
71821- return __pgprot(pgprot_val(protection_map[vm_flags &
71822+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
71823 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
71824 pgprot_val(arch_vm_get_page_prot(vm_flags)));
71825+
71826+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
71827+ if (!(__supported_pte_mask & _PAGE_NX) &&
71828+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
71829+ (vm_flags & (VM_READ | VM_WRITE)))
71830+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
71831+#endif
71832+
71833+ return prot;
71834 }
71835 EXPORT_SYMBOL(vm_get_page_prot);
71836
71837 int sysctl_overcommit_memory __read_mostly = OVERCOMMIT_GUESS; /* heuristic overcommit */
71838 int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
71839 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
71840+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
71841 /*
71842 * Make sure vm_committed_as in one cacheline and not cacheline shared with
71843 * other variables. It can be updated by several CPUs frequently.
71844@@ -228,6 +248,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
71845 struct vm_area_struct *next = vma->vm_next;
71846
71847 might_sleep();
71848+ BUG_ON(vma->vm_mirror);
71849 if (vma->vm_ops && vma->vm_ops->close)
71850 vma->vm_ops->close(vma);
71851 if (vma->vm_file) {
71852@@ -272,6 +293,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
71853 * not page aligned -Ram Gupta
71854 */
71855 rlim = rlimit(RLIMIT_DATA);
71856+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
71857 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
71858 (mm->end_data - mm->start_data) > rlim)
71859 goto out;
71860@@ -689,6 +711,12 @@ static int
71861 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
71862 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
71863 {
71864+
71865+#ifdef CONFIG_PAX_SEGMEXEC
71866+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
71867+ return 0;
71868+#endif
71869+
71870 if (is_mergeable_vma(vma, file, vm_flags) &&
71871 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
71872 if (vma->vm_pgoff == vm_pgoff)
71873@@ -708,6 +736,12 @@ static int
71874 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
71875 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
71876 {
71877+
71878+#ifdef CONFIG_PAX_SEGMEXEC
71879+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
71880+ return 0;
71881+#endif
71882+
71883 if (is_mergeable_vma(vma, file, vm_flags) &&
71884 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
71885 pgoff_t vm_pglen;
71886@@ -750,13 +784,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
71887 struct vm_area_struct *vma_merge(struct mm_struct *mm,
71888 struct vm_area_struct *prev, unsigned long addr,
71889 unsigned long end, unsigned long vm_flags,
71890- struct anon_vma *anon_vma, struct file *file,
71891+ struct anon_vma *anon_vma, struct file *file,
71892 pgoff_t pgoff, struct mempolicy *policy)
71893 {
71894 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
71895 struct vm_area_struct *area, *next;
71896 int err;
71897
71898+#ifdef CONFIG_PAX_SEGMEXEC
71899+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
71900+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
71901+
71902+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
71903+#endif
71904+
71905 /*
71906 * We later require that vma->vm_flags == vm_flags,
71907 * so this tests vma->vm_flags & VM_SPECIAL, too.
71908@@ -772,6 +813,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71909 if (next && next->vm_end == end) /* cases 6, 7, 8 */
71910 next = next->vm_next;
71911
71912+#ifdef CONFIG_PAX_SEGMEXEC
71913+ if (prev)
71914+ prev_m = pax_find_mirror_vma(prev);
71915+ if (area)
71916+ area_m = pax_find_mirror_vma(area);
71917+ if (next)
71918+ next_m = pax_find_mirror_vma(next);
71919+#endif
71920+
71921 /*
71922 * Can it merge with the predecessor?
71923 */
71924@@ -791,9 +841,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71925 /* cases 1, 6 */
71926 err = vma_adjust(prev, prev->vm_start,
71927 next->vm_end, prev->vm_pgoff, NULL);
71928- } else /* cases 2, 5, 7 */
71929+
71930+#ifdef CONFIG_PAX_SEGMEXEC
71931+ if (!err && prev_m)
71932+ err = vma_adjust(prev_m, prev_m->vm_start,
71933+ next_m->vm_end, prev_m->vm_pgoff, NULL);
71934+#endif
71935+
71936+ } else { /* cases 2, 5, 7 */
71937 err = vma_adjust(prev, prev->vm_start,
71938 end, prev->vm_pgoff, NULL);
71939+
71940+#ifdef CONFIG_PAX_SEGMEXEC
71941+ if (!err && prev_m)
71942+ err = vma_adjust(prev_m, prev_m->vm_start,
71943+ end_m, prev_m->vm_pgoff, NULL);
71944+#endif
71945+
71946+ }
71947 if (err)
71948 return NULL;
71949 khugepaged_enter_vma_merge(prev);
71950@@ -807,12 +872,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71951 mpol_equal(policy, vma_policy(next)) &&
71952 can_vma_merge_before(next, vm_flags,
71953 anon_vma, file, pgoff+pglen)) {
71954- if (prev && addr < prev->vm_end) /* case 4 */
71955+ if (prev && addr < prev->vm_end) { /* case 4 */
71956 err = vma_adjust(prev, prev->vm_start,
71957 addr, prev->vm_pgoff, NULL);
71958- else /* cases 3, 8 */
71959+
71960+#ifdef CONFIG_PAX_SEGMEXEC
71961+ if (!err && prev_m)
71962+ err = vma_adjust(prev_m, prev_m->vm_start,
71963+ addr_m, prev_m->vm_pgoff, NULL);
71964+#endif
71965+
71966+ } else { /* cases 3, 8 */
71967 err = vma_adjust(area, addr, next->vm_end,
71968 next->vm_pgoff - pglen, NULL);
71969+
71970+#ifdef CONFIG_PAX_SEGMEXEC
71971+ if (!err && area_m)
71972+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
71973+ next_m->vm_pgoff - pglen, NULL);
71974+#endif
71975+
71976+ }
71977 if (err)
71978 return NULL;
71979 khugepaged_enter_vma_merge(area);
71980@@ -921,14 +1001,11 @@ none:
71981 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
71982 struct file *file, long pages)
71983 {
71984- const unsigned long stack_flags
71985- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
71986-
71987 if (file) {
71988 mm->shared_vm += pages;
71989 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
71990 mm->exec_vm += pages;
71991- } else if (flags & stack_flags)
71992+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
71993 mm->stack_vm += pages;
71994 if (flags & (VM_RESERVED|VM_IO))
71995 mm->reserved_vm += pages;
71996@@ -955,7 +1032,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71997 * (the exception is when the underlying filesystem is noexec
71998 * mounted, in which case we dont add PROT_EXEC.)
71999 */
72000- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
72001+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
72002 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
72003 prot |= PROT_EXEC;
72004
72005@@ -981,7 +1058,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
72006 /* Obtain the address to map to. we verify (or select) it and ensure
72007 * that it represents a valid section of the address space.
72008 */
72009- addr = get_unmapped_area(file, addr, len, pgoff, flags);
72010+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
72011 if (addr & ~PAGE_MASK)
72012 return addr;
72013
72014@@ -992,6 +1069,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
72015 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
72016 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
72017
72018+#ifdef CONFIG_PAX_MPROTECT
72019+ if (mm->pax_flags & MF_PAX_MPROTECT) {
72020+#ifndef CONFIG_PAX_MPROTECT_COMPAT
72021+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
72022+ gr_log_rwxmmap(file);
72023+
72024+#ifdef CONFIG_PAX_EMUPLT
72025+ vm_flags &= ~VM_EXEC;
72026+#else
72027+ return -EPERM;
72028+#endif
72029+
72030+ }
72031+
72032+ if (!(vm_flags & VM_EXEC))
72033+ vm_flags &= ~VM_MAYEXEC;
72034+#else
72035+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
72036+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
72037+#endif
72038+ else
72039+ vm_flags &= ~VM_MAYWRITE;
72040+ }
72041+#endif
72042+
72043+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
72044+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
72045+ vm_flags &= ~VM_PAGEEXEC;
72046+#endif
72047+
72048 if (flags & MAP_LOCKED)
72049 if (!can_do_mlock())
72050 return -EPERM;
72051@@ -1003,6 +1110,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
72052 locked += mm->locked_vm;
72053 lock_limit = rlimit(RLIMIT_MEMLOCK);
72054 lock_limit >>= PAGE_SHIFT;
72055+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
72056 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
72057 return -EAGAIN;
72058 }
72059@@ -1073,6 +1181,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
72060 if (error)
72061 return error;
72062
72063+ if (!gr_acl_handle_mmap(file, prot))
72064+ return -EACCES;
72065+
72066 return mmap_region(file, addr, len, flags, vm_flags, pgoff);
72067 }
72068 EXPORT_SYMBOL(do_mmap_pgoff);
72069@@ -1153,7 +1264,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
72070 vm_flags_t vm_flags = vma->vm_flags;
72071
72072 /* If it was private or non-writable, the write bit is already clear */
72073- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
72074+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
72075 return 0;
72076
72077 /* The backer wishes to know when pages are first written to? */
72078@@ -1202,14 +1313,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
72079 unsigned long charged = 0;
72080 struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
72081
72082+#ifdef CONFIG_PAX_SEGMEXEC
72083+ struct vm_area_struct *vma_m = NULL;
72084+#endif
72085+
72086+ /*
72087+ * mm->mmap_sem is required to protect against another thread
72088+ * changing the mappings in case we sleep.
72089+ */
72090+ verify_mm_writelocked(mm);
72091+
72092 /* Clear old maps */
72093 error = -ENOMEM;
72094-munmap_back:
72095 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72096 if (vma && vma->vm_start < addr + len) {
72097 if (do_munmap(mm, addr, len))
72098 return -ENOMEM;
72099- goto munmap_back;
72100+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72101+ BUG_ON(vma && vma->vm_start < addr + len);
72102 }
72103
72104 /* Check against address space limit. */
72105@@ -1258,6 +1379,16 @@ munmap_back:
72106 goto unacct_error;
72107 }
72108
72109+#ifdef CONFIG_PAX_SEGMEXEC
72110+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
72111+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72112+ if (!vma_m) {
72113+ error = -ENOMEM;
72114+ goto free_vma;
72115+ }
72116+ }
72117+#endif
72118+
72119 vma->vm_mm = mm;
72120 vma->vm_start = addr;
72121 vma->vm_end = addr + len;
72122@@ -1282,6 +1413,19 @@ munmap_back:
72123 error = file->f_op->mmap(file, vma);
72124 if (error)
72125 goto unmap_and_free_vma;
72126+
72127+#ifdef CONFIG_PAX_SEGMEXEC
72128+ if (vma_m && (vm_flags & VM_EXECUTABLE))
72129+ added_exe_file_vma(mm);
72130+#endif
72131+
72132+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
72133+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
72134+ vma->vm_flags |= VM_PAGEEXEC;
72135+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
72136+ }
72137+#endif
72138+
72139 if (vm_flags & VM_EXECUTABLE)
72140 added_exe_file_vma(mm);
72141
72142@@ -1319,6 +1463,11 @@ munmap_back:
72143 vma_link(mm, vma, prev, rb_link, rb_parent);
72144 file = vma->vm_file;
72145
72146+#ifdef CONFIG_PAX_SEGMEXEC
72147+ if (vma_m)
72148+ BUG_ON(pax_mirror_vma(vma_m, vma));
72149+#endif
72150+
72151 /* Once vma denies write, undo our temporary denial count */
72152 if (correct_wcount)
72153 atomic_inc(&inode->i_writecount);
72154@@ -1327,6 +1476,7 @@ out:
72155
72156 mm->total_vm += len >> PAGE_SHIFT;
72157 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
72158+ track_exec_limit(mm, addr, addr + len, vm_flags);
72159 if (vm_flags & VM_LOCKED) {
72160 if (!mlock_vma_pages_range(vma, addr, addr + len))
72161 mm->locked_vm += (len >> PAGE_SHIFT);
72162@@ -1344,6 +1494,12 @@ unmap_and_free_vma:
72163 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
72164 charged = 0;
72165 free_vma:
72166+
72167+#ifdef CONFIG_PAX_SEGMEXEC
72168+ if (vma_m)
72169+ kmem_cache_free(vm_area_cachep, vma_m);
72170+#endif
72171+
72172 kmem_cache_free(vm_area_cachep, vma);
72173 unacct_error:
72174 if (charged)
72175@@ -1351,6 +1507,44 @@ unacct_error:
72176 return error;
72177 }
72178
72179+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
72180+{
72181+ if (!vma) {
72182+#ifdef CONFIG_STACK_GROWSUP
72183+ if (addr > sysctl_heap_stack_gap)
72184+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
72185+ else
72186+ vma = find_vma(current->mm, 0);
72187+ if (vma && (vma->vm_flags & VM_GROWSUP))
72188+ return false;
72189+#endif
72190+ return true;
72191+ }
72192+
72193+ if (addr + len > vma->vm_start)
72194+ return false;
72195+
72196+ if (vma->vm_flags & VM_GROWSDOWN)
72197+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
72198+#ifdef CONFIG_STACK_GROWSUP
72199+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
72200+ return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
72201+#endif
72202+
72203+ return true;
72204+}
72205+
72206+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
72207+{
72208+ if (vma->vm_start < len)
72209+ return -ENOMEM;
72210+ if (!(vma->vm_flags & VM_GROWSDOWN))
72211+ return vma->vm_start - len;
72212+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
72213+ return vma->vm_start - len - sysctl_heap_stack_gap;
72214+ return -ENOMEM;
72215+}
72216+
72217 /* Get an address range which is currently unmapped.
72218 * For shmat() with addr=0.
72219 *
72220@@ -1377,18 +1571,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
72221 if (flags & MAP_FIXED)
72222 return addr;
72223
72224+#ifdef CONFIG_PAX_RANDMMAP
72225+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
72226+#endif
72227+
72228 if (addr) {
72229 addr = PAGE_ALIGN(addr);
72230- vma = find_vma(mm, addr);
72231- if (TASK_SIZE - len >= addr &&
72232- (!vma || addr + len <= vma->vm_start))
72233- return addr;
72234+ if (TASK_SIZE - len >= addr) {
72235+ vma = find_vma(mm, addr);
72236+ if (check_heap_stack_gap(vma, addr, len))
72237+ return addr;
72238+ }
72239 }
72240 if (len > mm->cached_hole_size) {
72241- start_addr = addr = mm->free_area_cache;
72242+ start_addr = addr = mm->free_area_cache;
72243 } else {
72244- start_addr = addr = TASK_UNMAPPED_BASE;
72245- mm->cached_hole_size = 0;
72246+ start_addr = addr = mm->mmap_base;
72247+ mm->cached_hole_size = 0;
72248 }
72249
72250 full_search:
72251@@ -1399,34 +1598,40 @@ full_search:
72252 * Start a new search - just in case we missed
72253 * some holes.
72254 */
72255- if (start_addr != TASK_UNMAPPED_BASE) {
72256- addr = TASK_UNMAPPED_BASE;
72257- start_addr = addr;
72258+ if (start_addr != mm->mmap_base) {
72259+ start_addr = addr = mm->mmap_base;
72260 mm->cached_hole_size = 0;
72261 goto full_search;
72262 }
72263 return -ENOMEM;
72264 }
72265- if (!vma || addr + len <= vma->vm_start) {
72266- /*
72267- * Remember the place where we stopped the search:
72268- */
72269- mm->free_area_cache = addr + len;
72270- return addr;
72271- }
72272+ if (check_heap_stack_gap(vma, addr, len))
72273+ break;
72274 if (addr + mm->cached_hole_size < vma->vm_start)
72275 mm->cached_hole_size = vma->vm_start - addr;
72276 addr = vma->vm_end;
72277 }
72278+
72279+ /*
72280+ * Remember the place where we stopped the search:
72281+ */
72282+ mm->free_area_cache = addr + len;
72283+ return addr;
72284 }
72285 #endif
72286
72287 void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
72288 {
72289+
72290+#ifdef CONFIG_PAX_SEGMEXEC
72291+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
72292+ return;
72293+#endif
72294+
72295 /*
72296 * Is this a new hole at the lowest possible address?
72297 */
72298- if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache) {
72299+ if (addr >= mm->mmap_base && addr < mm->free_area_cache) {
72300 mm->free_area_cache = addr;
72301 mm->cached_hole_size = ~0UL;
72302 }
72303@@ -1444,7 +1649,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72304 {
72305 struct vm_area_struct *vma;
72306 struct mm_struct *mm = current->mm;
72307- unsigned long addr = addr0;
72308+ unsigned long base = mm->mmap_base, addr = addr0;
72309
72310 /* requested length too big for entire address space */
72311 if (len > TASK_SIZE)
72312@@ -1453,13 +1658,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72313 if (flags & MAP_FIXED)
72314 return addr;
72315
72316+#ifdef CONFIG_PAX_RANDMMAP
72317+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
72318+#endif
72319+
72320 /* requesting a specific address */
72321 if (addr) {
72322 addr = PAGE_ALIGN(addr);
72323- vma = find_vma(mm, addr);
72324- if (TASK_SIZE - len >= addr &&
72325- (!vma || addr + len <= vma->vm_start))
72326- return addr;
72327+ if (TASK_SIZE - len >= addr) {
72328+ vma = find_vma(mm, addr);
72329+ if (check_heap_stack_gap(vma, addr, len))
72330+ return addr;
72331+ }
72332 }
72333
72334 /* check if free_area_cache is useful for us */
72335@@ -1474,7 +1684,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72336 /* make sure it can fit in the remaining address space */
72337 if (addr > len) {
72338 vma = find_vma(mm, addr-len);
72339- if (!vma || addr <= vma->vm_start)
72340+ if (check_heap_stack_gap(vma, addr - len, len))
72341 /* remember the address as a hint for next time */
72342 return (mm->free_area_cache = addr-len);
72343 }
72344@@ -1491,7 +1701,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72345 * return with success:
72346 */
72347 vma = find_vma(mm, addr);
72348- if (!vma || addr+len <= vma->vm_start)
72349+ if (check_heap_stack_gap(vma, addr, len))
72350 /* remember the address as a hint for next time */
72351 return (mm->free_area_cache = addr);
72352
72353@@ -1500,8 +1710,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72354 mm->cached_hole_size = vma->vm_start - addr;
72355
72356 /* try just below the current vma->vm_start */
72357- addr = vma->vm_start-len;
72358- } while (len < vma->vm_start);
72359+ addr = skip_heap_stack_gap(vma, len);
72360+ } while (!IS_ERR_VALUE(addr));
72361
72362 bottomup:
72363 /*
72364@@ -1510,13 +1720,21 @@ bottomup:
72365 * can happen with large stack limits and large mmap()
72366 * allocations.
72367 */
72368+ mm->mmap_base = TASK_UNMAPPED_BASE;
72369+
72370+#ifdef CONFIG_PAX_RANDMMAP
72371+ if (mm->pax_flags & MF_PAX_RANDMMAP)
72372+ mm->mmap_base += mm->delta_mmap;
72373+#endif
72374+
72375+ mm->free_area_cache = mm->mmap_base;
72376 mm->cached_hole_size = ~0UL;
72377- mm->free_area_cache = TASK_UNMAPPED_BASE;
72378 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
72379 /*
72380 * Restore the topdown base:
72381 */
72382- mm->free_area_cache = mm->mmap_base;
72383+ mm->mmap_base = base;
72384+ mm->free_area_cache = base;
72385 mm->cached_hole_size = ~0UL;
72386
72387 return addr;
72388@@ -1525,6 +1743,12 @@ bottomup:
72389
72390 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
72391 {
72392+
72393+#ifdef CONFIG_PAX_SEGMEXEC
72394+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
72395+ return;
72396+#endif
72397+
72398 /*
72399 * Is this a new hole at the highest possible address?
72400 */
72401@@ -1532,8 +1756,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
72402 mm->free_area_cache = addr;
72403
72404 /* dont allow allocations above current base */
72405- if (mm->free_area_cache > mm->mmap_base)
72406+ if (mm->free_area_cache > mm->mmap_base) {
72407 mm->free_area_cache = mm->mmap_base;
72408+ mm->cached_hole_size = ~0UL;
72409+ }
72410 }
72411
72412 unsigned long
72413@@ -1629,6 +1855,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
72414 return vma;
72415 }
72416
72417+#ifdef CONFIG_PAX_SEGMEXEC
72418+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
72419+{
72420+ struct vm_area_struct *vma_m;
72421+
72422+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
72423+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
72424+ BUG_ON(vma->vm_mirror);
72425+ return NULL;
72426+ }
72427+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
72428+ vma_m = vma->vm_mirror;
72429+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
72430+ BUG_ON(vma->vm_file != vma_m->vm_file);
72431+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
72432+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
72433+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
72434+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
72435+ return vma_m;
72436+}
72437+#endif
72438+
72439 /*
72440 * Verify that the stack growth is acceptable and
72441 * update accounting. This is shared with both the
72442@@ -1645,6 +1893,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72443 return -ENOMEM;
72444
72445 /* Stack limit test */
72446+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
72447 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
72448 return -ENOMEM;
72449
72450@@ -1655,6 +1904,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72451 locked = mm->locked_vm + grow;
72452 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
72453 limit >>= PAGE_SHIFT;
72454+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
72455 if (locked > limit && !capable(CAP_IPC_LOCK))
72456 return -ENOMEM;
72457 }
72458@@ -1685,37 +1935,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72459 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
72460 * vma is the last one with address > vma->vm_end. Have to extend vma.
72461 */
72462+#ifndef CONFIG_IA64
72463+static
72464+#endif
72465 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
72466 {
72467 int error;
72468+ bool locknext;
72469
72470 if (!(vma->vm_flags & VM_GROWSUP))
72471 return -EFAULT;
72472
72473+ /* Also guard against wrapping around to address 0. */
72474+ if (address < PAGE_ALIGN(address+1))
72475+ address = PAGE_ALIGN(address+1);
72476+ else
72477+ return -ENOMEM;
72478+
72479 /*
72480 * We must make sure the anon_vma is allocated
72481 * so that the anon_vma locking is not a noop.
72482 */
72483 if (unlikely(anon_vma_prepare(vma)))
72484 return -ENOMEM;
72485+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
72486+ if (locknext && anon_vma_prepare(vma->vm_next))
72487+ return -ENOMEM;
72488 vma_lock_anon_vma(vma);
72489+ if (locknext)
72490+ vma_lock_anon_vma(vma->vm_next);
72491
72492 /*
72493 * vma->vm_start/vm_end cannot change under us because the caller
72494 * is required to hold the mmap_sem in read mode. We need the
72495- * anon_vma lock to serialize against concurrent expand_stacks.
72496- * Also guard against wrapping around to address 0.
72497+ * anon_vma locks to serialize against concurrent expand_stacks
72498+ * and expand_upwards.
72499 */
72500- if (address < PAGE_ALIGN(address+4))
72501- address = PAGE_ALIGN(address+4);
72502- else {
72503- vma_unlock_anon_vma(vma);
72504- return -ENOMEM;
72505- }
72506 error = 0;
72507
72508 /* Somebody else might have raced and expanded it already */
72509- if (address > vma->vm_end) {
72510+ 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)
72511+ error = -ENOMEM;
72512+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
72513 unsigned long size, grow;
72514
72515 size = address - vma->vm_start;
72516@@ -1730,6 +1991,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
72517 }
72518 }
72519 }
72520+ if (locknext)
72521+ vma_unlock_anon_vma(vma->vm_next);
72522 vma_unlock_anon_vma(vma);
72523 khugepaged_enter_vma_merge(vma);
72524 return error;
72525@@ -1743,6 +2006,8 @@ int expand_downwards(struct vm_area_struct *vma,
72526 unsigned long address)
72527 {
72528 int error;
72529+ bool lockprev = false;
72530+ struct vm_area_struct *prev;
72531
72532 /*
72533 * We must make sure the anon_vma is allocated
72534@@ -1756,6 +2021,15 @@ int expand_downwards(struct vm_area_struct *vma,
72535 if (error)
72536 return error;
72537
72538+ prev = vma->vm_prev;
72539+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
72540+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
72541+#endif
72542+ if (lockprev && anon_vma_prepare(prev))
72543+ return -ENOMEM;
72544+ if (lockprev)
72545+ vma_lock_anon_vma(prev);
72546+
72547 vma_lock_anon_vma(vma);
72548
72549 /*
72550@@ -1765,9 +2039,17 @@ int expand_downwards(struct vm_area_struct *vma,
72551 */
72552
72553 /* Somebody else might have raced and expanded it already */
72554- if (address < vma->vm_start) {
72555+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
72556+ error = -ENOMEM;
72557+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
72558 unsigned long size, grow;
72559
72560+#ifdef CONFIG_PAX_SEGMEXEC
72561+ struct vm_area_struct *vma_m;
72562+
72563+ vma_m = pax_find_mirror_vma(vma);
72564+#endif
72565+
72566 size = vma->vm_end - address;
72567 grow = (vma->vm_start - address) >> PAGE_SHIFT;
72568
72569@@ -1777,11 +2059,22 @@ int expand_downwards(struct vm_area_struct *vma,
72570 if (!error) {
72571 vma->vm_start = address;
72572 vma->vm_pgoff -= grow;
72573+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
72574+
72575+#ifdef CONFIG_PAX_SEGMEXEC
72576+ if (vma_m) {
72577+ vma_m->vm_start -= grow << PAGE_SHIFT;
72578+ vma_m->vm_pgoff -= grow;
72579+ }
72580+#endif
72581+
72582 perf_event_mmap(vma);
72583 }
72584 }
72585 }
72586 vma_unlock_anon_vma(vma);
72587+ if (lockprev)
72588+ vma_unlock_anon_vma(prev);
72589 khugepaged_enter_vma_merge(vma);
72590 return error;
72591 }
72592@@ -1851,6 +2144,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
72593 do {
72594 long nrpages = vma_pages(vma);
72595
72596+#ifdef CONFIG_PAX_SEGMEXEC
72597+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
72598+ vma = remove_vma(vma);
72599+ continue;
72600+ }
72601+#endif
72602+
72603 mm->total_vm -= nrpages;
72604 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
72605 vma = remove_vma(vma);
72606@@ -1896,6 +2196,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
72607 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
72608 vma->vm_prev = NULL;
72609 do {
72610+
72611+#ifdef CONFIG_PAX_SEGMEXEC
72612+ if (vma->vm_mirror) {
72613+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
72614+ vma->vm_mirror->vm_mirror = NULL;
72615+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
72616+ vma->vm_mirror = NULL;
72617+ }
72618+#endif
72619+
72620 rb_erase(&vma->vm_rb, &mm->mm_rb);
72621 mm->map_count--;
72622 tail_vma = vma;
72623@@ -1924,14 +2234,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72624 struct vm_area_struct *new;
72625 int err = -ENOMEM;
72626
72627+#ifdef CONFIG_PAX_SEGMEXEC
72628+ struct vm_area_struct *vma_m, *new_m = NULL;
72629+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
72630+#endif
72631+
72632 if (is_vm_hugetlb_page(vma) && (addr &
72633 ~(huge_page_mask(hstate_vma(vma)))))
72634 return -EINVAL;
72635
72636+#ifdef CONFIG_PAX_SEGMEXEC
72637+ vma_m = pax_find_mirror_vma(vma);
72638+#endif
72639+
72640 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
72641 if (!new)
72642 goto out_err;
72643
72644+#ifdef CONFIG_PAX_SEGMEXEC
72645+ if (vma_m) {
72646+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
72647+ if (!new_m) {
72648+ kmem_cache_free(vm_area_cachep, new);
72649+ goto out_err;
72650+ }
72651+ }
72652+#endif
72653+
72654 /* most fields are the same, copy all, and then fixup */
72655 *new = *vma;
72656
72657@@ -1944,6 +2273,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72658 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
72659 }
72660
72661+#ifdef CONFIG_PAX_SEGMEXEC
72662+ if (vma_m) {
72663+ *new_m = *vma_m;
72664+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
72665+ new_m->vm_mirror = new;
72666+ new->vm_mirror = new_m;
72667+
72668+ if (new_below)
72669+ new_m->vm_end = addr_m;
72670+ else {
72671+ new_m->vm_start = addr_m;
72672+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
72673+ }
72674+ }
72675+#endif
72676+
72677 pol = mpol_dup(vma_policy(vma));
72678 if (IS_ERR(pol)) {
72679 err = PTR_ERR(pol);
72680@@ -1969,6 +2314,42 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72681 else
72682 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
72683
72684+#ifdef CONFIG_PAX_SEGMEXEC
72685+ if (!err && vma_m) {
72686+ if (anon_vma_clone(new_m, vma_m))
72687+ goto out_free_mpol;
72688+
72689+ mpol_get(pol);
72690+ vma_set_policy(new_m, pol);
72691+
72692+ if (new_m->vm_file) {
72693+ get_file(new_m->vm_file);
72694+ if (vma_m->vm_flags & VM_EXECUTABLE)
72695+ added_exe_file_vma(mm);
72696+ }
72697+
72698+ if (new_m->vm_ops && new_m->vm_ops->open)
72699+ new_m->vm_ops->open(new_m);
72700+
72701+ if (new_below)
72702+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
72703+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
72704+ else
72705+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
72706+
72707+ if (err) {
72708+ if (new_m->vm_ops && new_m->vm_ops->close)
72709+ new_m->vm_ops->close(new_m);
72710+ if (new_m->vm_file) {
72711+ if (vma_m->vm_flags & VM_EXECUTABLE)
72712+ removed_exe_file_vma(mm);
72713+ fput(new_m->vm_file);
72714+ }
72715+ mpol_put(pol);
72716+ }
72717+ }
72718+#endif
72719+
72720 /* Success. */
72721 if (!err)
72722 return 0;
72723@@ -1981,10 +2362,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72724 removed_exe_file_vma(mm);
72725 fput(new->vm_file);
72726 }
72727- unlink_anon_vmas(new);
72728 out_free_mpol:
72729 mpol_put(pol);
72730 out_free_vma:
72731+
72732+#ifdef CONFIG_PAX_SEGMEXEC
72733+ if (new_m) {
72734+ unlink_anon_vmas(new_m);
72735+ kmem_cache_free(vm_area_cachep, new_m);
72736+ }
72737+#endif
72738+
72739+ unlink_anon_vmas(new);
72740 kmem_cache_free(vm_area_cachep, new);
72741 out_err:
72742 return err;
72743@@ -1997,6 +2386,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72744 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
72745 unsigned long addr, int new_below)
72746 {
72747+
72748+#ifdef CONFIG_PAX_SEGMEXEC
72749+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
72750+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
72751+ if (mm->map_count >= sysctl_max_map_count-1)
72752+ return -ENOMEM;
72753+ } else
72754+#endif
72755+
72756 if (mm->map_count >= sysctl_max_map_count)
72757 return -ENOMEM;
72758
72759@@ -2008,11 +2406,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
72760 * work. This now handles partial unmappings.
72761 * Jeremy Fitzhardinge <jeremy@goop.org>
72762 */
72763+#ifdef CONFIG_PAX_SEGMEXEC
72764 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72765 {
72766+ int ret = __do_munmap(mm, start, len);
72767+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
72768+ return ret;
72769+
72770+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
72771+}
72772+
72773+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72774+#else
72775+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72776+#endif
72777+{
72778 unsigned long end;
72779 struct vm_area_struct *vma, *prev, *last;
72780
72781+ /*
72782+ * mm->mmap_sem is required to protect against another thread
72783+ * changing the mappings in case we sleep.
72784+ */
72785+ verify_mm_writelocked(mm);
72786+
72787 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
72788 return -EINVAL;
72789
72790@@ -2087,6 +2504,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72791 /* Fix up all other VM information */
72792 remove_vma_list(mm, vma);
72793
72794+ track_exec_limit(mm, start, end, 0UL);
72795+
72796 return 0;
72797 }
72798
72799@@ -2099,22 +2518,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
72800
72801 profile_munmap(addr);
72802
72803+#ifdef CONFIG_PAX_SEGMEXEC
72804+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
72805+ (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len))
72806+ return -EINVAL;
72807+#endif
72808+
72809 down_write(&mm->mmap_sem);
72810 ret = do_munmap(mm, addr, len);
72811 up_write(&mm->mmap_sem);
72812 return ret;
72813 }
72814
72815-static inline void verify_mm_writelocked(struct mm_struct *mm)
72816-{
72817-#ifdef CONFIG_DEBUG_VM
72818- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
72819- WARN_ON(1);
72820- up_read(&mm->mmap_sem);
72821- }
72822-#endif
72823-}
72824-
72825 /*
72826 * this is really a simplified "do_mmap". it only handles
72827 * anonymous maps. eventually we may be able to do some
72828@@ -2128,6 +2543,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72829 struct rb_node ** rb_link, * rb_parent;
72830 pgoff_t pgoff = addr >> PAGE_SHIFT;
72831 int error;
72832+ unsigned long charged;
72833
72834 len = PAGE_ALIGN(len);
72835 if (!len)
72836@@ -2139,16 +2555,30 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72837
72838 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
72839
72840+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
72841+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72842+ flags &= ~VM_EXEC;
72843+
72844+#ifdef CONFIG_PAX_MPROTECT
72845+ if (mm->pax_flags & MF_PAX_MPROTECT)
72846+ flags &= ~VM_MAYEXEC;
72847+#endif
72848+
72849+ }
72850+#endif
72851+
72852 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
72853 if (error & ~PAGE_MASK)
72854 return error;
72855
72856+ charged = len >> PAGE_SHIFT;
72857+
72858 /*
72859 * mlock MCL_FUTURE?
72860 */
72861 if (mm->def_flags & VM_LOCKED) {
72862 unsigned long locked, lock_limit;
72863- locked = len >> PAGE_SHIFT;
72864+ locked = charged;
72865 locked += mm->locked_vm;
72866 lock_limit = rlimit(RLIMIT_MEMLOCK);
72867 lock_limit >>= PAGE_SHIFT;
72868@@ -2165,22 +2595,22 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72869 /*
72870 * Clear old maps. this also does some error checking for us
72871 */
72872- munmap_back:
72873 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72874 if (vma && vma->vm_start < addr + len) {
72875 if (do_munmap(mm, addr, len))
72876 return -ENOMEM;
72877- goto munmap_back;
72878+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72879+ BUG_ON(vma && vma->vm_start < addr + len);
72880 }
72881
72882 /* Check against address space limits *after* clearing old maps... */
72883- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
72884+ if (!may_expand_vm(mm, charged))
72885 return -ENOMEM;
72886
72887 if (mm->map_count > sysctl_max_map_count)
72888 return -ENOMEM;
72889
72890- if (security_vm_enough_memory(len >> PAGE_SHIFT))
72891+ if (security_vm_enough_memory(charged))
72892 return -ENOMEM;
72893
72894 /* Can we just expand an old private anonymous mapping? */
72895@@ -2194,7 +2624,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72896 */
72897 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72898 if (!vma) {
72899- vm_unacct_memory(len >> PAGE_SHIFT);
72900+ vm_unacct_memory(charged);
72901 return -ENOMEM;
72902 }
72903
72904@@ -2208,11 +2638,12 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72905 vma_link(mm, vma, prev, rb_link, rb_parent);
72906 out:
72907 perf_event_mmap(vma);
72908- mm->total_vm += len >> PAGE_SHIFT;
72909+ mm->total_vm += charged;
72910 if (flags & VM_LOCKED) {
72911 if (!mlock_vma_pages_range(vma, addr, addr + len))
72912- mm->locked_vm += (len >> PAGE_SHIFT);
72913+ mm->locked_vm += charged;
72914 }
72915+ track_exec_limit(mm, addr, addr + len, flags);
72916 return addr;
72917 }
72918
72919@@ -2259,8 +2690,10 @@ void exit_mmap(struct mm_struct *mm)
72920 * Walk the list again, actually closing and freeing it,
72921 * with preemption enabled, without holding any MM locks.
72922 */
72923- while (vma)
72924+ while (vma) {
72925+ vma->vm_mirror = NULL;
72926 vma = remove_vma(vma);
72927+ }
72928
72929 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
72930 }
72931@@ -2274,6 +2707,13 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
72932 struct vm_area_struct * __vma, * prev;
72933 struct rb_node ** rb_link, * rb_parent;
72934
72935+#ifdef CONFIG_PAX_SEGMEXEC
72936+ struct vm_area_struct *vma_m = NULL;
72937+#endif
72938+
72939+ if (security_file_mmap(NULL, 0, 0, 0, vma->vm_start, 1))
72940+ return -EPERM;
72941+
72942 /*
72943 * The vm_pgoff of a purely anonymous vma should be irrelevant
72944 * until its first write fault, when page's anon_vma and index
72945@@ -2296,7 +2736,22 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
72946 if ((vma->vm_flags & VM_ACCOUNT) &&
72947 security_vm_enough_memory_mm(mm, vma_pages(vma)))
72948 return -ENOMEM;
72949+
72950+#ifdef CONFIG_PAX_SEGMEXEC
72951+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
72952+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72953+ if (!vma_m)
72954+ return -ENOMEM;
72955+ }
72956+#endif
72957+
72958 vma_link(mm, vma, prev, rb_link, rb_parent);
72959+
72960+#ifdef CONFIG_PAX_SEGMEXEC
72961+ if (vma_m)
72962+ BUG_ON(pax_mirror_vma(vma_m, vma));
72963+#endif
72964+
72965 return 0;
72966 }
72967
72968@@ -2315,6 +2770,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
72969 struct mempolicy *pol;
72970 bool faulted_in_anon_vma = true;
72971
72972+ BUG_ON(vma->vm_mirror);
72973+
72974 /*
72975 * If anonymous vma has not yet been faulted, update new pgoff
72976 * to match new location, to increase its chance of merging.
72977@@ -2382,6 +2839,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
72978 return NULL;
72979 }
72980
72981+#ifdef CONFIG_PAX_SEGMEXEC
72982+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
72983+{
72984+ struct vm_area_struct *prev_m;
72985+ struct rb_node **rb_link_m, *rb_parent_m;
72986+ struct mempolicy *pol_m;
72987+
72988+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
72989+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
72990+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
72991+ *vma_m = *vma;
72992+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
72993+ if (anon_vma_clone(vma_m, vma))
72994+ return -ENOMEM;
72995+ pol_m = vma_policy(vma_m);
72996+ mpol_get(pol_m);
72997+ vma_set_policy(vma_m, pol_m);
72998+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
72999+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
73000+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
73001+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
73002+ if (vma_m->vm_file)
73003+ get_file(vma_m->vm_file);
73004+ if (vma_m->vm_ops && vma_m->vm_ops->open)
73005+ vma_m->vm_ops->open(vma_m);
73006+ find_vma_prepare(vma->vm_mm, vma_m->vm_start, &prev_m, &rb_link_m, &rb_parent_m);
73007+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
73008+ vma_m->vm_mirror = vma;
73009+ vma->vm_mirror = vma_m;
73010+ return 0;
73011+}
73012+#endif
73013+
73014 /*
73015 * Return true if the calling process may expand its vm space by the passed
73016 * number of pages
73017@@ -2393,6 +2883,12 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
73018
73019 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
73020
73021+#ifdef CONFIG_PAX_RANDMMAP
73022+ if (mm->pax_flags & MF_PAX_RANDMMAP)
73023+ cur -= mm->brk_gap;
73024+#endif
73025+
73026+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
73027 if (cur + npages > lim)
73028 return 0;
73029 return 1;
73030@@ -2463,6 +2959,22 @@ int install_special_mapping(struct mm_struct *mm,
73031 vma->vm_start = addr;
73032 vma->vm_end = addr + len;
73033
73034+#ifdef CONFIG_PAX_MPROTECT
73035+ if (mm->pax_flags & MF_PAX_MPROTECT) {
73036+#ifndef CONFIG_PAX_MPROTECT_COMPAT
73037+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
73038+ return -EPERM;
73039+ if (!(vm_flags & VM_EXEC))
73040+ vm_flags &= ~VM_MAYEXEC;
73041+#else
73042+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
73043+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
73044+#endif
73045+ else
73046+ vm_flags &= ~VM_MAYWRITE;
73047+ }
73048+#endif
73049+
73050 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
73051 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
73052
73053diff --git a/mm/mprotect.c b/mm/mprotect.c
73054index f437d05..e3763f6 100644
73055--- a/mm/mprotect.c
73056+++ b/mm/mprotect.c
73057@@ -23,10 +23,16 @@
73058 #include <linux/mmu_notifier.h>
73059 #include <linux/migrate.h>
73060 #include <linux/perf_event.h>
73061+
73062+#ifdef CONFIG_PAX_MPROTECT
73063+#include <linux/elf.h>
73064+#endif
73065+
73066 #include <asm/uaccess.h>
73067 #include <asm/pgtable.h>
73068 #include <asm/cacheflush.h>
73069 #include <asm/tlbflush.h>
73070+#include <asm/mmu_context.h>
73071
73072 #ifndef pgprot_modify
73073 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
73074@@ -141,6 +147,48 @@ static void change_protection(struct vm_area_struct *vma,
73075 flush_tlb_range(vma, start, end);
73076 }
73077
73078+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
73079+/* called while holding the mmap semaphor for writing except stack expansion */
73080+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
73081+{
73082+ unsigned long oldlimit, newlimit = 0UL;
73083+
73084+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
73085+ return;
73086+
73087+ spin_lock(&mm->page_table_lock);
73088+ oldlimit = mm->context.user_cs_limit;
73089+ if ((prot & VM_EXEC) && oldlimit < end)
73090+ /* USER_CS limit moved up */
73091+ newlimit = end;
73092+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
73093+ /* USER_CS limit moved down */
73094+ newlimit = start;
73095+
73096+ if (newlimit) {
73097+ mm->context.user_cs_limit = newlimit;
73098+
73099+#ifdef CONFIG_SMP
73100+ wmb();
73101+ cpus_clear(mm->context.cpu_user_cs_mask);
73102+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
73103+#endif
73104+
73105+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
73106+ }
73107+ spin_unlock(&mm->page_table_lock);
73108+ if (newlimit == end) {
73109+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
73110+
73111+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
73112+ if (is_vm_hugetlb_page(vma))
73113+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
73114+ else
73115+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma));
73116+ }
73117+}
73118+#endif
73119+
73120 int
73121 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
73122 unsigned long start, unsigned long end, unsigned long newflags)
73123@@ -153,11 +201,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
73124 int error;
73125 int dirty_accountable = 0;
73126
73127+#ifdef CONFIG_PAX_SEGMEXEC
73128+ struct vm_area_struct *vma_m = NULL;
73129+ unsigned long start_m, end_m;
73130+
73131+ start_m = start + SEGMEXEC_TASK_SIZE;
73132+ end_m = end + SEGMEXEC_TASK_SIZE;
73133+#endif
73134+
73135 if (newflags == oldflags) {
73136 *pprev = vma;
73137 return 0;
73138 }
73139
73140+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
73141+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
73142+
73143+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
73144+ return -ENOMEM;
73145+
73146+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
73147+ return -ENOMEM;
73148+ }
73149+
73150 /*
73151 * If we make a private mapping writable we increase our commit;
73152 * but (without finer accounting) cannot reduce our commit if we
73153@@ -174,6 +240,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
73154 }
73155 }
73156
73157+#ifdef CONFIG_PAX_SEGMEXEC
73158+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
73159+ if (start != vma->vm_start) {
73160+ error = split_vma(mm, vma, start, 1);
73161+ if (error)
73162+ goto fail;
73163+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
73164+ *pprev = (*pprev)->vm_next;
73165+ }
73166+
73167+ if (end != vma->vm_end) {
73168+ error = split_vma(mm, vma, end, 0);
73169+ if (error)
73170+ goto fail;
73171+ }
73172+
73173+ if (pax_find_mirror_vma(vma)) {
73174+ error = __do_munmap(mm, start_m, end_m - start_m);
73175+ if (error)
73176+ goto fail;
73177+ } else {
73178+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
73179+ if (!vma_m) {
73180+ error = -ENOMEM;
73181+ goto fail;
73182+ }
73183+ vma->vm_flags = newflags;
73184+ error = pax_mirror_vma(vma_m, vma);
73185+ if (error) {
73186+ vma->vm_flags = oldflags;
73187+ goto fail;
73188+ }
73189+ }
73190+ }
73191+#endif
73192+
73193 /*
73194 * First try to merge with previous and/or next vma.
73195 */
73196@@ -204,9 +306,21 @@ success:
73197 * vm_flags and vm_page_prot are protected by the mmap_sem
73198 * held in write mode.
73199 */
73200+
73201+#ifdef CONFIG_PAX_SEGMEXEC
73202+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
73203+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
73204+#endif
73205+
73206 vma->vm_flags = newflags;
73207+
73208+#ifdef CONFIG_PAX_MPROTECT
73209+ if (mm->binfmt && mm->binfmt->handle_mprotect)
73210+ mm->binfmt->handle_mprotect(vma, newflags);
73211+#endif
73212+
73213 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
73214- vm_get_page_prot(newflags));
73215+ vm_get_page_prot(vma->vm_flags));
73216
73217 if (vma_wants_writenotify(vma)) {
73218 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
73219@@ -248,6 +362,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73220 end = start + len;
73221 if (end <= start)
73222 return -ENOMEM;
73223+
73224+#ifdef CONFIG_PAX_SEGMEXEC
73225+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
73226+ if (end > SEGMEXEC_TASK_SIZE)
73227+ return -EINVAL;
73228+ } else
73229+#endif
73230+
73231+ if (end > TASK_SIZE)
73232+ return -EINVAL;
73233+
73234 if (!arch_validate_prot(prot))
73235 return -EINVAL;
73236
73237@@ -255,7 +380,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73238 /*
73239 * Does the application expect PROT_READ to imply PROT_EXEC:
73240 */
73241- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
73242+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
73243 prot |= PROT_EXEC;
73244
73245 vm_flags = calc_vm_prot_bits(prot);
73246@@ -288,6 +413,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73247 if (start > vma->vm_start)
73248 prev = vma;
73249
73250+#ifdef CONFIG_PAX_MPROTECT
73251+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
73252+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
73253+#endif
73254+
73255 for (nstart = start ; ; ) {
73256 unsigned long newflags;
73257
73258@@ -297,6 +427,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73259
73260 /* newflags >> 4 shift VM_MAY% in place of VM_% */
73261 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
73262+ if (prot & (PROT_WRITE | PROT_EXEC))
73263+ gr_log_rwxmprotect(vma->vm_file);
73264+
73265+ error = -EACCES;
73266+ goto out;
73267+ }
73268+
73269+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
73270 error = -EACCES;
73271 goto out;
73272 }
73273@@ -311,6 +449,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73274 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
73275 if (error)
73276 goto out;
73277+
73278+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
73279+
73280 nstart = tmp;
73281
73282 if (nstart < prev->vm_end)
73283diff --git a/mm/mremap.c b/mm/mremap.c
73284index 87bb839..c3bfadb 100644
73285--- a/mm/mremap.c
73286+++ b/mm/mremap.c
73287@@ -106,6 +106,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
73288 continue;
73289 pte = ptep_get_and_clear(mm, old_addr, old_pte);
73290 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
73291+
73292+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
73293+ if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
73294+ pte = pte_exprotect(pte);
73295+#endif
73296+
73297 set_pte_at(mm, new_addr, new_pte, pte);
73298 }
73299
73300@@ -299,6 +305,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
73301 if (is_vm_hugetlb_page(vma))
73302 goto Einval;
73303
73304+#ifdef CONFIG_PAX_SEGMEXEC
73305+ if (pax_find_mirror_vma(vma))
73306+ goto Einval;
73307+#endif
73308+
73309 /* We can't remap across vm area boundaries */
73310 if (old_len > vma->vm_end - addr)
73311 goto Efault;
73312@@ -355,20 +366,25 @@ static unsigned long mremap_to(unsigned long addr,
73313 unsigned long ret = -EINVAL;
73314 unsigned long charged = 0;
73315 unsigned long map_flags;
73316+ unsigned long pax_task_size = TASK_SIZE;
73317
73318 if (new_addr & ~PAGE_MASK)
73319 goto out;
73320
73321- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
73322+#ifdef CONFIG_PAX_SEGMEXEC
73323+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
73324+ pax_task_size = SEGMEXEC_TASK_SIZE;
73325+#endif
73326+
73327+ pax_task_size -= PAGE_SIZE;
73328+
73329+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
73330 goto out;
73331
73332 /* Check if the location we're moving into overlaps the
73333 * old location at all, and fail if it does.
73334 */
73335- if ((new_addr <= addr) && (new_addr+new_len) > addr)
73336- goto out;
73337-
73338- if ((addr <= new_addr) && (addr+old_len) > new_addr)
73339+ if (addr + old_len > new_addr && new_addr + new_len > addr)
73340 goto out;
73341
73342 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
73343@@ -440,6 +456,7 @@ unsigned long do_mremap(unsigned long addr,
73344 struct vm_area_struct *vma;
73345 unsigned long ret = -EINVAL;
73346 unsigned long charged = 0;
73347+ unsigned long pax_task_size = TASK_SIZE;
73348
73349 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
73350 goto out;
73351@@ -458,6 +475,17 @@ unsigned long do_mremap(unsigned long addr,
73352 if (!new_len)
73353 goto out;
73354
73355+#ifdef CONFIG_PAX_SEGMEXEC
73356+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
73357+ pax_task_size = SEGMEXEC_TASK_SIZE;
73358+#endif
73359+
73360+ pax_task_size -= PAGE_SIZE;
73361+
73362+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
73363+ old_len > pax_task_size || addr > pax_task_size-old_len)
73364+ goto out;
73365+
73366 if (flags & MREMAP_FIXED) {
73367 if (flags & MREMAP_MAYMOVE)
73368 ret = mremap_to(addr, old_len, new_addr, new_len);
73369@@ -507,6 +535,7 @@ unsigned long do_mremap(unsigned long addr,
73370 addr + new_len);
73371 }
73372 ret = addr;
73373+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
73374 goto out;
73375 }
73376 }
73377@@ -533,7 +562,13 @@ unsigned long do_mremap(unsigned long addr,
73378 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
73379 if (ret)
73380 goto out;
73381+
73382+ map_flags = vma->vm_flags;
73383 ret = move_vma(vma, addr, old_len, new_len, new_addr);
73384+ if (!(ret & ~PAGE_MASK)) {
73385+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
73386+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
73387+ }
73388 }
73389 out:
73390 if (ret & ~PAGE_MASK)
73391diff --git a/mm/nommu.c b/mm/nommu.c
73392index f59e170..34e2a2b 100644
73393--- a/mm/nommu.c
73394+++ b/mm/nommu.c
73395@@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
73396 int sysctl_overcommit_ratio = 50; /* default is 50% */
73397 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
73398 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
73399-int heap_stack_gap = 0;
73400
73401 atomic_long_t mmap_pages_allocated;
73402
73403@@ -827,15 +826,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
73404 EXPORT_SYMBOL(find_vma);
73405
73406 /*
73407- * find a VMA
73408- * - we don't extend stack VMAs under NOMMU conditions
73409- */
73410-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
73411-{
73412- return find_vma(mm, addr);
73413-}
73414-
73415-/*
73416 * expand a stack to a given address
73417 * - not supported under NOMMU conditions
73418 */
73419@@ -1555,6 +1545,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
73420
73421 /* most fields are the same, copy all, and then fixup */
73422 *new = *vma;
73423+ INIT_LIST_HEAD(&new->anon_vma_chain);
73424 *region = *vma->vm_region;
73425 new->vm_region = region;
73426
73427diff --git a/mm/page_alloc.c b/mm/page_alloc.c
73428index a13ded1..b949d15 100644
73429--- a/mm/page_alloc.c
73430+++ b/mm/page_alloc.c
73431@@ -335,7 +335,7 @@ out:
73432 * This usage means that zero-order pages may not be compound.
73433 */
73434
73435-static void free_compound_page(struct page *page)
73436+void free_compound_page(struct page *page)
73437 {
73438 __free_pages_ok(page, compound_order(page));
73439 }
73440@@ -692,6 +692,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
73441 int i;
73442 int bad = 0;
73443
73444+#ifdef CONFIG_PAX_MEMORY_SANITIZE
73445+ unsigned long index = 1UL << order;
73446+#endif
73447+
73448 trace_mm_page_free(page, order);
73449 kmemcheck_free_shadow(page, order);
73450
73451@@ -707,6 +711,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
73452 debug_check_no_obj_freed(page_address(page),
73453 PAGE_SIZE << order);
73454 }
73455+
73456+#ifdef CONFIG_PAX_MEMORY_SANITIZE
73457+ for (; index; --index)
73458+ sanitize_highpage(page + index - 1);
73459+#endif
73460+
73461 arch_free_page(page, order);
73462 kernel_map_pages(page, 1 << order, 0);
73463
73464@@ -830,8 +840,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
73465 arch_alloc_page(page, order);
73466 kernel_map_pages(page, 1 << order, 1);
73467
73468+#ifndef CONFIG_PAX_MEMORY_SANITIZE
73469 if (gfp_flags & __GFP_ZERO)
73470 prep_zero_page(page, order, gfp_flags);
73471+#endif
73472
73473 if (order && (gfp_flags & __GFP_COMP))
73474 prep_compound_page(page, order);
73475@@ -3468,7 +3480,13 @@ static int pageblock_is_reserved(unsigned long start_pfn, unsigned long end_pfn)
73476 unsigned long pfn;
73477
73478 for (pfn = start_pfn; pfn < end_pfn; pfn++) {
73479+#ifdef CONFIG_X86_32
73480+ /* boot failures in VMware 8 on 32bit vanilla since
73481+ this change */
73482+ if (!pfn_valid(pfn) || PageReserved(pfn_to_page(pfn)))
73483+#else
73484 if (!pfn_valid_within(pfn) || PageReserved(pfn_to_page(pfn)))
73485+#endif
73486 return 1;
73487 }
73488 return 0;
73489diff --git a/mm/percpu.c b/mm/percpu.c
73490index f47af91..7eeef99 100644
73491--- a/mm/percpu.c
73492+++ b/mm/percpu.c
73493@@ -122,7 +122,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
73494 static unsigned int pcpu_high_unit_cpu __read_mostly;
73495
73496 /* the address of the first chunk which starts with the kernel static area */
73497-void *pcpu_base_addr __read_mostly;
73498+void *pcpu_base_addr __read_only;
73499 EXPORT_SYMBOL_GPL(pcpu_base_addr);
73500
73501 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
73502diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
73503index c20ff48..137702a 100644
73504--- a/mm/process_vm_access.c
73505+++ b/mm/process_vm_access.c
73506@@ -13,6 +13,7 @@
73507 #include <linux/uio.h>
73508 #include <linux/sched.h>
73509 #include <linux/highmem.h>
73510+#include <linux/security.h>
73511 #include <linux/ptrace.h>
73512 #include <linux/slab.h>
73513 #include <linux/syscalls.h>
73514@@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
73515 size_t iov_l_curr_offset = 0;
73516 ssize_t iov_len;
73517
73518+ return -ENOSYS; // PaX: until properly audited
73519+
73520 /*
73521 * Work out how many pages of struct pages we're going to need
73522 * when eventually calling get_user_pages
73523 */
73524 for (i = 0; i < riovcnt; i++) {
73525 iov_len = rvec[i].iov_len;
73526- if (iov_len > 0) {
73527- nr_pages_iov = ((unsigned long)rvec[i].iov_base
73528- + iov_len)
73529- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
73530- / PAGE_SIZE + 1;
73531- nr_pages = max(nr_pages, nr_pages_iov);
73532- }
73533+ if (iov_len <= 0)
73534+ continue;
73535+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
73536+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
73537+ nr_pages = max(nr_pages, nr_pages_iov);
73538 }
73539
73540 if (nr_pages == 0)
73541@@ -298,6 +299,11 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
73542 goto free_proc_pages;
73543 }
73544
73545+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
73546+ rc = -EPERM;
73547+ goto put_task_struct;
73548+ }
73549+
73550 mm = mm_access(task, PTRACE_MODE_ATTACH);
73551 if (!mm || IS_ERR(mm)) {
73552 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
73553diff --git a/mm/rmap.c b/mm/rmap.c
73554index c8454e0..b04f3a2 100644
73555--- a/mm/rmap.c
73556+++ b/mm/rmap.c
73557@@ -152,6 +152,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73558 struct anon_vma *anon_vma = vma->anon_vma;
73559 struct anon_vma_chain *avc;
73560
73561+#ifdef CONFIG_PAX_SEGMEXEC
73562+ struct anon_vma_chain *avc_m = NULL;
73563+#endif
73564+
73565 might_sleep();
73566 if (unlikely(!anon_vma)) {
73567 struct mm_struct *mm = vma->vm_mm;
73568@@ -161,6 +165,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73569 if (!avc)
73570 goto out_enomem;
73571
73572+#ifdef CONFIG_PAX_SEGMEXEC
73573+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
73574+ if (!avc_m)
73575+ goto out_enomem_free_avc;
73576+#endif
73577+
73578 anon_vma = find_mergeable_anon_vma(vma);
73579 allocated = NULL;
73580 if (!anon_vma) {
73581@@ -174,6 +184,21 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73582 /* page_table_lock to protect against threads */
73583 spin_lock(&mm->page_table_lock);
73584 if (likely(!vma->anon_vma)) {
73585+
73586+#ifdef CONFIG_PAX_SEGMEXEC
73587+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
73588+
73589+ if (vma_m) {
73590+ BUG_ON(vma_m->anon_vma);
73591+ vma_m->anon_vma = anon_vma;
73592+ avc_m->anon_vma = anon_vma;
73593+ avc_m->vma = vma;
73594+ list_add(&avc_m->same_vma, &vma_m->anon_vma_chain);
73595+ list_add(&avc_m->same_anon_vma, &anon_vma->head);
73596+ avc_m = NULL;
73597+ }
73598+#endif
73599+
73600 vma->anon_vma = anon_vma;
73601 avc->anon_vma = anon_vma;
73602 avc->vma = vma;
73603@@ -187,12 +212,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73604
73605 if (unlikely(allocated))
73606 put_anon_vma(allocated);
73607+
73608+#ifdef CONFIG_PAX_SEGMEXEC
73609+ if (unlikely(avc_m))
73610+ anon_vma_chain_free(avc_m);
73611+#endif
73612+
73613 if (unlikely(avc))
73614 anon_vma_chain_free(avc);
73615 }
73616 return 0;
73617
73618 out_enomem_free_avc:
73619+
73620+#ifdef CONFIG_PAX_SEGMEXEC
73621+ if (avc_m)
73622+ anon_vma_chain_free(avc_m);
73623+#endif
73624+
73625 anon_vma_chain_free(avc);
73626 out_enomem:
73627 return -ENOMEM;
73628@@ -243,7 +280,7 @@ static void anon_vma_chain_link(struct vm_area_struct *vma,
73629 * Attach the anon_vmas from src to dst.
73630 * Returns 0 on success, -ENOMEM on failure.
73631 */
73632-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
73633+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
73634 {
73635 struct anon_vma_chain *avc, *pavc;
73636 struct anon_vma *root = NULL;
73637@@ -321,7 +358,7 @@ void anon_vma_moveto_tail(struct vm_area_struct *dst)
73638 * the corresponding VMA in the parent process is attached to.
73639 * Returns 0 on success, non-zero on failure.
73640 */
73641-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
73642+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
73643 {
73644 struct anon_vma_chain *avc;
73645 struct anon_vma *anon_vma;
73646diff --git a/mm/shmem.c b/mm/shmem.c
73647index 269d049..a9d2b50 100644
73648--- a/mm/shmem.c
73649+++ b/mm/shmem.c
73650@@ -31,7 +31,7 @@
73651 #include <linux/export.h>
73652 #include <linux/swap.h>
73653
73654-static struct vfsmount *shm_mnt;
73655+struct vfsmount *shm_mnt;
73656
73657 #ifdef CONFIG_SHMEM
73658 /*
73659@@ -74,7 +74,7 @@ static struct vfsmount *shm_mnt;
73660 #define BOGO_DIRENT_SIZE 20
73661
73662 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
73663-#define SHORT_SYMLINK_LEN 128
73664+#define SHORT_SYMLINK_LEN 64
73665
73666 struct shmem_xattr {
73667 struct list_head list; /* anchored by shmem_inode_info->xattr_list */
73668@@ -2180,8 +2180,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
73669 int err = -ENOMEM;
73670
73671 /* Round up to L1_CACHE_BYTES to resist false sharing */
73672- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
73673- L1_CACHE_BYTES), GFP_KERNEL);
73674+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
73675 if (!sbinfo)
73676 return -ENOMEM;
73677
73678diff --git a/mm/slab.c b/mm/slab.c
73679index f0bd785..348b96a 100644
73680--- a/mm/slab.c
73681+++ b/mm/slab.c
73682@@ -153,7 +153,7 @@
73683
73684 /* Legal flag mask for kmem_cache_create(). */
73685 #if DEBUG
73686-# define CREATE_MASK (SLAB_RED_ZONE | \
73687+# define CREATE_MASK (SLAB_USERCOPY | SLAB_RED_ZONE | \
73688 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
73689 SLAB_CACHE_DMA | \
73690 SLAB_STORE_USER | \
73691@@ -161,7 +161,7 @@
73692 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
73693 SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
73694 #else
73695-# define CREATE_MASK (SLAB_HWCACHE_ALIGN | \
73696+# define CREATE_MASK (SLAB_USERCOPY | SLAB_HWCACHE_ALIGN | \
73697 SLAB_CACHE_DMA | \
73698 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
73699 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
73700@@ -290,7 +290,7 @@ struct kmem_list3 {
73701 * Need this for bootstrapping a per node allocator.
73702 */
73703 #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
73704-static struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
73705+static struct kmem_list3 initkmem_list3[NUM_INIT_LISTS];
73706 #define CACHE_CACHE 0
73707 #define SIZE_AC MAX_NUMNODES
73708 #define SIZE_L3 (2 * MAX_NUMNODES)
73709@@ -391,10 +391,10 @@ static void kmem_list3_init(struct kmem_list3 *parent)
73710 if ((x)->max_freeable < i) \
73711 (x)->max_freeable = i; \
73712 } while (0)
73713-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
73714-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
73715-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
73716-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
73717+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
73718+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
73719+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
73720+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
73721 #else
73722 #define STATS_INC_ACTIVE(x) do { } while (0)
73723 #define STATS_DEC_ACTIVE(x) do { } while (0)
73724@@ -542,7 +542,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
73725 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
73726 */
73727 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
73728- const struct slab *slab, void *obj)
73729+ const struct slab *slab, const void *obj)
73730 {
73731 u32 offset = (obj - slab->s_mem);
73732 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
73733@@ -568,7 +568,7 @@ struct cache_names {
73734 static struct cache_names __initdata cache_names[] = {
73735 #define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
73736 #include <linux/kmalloc_sizes.h>
73737- {NULL,}
73738+ {NULL}
73739 #undef CACHE
73740 };
73741
73742@@ -1588,7 +1588,7 @@ void __init kmem_cache_init(void)
73743 sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
73744 sizes[INDEX_AC].cs_size,
73745 ARCH_KMALLOC_MINALIGN,
73746- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73747+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73748 NULL);
73749
73750 if (INDEX_AC != INDEX_L3) {
73751@@ -1596,7 +1596,7 @@ void __init kmem_cache_init(void)
73752 kmem_cache_create(names[INDEX_L3].name,
73753 sizes[INDEX_L3].cs_size,
73754 ARCH_KMALLOC_MINALIGN,
73755- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73756+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73757 NULL);
73758 }
73759
73760@@ -1614,7 +1614,7 @@ void __init kmem_cache_init(void)
73761 sizes->cs_cachep = kmem_cache_create(names->name,
73762 sizes->cs_size,
73763 ARCH_KMALLOC_MINALIGN,
73764- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73765+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73766 NULL);
73767 }
73768 #ifdef CONFIG_ZONE_DMA
73769@@ -4339,10 +4339,10 @@ static int s_show(struct seq_file *m, void *p)
73770 }
73771 /* cpu stats */
73772 {
73773- unsigned long allochit = atomic_read(&cachep->allochit);
73774- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
73775- unsigned long freehit = atomic_read(&cachep->freehit);
73776- unsigned long freemiss = atomic_read(&cachep->freemiss);
73777+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
73778+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
73779+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
73780+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
73781
73782 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
73783 allochit, allocmiss, freehit, freemiss);
73784@@ -4601,13 +4601,62 @@ static int __init slab_proc_init(void)
73785 {
73786 proc_create("slabinfo",S_IWUSR|S_IRUSR,NULL,&proc_slabinfo_operations);
73787 #ifdef CONFIG_DEBUG_SLAB_LEAK
73788- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
73789+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
73790 #endif
73791 return 0;
73792 }
73793 module_init(slab_proc_init);
73794 #endif
73795
73796+void check_object_size(const void *ptr, unsigned long n, bool to)
73797+{
73798+
73799+#ifdef CONFIG_PAX_USERCOPY
73800+ struct page *page;
73801+ struct kmem_cache *cachep = NULL;
73802+ struct slab *slabp;
73803+ unsigned int objnr;
73804+ unsigned long offset;
73805+ const char *type;
73806+
73807+ if (!n)
73808+ return;
73809+
73810+ type = "<null>";
73811+ if (ZERO_OR_NULL_PTR(ptr))
73812+ goto report;
73813+
73814+ if (!virt_addr_valid(ptr))
73815+ return;
73816+
73817+ page = virt_to_head_page(ptr);
73818+
73819+ type = "<process stack>";
73820+ if (!PageSlab(page)) {
73821+ if (object_is_on_stack(ptr, n) == -1)
73822+ goto report;
73823+ return;
73824+ }
73825+
73826+ cachep = page_get_cache(page);
73827+ type = cachep->name;
73828+ if (!(cachep->flags & SLAB_USERCOPY))
73829+ goto report;
73830+
73831+ slabp = page_get_slab(page);
73832+ objnr = obj_to_index(cachep, slabp, ptr);
73833+ BUG_ON(objnr >= cachep->num);
73834+ offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
73835+ if (offset <= obj_size(cachep) && n <= obj_size(cachep) - offset)
73836+ return;
73837+
73838+report:
73839+ pax_report_usercopy(ptr, n, to, type);
73840+#endif
73841+
73842+}
73843+EXPORT_SYMBOL(check_object_size);
73844+
73845 /**
73846 * ksize - get the actual amount of memory allocated for a given object
73847 * @objp: Pointer to the object
73848diff --git a/mm/slob.c b/mm/slob.c
73849index 8105be4..e045f96 100644
73850--- a/mm/slob.c
73851+++ b/mm/slob.c
73852@@ -29,7 +29,7 @@
73853 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
73854 * alloc_pages() directly, allocating compound pages so the page order
73855 * does not have to be separately tracked, and also stores the exact
73856- * allocation size in page->private so that it can be used to accurately
73857+ * allocation size in slob_page->size so that it can be used to accurately
73858 * provide ksize(). These objects are detected in kfree() because slob_page()
73859 * is false for them.
73860 *
73861@@ -58,6 +58,7 @@
73862 */
73863
73864 #include <linux/kernel.h>
73865+#include <linux/sched.h>
73866 #include <linux/slab.h>
73867 #include <linux/mm.h>
73868 #include <linux/swap.h> /* struct reclaim_state */
73869@@ -102,7 +103,8 @@ struct slob_page {
73870 unsigned long flags; /* mandatory */
73871 atomic_t _count; /* mandatory */
73872 slobidx_t units; /* free units left in page */
73873- unsigned long pad[2];
73874+ unsigned long pad[1];
73875+ unsigned long size; /* size when >=PAGE_SIZE */
73876 slob_t *free; /* first free slob_t in page */
73877 struct list_head list; /* linked list of free pages */
73878 };
73879@@ -135,7 +137,7 @@ static LIST_HEAD(free_slob_large);
73880 */
73881 static inline int is_slob_page(struct slob_page *sp)
73882 {
73883- return PageSlab((struct page *)sp);
73884+ return PageSlab((struct page *)sp) && !sp->size;
73885 }
73886
73887 static inline void set_slob_page(struct slob_page *sp)
73888@@ -150,7 +152,7 @@ static inline void clear_slob_page(struct slob_page *sp)
73889
73890 static inline struct slob_page *slob_page(const void *addr)
73891 {
73892- return (struct slob_page *)virt_to_page(addr);
73893+ return (struct slob_page *)virt_to_head_page(addr);
73894 }
73895
73896 /*
73897@@ -210,7 +212,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
73898 /*
73899 * Return the size of a slob block.
73900 */
73901-static slobidx_t slob_units(slob_t *s)
73902+static slobidx_t slob_units(const slob_t *s)
73903 {
73904 if (s->units > 0)
73905 return s->units;
73906@@ -220,7 +222,7 @@ static slobidx_t slob_units(slob_t *s)
73907 /*
73908 * Return the next free slob block pointer after this one.
73909 */
73910-static slob_t *slob_next(slob_t *s)
73911+static slob_t *slob_next(const slob_t *s)
73912 {
73913 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
73914 slobidx_t next;
73915@@ -235,7 +237,7 @@ static slob_t *slob_next(slob_t *s)
73916 /*
73917 * Returns true if s is the last free block in its page.
73918 */
73919-static int slob_last(slob_t *s)
73920+static int slob_last(const slob_t *s)
73921 {
73922 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
73923 }
73924@@ -254,6 +256,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
73925 if (!page)
73926 return NULL;
73927
73928+ set_slob_page(page);
73929 return page_address(page);
73930 }
73931
73932@@ -370,11 +373,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
73933 if (!b)
73934 return NULL;
73935 sp = slob_page(b);
73936- set_slob_page(sp);
73937
73938 spin_lock_irqsave(&slob_lock, flags);
73939 sp->units = SLOB_UNITS(PAGE_SIZE);
73940 sp->free = b;
73941+ sp->size = 0;
73942 INIT_LIST_HEAD(&sp->list);
73943 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
73944 set_slob_page_free(sp, slob_list);
73945@@ -476,10 +479,9 @@ out:
73946 * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
73947 */
73948
73949-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73950+static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
73951 {
73952- unsigned int *m;
73953- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
73954+ slob_t *m;
73955 void *ret;
73956
73957 gfp &= gfp_allowed_mask;
73958@@ -494,7 +496,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73959
73960 if (!m)
73961 return NULL;
73962- *m = size;
73963+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
73964+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
73965+ m[0].units = size;
73966+ m[1].units = align;
73967 ret = (void *)m + align;
73968
73969 trace_kmalloc_node(_RET_IP_, ret,
73970@@ -506,16 +511,25 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73971 gfp |= __GFP_COMP;
73972 ret = slob_new_pages(gfp, order, node);
73973 if (ret) {
73974- struct page *page;
73975- page = virt_to_page(ret);
73976- page->private = size;
73977+ struct slob_page *sp;
73978+ sp = slob_page(ret);
73979+ sp->size = size;
73980 }
73981
73982 trace_kmalloc_node(_RET_IP_, ret,
73983 size, PAGE_SIZE << order, gfp, node);
73984 }
73985
73986- kmemleak_alloc(ret, size, 1, gfp);
73987+ return ret;
73988+}
73989+
73990+void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73991+{
73992+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
73993+ void *ret = __kmalloc_node_align(size, gfp, node, align);
73994+
73995+ if (!ZERO_OR_NULL_PTR(ret))
73996+ kmemleak_alloc(ret, size, 1, gfp);
73997 return ret;
73998 }
73999 EXPORT_SYMBOL(__kmalloc_node);
74000@@ -533,13 +547,92 @@ void kfree(const void *block)
74001 sp = slob_page(block);
74002 if (is_slob_page(sp)) {
74003 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74004- unsigned int *m = (unsigned int *)(block - align);
74005- slob_free(m, *m + align);
74006- } else
74007+ slob_t *m = (slob_t *)(block - align);
74008+ slob_free(m, m[0].units + align);
74009+ } else {
74010+ clear_slob_page(sp);
74011+ free_slob_page(sp);
74012+ sp->size = 0;
74013 put_page(&sp->page);
74014+ }
74015 }
74016 EXPORT_SYMBOL(kfree);
74017
74018+void check_object_size(const void *ptr, unsigned long n, bool to)
74019+{
74020+
74021+#ifdef CONFIG_PAX_USERCOPY
74022+ struct slob_page *sp;
74023+ const slob_t *free;
74024+ const void *base;
74025+ unsigned long flags;
74026+ const char *type;
74027+
74028+ if (!n)
74029+ return;
74030+
74031+ type = "<null>";
74032+ if (ZERO_OR_NULL_PTR(ptr))
74033+ goto report;
74034+
74035+ if (!virt_addr_valid(ptr))
74036+ return;
74037+
74038+ type = "<process stack>";
74039+ sp = slob_page(ptr);
74040+ if (!PageSlab((struct page *)sp)) {
74041+ if (object_is_on_stack(ptr, n) == -1)
74042+ goto report;
74043+ return;
74044+ }
74045+
74046+ type = "<slob>";
74047+ if (sp->size) {
74048+ base = page_address(&sp->page);
74049+ if (base <= ptr && n <= sp->size - (ptr - base))
74050+ return;
74051+ goto report;
74052+ }
74053+
74054+ /* some tricky double walking to find the chunk */
74055+ spin_lock_irqsave(&slob_lock, flags);
74056+ base = (void *)((unsigned long)ptr & PAGE_MASK);
74057+ free = sp->free;
74058+
74059+ while (!slob_last(free) && (void *)free <= ptr) {
74060+ base = free + slob_units(free);
74061+ free = slob_next(free);
74062+ }
74063+
74064+ while (base < (void *)free) {
74065+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
74066+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
74067+ int offset;
74068+
74069+ if (ptr < base + align)
74070+ break;
74071+
74072+ offset = ptr - base - align;
74073+ if (offset >= m) {
74074+ base += size;
74075+ continue;
74076+ }
74077+
74078+ if (n > m - offset)
74079+ break;
74080+
74081+ spin_unlock_irqrestore(&slob_lock, flags);
74082+ return;
74083+ }
74084+
74085+ spin_unlock_irqrestore(&slob_lock, flags);
74086+report:
74087+ pax_report_usercopy(ptr, n, to, type);
74088+#endif
74089+
74090+}
74091+EXPORT_SYMBOL(check_object_size);
74092+
74093 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
74094 size_t ksize(const void *block)
74095 {
74096@@ -552,10 +645,10 @@ size_t ksize(const void *block)
74097 sp = slob_page(block);
74098 if (is_slob_page(sp)) {
74099 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74100- unsigned int *m = (unsigned int *)(block - align);
74101- return SLOB_UNITS(*m) * SLOB_UNIT;
74102+ slob_t *m = (slob_t *)(block - align);
74103+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
74104 } else
74105- return sp->page.private;
74106+ return sp->size;
74107 }
74108 EXPORT_SYMBOL(ksize);
74109
74110@@ -571,8 +664,13 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74111 {
74112 struct kmem_cache *c;
74113
74114+#ifdef CONFIG_PAX_USERCOPY
74115+ c = __kmalloc_node_align(sizeof(struct kmem_cache),
74116+ GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
74117+#else
74118 c = slob_alloc(sizeof(struct kmem_cache),
74119 GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
74120+#endif
74121
74122 if (c) {
74123 c->name = name;
74124@@ -614,17 +712,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
74125
74126 lockdep_trace_alloc(flags);
74127
74128+#ifdef CONFIG_PAX_USERCOPY
74129+ b = __kmalloc_node_align(c->size, flags, node, c->align);
74130+#else
74131 if (c->size < PAGE_SIZE) {
74132 b = slob_alloc(c->size, flags, c->align, node);
74133 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
74134 SLOB_UNITS(c->size) * SLOB_UNIT,
74135 flags, node);
74136 } else {
74137+ struct slob_page *sp;
74138+
74139 b = slob_new_pages(flags, get_order(c->size), node);
74140+ sp = slob_page(b);
74141+ sp->size = c->size;
74142 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
74143 PAGE_SIZE << get_order(c->size),
74144 flags, node);
74145 }
74146+#endif
74147
74148 if (c->ctor)
74149 c->ctor(b);
74150@@ -636,10 +742,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
74151
74152 static void __kmem_cache_free(void *b, int size)
74153 {
74154- if (size < PAGE_SIZE)
74155+ struct slob_page *sp = slob_page(b);
74156+
74157+ if (is_slob_page(sp))
74158 slob_free(b, size);
74159- else
74160+ else {
74161+ clear_slob_page(sp);
74162+ free_slob_page(sp);
74163+ sp->size = 0;
74164 slob_free_pages(b, get_order(size));
74165+ }
74166 }
74167
74168 static void kmem_rcu_free(struct rcu_head *head)
74169@@ -652,17 +764,31 @@ static void kmem_rcu_free(struct rcu_head *head)
74170
74171 void kmem_cache_free(struct kmem_cache *c, void *b)
74172 {
74173+ int size = c->size;
74174+
74175+#ifdef CONFIG_PAX_USERCOPY
74176+ if (size + c->align < PAGE_SIZE) {
74177+ size += c->align;
74178+ b -= c->align;
74179+ }
74180+#endif
74181+
74182 kmemleak_free_recursive(b, c->flags);
74183 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
74184 struct slob_rcu *slob_rcu;
74185- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
74186- slob_rcu->size = c->size;
74187+ slob_rcu = b + (size - sizeof(struct slob_rcu));
74188+ slob_rcu->size = size;
74189 call_rcu(&slob_rcu->head, kmem_rcu_free);
74190 } else {
74191- __kmem_cache_free(b, c->size);
74192+ __kmem_cache_free(b, size);
74193 }
74194
74195+#ifdef CONFIG_PAX_USERCOPY
74196+ trace_kfree(_RET_IP_, b);
74197+#else
74198 trace_kmem_cache_free(_RET_IP_, b);
74199+#endif
74200+
74201 }
74202 EXPORT_SYMBOL(kmem_cache_free);
74203
74204diff --git a/mm/slub.c b/mm/slub.c
74205index 0342a5d..8180ae9 100644
74206--- a/mm/slub.c
74207+++ b/mm/slub.c
74208@@ -208,7 +208,7 @@ struct track {
74209
74210 enum track_item { TRACK_ALLOC, TRACK_FREE };
74211
74212-#ifdef CONFIG_SYSFS
74213+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74214 static int sysfs_slab_add(struct kmem_cache *);
74215 static int sysfs_slab_alias(struct kmem_cache *, const char *);
74216 static void sysfs_slab_remove(struct kmem_cache *);
74217@@ -532,7 +532,7 @@ static void print_track(const char *s, struct track *t)
74218 if (!t->addr)
74219 return;
74220
74221- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
74222+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
74223 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
74224 #ifdef CONFIG_STACKTRACE
74225 {
74226@@ -2571,6 +2571,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
74227
74228 page = virt_to_head_page(x);
74229
74230+ BUG_ON(!PageSlab(page));
74231+
74232 slab_free(s, page, x, _RET_IP_);
74233
74234 trace_kmem_cache_free(_RET_IP_, x);
74235@@ -2604,7 +2606,7 @@ static int slub_min_objects;
74236 * Merge control. If this is set then no merging of slab caches will occur.
74237 * (Could be removed. This was introduced to pacify the merge skeptics.)
74238 */
74239-static int slub_nomerge;
74240+static int slub_nomerge = 1;
74241
74242 /*
74243 * Calculate the order of allocation given an slab object size.
74244@@ -3057,7 +3059,7 @@ static int kmem_cache_open(struct kmem_cache *s,
74245 else
74246 s->cpu_partial = 30;
74247
74248- s->refcount = 1;
74249+ atomic_set(&s->refcount, 1);
74250 #ifdef CONFIG_NUMA
74251 s->remote_node_defrag_ratio = 1000;
74252 #endif
74253@@ -3161,8 +3163,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
74254 void kmem_cache_destroy(struct kmem_cache *s)
74255 {
74256 down_write(&slub_lock);
74257- s->refcount--;
74258- if (!s->refcount) {
74259+ if (atomic_dec_and_test(&s->refcount)) {
74260 list_del(&s->list);
74261 up_write(&slub_lock);
74262 if (kmem_cache_close(s)) {
74263@@ -3373,6 +3374,50 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
74264 EXPORT_SYMBOL(__kmalloc_node);
74265 #endif
74266
74267+void check_object_size(const void *ptr, unsigned long n, bool to)
74268+{
74269+
74270+#ifdef CONFIG_PAX_USERCOPY
74271+ struct page *page;
74272+ struct kmem_cache *s = NULL;
74273+ unsigned long offset;
74274+ const char *type;
74275+
74276+ if (!n)
74277+ return;
74278+
74279+ type = "<null>";
74280+ if (ZERO_OR_NULL_PTR(ptr))
74281+ goto report;
74282+
74283+ if (!virt_addr_valid(ptr))
74284+ return;
74285+
74286+ page = virt_to_head_page(ptr);
74287+
74288+ type = "<process stack>";
74289+ if (!PageSlab(page)) {
74290+ if (object_is_on_stack(ptr, n) == -1)
74291+ goto report;
74292+ return;
74293+ }
74294+
74295+ s = page->slab;
74296+ type = s->name;
74297+ if (!(s->flags & SLAB_USERCOPY))
74298+ goto report;
74299+
74300+ offset = (ptr - page_address(page)) % s->size;
74301+ if (offset <= s->objsize && n <= s->objsize - offset)
74302+ return;
74303+
74304+report:
74305+ pax_report_usercopy(ptr, n, to, type);
74306+#endif
74307+
74308+}
74309+EXPORT_SYMBOL(check_object_size);
74310+
74311 size_t ksize(const void *object)
74312 {
74313 struct page *page;
74314@@ -3647,7 +3692,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
74315 int node;
74316
74317 list_add(&s->list, &slab_caches);
74318- s->refcount = -1;
74319+ atomic_set(&s->refcount, -1);
74320
74321 for_each_node_state(node, N_NORMAL_MEMORY) {
74322 struct kmem_cache_node *n = get_node(s, node);
74323@@ -3767,17 +3812,17 @@ void __init kmem_cache_init(void)
74324
74325 /* Caches that are not of the two-to-the-power-of size */
74326 if (KMALLOC_MIN_SIZE <= 32) {
74327- kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, 0);
74328+ kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, SLAB_USERCOPY);
74329 caches++;
74330 }
74331
74332 if (KMALLOC_MIN_SIZE <= 64) {
74333- kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, 0);
74334+ kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, SLAB_USERCOPY);
74335 caches++;
74336 }
74337
74338 for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
74339- kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, 0);
74340+ kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, SLAB_USERCOPY);
74341 caches++;
74342 }
74343
74344@@ -3845,7 +3890,7 @@ static int slab_unmergeable(struct kmem_cache *s)
74345 /*
74346 * We may have set a slab to be unmergeable during bootstrap.
74347 */
74348- if (s->refcount < 0)
74349+ if (atomic_read(&s->refcount) < 0)
74350 return 1;
74351
74352 return 0;
74353@@ -3904,7 +3949,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74354 down_write(&slub_lock);
74355 s = find_mergeable(size, align, flags, name, ctor);
74356 if (s) {
74357- s->refcount++;
74358+ atomic_inc(&s->refcount);
74359 /*
74360 * Adjust the object sizes so that we clear
74361 * the complete object on kzalloc.
74362@@ -3913,7 +3958,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74363 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
74364
74365 if (sysfs_slab_alias(s, name)) {
74366- s->refcount--;
74367+ atomic_dec(&s->refcount);
74368 goto err;
74369 }
74370 up_write(&slub_lock);
74371@@ -4042,7 +4087,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
74372 }
74373 #endif
74374
74375-#ifdef CONFIG_SYSFS
74376+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74377 static int count_inuse(struct page *page)
74378 {
74379 return page->inuse;
74380@@ -4429,12 +4474,12 @@ static void resiliency_test(void)
74381 validate_slab_cache(kmalloc_caches[9]);
74382 }
74383 #else
74384-#ifdef CONFIG_SYSFS
74385+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74386 static void resiliency_test(void) {};
74387 #endif
74388 #endif
74389
74390-#ifdef CONFIG_SYSFS
74391+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74392 enum slab_stat_type {
74393 SL_ALL, /* All slabs */
74394 SL_PARTIAL, /* Only partially allocated slabs */
74395@@ -4677,7 +4722,7 @@ SLAB_ATTR_RO(ctor);
74396
74397 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
74398 {
74399- return sprintf(buf, "%d\n", s->refcount - 1);
74400+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
74401 }
74402 SLAB_ATTR_RO(aliases);
74403
74404@@ -5244,6 +5289,7 @@ static char *create_unique_id(struct kmem_cache *s)
74405 return name;
74406 }
74407
74408+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74409 static int sysfs_slab_add(struct kmem_cache *s)
74410 {
74411 int err;
74412@@ -5306,6 +5352,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
74413 kobject_del(&s->kobj);
74414 kobject_put(&s->kobj);
74415 }
74416+#endif
74417
74418 /*
74419 * Need to buffer aliases during bootup until sysfs becomes
74420@@ -5319,6 +5366,7 @@ struct saved_alias {
74421
74422 static struct saved_alias *alias_list;
74423
74424+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74425 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
74426 {
74427 struct saved_alias *al;
74428@@ -5341,6 +5389,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
74429 alias_list = al;
74430 return 0;
74431 }
74432+#endif
74433
74434 static int __init slab_sysfs_init(void)
74435 {
74436diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
74437index 1b7e22a..3fcd4f3 100644
74438--- a/mm/sparse-vmemmap.c
74439+++ b/mm/sparse-vmemmap.c
74440@@ -128,7 +128,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
74441 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
74442 if (!p)
74443 return NULL;
74444- pud_populate(&init_mm, pud, p);
74445+ pud_populate_kernel(&init_mm, pud, p);
74446 }
74447 return pud;
74448 }
74449@@ -140,7 +140,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
74450 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
74451 if (!p)
74452 return NULL;
74453- pgd_populate(&init_mm, pgd, p);
74454+ pgd_populate_kernel(&init_mm, pgd, p);
74455 }
74456 return pgd;
74457 }
74458diff --git a/mm/swap.c b/mm/swap.c
74459index 14380e9..e244704 100644
74460--- a/mm/swap.c
74461+++ b/mm/swap.c
74462@@ -30,6 +30,7 @@
74463 #include <linux/backing-dev.h>
74464 #include <linux/memcontrol.h>
74465 #include <linux/gfp.h>
74466+#include <linux/hugetlb.h>
74467
74468 #include "internal.h"
74469
74470@@ -70,6 +71,8 @@ static void __put_compound_page(struct page *page)
74471
74472 __page_cache_release(page);
74473 dtor = get_compound_page_dtor(page);
74474+ if (!PageHuge(page))
74475+ BUG_ON(dtor != free_compound_page);
74476 (*dtor)(page);
74477 }
74478
74479diff --git a/mm/swapfile.c b/mm/swapfile.c
74480index f31b29d..8bdcae2 100644
74481--- a/mm/swapfile.c
74482+++ b/mm/swapfile.c
74483@@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex);
74484
74485 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
74486 /* Activity counter to indicate that a swapon or swapoff has occurred */
74487-static atomic_t proc_poll_event = ATOMIC_INIT(0);
74488+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
74489
74490 static inline unsigned char swap_count(unsigned char ent)
74491 {
74492@@ -1669,7 +1669,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
74493 }
74494 filp_close(swap_file, NULL);
74495 err = 0;
74496- atomic_inc(&proc_poll_event);
74497+ atomic_inc_unchecked(&proc_poll_event);
74498 wake_up_interruptible(&proc_poll_wait);
74499
74500 out_dput:
74501@@ -1685,8 +1685,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
74502
74503 poll_wait(file, &proc_poll_wait, wait);
74504
74505- if (seq->poll_event != atomic_read(&proc_poll_event)) {
74506- seq->poll_event = atomic_read(&proc_poll_event);
74507+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
74508+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
74509 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
74510 }
74511
74512@@ -1784,7 +1784,7 @@ static int swaps_open(struct inode *inode, struct file *file)
74513 return ret;
74514
74515 seq = file->private_data;
74516- seq->poll_event = atomic_read(&proc_poll_event);
74517+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
74518 return 0;
74519 }
74520
74521@@ -2122,7 +2122,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
74522 (p->flags & SWP_DISCARDABLE) ? "D" : "");
74523
74524 mutex_unlock(&swapon_mutex);
74525- atomic_inc(&proc_poll_event);
74526+ atomic_inc_unchecked(&proc_poll_event);
74527 wake_up_interruptible(&proc_poll_wait);
74528
74529 if (S_ISREG(inode->i_mode))
74530diff --git a/mm/util.c b/mm/util.c
74531index 136ac4f..f917fa9 100644
74532--- a/mm/util.c
74533+++ b/mm/util.c
74534@@ -243,6 +243,12 @@ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
74535 void arch_pick_mmap_layout(struct mm_struct *mm)
74536 {
74537 mm->mmap_base = TASK_UNMAPPED_BASE;
74538+
74539+#ifdef CONFIG_PAX_RANDMMAP
74540+ if (mm->pax_flags & MF_PAX_RANDMMAP)
74541+ mm->mmap_base += mm->delta_mmap;
74542+#endif
74543+
74544 mm->get_unmapped_area = arch_get_unmapped_area;
74545 mm->unmap_area = arch_unmap_area;
74546 }
74547diff --git a/mm/vmalloc.c b/mm/vmalloc.c
74548index 86ce9a5..e0bd080 100644
74549--- a/mm/vmalloc.c
74550+++ b/mm/vmalloc.c
74551@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
74552
74553 pte = pte_offset_kernel(pmd, addr);
74554 do {
74555- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74556- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74557+
74558+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74559+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
74560+ BUG_ON(!pte_exec(*pte));
74561+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
74562+ continue;
74563+ }
74564+#endif
74565+
74566+ {
74567+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74568+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74569+ }
74570 } while (pte++, addr += PAGE_SIZE, addr != end);
74571 }
74572
74573@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
74574 unsigned long end, pgprot_t prot, struct page **pages, int *nr)
74575 {
74576 pte_t *pte;
74577+ int ret = -ENOMEM;
74578
74579 /*
74580 * nr is a running index into the array which helps higher level
74581@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
74582 pte = pte_alloc_kernel(pmd, addr);
74583 if (!pte)
74584 return -ENOMEM;
74585+
74586+ pax_open_kernel();
74587 do {
74588 struct page *page = pages[*nr];
74589
74590- if (WARN_ON(!pte_none(*pte)))
74591- return -EBUSY;
74592- if (WARN_ON(!page))
74593- return -ENOMEM;
74594+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74595+ if (pgprot_val(prot) & _PAGE_NX)
74596+#endif
74597+
74598+ if (WARN_ON(!pte_none(*pte))) {
74599+ ret = -EBUSY;
74600+ goto out;
74601+ }
74602+ if (WARN_ON(!page)) {
74603+ ret = -ENOMEM;
74604+ goto out;
74605+ }
74606 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
74607 (*nr)++;
74608 } while (pte++, addr += PAGE_SIZE, addr != end);
74609- return 0;
74610+ ret = 0;
74611+out:
74612+ pax_close_kernel();
74613+ return ret;
74614 }
74615
74616 static int vmap_pmd_range(pud_t *pud, unsigned long addr,
74617@@ -119,7 +144,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
74618 pmd_t *pmd;
74619 unsigned long next;
74620
74621- pmd = pmd_alloc(&init_mm, pud, addr);
74622+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
74623 if (!pmd)
74624 return -ENOMEM;
74625 do {
74626@@ -136,7 +161,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
74627 pud_t *pud;
74628 unsigned long next;
74629
74630- pud = pud_alloc(&init_mm, pgd, addr);
74631+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
74632 if (!pud)
74633 return -ENOMEM;
74634 do {
74635@@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void *x)
74636 * and fall back on vmalloc() if that fails. Others
74637 * just put it in the vmalloc space.
74638 */
74639-#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
74640+#ifdef CONFIG_MODULES
74641+#ifdef MODULES_VADDR
74642 unsigned long addr = (unsigned long)x;
74643 if (addr >= MODULES_VADDR && addr < MODULES_END)
74644 return 1;
74645 #endif
74646+
74647+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74648+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
74649+ return 1;
74650+#endif
74651+
74652+#endif
74653+
74654 return is_vmalloc_addr(x);
74655 }
74656
74657@@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
74658
74659 if (!pgd_none(*pgd)) {
74660 pud_t *pud = pud_offset(pgd, addr);
74661+#ifdef CONFIG_X86
74662+ if (!pud_large(*pud))
74663+#endif
74664 if (!pud_none(*pud)) {
74665 pmd_t *pmd = pmd_offset(pud, addr);
74666+#ifdef CONFIG_X86
74667+ if (!pmd_large(*pmd))
74668+#endif
74669 if (!pmd_none(*pmd)) {
74670 pte_t *ptep, pte;
74671
74672@@ -1319,6 +1359,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
74673 struct vm_struct *area;
74674
74675 BUG_ON(in_interrupt());
74676+
74677+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74678+ if (flags & VM_KERNEXEC) {
74679+ if (start != VMALLOC_START || end != VMALLOC_END)
74680+ return NULL;
74681+ start = (unsigned long)MODULES_EXEC_VADDR;
74682+ end = (unsigned long)MODULES_EXEC_END;
74683+ }
74684+#endif
74685+
74686 if (flags & VM_IOREMAP) {
74687 int bit = fls(size);
74688
74689@@ -1551,6 +1601,11 @@ void *vmap(struct page **pages, unsigned int count,
74690 if (count > totalram_pages)
74691 return NULL;
74692
74693+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74694+ if (!(pgprot_val(prot) & _PAGE_NX))
74695+ flags |= VM_KERNEXEC;
74696+#endif
74697+
74698 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
74699 __builtin_return_address(0));
74700 if (!area)
74701@@ -1652,6 +1707,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
74702 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
74703 goto fail;
74704
74705+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74706+ if (!(pgprot_val(prot) & _PAGE_NX))
74707+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
74708+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
74709+ else
74710+#endif
74711+
74712 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
74713 start, end, node, gfp_mask, caller);
74714 if (!area)
74715@@ -1825,10 +1887,9 @@ EXPORT_SYMBOL(vzalloc_node);
74716 * For tight control over page level allocator and protection flags
74717 * use __vmalloc() instead.
74718 */
74719-
74720 void *vmalloc_exec(unsigned long size)
74721 {
74722- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
74723+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
74724 -1, __builtin_return_address(0));
74725 }
74726
74727@@ -2123,6 +2184,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
74728 unsigned long uaddr = vma->vm_start;
74729 unsigned long usize = vma->vm_end - vma->vm_start;
74730
74731+ BUG_ON(vma->vm_mirror);
74732+
74733 if ((PAGE_SIZE-1) & (unsigned long)addr)
74734 return -EINVAL;
74735
74736diff --git a/mm/vmstat.c b/mm/vmstat.c
74737index f600557..1459fc8 100644
74738--- a/mm/vmstat.c
74739+++ b/mm/vmstat.c
74740@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
74741 *
74742 * vm_stat contains the global counters
74743 */
74744-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
74745+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
74746 EXPORT_SYMBOL(vm_stat);
74747
74748 #ifdef CONFIG_SMP
74749@@ -454,7 +454,7 @@ void refresh_cpu_vm_stats(int cpu)
74750 v = p->vm_stat_diff[i];
74751 p->vm_stat_diff[i] = 0;
74752 local_irq_restore(flags);
74753- atomic_long_add(v, &zone->vm_stat[i]);
74754+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
74755 global_diff[i] += v;
74756 #ifdef CONFIG_NUMA
74757 /* 3 seconds idle till flush */
74758@@ -492,7 +492,7 @@ void refresh_cpu_vm_stats(int cpu)
74759
74760 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
74761 if (global_diff[i])
74762- atomic_long_add(global_diff[i], &vm_stat[i]);
74763+ atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
74764 }
74765
74766 #endif
74767@@ -1208,10 +1208,20 @@ static int __init setup_vmstat(void)
74768 start_cpu_timer(cpu);
74769 #endif
74770 #ifdef CONFIG_PROC_FS
74771- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
74772- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
74773- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
74774- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
74775+ {
74776+ mode_t gr_mode = S_IRUGO;
74777+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74778+ gr_mode = S_IRUSR;
74779+#endif
74780+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
74781+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
74782+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74783+ proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
74784+#else
74785+ proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
74786+#endif
74787+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
74788+ }
74789 #endif
74790 return 0;
74791 }
74792diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
74793index efea35b..9c8dd0b 100644
74794--- a/net/8021q/vlan.c
74795+++ b/net/8021q/vlan.c
74796@@ -554,8 +554,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
74797 err = -EPERM;
74798 if (!capable(CAP_NET_ADMIN))
74799 break;
74800- if ((args.u.name_type >= 0) &&
74801- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
74802+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
74803 struct vlan_net *vn;
74804
74805 vn = net_generic(net, vlan_net_id);
74806diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
74807index fccae26..e7ece2f 100644
74808--- a/net/9p/trans_fd.c
74809+++ b/net/9p/trans_fd.c
74810@@ -425,7 +425,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
74811 oldfs = get_fs();
74812 set_fs(get_ds());
74813 /* The cast to a user pointer is valid due to the set_fs() */
74814- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
74815+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
74816 set_fs(oldfs);
74817
74818 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
74819diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
74820index 876fbe8..8bbea9f 100644
74821--- a/net/atm/atm_misc.c
74822+++ b/net/atm/atm_misc.c
74823@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
74824 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
74825 return 1;
74826 atm_return(vcc, truesize);
74827- atomic_inc(&vcc->stats->rx_drop);
74828+ atomic_inc_unchecked(&vcc->stats->rx_drop);
74829 return 0;
74830 }
74831 EXPORT_SYMBOL(atm_charge);
74832@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
74833 }
74834 }
74835 atm_return(vcc, guess);
74836- atomic_inc(&vcc->stats->rx_drop);
74837+ atomic_inc_unchecked(&vcc->stats->rx_drop);
74838 return NULL;
74839 }
74840 EXPORT_SYMBOL(atm_alloc_charge);
74841@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
74842
74843 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
74844 {
74845-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
74846+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
74847 __SONET_ITEMS
74848 #undef __HANDLE_ITEM
74849 }
74850@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
74851
74852 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
74853 {
74854-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
74855+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
74856 __SONET_ITEMS
74857 #undef __HANDLE_ITEM
74858 }
74859diff --git a/net/atm/lec.h b/net/atm/lec.h
74860index dfc0719..47c5322 100644
74861--- a/net/atm/lec.h
74862+++ b/net/atm/lec.h
74863@@ -48,7 +48,7 @@ struct lane2_ops {
74864 const u8 *tlvs, u32 sizeoftlvs);
74865 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
74866 const u8 *tlvs, u32 sizeoftlvs);
74867-};
74868+} __no_const;
74869
74870 /*
74871 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
74872diff --git a/net/atm/mpc.h b/net/atm/mpc.h
74873index 0919a88..a23d54e 100644
74874--- a/net/atm/mpc.h
74875+++ b/net/atm/mpc.h
74876@@ -33,7 +33,7 @@ struct mpoa_client {
74877 struct mpc_parameters parameters; /* parameters for this client */
74878
74879 const struct net_device_ops *old_ops;
74880- struct net_device_ops new_ops;
74881+ net_device_ops_no_const new_ops;
74882 };
74883
74884
74885diff --git a/net/atm/proc.c b/net/atm/proc.c
74886index 0d020de..011c7bb 100644
74887--- a/net/atm/proc.c
74888+++ b/net/atm/proc.c
74889@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
74890 const struct k_atm_aal_stats *stats)
74891 {
74892 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
74893- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
74894- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
74895- atomic_read(&stats->rx_drop));
74896+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
74897+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
74898+ atomic_read_unchecked(&stats->rx_drop));
74899 }
74900
74901 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
74902diff --git a/net/atm/resources.c b/net/atm/resources.c
74903index 23f45ce..c748f1a 100644
74904--- a/net/atm/resources.c
74905+++ b/net/atm/resources.c
74906@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
74907 static void copy_aal_stats(struct k_atm_aal_stats *from,
74908 struct atm_aal_stats *to)
74909 {
74910-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
74911+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
74912 __AAL_STAT_ITEMS
74913 #undef __HANDLE_ITEM
74914 }
74915@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
74916 static void subtract_aal_stats(struct k_atm_aal_stats *from,
74917 struct atm_aal_stats *to)
74918 {
74919-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
74920+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
74921 __AAL_STAT_ITEMS
74922 #undef __HANDLE_ITEM
74923 }
74924diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
74925index 3512e25..2b33401 100644
74926--- a/net/batman-adv/bat_iv_ogm.c
74927+++ b/net/batman-adv/bat_iv_ogm.c
74928@@ -541,7 +541,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
74929
74930 /* change sequence number to network order */
74931 batman_ogm_packet->seqno =
74932- htonl((uint32_t)atomic_read(&hard_iface->seqno));
74933+ htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
74934
74935 batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
74936 batman_ogm_packet->tt_crc = htons((uint16_t)
74937@@ -561,7 +561,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
74938 else
74939 batman_ogm_packet->gw_flags = NO_FLAGS;
74940
74941- atomic_inc(&hard_iface->seqno);
74942+ atomic_inc_unchecked(&hard_iface->seqno);
74943
74944 slide_own_bcast_window(hard_iface);
74945 bat_ogm_queue_add(bat_priv, hard_iface->packet_buff,
74946@@ -922,7 +922,7 @@ static void bat_ogm_process(const struct ethhdr *ethhdr,
74947 return;
74948
74949 /* could be changed by schedule_own_packet() */
74950- if_incoming_seqno = atomic_read(&if_incoming->seqno);
74951+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->seqno);
74952
74953 has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);
74954
74955diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
74956index 7704df4..beb4e16 100644
74957--- a/net/batman-adv/hard-interface.c
74958+++ b/net/batman-adv/hard-interface.c
74959@@ -326,8 +326,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
74960 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
74961 dev_add_pack(&hard_iface->batman_adv_ptype);
74962
74963- atomic_set(&hard_iface->seqno, 1);
74964- atomic_set(&hard_iface->frag_seqno, 1);
74965+ atomic_set_unchecked(&hard_iface->seqno, 1);
74966+ atomic_set_unchecked(&hard_iface->frag_seqno, 1);
74967 bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
74968 hard_iface->net_dev->name);
74969
74970diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
74971index 987c75a..20d6f36 100644
74972--- a/net/batman-adv/soft-interface.c
74973+++ b/net/batman-adv/soft-interface.c
74974@@ -645,7 +645,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
74975
74976 /* set broadcast sequence number */
74977 bcast_packet->seqno =
74978- htonl(atomic_inc_return(&bat_priv->bcast_seqno));
74979+ htonl(atomic_inc_return_unchecked(&bat_priv->bcast_seqno));
74980
74981 add_bcast_packet_to_list(bat_priv, skb, 1);
74982
74983@@ -843,7 +843,7 @@ struct net_device *softif_create(const char *name)
74984 atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
74985
74986 atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
74987- atomic_set(&bat_priv->bcast_seqno, 1);
74988+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
74989 atomic_set(&bat_priv->ttvn, 0);
74990 atomic_set(&bat_priv->tt_local_changes, 0);
74991 atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
74992diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
74993index e9eb043..d174eeb 100644
74994--- a/net/batman-adv/types.h
74995+++ b/net/batman-adv/types.h
74996@@ -38,8 +38,8 @@ struct hard_iface {
74997 int16_t if_num;
74998 char if_status;
74999 struct net_device *net_dev;
75000- atomic_t seqno;
75001- atomic_t frag_seqno;
75002+ atomic_unchecked_t seqno;
75003+ atomic_unchecked_t frag_seqno;
75004 unsigned char *packet_buff;
75005 int packet_len;
75006 struct kobject *hardif_obj;
75007@@ -154,7 +154,7 @@ struct bat_priv {
75008 atomic_t orig_interval; /* uint */
75009 atomic_t hop_penalty; /* uint */
75010 atomic_t log_level; /* uint */
75011- atomic_t bcast_seqno;
75012+ atomic_unchecked_t bcast_seqno;
75013 atomic_t bcast_queue_left;
75014 atomic_t batman_queue_left;
75015 atomic_t ttvn; /* translation table version number */
75016diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
75017index 07d1c1d..7e9bea9 100644
75018--- a/net/batman-adv/unicast.c
75019+++ b/net/batman-adv/unicast.c
75020@@ -264,7 +264,7 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
75021 frag1->flags = UNI_FRAG_HEAD | large_tail;
75022 frag2->flags = large_tail;
75023
75024- seqno = atomic_add_return(2, &hard_iface->frag_seqno);
75025+ seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
75026 frag1->seqno = htons(seqno - 1);
75027 frag2->seqno = htons(seqno);
75028
75029diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
75030index 280953b..cd219bb 100644
75031--- a/net/bluetooth/hci_conn.c
75032+++ b/net/bluetooth/hci_conn.c
75033@@ -234,7 +234,7 @@ void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16])
75034 memset(&cp, 0, sizeof(cp));
75035
75036 cp.handle = cpu_to_le16(conn->handle);
75037- memcpy(cp.ltk, ltk, sizeof(ltk));
75038+ memcpy(cp.ltk, ltk, sizeof(cp.ltk));
75039
75040 hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
75041 }
75042diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
75043index 32d338c..d24bcdb 100644
75044--- a/net/bluetooth/l2cap_core.c
75045+++ b/net/bluetooth/l2cap_core.c
75046@@ -2418,8 +2418,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
75047 break;
75048
75049 case L2CAP_CONF_RFC:
75050- if (olen == sizeof(rfc))
75051- memcpy(&rfc, (void *)val, olen);
75052+ if (olen != sizeof(rfc))
75053+ break;
75054+
75055+ memcpy(&rfc, (void *)val, olen);
75056
75057 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
75058 rfc.mode != chan->mode)
75059@@ -2537,8 +2539,10 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len)
75060
75061 switch (type) {
75062 case L2CAP_CONF_RFC:
75063- if (olen == sizeof(rfc))
75064- memcpy(&rfc, (void *)val, olen);
75065+ if (olen != sizeof(rfc))
75066+ break;
75067+
75068+ memcpy(&rfc, (void *)val, olen);
75069 goto done;
75070 }
75071 }
75072diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
75073index 5449294..7da9a5f 100644
75074--- a/net/bridge/netfilter/ebt_ulog.c
75075+++ b/net/bridge/netfilter/ebt_ulog.c
75076@@ -96,6 +96,7 @@ static void ulog_timer(unsigned long data)
75077 spin_unlock_bh(&ulog_buffers[data].lock);
75078 }
75079
75080+static struct sk_buff *ulog_alloc_skb(unsigned int size) __size_overflow(1);
75081 static struct sk_buff *ulog_alloc_skb(unsigned int size)
75082 {
75083 struct sk_buff *skb;
75084diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
75085index 5fe2ff3..10968b5 100644
75086--- a/net/bridge/netfilter/ebtables.c
75087+++ b/net/bridge/netfilter/ebtables.c
75088@@ -1523,7 +1523,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
75089 tmp.valid_hooks = t->table->valid_hooks;
75090 }
75091 mutex_unlock(&ebt_mutex);
75092- if (copy_to_user(user, &tmp, *len) != 0){
75093+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
75094 BUGPRINT("c2u Didn't work\n");
75095 ret = -EFAULT;
75096 break;
75097diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
75098index a97d97a..6f679ed 100644
75099--- a/net/caif/caif_socket.c
75100+++ b/net/caif/caif_socket.c
75101@@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
75102 #ifdef CONFIG_DEBUG_FS
75103 struct debug_fs_counter {
75104 atomic_t caif_nr_socks;
75105- atomic_t caif_sock_create;
75106- atomic_t num_connect_req;
75107- atomic_t num_connect_resp;
75108- atomic_t num_connect_fail_resp;
75109- atomic_t num_disconnect;
75110- atomic_t num_remote_shutdown_ind;
75111- atomic_t num_tx_flow_off_ind;
75112- atomic_t num_tx_flow_on_ind;
75113- atomic_t num_rx_flow_off;
75114- atomic_t num_rx_flow_on;
75115+ atomic_unchecked_t caif_sock_create;
75116+ atomic_unchecked_t num_connect_req;
75117+ atomic_unchecked_t num_connect_resp;
75118+ atomic_unchecked_t num_connect_fail_resp;
75119+ atomic_unchecked_t num_disconnect;
75120+ atomic_unchecked_t num_remote_shutdown_ind;
75121+ atomic_unchecked_t num_tx_flow_off_ind;
75122+ atomic_unchecked_t num_tx_flow_on_ind;
75123+ atomic_unchecked_t num_rx_flow_off;
75124+ atomic_unchecked_t num_rx_flow_on;
75125 };
75126 static struct debug_fs_counter cnt;
75127 #define dbfs_atomic_inc(v) atomic_inc_return(v)
75128+#define dbfs_atomic_inc_unchecked(v) atomic_inc_return_unchecked(v)
75129 #define dbfs_atomic_dec(v) atomic_dec_return(v)
75130 #else
75131 #define dbfs_atomic_inc(v) 0
75132@@ -161,7 +162,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75133 atomic_read(&cf_sk->sk.sk_rmem_alloc),
75134 sk_rcvbuf_lowwater(cf_sk));
75135 set_rx_flow_off(cf_sk);
75136- dbfs_atomic_inc(&cnt.num_rx_flow_off);
75137+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
75138 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
75139 }
75140
75141@@ -172,7 +173,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75142 set_rx_flow_off(cf_sk);
75143 if (net_ratelimit())
75144 pr_debug("sending flow OFF due to rmem_schedule\n");
75145- dbfs_atomic_inc(&cnt.num_rx_flow_off);
75146+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
75147 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
75148 }
75149 skb->dev = NULL;
75150@@ -233,14 +234,14 @@ static void caif_ctrl_cb(struct cflayer *layr,
75151 switch (flow) {
75152 case CAIF_CTRLCMD_FLOW_ON_IND:
75153 /* OK from modem to start sending again */
75154- dbfs_atomic_inc(&cnt.num_tx_flow_on_ind);
75155+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_on_ind);
75156 set_tx_flow_on(cf_sk);
75157 cf_sk->sk.sk_state_change(&cf_sk->sk);
75158 break;
75159
75160 case CAIF_CTRLCMD_FLOW_OFF_IND:
75161 /* Modem asks us to shut up */
75162- dbfs_atomic_inc(&cnt.num_tx_flow_off_ind);
75163+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_off_ind);
75164 set_tx_flow_off(cf_sk);
75165 cf_sk->sk.sk_state_change(&cf_sk->sk);
75166 break;
75167@@ -249,7 +250,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
75168 /* We're now connected */
75169 caif_client_register_refcnt(&cf_sk->layer,
75170 cfsk_hold, cfsk_put);
75171- dbfs_atomic_inc(&cnt.num_connect_resp);
75172+ dbfs_atomic_inc_unchecked(&cnt.num_connect_resp);
75173 cf_sk->sk.sk_state = CAIF_CONNECTED;
75174 set_tx_flow_on(cf_sk);
75175 cf_sk->sk.sk_state_change(&cf_sk->sk);
75176@@ -263,7 +264,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
75177
75178 case CAIF_CTRLCMD_INIT_FAIL_RSP:
75179 /* Connect request failed */
75180- dbfs_atomic_inc(&cnt.num_connect_fail_resp);
75181+ dbfs_atomic_inc_unchecked(&cnt.num_connect_fail_resp);
75182 cf_sk->sk.sk_err = ECONNREFUSED;
75183 cf_sk->sk.sk_state = CAIF_DISCONNECTED;
75184 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
75185@@ -277,7 +278,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
75186
75187 case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:
75188 /* Modem has closed this connection, or device is down. */
75189- dbfs_atomic_inc(&cnt.num_remote_shutdown_ind);
75190+ dbfs_atomic_inc_unchecked(&cnt.num_remote_shutdown_ind);
75191 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
75192 cf_sk->sk.sk_err = ECONNRESET;
75193 set_rx_flow_on(cf_sk);
75194@@ -297,7 +298,7 @@ static void caif_check_flow_release(struct sock *sk)
75195 return;
75196
75197 if (atomic_read(&sk->sk_rmem_alloc) <= sk_rcvbuf_lowwater(cf_sk)) {
75198- dbfs_atomic_inc(&cnt.num_rx_flow_on);
75199+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_on);
75200 set_rx_flow_on(cf_sk);
75201 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_ON_REQ);
75202 }
75203@@ -856,7 +857,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr,
75204 /*ifindex = id of the interface.*/
75205 cf_sk->conn_req.ifindex = cf_sk->sk.sk_bound_dev_if;
75206
75207- dbfs_atomic_inc(&cnt.num_connect_req);
75208+ dbfs_atomic_inc_unchecked(&cnt.num_connect_req);
75209 cf_sk->layer.receive = caif_sktrecv_cb;
75210
75211 err = caif_connect_client(sock_net(sk), &cf_sk->conn_req,
75212@@ -945,7 +946,7 @@ static int caif_release(struct socket *sock)
75213 spin_unlock_bh(&sk->sk_receive_queue.lock);
75214 sock->sk = NULL;
75215
75216- dbfs_atomic_inc(&cnt.num_disconnect);
75217+ dbfs_atomic_inc_unchecked(&cnt.num_disconnect);
75218
75219 WARN_ON(IS_ERR(cf_sk->debugfs_socket_dir));
75220 if (cf_sk->debugfs_socket_dir != NULL)
75221@@ -1124,7 +1125,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol,
75222 cf_sk->conn_req.protocol = protocol;
75223 /* Increase the number of sockets created. */
75224 dbfs_atomic_inc(&cnt.caif_nr_socks);
75225- num = dbfs_atomic_inc(&cnt.caif_sock_create);
75226+ num = dbfs_atomic_inc_unchecked(&cnt.caif_sock_create);
75227 #ifdef CONFIG_DEBUG_FS
75228 if (!IS_ERR(debugfsdir)) {
75229
75230diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
75231index 5cf5222..6f704ad 100644
75232--- a/net/caif/cfctrl.c
75233+++ b/net/caif/cfctrl.c
75234@@ -9,6 +9,7 @@
75235 #include <linux/stddef.h>
75236 #include <linux/spinlock.h>
75237 #include <linux/slab.h>
75238+#include <linux/sched.h>
75239 #include <net/caif/caif_layer.h>
75240 #include <net/caif/cfpkt.h>
75241 #include <net/caif/cfctrl.h>
75242@@ -42,8 +43,8 @@ struct cflayer *cfctrl_create(void)
75243 memset(&dev_info, 0, sizeof(dev_info));
75244 dev_info.id = 0xff;
75245 cfsrvl_init(&this->serv, 0, &dev_info, false);
75246- atomic_set(&this->req_seq_no, 1);
75247- atomic_set(&this->rsp_seq_no, 1);
75248+ atomic_set_unchecked(&this->req_seq_no, 1);
75249+ atomic_set_unchecked(&this->rsp_seq_no, 1);
75250 this->serv.layer.receive = cfctrl_recv;
75251 sprintf(this->serv.layer.name, "ctrl");
75252 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
75253@@ -129,8 +130,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
75254 struct cfctrl_request_info *req)
75255 {
75256 spin_lock_bh(&ctrl->info_list_lock);
75257- atomic_inc(&ctrl->req_seq_no);
75258- req->sequence_no = atomic_read(&ctrl->req_seq_no);
75259+ atomic_inc_unchecked(&ctrl->req_seq_no);
75260+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
75261 list_add_tail(&req->list, &ctrl->list);
75262 spin_unlock_bh(&ctrl->info_list_lock);
75263 }
75264@@ -148,7 +149,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
75265 if (p != first)
75266 pr_warn("Requests are not received in order\n");
75267
75268- atomic_set(&ctrl->rsp_seq_no,
75269+ atomic_set_unchecked(&ctrl->rsp_seq_no,
75270 p->sequence_no);
75271 list_del(&p->list);
75272 goto out;
75273diff --git a/net/can/gw.c b/net/can/gw.c
75274index 3d79b12..8de85fa 100644
75275--- a/net/can/gw.c
75276+++ b/net/can/gw.c
75277@@ -96,7 +96,7 @@ struct cf_mod {
75278 struct {
75279 void (*xor)(struct can_frame *cf, struct cgw_csum_xor *xor);
75280 void (*crc8)(struct can_frame *cf, struct cgw_csum_crc8 *crc8);
75281- } csumfunc;
75282+ } __no_const csumfunc;
75283 };
75284
75285
75286diff --git a/net/compat.c b/net/compat.c
75287index 6def90e..c6992fa 100644
75288--- a/net/compat.c
75289+++ b/net/compat.c
75290@@ -71,9 +71,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
75291 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
75292 __get_user(kmsg->msg_flags, &umsg->msg_flags))
75293 return -EFAULT;
75294- kmsg->msg_name = compat_ptr(tmp1);
75295- kmsg->msg_iov = compat_ptr(tmp2);
75296- kmsg->msg_control = compat_ptr(tmp3);
75297+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
75298+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
75299+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
75300 return 0;
75301 }
75302
75303@@ -85,7 +85,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75304
75305 if (kern_msg->msg_namelen) {
75306 if (mode == VERIFY_READ) {
75307- int err = move_addr_to_kernel(kern_msg->msg_name,
75308+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
75309 kern_msg->msg_namelen,
75310 kern_address);
75311 if (err < 0)
75312@@ -96,7 +96,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75313 kern_msg->msg_name = NULL;
75314
75315 tot_len = iov_from_user_compat_to_kern(kern_iov,
75316- (struct compat_iovec __user *)kern_msg->msg_iov,
75317+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
75318 kern_msg->msg_iovlen);
75319 if (tot_len >= 0)
75320 kern_msg->msg_iov = kern_iov;
75321@@ -116,20 +116,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75322
75323 #define CMSG_COMPAT_FIRSTHDR(msg) \
75324 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
75325- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
75326+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
75327 (struct compat_cmsghdr __user *)NULL)
75328
75329 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
75330 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
75331 (ucmlen) <= (unsigned long) \
75332 ((mhdr)->msg_controllen - \
75333- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
75334+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
75335
75336 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
75337 struct compat_cmsghdr __user *cmsg, int cmsg_len)
75338 {
75339 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
75340- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
75341+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
75342 msg->msg_controllen)
75343 return NULL;
75344 return (struct compat_cmsghdr __user *)ptr;
75345@@ -221,7 +221,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
75346 {
75347 struct compat_timeval ctv;
75348 struct compat_timespec cts[3];
75349- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
75350+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
75351 struct compat_cmsghdr cmhdr;
75352 int cmlen;
75353
75354@@ -273,7 +273,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
75355
75356 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
75357 {
75358- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
75359+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
75360 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
75361 int fdnum = scm->fp->count;
75362 struct file **fp = scm->fp->fp;
75363@@ -370,7 +370,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
75364 return -EFAULT;
75365 old_fs = get_fs();
75366 set_fs(KERNEL_DS);
75367- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
75368+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
75369 set_fs(old_fs);
75370
75371 return err;
75372@@ -431,7 +431,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
75373 len = sizeof(ktime);
75374 old_fs = get_fs();
75375 set_fs(KERNEL_DS);
75376- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
75377+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
75378 set_fs(old_fs);
75379
75380 if (!err) {
75381@@ -566,7 +566,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75382 case MCAST_JOIN_GROUP:
75383 case MCAST_LEAVE_GROUP:
75384 {
75385- struct compat_group_req __user *gr32 = (void *)optval;
75386+ struct compat_group_req __user *gr32 = (void __user *)optval;
75387 struct group_req __user *kgr =
75388 compat_alloc_user_space(sizeof(struct group_req));
75389 u32 interface;
75390@@ -587,7 +587,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75391 case MCAST_BLOCK_SOURCE:
75392 case MCAST_UNBLOCK_SOURCE:
75393 {
75394- struct compat_group_source_req __user *gsr32 = (void *)optval;
75395+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
75396 struct group_source_req __user *kgsr = compat_alloc_user_space(
75397 sizeof(struct group_source_req));
75398 u32 interface;
75399@@ -608,7 +608,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75400 }
75401 case MCAST_MSFILTER:
75402 {
75403- struct compat_group_filter __user *gf32 = (void *)optval;
75404+ struct compat_group_filter __user *gf32 = (void __user *)optval;
75405 struct group_filter __user *kgf;
75406 u32 interface, fmode, numsrc;
75407
75408@@ -646,7 +646,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
75409 char __user *optval, int __user *optlen,
75410 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
75411 {
75412- struct compat_group_filter __user *gf32 = (void *)optval;
75413+ struct compat_group_filter __user *gf32 = (void __user *)optval;
75414 struct group_filter __user *kgf;
75415 int __user *koptlen;
75416 u32 interface, fmode, numsrc;
75417diff --git a/net/core/datagram.c b/net/core/datagram.c
75418index 68bbf9f..5ef0d12 100644
75419--- a/net/core/datagram.c
75420+++ b/net/core/datagram.c
75421@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
75422 }
75423
75424 kfree_skb(skb);
75425- atomic_inc(&sk->sk_drops);
75426+ atomic_inc_unchecked(&sk->sk_drops);
75427 sk_mem_reclaim_partial(sk);
75428
75429 return err;
75430diff --git a/net/core/dev.c b/net/core/dev.c
75431index 7f72c9c..e29943b 100644
75432--- a/net/core/dev.c
75433+++ b/net/core/dev.c
75434@@ -1138,10 +1138,14 @@ void dev_load(struct net *net, const char *name)
75435 if (no_module && capable(CAP_NET_ADMIN))
75436 no_module = request_module("netdev-%s", name);
75437 if (no_module && capable(CAP_SYS_MODULE)) {
75438+#ifdef CONFIG_GRKERNSEC_MODHARDEN
75439+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
75440+#else
75441 if (!request_module("%s", name))
75442 pr_err("Loading kernel module for a network device "
75443 "with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s "
75444 "instead\n", name);
75445+#endif
75446 }
75447 }
75448 EXPORT_SYMBOL(dev_load);
75449@@ -1585,7 +1589,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
75450 {
75451 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
75452 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
75453- atomic_long_inc(&dev->rx_dropped);
75454+ atomic_long_inc_unchecked(&dev->rx_dropped);
75455 kfree_skb(skb);
75456 return NET_RX_DROP;
75457 }
75458@@ -1595,7 +1599,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
75459 nf_reset(skb);
75460
75461 if (unlikely(!is_skb_forwardable(dev, skb))) {
75462- atomic_long_inc(&dev->rx_dropped);
75463+ atomic_long_inc_unchecked(&dev->rx_dropped);
75464 kfree_skb(skb);
75465 return NET_RX_DROP;
75466 }
75467@@ -2057,7 +2061,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
75468
75469 struct dev_gso_cb {
75470 void (*destructor)(struct sk_buff *skb);
75471-};
75472+} __no_const;
75473
75474 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
75475
75476@@ -2913,7 +2917,7 @@ enqueue:
75477
75478 local_irq_restore(flags);
75479
75480- atomic_long_inc(&skb->dev->rx_dropped);
75481+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
75482 kfree_skb(skb);
75483 return NET_RX_DROP;
75484 }
75485@@ -2985,7 +2989,7 @@ int netif_rx_ni(struct sk_buff *skb)
75486 }
75487 EXPORT_SYMBOL(netif_rx_ni);
75488
75489-static void net_tx_action(struct softirq_action *h)
75490+static void net_tx_action(void)
75491 {
75492 struct softnet_data *sd = &__get_cpu_var(softnet_data);
75493
75494@@ -3273,7 +3277,7 @@ ncls:
75495 if (pt_prev) {
75496 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
75497 } else {
75498- atomic_long_inc(&skb->dev->rx_dropped);
75499+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
75500 kfree_skb(skb);
75501 /* Jamal, now you will not able to escape explaining
75502 * me how you were going to use this. :-)
75503@@ -3833,7 +3837,7 @@ void netif_napi_del(struct napi_struct *napi)
75504 }
75505 EXPORT_SYMBOL(netif_napi_del);
75506
75507-static void net_rx_action(struct softirq_action *h)
75508+static void net_rx_action(void)
75509 {
75510 struct softnet_data *sd = &__get_cpu_var(softnet_data);
75511 unsigned long time_limit = jiffies + 2;
75512@@ -5858,7 +5862,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
75513 } else {
75514 netdev_stats_to_stats64(storage, &dev->stats);
75515 }
75516- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
75517+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
75518 return storage;
75519 }
75520 EXPORT_SYMBOL(dev_get_stats);
75521diff --git a/net/core/flow.c b/net/core/flow.c
75522index e318c7e..168b1d0 100644
75523--- a/net/core/flow.c
75524+++ b/net/core/flow.c
75525@@ -61,7 +61,7 @@ struct flow_cache {
75526 struct timer_list rnd_timer;
75527 };
75528
75529-atomic_t flow_cache_genid = ATOMIC_INIT(0);
75530+atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
75531 EXPORT_SYMBOL(flow_cache_genid);
75532 static struct flow_cache flow_cache_global;
75533 static struct kmem_cache *flow_cachep __read_mostly;
75534@@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
75535
75536 static int flow_entry_valid(struct flow_cache_entry *fle)
75537 {
75538- if (atomic_read(&flow_cache_genid) != fle->genid)
75539+ if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
75540 return 0;
75541 if (fle->object && !fle->object->ops->check(fle->object))
75542 return 0;
75543@@ -259,7 +259,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
75544 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
75545 fcp->hash_count++;
75546 }
75547- } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
75548+ } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
75549 flo = fle->object;
75550 if (!flo)
75551 goto ret_object;
75552@@ -280,7 +280,7 @@ nocache:
75553 }
75554 flo = resolver(net, key, family, dir, flo, ctx);
75555 if (fle) {
75556- fle->genid = atomic_read(&flow_cache_genid);
75557+ fle->genid = atomic_read_unchecked(&flow_cache_genid);
75558 if (!IS_ERR(flo))
75559 fle->object = flo;
75560 else
75561diff --git a/net/core/iovec.c b/net/core/iovec.c
75562index c40f27e..7f49254 100644
75563--- a/net/core/iovec.c
75564+++ b/net/core/iovec.c
75565@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
75566 if (m->msg_namelen) {
75567 if (mode == VERIFY_READ) {
75568 void __user *namep;
75569- namep = (void __user __force *) m->msg_name;
75570+ namep = (void __force_user *) m->msg_name;
75571 err = move_addr_to_kernel(namep, m->msg_namelen,
75572 address);
75573 if (err < 0)
75574@@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
75575 }
75576
75577 size = m->msg_iovlen * sizeof(struct iovec);
75578- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
75579+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
75580 return -EFAULT;
75581
75582 m->msg_iov = iov;
75583diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
75584index 5c30296..ebe7b61 100644
75585--- a/net/core/rtnetlink.c
75586+++ b/net/core/rtnetlink.c
75587@@ -57,7 +57,7 @@ struct rtnl_link {
75588 rtnl_doit_func doit;
75589 rtnl_dumpit_func dumpit;
75590 rtnl_calcit_func calcit;
75591-};
75592+} __no_const;
75593
75594 static DEFINE_MUTEX(rtnl_mutex);
75595
75596diff --git a/net/core/scm.c b/net/core/scm.c
75597index ff52ad0..aff1c0f 100644
75598--- a/net/core/scm.c
75599+++ b/net/core/scm.c
75600@@ -220,7 +220,7 @@ EXPORT_SYMBOL(__scm_send);
75601 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
75602 {
75603 struct cmsghdr __user *cm
75604- = (__force struct cmsghdr __user *)msg->msg_control;
75605+ = (struct cmsghdr __force_user *)msg->msg_control;
75606 struct cmsghdr cmhdr;
75607 int cmlen = CMSG_LEN(len);
75608 int err;
75609@@ -243,7 +243,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
75610 err = -EFAULT;
75611 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
75612 goto out;
75613- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
75614+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
75615 goto out;
75616 cmlen = CMSG_SPACE(len);
75617 if (msg->msg_controllen < cmlen)
75618@@ -259,7 +259,7 @@ EXPORT_SYMBOL(put_cmsg);
75619 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
75620 {
75621 struct cmsghdr __user *cm
75622- = (__force struct cmsghdr __user*)msg->msg_control;
75623+ = (struct cmsghdr __force_user *)msg->msg_control;
75624
75625 int fdmax = 0;
75626 int fdnum = scm->fp->count;
75627@@ -279,7 +279,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
75628 if (fdnum < fdmax)
75629 fdmax = fdnum;
75630
75631- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
75632+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
75633 i++, cmfptr++)
75634 {
75635 int new_fd;
75636diff --git a/net/core/sock.c b/net/core/sock.c
75637index 02f8dfe..86dfd4a 100644
75638--- a/net/core/sock.c
75639+++ b/net/core/sock.c
75640@@ -341,7 +341,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75641 struct sk_buff_head *list = &sk->sk_receive_queue;
75642
75643 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
75644- atomic_inc(&sk->sk_drops);
75645+ atomic_inc_unchecked(&sk->sk_drops);
75646 trace_sock_rcvqueue_full(sk, skb);
75647 return -ENOMEM;
75648 }
75649@@ -351,7 +351,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75650 return err;
75651
75652 if (!sk_rmem_schedule(sk, skb->truesize)) {
75653- atomic_inc(&sk->sk_drops);
75654+ atomic_inc_unchecked(&sk->sk_drops);
75655 return -ENOBUFS;
75656 }
75657
75658@@ -371,7 +371,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75659 skb_dst_force(skb);
75660
75661 spin_lock_irqsave(&list->lock, flags);
75662- skb->dropcount = atomic_read(&sk->sk_drops);
75663+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
75664 __skb_queue_tail(list, skb);
75665 spin_unlock_irqrestore(&list->lock, flags);
75666
75667@@ -391,7 +391,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
75668 skb->dev = NULL;
75669
75670 if (sk_rcvqueues_full(sk, skb)) {
75671- atomic_inc(&sk->sk_drops);
75672+ atomic_inc_unchecked(&sk->sk_drops);
75673 goto discard_and_relse;
75674 }
75675 if (nested)
75676@@ -409,7 +409,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
75677 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
75678 } else if (sk_add_backlog(sk, skb)) {
75679 bh_unlock_sock(sk);
75680- atomic_inc(&sk->sk_drops);
75681+ atomic_inc_unchecked(&sk->sk_drops);
75682 goto discard_and_relse;
75683 }
75684
75685@@ -974,7 +974,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75686 if (len > sizeof(peercred))
75687 len = sizeof(peercred);
75688 cred_to_ucred(sk->sk_peer_pid, sk->sk_peer_cred, &peercred);
75689- if (copy_to_user(optval, &peercred, len))
75690+ if (len > sizeof(peercred) || copy_to_user(optval, &peercred, len))
75691 return -EFAULT;
75692 goto lenout;
75693 }
75694@@ -987,7 +987,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75695 return -ENOTCONN;
75696 if (lv < len)
75697 return -EINVAL;
75698- if (copy_to_user(optval, address, len))
75699+ if (len > sizeof(address) || copy_to_user(optval, address, len))
75700 return -EFAULT;
75701 goto lenout;
75702 }
75703@@ -1024,7 +1024,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75704
75705 if (len > lv)
75706 len = lv;
75707- if (copy_to_user(optval, &v, len))
75708+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
75709 return -EFAULT;
75710 lenout:
75711 if (put_user(len, optlen))
75712@@ -2108,7 +2108,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
75713 */
75714 smp_wmb();
75715 atomic_set(&sk->sk_refcnt, 1);
75716- atomic_set(&sk->sk_drops, 0);
75717+ atomic_set_unchecked(&sk->sk_drops, 0);
75718 }
75719 EXPORT_SYMBOL(sock_init_data);
75720
75721diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
75722index b9868e1..849f809 100644
75723--- a/net/core/sock_diag.c
75724+++ b/net/core/sock_diag.c
75725@@ -16,20 +16,27 @@ static DEFINE_MUTEX(sock_diag_table_mutex);
75726
75727 int sock_diag_check_cookie(void *sk, __u32 *cookie)
75728 {
75729+#ifndef CONFIG_GRKERNSEC_HIDESYM
75730 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
75731 cookie[1] != INET_DIAG_NOCOOKIE) &&
75732 ((u32)(unsigned long)sk != cookie[0] ||
75733 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
75734 return -ESTALE;
75735 else
75736+#endif
75737 return 0;
75738 }
75739 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
75740
75741 void sock_diag_save_cookie(void *sk, __u32 *cookie)
75742 {
75743+#ifdef CONFIG_GRKERNSEC_HIDESYM
75744+ cookie[0] = 0;
75745+ cookie[1] = 0;
75746+#else
75747 cookie[0] = (u32)(unsigned long)sk;
75748 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
75749+#endif
75750 }
75751 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
75752
75753diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
75754index 02e75d1..9a57a7c 100644
75755--- a/net/decnet/sysctl_net_decnet.c
75756+++ b/net/decnet/sysctl_net_decnet.c
75757@@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
75758
75759 if (len > *lenp) len = *lenp;
75760
75761- if (copy_to_user(buffer, addr, len))
75762+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
75763 return -EFAULT;
75764
75765 *lenp = len;
75766@@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
75767
75768 if (len > *lenp) len = *lenp;
75769
75770- if (copy_to_user(buffer, devname, len))
75771+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
75772 return -EFAULT;
75773
75774 *lenp = len;
75775diff --git a/net/econet/Kconfig b/net/econet/Kconfig
75776index 39a2d29..f39c0fe 100644
75777--- a/net/econet/Kconfig
75778+++ b/net/econet/Kconfig
75779@@ -4,7 +4,7 @@
75780
75781 config ECONET
75782 tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
75783- depends on EXPERIMENTAL && INET
75784+ depends on EXPERIMENTAL && INET && BROKEN
75785 ---help---
75786 Econet is a fairly old and slow networking protocol mainly used by
75787 Acorn computers to access file and print servers. It uses native
75788diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
75789index 36d1440..44ff28b 100644
75790--- a/net/ipv4/ah4.c
75791+++ b/net/ipv4/ah4.c
75792@@ -19,6 +19,8 @@ struct ah_skb_cb {
75793 #define AH_SKB_CB(__skb) ((struct ah_skb_cb *)&((__skb)->cb[0]))
75794
75795 static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
75796+ unsigned int size) __size_overflow(3);
75797+static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
75798 unsigned int size)
75799 {
75800 unsigned int len;
75801diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
75802index 92fc5f6..b790d91 100644
75803--- a/net/ipv4/fib_frontend.c
75804+++ b/net/ipv4/fib_frontend.c
75805@@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
75806 #ifdef CONFIG_IP_ROUTE_MULTIPATH
75807 fib_sync_up(dev);
75808 #endif
75809- atomic_inc(&net->ipv4.dev_addr_genid);
75810+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75811 rt_cache_flush(dev_net(dev), -1);
75812 break;
75813 case NETDEV_DOWN:
75814 fib_del_ifaddr(ifa, NULL);
75815- atomic_inc(&net->ipv4.dev_addr_genid);
75816+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75817 if (ifa->ifa_dev->ifa_list == NULL) {
75818 /* Last address was deleted from this interface.
75819 * Disable IP.
75820@@ -1011,7 +1011,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
75821 #ifdef CONFIG_IP_ROUTE_MULTIPATH
75822 fib_sync_up(dev);
75823 #endif
75824- atomic_inc(&net->ipv4.dev_addr_genid);
75825+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75826 rt_cache_flush(dev_net(dev), -1);
75827 break;
75828 case NETDEV_DOWN:
75829diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
75830index 80106d8..232e898 100644
75831--- a/net/ipv4/fib_semantics.c
75832+++ b/net/ipv4/fib_semantics.c
75833@@ -699,7 +699,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
75834 nh->nh_saddr = inet_select_addr(nh->nh_dev,
75835 nh->nh_gw,
75836 nh->nh_parent->fib_scope);
75837- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
75838+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
75839
75840 return nh->nh_saddr;
75841 }
75842diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
75843index 984ec65..97ac518 100644
75844--- a/net/ipv4/inet_hashtables.c
75845+++ b/net/ipv4/inet_hashtables.c
75846@@ -18,12 +18,15 @@
75847 #include <linux/sched.h>
75848 #include <linux/slab.h>
75849 #include <linux/wait.h>
75850+#include <linux/security.h>
75851
75852 #include <net/inet_connection_sock.h>
75853 #include <net/inet_hashtables.h>
75854 #include <net/secure_seq.h>
75855 #include <net/ip.h>
75856
75857+extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
75858+
75859 /*
75860 * Allocate and initialize a new local port bind bucket.
75861 * The bindhash mutex for snum's hash chain must be held here.
75862@@ -530,6 +533,8 @@ ok:
75863 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
75864 spin_unlock(&head->lock);
75865
75866+ gr_update_task_in_ip_table(current, inet_sk(sk));
75867+
75868 if (tw) {
75869 inet_twsk_deschedule(tw, death_row);
75870 while (twrefcnt) {
75871diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
75872index d4d61b6..b81aec8 100644
75873--- a/net/ipv4/inetpeer.c
75874+++ b/net/ipv4/inetpeer.c
75875@@ -487,8 +487,8 @@ relookup:
75876 if (p) {
75877 p->daddr = *daddr;
75878 atomic_set(&p->refcnt, 1);
75879- atomic_set(&p->rid, 0);
75880- atomic_set(&p->ip_id_count,
75881+ atomic_set_unchecked(&p->rid, 0);
75882+ atomic_set_unchecked(&p->ip_id_count,
75883 (daddr->family == AF_INET) ?
75884 secure_ip_id(daddr->addr.a4) :
75885 secure_ipv6_id(daddr->addr.a6));
75886diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
75887index 1f23a57..7180dfe 100644
75888--- a/net/ipv4/ip_fragment.c
75889+++ b/net/ipv4/ip_fragment.c
75890@@ -316,7 +316,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
75891 return 0;
75892
75893 start = qp->rid;
75894- end = atomic_inc_return(&peer->rid);
75895+ end = atomic_inc_return_unchecked(&peer->rid);
75896 qp->rid = end;
75897
75898 rc = qp->q.fragments && (end - start) > max;
75899diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
75900index 8aa87c1..35c3248 100644
75901--- a/net/ipv4/ip_sockglue.c
75902+++ b/net/ipv4/ip_sockglue.c
75903@@ -1112,7 +1112,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
75904 len = min_t(unsigned int, len, opt->optlen);
75905 if (put_user(len, optlen))
75906 return -EFAULT;
75907- if (copy_to_user(optval, opt->__data, len))
75908+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
75909+ copy_to_user(optval, opt->__data, len))
75910 return -EFAULT;
75911 return 0;
75912 }
75913@@ -1240,7 +1241,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
75914 if (sk->sk_type != SOCK_STREAM)
75915 return -ENOPROTOOPT;
75916
75917- msg.msg_control = optval;
75918+ msg.msg_control = (void __force_kernel *)optval;
75919 msg.msg_controllen = len;
75920 msg.msg_flags = flags;
75921
75922diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
75923index 6e412a6..6640538 100644
75924--- a/net/ipv4/ipconfig.c
75925+++ b/net/ipv4/ipconfig.c
75926@@ -318,7 +318,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
75927
75928 mm_segment_t oldfs = get_fs();
75929 set_fs(get_ds());
75930- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
75931+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
75932 set_fs(oldfs);
75933 return res;
75934 }
75935@@ -329,7 +329,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
75936
75937 mm_segment_t oldfs = get_fs();
75938 set_fs(get_ds());
75939- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
75940+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
75941 set_fs(oldfs);
75942 return res;
75943 }
75944@@ -340,7 +340,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
75945
75946 mm_segment_t oldfs = get_fs();
75947 set_fs(get_ds());
75948- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
75949+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
75950 set_fs(oldfs);
75951 return res;
75952 }
75953diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
75954index fd7a3f6..a1b1013 100644
75955--- a/net/ipv4/netfilter/arp_tables.c
75956+++ b/net/ipv4/netfilter/arp_tables.c
75957@@ -757,6 +757,9 @@ static struct xt_counters *alloc_counters(const struct xt_table *table)
75958
75959 static int copy_entries_to_user(unsigned int total_size,
75960 const struct xt_table *table,
75961+ void __user *userptr) __size_overflow(1);
75962+static int copy_entries_to_user(unsigned int total_size,
75963+ const struct xt_table *table,
75964 void __user *userptr)
75965 {
75966 unsigned int off, num;
75967@@ -984,6 +987,11 @@ static int __do_replace(struct net *net, const char *name,
75968 unsigned int valid_hooks,
75969 struct xt_table_info *newinfo,
75970 unsigned int num_counters,
75971+ void __user *counters_ptr) __size_overflow(5);
75972+static int __do_replace(struct net *net, const char *name,
75973+ unsigned int valid_hooks,
75974+ struct xt_table_info *newinfo,
75975+ unsigned int num_counters,
75976 void __user *counters_ptr)
75977 {
75978 int ret;
75979@@ -1104,6 +1112,8 @@ static int do_replace(struct net *net, const void __user *user,
75980 }
75981
75982 static int do_add_counters(struct net *net, const void __user *user,
75983+ unsigned int len, int compat) __size_overflow(3);
75984+static int do_add_counters(struct net *net, const void __user *user,
75985 unsigned int len, int compat)
75986 {
75987 unsigned int i, curcpu;
75988diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
75989index 24e556e..b073356 100644
75990--- a/net/ipv4/netfilter/ip_tables.c
75991+++ b/net/ipv4/netfilter/ip_tables.c
75992@@ -923,6 +923,10 @@ static struct xt_counters *alloc_counters(const struct xt_table *table)
75993 static int
75994 copy_entries_to_user(unsigned int total_size,
75995 const struct xt_table *table,
75996+ void __user *userptr) __size_overflow(1);
75997+static int
75998+copy_entries_to_user(unsigned int total_size,
75999+ const struct xt_table *table,
76000 void __user *userptr)
76001 {
76002 unsigned int off, num;
76003@@ -1172,6 +1176,10 @@ get_entries(struct net *net, struct ipt_get_entries __user *uptr,
76004 static int
76005 __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76006 struct xt_table_info *newinfo, unsigned int num_counters,
76007+ void __user *counters_ptr) __size_overflow(5);
76008+static int
76009+__do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76010+ struct xt_table_info *newinfo, unsigned int num_counters,
76011 void __user *counters_ptr)
76012 {
76013 int ret;
76014@@ -1293,6 +1301,9 @@ do_replace(struct net *net, const void __user *user, unsigned int len)
76015
76016 static int
76017 do_add_counters(struct net *net, const void __user *user,
76018+ unsigned int len, int compat) __size_overflow(3);
76019+static int
76020+do_add_counters(struct net *net, const void __user *user,
76021 unsigned int len, int compat)
76022 {
76023 unsigned int i, curcpu;
76024diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
76025index ba5756d..8d34d74 100644
76026--- a/net/ipv4/netfilter/ipt_ULOG.c
76027+++ b/net/ipv4/netfilter/ipt_ULOG.c
76028@@ -125,6 +125,7 @@ static void ulog_timer(unsigned long data)
76029 spin_unlock_bh(&ulog_lock);
76030 }
76031
76032+static struct sk_buff *ulog_alloc_skb(unsigned int size) __size_overflow(1);
76033 static struct sk_buff *ulog_alloc_skb(unsigned int size)
76034 {
76035 struct sk_buff *skb;
76036diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
76037index 2133c30..0e8047e 100644
76038--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
76039+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
76040@@ -435,6 +435,10 @@ static unsigned char asn1_subid_decode(struct asn1_ctx *ctx,
76041 static unsigned char asn1_oid_decode(struct asn1_ctx *ctx,
76042 unsigned char *eoc,
76043 unsigned long **oid,
76044+ unsigned int *len) __size_overflow(2);
76045+static unsigned char asn1_oid_decode(struct asn1_ctx *ctx,
76046+ unsigned char *eoc,
76047+ unsigned long **oid,
76048 unsigned int *len)
76049 {
76050 unsigned long subid;
76051diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
76052index b072386..abdebcf 100644
76053--- a/net/ipv4/ping.c
76054+++ b/net/ipv4/ping.c
76055@@ -838,7 +838,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
76056 sk_rmem_alloc_get(sp),
76057 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76058 atomic_read(&sp->sk_refcnt), sp,
76059- atomic_read(&sp->sk_drops), len);
76060+ atomic_read_unchecked(&sp->sk_drops), len);
76061 }
76062
76063 static int ping_seq_show(struct seq_file *seq, void *v)
76064diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
76065index 3ccda5a..3c1e61d 100644
76066--- a/net/ipv4/raw.c
76067+++ b/net/ipv4/raw.c
76068@@ -304,7 +304,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
76069 int raw_rcv(struct sock *sk, struct sk_buff *skb)
76070 {
76071 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
76072- atomic_inc(&sk->sk_drops);
76073+ atomic_inc_unchecked(&sk->sk_drops);
76074 kfree_skb(skb);
76075 return NET_RX_DROP;
76076 }
76077@@ -742,16 +742,20 @@ static int raw_init(struct sock *sk)
76078
76079 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
76080 {
76081+ struct icmp_filter filter;
76082+
76083 if (optlen > sizeof(struct icmp_filter))
76084 optlen = sizeof(struct icmp_filter);
76085- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
76086+ if (copy_from_user(&filter, optval, optlen))
76087 return -EFAULT;
76088+ raw_sk(sk)->filter = filter;
76089 return 0;
76090 }
76091
76092 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
76093 {
76094 int len, ret = -EFAULT;
76095+ struct icmp_filter filter;
76096
76097 if (get_user(len, optlen))
76098 goto out;
76099@@ -761,8 +765,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
76100 if (len > sizeof(struct icmp_filter))
76101 len = sizeof(struct icmp_filter);
76102 ret = -EFAULT;
76103- if (put_user(len, optlen) ||
76104- copy_to_user(optval, &raw_sk(sk)->filter, len))
76105+ filter = raw_sk(sk)->filter;
76106+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
76107 goto out;
76108 ret = 0;
76109 out: return ret;
76110@@ -990,7 +994,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
76111 sk_wmem_alloc_get(sp),
76112 sk_rmem_alloc_get(sp),
76113 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76114- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
76115+ atomic_read(&sp->sk_refcnt),
76116+#ifdef CONFIG_GRKERNSEC_HIDESYM
76117+ NULL,
76118+#else
76119+ sp,
76120+#endif
76121+ atomic_read_unchecked(&sp->sk_drops));
76122 }
76123
76124 static int raw_seq_show(struct seq_file *seq, void *v)
76125diff --git a/net/ipv4/route.c b/net/ipv4/route.c
76126index 0197747..7adb0dc 100644
76127--- a/net/ipv4/route.c
76128+++ b/net/ipv4/route.c
76129@@ -311,7 +311,7 @@ static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx,
76130
76131 static inline int rt_genid(struct net *net)
76132 {
76133- return atomic_read(&net->ipv4.rt_genid);
76134+ return atomic_read_unchecked(&net->ipv4.rt_genid);
76135 }
76136
76137 #ifdef CONFIG_PROC_FS
76138@@ -935,7 +935,7 @@ static void rt_cache_invalidate(struct net *net)
76139 unsigned char shuffle;
76140
76141 get_random_bytes(&shuffle, sizeof(shuffle));
76142- atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
76143+ atomic_add_unchecked(shuffle + 1U, &net->ipv4.rt_genid);
76144 inetpeer_invalidate_tree(AF_INET);
76145 }
76146
76147@@ -3010,7 +3010,7 @@ static int rt_fill_info(struct net *net,
76148 error = rt->dst.error;
76149 if (peer) {
76150 inet_peer_refcheck(rt->peer);
76151- id = atomic_read(&peer->ip_id_count) & 0xffff;
76152+ id = atomic_read_unchecked(&peer->ip_id_count) & 0xffff;
76153 if (peer->tcp_ts_stamp) {
76154 ts = peer->tcp_ts;
76155 tsage = get_seconds() - peer->tcp_ts_stamp;
76156diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
76157index fd54c5f..96d6407 100644
76158--- a/net/ipv4/tcp_ipv4.c
76159+++ b/net/ipv4/tcp_ipv4.c
76160@@ -88,6 +88,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
76161 int sysctl_tcp_low_latency __read_mostly;
76162 EXPORT_SYMBOL(sysctl_tcp_low_latency);
76163
76164+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76165+extern int grsec_enable_blackhole;
76166+#endif
76167
76168 #ifdef CONFIG_TCP_MD5SIG
76169 static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
76170@@ -1638,6 +1641,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
76171 return 0;
76172
76173 reset:
76174+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76175+ if (!grsec_enable_blackhole)
76176+#endif
76177 tcp_v4_send_reset(rsk, skb);
76178 discard:
76179 kfree_skb(skb);
76180@@ -1700,12 +1706,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
76181 TCP_SKB_CB(skb)->sacked = 0;
76182
76183 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
76184- if (!sk)
76185+ if (!sk) {
76186+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76187+ ret = 1;
76188+#endif
76189 goto no_tcp_socket;
76190-
76191+ }
76192 process:
76193- if (sk->sk_state == TCP_TIME_WAIT)
76194+ if (sk->sk_state == TCP_TIME_WAIT) {
76195+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76196+ ret = 2;
76197+#endif
76198 goto do_time_wait;
76199+ }
76200
76201 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
76202 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
76203@@ -1755,6 +1768,10 @@ no_tcp_socket:
76204 bad_packet:
76205 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
76206 } else {
76207+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76208+ if (!grsec_enable_blackhole || (ret == 1 &&
76209+ (skb->dev->flags & IFF_LOOPBACK)))
76210+#endif
76211 tcp_v4_send_reset(NULL, skb);
76212 }
76213
76214@@ -2417,7 +2434,11 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req,
76215 0, /* non standard timer */
76216 0, /* open_requests have no inode */
76217 atomic_read(&sk->sk_refcnt),
76218+#ifdef CONFIG_GRKERNSEC_HIDESYM
76219+ NULL,
76220+#else
76221 req,
76222+#endif
76223 len);
76224 }
76225
76226@@ -2467,7 +2488,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
76227 sock_i_uid(sk),
76228 icsk->icsk_probes_out,
76229 sock_i_ino(sk),
76230- atomic_read(&sk->sk_refcnt), sk,
76231+ atomic_read(&sk->sk_refcnt),
76232+#ifdef CONFIG_GRKERNSEC_HIDESYM
76233+ NULL,
76234+#else
76235+ sk,
76236+#endif
76237 jiffies_to_clock_t(icsk->icsk_rto),
76238 jiffies_to_clock_t(icsk->icsk_ack.ato),
76239 (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
76240@@ -2495,7 +2521,13 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,
76241 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
76242 i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
76243 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
76244- atomic_read(&tw->tw_refcnt), tw, len);
76245+ atomic_read(&tw->tw_refcnt),
76246+#ifdef CONFIG_GRKERNSEC_HIDESYM
76247+ NULL,
76248+#else
76249+ tw,
76250+#endif
76251+ len);
76252 }
76253
76254 #define TMPSZ 150
76255diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
76256index 550e755..25721b3 100644
76257--- a/net/ipv4/tcp_minisocks.c
76258+++ b/net/ipv4/tcp_minisocks.c
76259@@ -27,6 +27,10 @@
76260 #include <net/inet_common.h>
76261 #include <net/xfrm.h>
76262
76263+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76264+extern int grsec_enable_blackhole;
76265+#endif
76266+
76267 int sysctl_tcp_syncookies __read_mostly = 1;
76268 EXPORT_SYMBOL(sysctl_tcp_syncookies);
76269
76270@@ -753,6 +757,10 @@ listen_overflow:
76271
76272 embryonic_reset:
76273 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
76274+
76275+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76276+ if (!grsec_enable_blackhole)
76277+#endif
76278 if (!(flg & TCP_FLAG_RST))
76279 req->rsk_ops->send_reset(sk, skb);
76280
76281diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
76282index 85ee7eb..53277ab 100644
76283--- a/net/ipv4/tcp_probe.c
76284+++ b/net/ipv4/tcp_probe.c
76285@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
76286 if (cnt + width >= len)
76287 break;
76288
76289- if (copy_to_user(buf + cnt, tbuf, width))
76290+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
76291 return -EFAULT;
76292 cnt += width;
76293 }
76294diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
76295index cd2e072..1fffee2 100644
76296--- a/net/ipv4/tcp_timer.c
76297+++ b/net/ipv4/tcp_timer.c
76298@@ -22,6 +22,10 @@
76299 #include <linux/gfp.h>
76300 #include <net/tcp.h>
76301
76302+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76303+extern int grsec_lastack_retries;
76304+#endif
76305+
76306 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
76307 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
76308 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
76309@@ -196,6 +200,13 @@ static int tcp_write_timeout(struct sock *sk)
76310 }
76311 }
76312
76313+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76314+ if ((sk->sk_state == TCP_LAST_ACK) &&
76315+ (grsec_lastack_retries > 0) &&
76316+ (grsec_lastack_retries < retry_until))
76317+ retry_until = grsec_lastack_retries;
76318+#endif
76319+
76320 if (retransmits_timed_out(sk, retry_until,
76321 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
76322 /* Has it gone just too far? */
76323diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
76324index 5d075b5..d907d5f 100644
76325--- a/net/ipv4/udp.c
76326+++ b/net/ipv4/udp.c
76327@@ -86,6 +86,7 @@
76328 #include <linux/types.h>
76329 #include <linux/fcntl.h>
76330 #include <linux/module.h>
76331+#include <linux/security.h>
76332 #include <linux/socket.h>
76333 #include <linux/sockios.h>
76334 #include <linux/igmp.h>
76335@@ -108,6 +109,10 @@
76336 #include <trace/events/udp.h>
76337 #include "udp_impl.h"
76338
76339+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76340+extern int grsec_enable_blackhole;
76341+#endif
76342+
76343 struct udp_table udp_table __read_mostly;
76344 EXPORT_SYMBOL(udp_table);
76345
76346@@ -566,6 +571,9 @@ found:
76347 return s;
76348 }
76349
76350+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
76351+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
76352+
76353 /*
76354 * This routine is called by the ICMP module when it gets some
76355 * sort of error condition. If err < 0 then the socket should
76356@@ -857,9 +865,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
76357 dport = usin->sin_port;
76358 if (dport == 0)
76359 return -EINVAL;
76360+
76361+ err = gr_search_udp_sendmsg(sk, usin);
76362+ if (err)
76363+ return err;
76364 } else {
76365 if (sk->sk_state != TCP_ESTABLISHED)
76366 return -EDESTADDRREQ;
76367+
76368+ err = gr_search_udp_sendmsg(sk, NULL);
76369+ if (err)
76370+ return err;
76371+
76372 daddr = inet->inet_daddr;
76373 dport = inet->inet_dport;
76374 /* Open fast path for connected socket.
76375@@ -1100,7 +1117,7 @@ static unsigned int first_packet_length(struct sock *sk)
76376 udp_lib_checksum_complete(skb)) {
76377 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
76378 IS_UDPLITE(sk));
76379- atomic_inc(&sk->sk_drops);
76380+ atomic_inc_unchecked(&sk->sk_drops);
76381 __skb_unlink(skb, rcvq);
76382 __skb_queue_tail(&list_kill, skb);
76383 }
76384@@ -1186,6 +1203,10 @@ try_again:
76385 if (!skb)
76386 goto out;
76387
76388+ err = gr_search_udp_recvmsg(sk, skb);
76389+ if (err)
76390+ goto out_free;
76391+
76392 ulen = skb->len - sizeof(struct udphdr);
76393 copied = len;
76394 if (copied > ulen)
76395@@ -1489,7 +1510,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
76396
76397 drop:
76398 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
76399- atomic_inc(&sk->sk_drops);
76400+ atomic_inc_unchecked(&sk->sk_drops);
76401 kfree_skb(skb);
76402 return -1;
76403 }
76404@@ -1508,7 +1529,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
76405 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
76406
76407 if (!skb1) {
76408- atomic_inc(&sk->sk_drops);
76409+ atomic_inc_unchecked(&sk->sk_drops);
76410 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
76411 IS_UDPLITE(sk));
76412 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
76413@@ -1677,6 +1698,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76414 goto csum_error;
76415
76416 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
76417+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76418+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
76419+#endif
76420 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
76421
76422 /*
76423@@ -2100,8 +2124,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
76424 sk_wmem_alloc_get(sp),
76425 sk_rmem_alloc_get(sp),
76426 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76427- atomic_read(&sp->sk_refcnt), sp,
76428- atomic_read(&sp->sk_drops), len);
76429+ atomic_read(&sp->sk_refcnt),
76430+#ifdef CONFIG_GRKERNSEC_HIDESYM
76431+ NULL,
76432+#else
76433+ sp,
76434+#endif
76435+ atomic_read_unchecked(&sp->sk_drops), len);
76436 }
76437
76438 int udp4_seq_show(struct seq_file *seq, void *v)
76439diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
76440index 6b8ebc5..1d624f4 100644
76441--- a/net/ipv6/addrconf.c
76442+++ b/net/ipv6/addrconf.c
76443@@ -2145,7 +2145,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
76444 p.iph.ihl = 5;
76445 p.iph.protocol = IPPROTO_IPV6;
76446 p.iph.ttl = 64;
76447- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
76448+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
76449
76450 if (ops->ndo_do_ioctl) {
76451 mm_segment_t oldfs = get_fs();
76452diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
76453index 2ae79db..8f101bf 100644
76454--- a/net/ipv6/ah6.c
76455+++ b/net/ipv6/ah6.c
76456@@ -56,6 +56,8 @@ struct ah_skb_cb {
76457 #define AH_SKB_CB(__skb) ((struct ah_skb_cb *)&((__skb)->cb[0]))
76458
76459 static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
76460+ unsigned int size) __size_overflow(3);
76461+static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
76462 unsigned int size)
76463 {
76464 unsigned int len;
76465diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
76466index 02dd203..e03fcc9 100644
76467--- a/net/ipv6/inet6_connection_sock.c
76468+++ b/net/ipv6/inet6_connection_sock.c
76469@@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
76470 #ifdef CONFIG_XFRM
76471 {
76472 struct rt6_info *rt = (struct rt6_info *)dst;
76473- rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
76474+ rt->rt6i_flow_cache_genid = atomic_read_unchecked(&flow_cache_genid);
76475 }
76476 #endif
76477 }
76478@@ -193,7 +193,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
76479 #ifdef CONFIG_XFRM
76480 if (dst) {
76481 struct rt6_info *rt = (struct rt6_info *)dst;
76482- if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
76483+ if (rt->rt6i_flow_cache_genid != atomic_read_unchecked(&flow_cache_genid)) {
76484 __sk_dst_reset(sk);
76485 dst = NULL;
76486 }
76487diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
76488index 18a2719..779f36a 100644
76489--- a/net/ipv6/ipv6_sockglue.c
76490+++ b/net/ipv6/ipv6_sockglue.c
76491@@ -960,7 +960,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
76492 if (sk->sk_type != SOCK_STREAM)
76493 return -ENOPROTOOPT;
76494
76495- msg.msg_control = optval;
76496+ msg.msg_control = (void __force_kernel *)optval;
76497 msg.msg_controllen = len;
76498 msg.msg_flags = flags;
76499
76500diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
76501index 94874b0..108a94d 100644
76502--- a/net/ipv6/netfilter/ip6_tables.c
76503+++ b/net/ipv6/netfilter/ip6_tables.c
76504@@ -945,6 +945,10 @@ static struct xt_counters *alloc_counters(const struct xt_table *table)
76505 static int
76506 copy_entries_to_user(unsigned int total_size,
76507 const struct xt_table *table,
76508+ void __user *userptr) __size_overflow(1);
76509+static int
76510+copy_entries_to_user(unsigned int total_size,
76511+ const struct xt_table *table,
76512 void __user *userptr)
76513 {
76514 unsigned int off, num;
76515@@ -1194,6 +1198,10 @@ get_entries(struct net *net, struct ip6t_get_entries __user *uptr,
76516 static int
76517 __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76518 struct xt_table_info *newinfo, unsigned int num_counters,
76519+ void __user *counters_ptr) __size_overflow(5);
76520+static int
76521+__do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76522+ struct xt_table_info *newinfo, unsigned int num_counters,
76523 void __user *counters_ptr)
76524 {
76525 int ret;
76526@@ -1315,6 +1323,9 @@ do_replace(struct net *net, const void __user *user, unsigned int len)
76527
76528 static int
76529 do_add_counters(struct net *net, const void __user *user, unsigned int len,
76530+ int compat) __size_overflow(3);
76531+static int
76532+do_add_counters(struct net *net, const void __user *user, unsigned int len,
76533 int compat)
76534 {
76535 unsigned int i, curcpu;
76536diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
76537index d02f7e4..2d2a0f1 100644
76538--- a/net/ipv6/raw.c
76539+++ b/net/ipv6/raw.c
76540@@ -377,7 +377,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
76541 {
76542 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
76543 skb_checksum_complete(skb)) {
76544- atomic_inc(&sk->sk_drops);
76545+ atomic_inc_unchecked(&sk->sk_drops);
76546 kfree_skb(skb);
76547 return NET_RX_DROP;
76548 }
76549@@ -405,7 +405,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
76550 struct raw6_sock *rp = raw6_sk(sk);
76551
76552 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
76553- atomic_inc(&sk->sk_drops);
76554+ atomic_inc_unchecked(&sk->sk_drops);
76555 kfree_skb(skb);
76556 return NET_RX_DROP;
76557 }
76558@@ -429,7 +429,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
76559
76560 if (inet->hdrincl) {
76561 if (skb_checksum_complete(skb)) {
76562- atomic_inc(&sk->sk_drops);
76563+ atomic_inc_unchecked(&sk->sk_drops);
76564 kfree_skb(skb);
76565 return NET_RX_DROP;
76566 }
76567@@ -602,7 +602,7 @@ out:
76568 return err;
76569 }
76570
76571-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
76572+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
76573 struct flowi6 *fl6, struct dst_entry **dstp,
76574 unsigned int flags)
76575 {
76576@@ -912,12 +912,15 @@ do_confirm:
76577 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
76578 char __user *optval, int optlen)
76579 {
76580+ struct icmp6_filter filter;
76581+
76582 switch (optname) {
76583 case ICMPV6_FILTER:
76584 if (optlen > sizeof(struct icmp6_filter))
76585 optlen = sizeof(struct icmp6_filter);
76586- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
76587+ if (copy_from_user(&filter, optval, optlen))
76588 return -EFAULT;
76589+ raw6_sk(sk)->filter = filter;
76590 return 0;
76591 default:
76592 return -ENOPROTOOPT;
76593@@ -930,6 +933,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
76594 char __user *optval, int __user *optlen)
76595 {
76596 int len;
76597+ struct icmp6_filter filter;
76598
76599 switch (optname) {
76600 case ICMPV6_FILTER:
76601@@ -941,7 +945,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
76602 len = sizeof(struct icmp6_filter);
76603 if (put_user(len, optlen))
76604 return -EFAULT;
76605- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
76606+ filter = raw6_sk(sk)->filter;
76607+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
76608 return -EFAULT;
76609 return 0;
76610 default:
76611@@ -1248,7 +1253,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
76612 0, 0L, 0,
76613 sock_i_uid(sp), 0,
76614 sock_i_ino(sp),
76615- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
76616+ atomic_read(&sp->sk_refcnt),
76617+#ifdef CONFIG_GRKERNSEC_HIDESYM
76618+ NULL,
76619+#else
76620+ sp,
76621+#endif
76622+ atomic_read_unchecked(&sp->sk_drops));
76623 }
76624
76625 static int raw6_seq_show(struct seq_file *seq, void *v)
76626diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
76627index a89ca8d..12e66b0 100644
76628--- a/net/ipv6/tcp_ipv6.c
76629+++ b/net/ipv6/tcp_ipv6.c
76630@@ -94,6 +94,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
76631 }
76632 #endif
76633
76634+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76635+extern int grsec_enable_blackhole;
76636+#endif
76637+
76638 static void tcp_v6_hash(struct sock *sk)
76639 {
76640 if (sk->sk_state != TCP_CLOSE) {
76641@@ -1654,6 +1658,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
76642 return 0;
76643
76644 reset:
76645+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76646+ if (!grsec_enable_blackhole)
76647+#endif
76648 tcp_v6_send_reset(sk, skb);
76649 discard:
76650 if (opt_skb)
76651@@ -1733,12 +1740,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
76652 TCP_SKB_CB(skb)->sacked = 0;
76653
76654 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
76655- if (!sk)
76656+ if (!sk) {
76657+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76658+ ret = 1;
76659+#endif
76660 goto no_tcp_socket;
76661+ }
76662
76663 process:
76664- if (sk->sk_state == TCP_TIME_WAIT)
76665+ if (sk->sk_state == TCP_TIME_WAIT) {
76666+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76667+ ret = 2;
76668+#endif
76669 goto do_time_wait;
76670+ }
76671
76672 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
76673 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
76674@@ -1786,6 +1801,10 @@ no_tcp_socket:
76675 bad_packet:
76676 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
76677 } else {
76678+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76679+ if (!grsec_enable_blackhole || (ret == 1 &&
76680+ (skb->dev->flags & IFF_LOOPBACK)))
76681+#endif
76682 tcp_v6_send_reset(NULL, skb);
76683 }
76684
76685@@ -2047,7 +2066,13 @@ static void get_openreq6(struct seq_file *seq,
76686 uid,
76687 0, /* non standard timer */
76688 0, /* open_requests have no inode */
76689- 0, req);
76690+ 0,
76691+#ifdef CONFIG_GRKERNSEC_HIDESYM
76692+ NULL
76693+#else
76694+ req
76695+#endif
76696+ );
76697 }
76698
76699 static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
76700@@ -2097,7 +2122,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
76701 sock_i_uid(sp),
76702 icsk->icsk_probes_out,
76703 sock_i_ino(sp),
76704- atomic_read(&sp->sk_refcnt), sp,
76705+ atomic_read(&sp->sk_refcnt),
76706+#ifdef CONFIG_GRKERNSEC_HIDESYM
76707+ NULL,
76708+#else
76709+ sp,
76710+#endif
76711 jiffies_to_clock_t(icsk->icsk_rto),
76712 jiffies_to_clock_t(icsk->icsk_ack.ato),
76713 (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
76714@@ -2132,7 +2162,13 @@ static void get_timewait6_sock(struct seq_file *seq,
76715 dest->s6_addr32[2], dest->s6_addr32[3], destp,
76716 tw->tw_substate, 0, 0,
76717 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
76718- atomic_read(&tw->tw_refcnt), tw);
76719+ atomic_read(&tw->tw_refcnt),
76720+#ifdef CONFIG_GRKERNSEC_HIDESYM
76721+ NULL
76722+#else
76723+ tw
76724+#endif
76725+ );
76726 }
76727
76728 static int tcp6_seq_show(struct seq_file *seq, void *v)
76729diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
76730index 4f96b5c..75543d7 100644
76731--- a/net/ipv6/udp.c
76732+++ b/net/ipv6/udp.c
76733@@ -50,6 +50,10 @@
76734 #include <linux/seq_file.h>
76735 #include "udp_impl.h"
76736
76737+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76738+extern int grsec_enable_blackhole;
76739+#endif
76740+
76741 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
76742 {
76743 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
76744@@ -551,7 +555,7 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
76745
76746 return 0;
76747 drop:
76748- atomic_inc(&sk->sk_drops);
76749+ atomic_inc_unchecked(&sk->sk_drops);
76750 drop_no_sk_drops_inc:
76751 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
76752 kfree_skb(skb);
76753@@ -627,7 +631,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
76754 continue;
76755 }
76756 drop:
76757- atomic_inc(&sk->sk_drops);
76758+ atomic_inc_unchecked(&sk->sk_drops);
76759 UDP6_INC_STATS_BH(sock_net(sk),
76760 UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk));
76761 UDP6_INC_STATS_BH(sock_net(sk),
76762@@ -782,6 +786,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76763 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
76764 proto == IPPROTO_UDPLITE);
76765
76766+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76767+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
76768+#endif
76769 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
76770
76771 kfree_skb(skb);
76772@@ -798,7 +805,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76773 if (!sock_owned_by_user(sk))
76774 udpv6_queue_rcv_skb(sk, skb);
76775 else if (sk_add_backlog(sk, skb)) {
76776- atomic_inc(&sk->sk_drops);
76777+ atomic_inc_unchecked(&sk->sk_drops);
76778 bh_unlock_sock(sk);
76779 sock_put(sk);
76780 goto discard;
76781@@ -1410,8 +1417,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
76782 0, 0L, 0,
76783 sock_i_uid(sp), 0,
76784 sock_i_ino(sp),
76785- atomic_read(&sp->sk_refcnt), sp,
76786- atomic_read(&sp->sk_drops));
76787+ atomic_read(&sp->sk_refcnt),
76788+#ifdef CONFIG_GRKERNSEC_HIDESYM
76789+ NULL,
76790+#else
76791+ sp,
76792+#endif
76793+ atomic_read_unchecked(&sp->sk_drops));
76794 }
76795
76796 int udp6_seq_show(struct seq_file *seq, void *v)
76797diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
76798index 253695d..9481ce8 100644
76799--- a/net/irda/ircomm/ircomm_tty.c
76800+++ b/net/irda/ircomm/ircomm_tty.c
76801@@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76802 add_wait_queue(&self->open_wait, &wait);
76803
76804 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
76805- __FILE__,__LINE__, tty->driver->name, self->open_count );
76806+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
76807
76808 /* As far as I can see, we protect open_count - Jean II */
76809 spin_lock_irqsave(&self->spinlock, flags);
76810 if (!tty_hung_up_p(filp)) {
76811 extra_count = 1;
76812- self->open_count--;
76813+ local_dec(&self->open_count);
76814 }
76815 spin_unlock_irqrestore(&self->spinlock, flags);
76816- self->blocked_open++;
76817+ local_inc(&self->blocked_open);
76818
76819 while (1) {
76820 if (tty->termios->c_cflag & CBAUD) {
76821@@ -331,7 +331,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76822 }
76823
76824 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
76825- __FILE__,__LINE__, tty->driver->name, self->open_count );
76826+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
76827
76828 schedule();
76829 }
76830@@ -342,13 +342,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76831 if (extra_count) {
76832 /* ++ is not atomic, so this should be protected - Jean II */
76833 spin_lock_irqsave(&self->spinlock, flags);
76834- self->open_count++;
76835+ local_inc(&self->open_count);
76836 spin_unlock_irqrestore(&self->spinlock, flags);
76837 }
76838- self->blocked_open--;
76839+ local_dec(&self->blocked_open);
76840
76841 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
76842- __FILE__,__LINE__, tty->driver->name, self->open_count);
76843+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
76844
76845 if (!retval)
76846 self->flags |= ASYNC_NORMAL_ACTIVE;
76847@@ -417,14 +417,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
76848 }
76849 /* ++ is not atomic, so this should be protected - Jean II */
76850 spin_lock_irqsave(&self->spinlock, flags);
76851- self->open_count++;
76852+ local_inc(&self->open_count);
76853
76854 tty->driver_data = self;
76855 self->tty = tty;
76856 spin_unlock_irqrestore(&self->spinlock, flags);
76857
76858 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
76859- self->line, self->open_count);
76860+ self->line, local_read(&self->open_count));
76861
76862 /* Not really used by us, but lets do it anyway */
76863 self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
76864@@ -510,7 +510,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
76865 return;
76866 }
76867
76868- if ((tty->count == 1) && (self->open_count != 1)) {
76869+ if ((tty->count == 1) && (local_read(&self->open_count) != 1)) {
76870 /*
76871 * Uh, oh. tty->count is 1, which means that the tty
76872 * structure will be freed. state->count should always
76873@@ -520,16 +520,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
76874 */
76875 IRDA_DEBUG(0, "%s(), bad serial port count; "
76876 "tty->count is 1, state->count is %d\n", __func__ ,
76877- self->open_count);
76878- self->open_count = 1;
76879+ local_read(&self->open_count));
76880+ local_set(&self->open_count, 1);
76881 }
76882
76883- if (--self->open_count < 0) {
76884+ if (local_dec_return(&self->open_count) < 0) {
76885 IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
76886- __func__, self->line, self->open_count);
76887- self->open_count = 0;
76888+ __func__, self->line, local_read(&self->open_count));
76889+ local_set(&self->open_count, 0);
76890 }
76891- if (self->open_count) {
76892+ if (local_read(&self->open_count)) {
76893 spin_unlock_irqrestore(&self->spinlock, flags);
76894
76895 IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
76896@@ -561,7 +561,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
76897 tty->closing = 0;
76898 self->tty = NULL;
76899
76900- if (self->blocked_open) {
76901+ if (local_read(&self->blocked_open)) {
76902 if (self->close_delay)
76903 schedule_timeout_interruptible(self->close_delay);
76904 wake_up_interruptible(&self->open_wait);
76905@@ -1013,7 +1013,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
76906 spin_lock_irqsave(&self->spinlock, flags);
76907 self->flags &= ~ASYNC_NORMAL_ACTIVE;
76908 self->tty = NULL;
76909- self->open_count = 0;
76910+ local_set(&self->open_count, 0);
76911 spin_unlock_irqrestore(&self->spinlock, flags);
76912
76913 wake_up_interruptible(&self->open_wait);
76914@@ -1360,7 +1360,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
76915 seq_putc(m, '\n');
76916
76917 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
76918- seq_printf(m, "Open count: %d\n", self->open_count);
76919+ seq_printf(m, "Open count: %d\n", local_read(&self->open_count));
76920 seq_printf(m, "Max data size: %d\n", self->max_data_size);
76921 seq_printf(m, "Max header size: %d\n", self->max_header_size);
76922
76923diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
76924index d5c5b8f..33beff0 100644
76925--- a/net/iucv/af_iucv.c
76926+++ b/net/iucv/af_iucv.c
76927@@ -764,10 +764,10 @@ static int iucv_sock_autobind(struct sock *sk)
76928
76929 write_lock_bh(&iucv_sk_list.lock);
76930
76931- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
76932+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
76933 while (__iucv_get_sock_by_name(name)) {
76934 sprintf(name, "%08x",
76935- atomic_inc_return(&iucv_sk_list.autobind_name));
76936+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
76937 }
76938
76939 write_unlock_bh(&iucv_sk_list.lock);
76940diff --git a/net/key/af_key.c b/net/key/af_key.c
76941index 11dbb22..c20f667 100644
76942--- a/net/key/af_key.c
76943+++ b/net/key/af_key.c
76944@@ -3016,10 +3016,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
76945 static u32 get_acqseq(void)
76946 {
76947 u32 res;
76948- static atomic_t acqseq;
76949+ static atomic_unchecked_t acqseq;
76950
76951 do {
76952- res = atomic_inc_return(&acqseq);
76953+ res = atomic_inc_return_unchecked(&acqseq);
76954 } while (!res);
76955 return res;
76956 }
76957diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
76958index 2f0642d..e5c6fba 100644
76959--- a/net/mac80211/ieee80211_i.h
76960+++ b/net/mac80211/ieee80211_i.h
76961@@ -28,6 +28,7 @@
76962 #include <net/ieee80211_radiotap.h>
76963 #include <net/cfg80211.h>
76964 #include <net/mac80211.h>
76965+#include <asm/local.h>
76966 #include "key.h"
76967 #include "sta_info.h"
76968
76969@@ -781,7 +782,7 @@ struct ieee80211_local {
76970 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
76971 spinlock_t queue_stop_reason_lock;
76972
76973- int open_count;
76974+ local_t open_count;
76975 int monitors, cooked_mntrs;
76976 /* number of interfaces with corresponding FIF_ flags */
76977 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
76978diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
76979index 8e2137b..2974283 100644
76980--- a/net/mac80211/iface.c
76981+++ b/net/mac80211/iface.c
76982@@ -222,7 +222,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76983 break;
76984 }
76985
76986- if (local->open_count == 0) {
76987+ if (local_read(&local->open_count) == 0) {
76988 res = drv_start(local);
76989 if (res)
76990 goto err_del_bss;
76991@@ -246,7 +246,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76992 memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
76993
76994 if (!is_valid_ether_addr(dev->dev_addr)) {
76995- if (!local->open_count)
76996+ if (!local_read(&local->open_count))
76997 drv_stop(local);
76998 return -EADDRNOTAVAIL;
76999 }
77000@@ -347,7 +347,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
77001 mutex_unlock(&local->mtx);
77002
77003 if (coming_up)
77004- local->open_count++;
77005+ local_inc(&local->open_count);
77006
77007 if (hw_reconf_flags)
77008 ieee80211_hw_config(local, hw_reconf_flags);
77009@@ -360,7 +360,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
77010 err_del_interface:
77011 drv_remove_interface(local, sdata);
77012 err_stop:
77013- if (!local->open_count)
77014+ if (!local_read(&local->open_count))
77015 drv_stop(local);
77016 err_del_bss:
77017 sdata->bss = NULL;
77018@@ -489,7 +489,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
77019 }
77020
77021 if (going_down)
77022- local->open_count--;
77023+ local_dec(&local->open_count);
77024
77025 switch (sdata->vif.type) {
77026 case NL80211_IFTYPE_AP_VLAN:
77027@@ -548,7 +548,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
77028
77029 ieee80211_recalc_ps(local, -1);
77030
77031- if (local->open_count == 0) {
77032+ if (local_read(&local->open_count) == 0) {
77033 if (local->ops->napi_poll)
77034 napi_disable(&local->napi);
77035 ieee80211_clear_tx_pending(local);
77036diff --git a/net/mac80211/main.c b/net/mac80211/main.c
77037index b142bd4..a651749 100644
77038--- a/net/mac80211/main.c
77039+++ b/net/mac80211/main.c
77040@@ -166,7 +166,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
77041 local->hw.conf.power_level = power;
77042 }
77043
77044- if (changed && local->open_count) {
77045+ if (changed && local_read(&local->open_count)) {
77046 ret = drv_config(local, changed);
77047 /*
77048 * Goal:
77049diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
77050index 596efaf..8f1911f 100644
77051--- a/net/mac80211/pm.c
77052+++ b/net/mac80211/pm.c
77053@@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
77054 struct ieee80211_sub_if_data *sdata;
77055 struct sta_info *sta;
77056
77057- if (!local->open_count)
77058+ if (!local_read(&local->open_count))
77059 goto suspend;
77060
77061 ieee80211_scan_cancel(local);
77062@@ -72,7 +72,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
77063 cancel_work_sync(&local->dynamic_ps_enable_work);
77064 del_timer_sync(&local->dynamic_ps_timer);
77065
77066- local->wowlan = wowlan && local->open_count;
77067+ local->wowlan = wowlan && local_read(&local->open_count);
77068 if (local->wowlan) {
77069 int err = drv_suspend(local, wowlan);
77070 if (err < 0) {
77071@@ -129,7 +129,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
77072 }
77073
77074 /* stop hardware - this must stop RX */
77075- if (local->open_count)
77076+ if (local_read(&local->open_count))
77077 ieee80211_stop_device(local);
77078
77079 suspend:
77080diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
77081index f9b8e81..bb89b46 100644
77082--- a/net/mac80211/rate.c
77083+++ b/net/mac80211/rate.c
77084@@ -401,7 +401,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
77085
77086 ASSERT_RTNL();
77087
77088- if (local->open_count)
77089+ if (local_read(&local->open_count))
77090 return -EBUSY;
77091
77092 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
77093diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
77094index c97a065..ff61928 100644
77095--- a/net/mac80211/rc80211_pid_debugfs.c
77096+++ b/net/mac80211/rc80211_pid_debugfs.c
77097@@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
77098
77099 spin_unlock_irqrestore(&events->lock, status);
77100
77101- if (copy_to_user(buf, pb, p))
77102+ if (p > sizeof(pb) || copy_to_user(buf, pb, p))
77103 return -EFAULT;
77104
77105 return p;
77106diff --git a/net/mac80211/util.c b/net/mac80211/util.c
77107index 9919892..8c49803 100644
77108--- a/net/mac80211/util.c
77109+++ b/net/mac80211/util.c
77110@@ -1143,7 +1143,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
77111 }
77112 #endif
77113 /* everything else happens only if HW was up & running */
77114- if (!local->open_count)
77115+ if (!local_read(&local->open_count))
77116 goto wake_up;
77117
77118 /*
77119diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
77120index f8ac4ef..b02560b 100644
77121--- a/net/netfilter/Kconfig
77122+++ b/net/netfilter/Kconfig
77123@@ -806,6 +806,16 @@ config NETFILTER_XT_MATCH_ESP
77124
77125 To compile it as a module, choose M here. If unsure, say N.
77126
77127+config NETFILTER_XT_MATCH_GRADM
77128+ tristate '"gradm" match support'
77129+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
77130+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
77131+ ---help---
77132+ The gradm match allows to match on grsecurity RBAC being enabled.
77133+ It is useful when iptables rules are applied early on bootup to
77134+ prevent connections to the machine (except from a trusted host)
77135+ while the RBAC system is disabled.
77136+
77137 config NETFILTER_XT_MATCH_HASHLIMIT
77138 tristate '"hashlimit" match support'
77139 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
77140diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
77141index 40f4c3d..0d5dd6b 100644
77142--- a/net/netfilter/Makefile
77143+++ b/net/netfilter/Makefile
77144@@ -83,6 +83,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
77145 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
77146 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
77147 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
77148+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
77149 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
77150 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
77151 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
77152diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
77153index 29fa5ba..8debc79 100644
77154--- a/net/netfilter/ipvs/ip_vs_conn.c
77155+++ b/net/netfilter/ipvs/ip_vs_conn.c
77156@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
77157 /* Increase the refcnt counter of the dest */
77158 atomic_inc(&dest->refcnt);
77159
77160- conn_flags = atomic_read(&dest->conn_flags);
77161+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
77162 if (cp->protocol != IPPROTO_UDP)
77163 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
77164 /* Bind with the destination and its corresponding transmitter */
77165@@ -869,7 +869,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
77166 atomic_set(&cp->refcnt, 1);
77167
77168 atomic_set(&cp->n_control, 0);
77169- atomic_set(&cp->in_pkts, 0);
77170+ atomic_set_unchecked(&cp->in_pkts, 0);
77171
77172 atomic_inc(&ipvs->conn_count);
77173 if (flags & IP_VS_CONN_F_NO_CPORT)
77174@@ -1149,7 +1149,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
77175
77176 /* Don't drop the entry if its number of incoming packets is not
77177 located in [0, 8] */
77178- i = atomic_read(&cp->in_pkts);
77179+ i = atomic_read_unchecked(&cp->in_pkts);
77180 if (i > 8 || i < 0) return 0;
77181
77182 if (!todrop_rate[i]) return 0;
77183diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
77184index 2555816..31492d9 100644
77185--- a/net/netfilter/ipvs/ip_vs_core.c
77186+++ b/net/netfilter/ipvs/ip_vs_core.c
77187@@ -562,7 +562,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
77188 ret = cp->packet_xmit(skb, cp, pd->pp);
77189 /* do not touch skb anymore */
77190
77191- atomic_inc(&cp->in_pkts);
77192+ atomic_inc_unchecked(&cp->in_pkts);
77193 ip_vs_conn_put(cp);
77194 return ret;
77195 }
77196@@ -1611,7 +1611,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
77197 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
77198 pkts = sysctl_sync_threshold(ipvs);
77199 else
77200- pkts = atomic_add_return(1, &cp->in_pkts);
77201+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
77202
77203 if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
77204 cp->protocol == IPPROTO_SCTP) {
77205diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
77206index b3afe18..08ec940 100644
77207--- a/net/netfilter/ipvs/ip_vs_ctl.c
77208+++ b/net/netfilter/ipvs/ip_vs_ctl.c
77209@@ -788,7 +788,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
77210 ip_vs_rs_hash(ipvs, dest);
77211 write_unlock_bh(&ipvs->rs_lock);
77212 }
77213- atomic_set(&dest->conn_flags, conn_flags);
77214+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
77215
77216 /* bind the service */
77217 if (!dest->svc) {
77218@@ -2028,7 +2028,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
77219 " %-7s %-6d %-10d %-10d\n",
77220 &dest->addr.in6,
77221 ntohs(dest->port),
77222- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
77223+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
77224 atomic_read(&dest->weight),
77225 atomic_read(&dest->activeconns),
77226 atomic_read(&dest->inactconns));
77227@@ -2039,7 +2039,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
77228 "%-7s %-6d %-10d %-10d\n",
77229 ntohl(dest->addr.ip),
77230 ntohs(dest->port),
77231- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
77232+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
77233 atomic_read(&dest->weight),
77234 atomic_read(&dest->activeconns),
77235 atomic_read(&dest->inactconns));
77236@@ -2509,7 +2509,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
77237
77238 entry.addr = dest->addr.ip;
77239 entry.port = dest->port;
77240- entry.conn_flags = atomic_read(&dest->conn_flags);
77241+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
77242 entry.weight = atomic_read(&dest->weight);
77243 entry.u_threshold = dest->u_threshold;
77244 entry.l_threshold = dest->l_threshold;
77245@@ -3042,7 +3042,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
77246 NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
77247
77248 NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
77249- atomic_read(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
77250+ atomic_read_unchecked(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
77251 NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
77252 NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
77253 NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
77254diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
77255index 8a0d6d6..90ec197 100644
77256--- a/net/netfilter/ipvs/ip_vs_sync.c
77257+++ b/net/netfilter/ipvs/ip_vs_sync.c
77258@@ -649,7 +649,7 @@ control:
77259 * i.e only increment in_pkts for Templates.
77260 */
77261 if (cp->flags & IP_VS_CONN_F_TEMPLATE) {
77262- int pkts = atomic_add_return(1, &cp->in_pkts);
77263+ int pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
77264
77265 if (pkts % sysctl_sync_period(ipvs) != 1)
77266 return;
77267@@ -795,7 +795,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
77268
77269 if (opt)
77270 memcpy(&cp->in_seq, opt, sizeof(*opt));
77271- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
77272+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
77273 cp->state = state;
77274 cp->old_state = cp->state;
77275 /*
77276diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
77277index 7fd66de..e6fb361 100644
77278--- a/net/netfilter/ipvs/ip_vs_xmit.c
77279+++ b/net/netfilter/ipvs/ip_vs_xmit.c
77280@@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
77281 else
77282 rc = NF_ACCEPT;
77283 /* do not touch skb anymore */
77284- atomic_inc(&cp->in_pkts);
77285+ atomic_inc_unchecked(&cp->in_pkts);
77286 goto out;
77287 }
77288
77289@@ -1272,7 +1272,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
77290 else
77291 rc = NF_ACCEPT;
77292 /* do not touch skb anymore */
77293- atomic_inc(&cp->in_pkts);
77294+ atomic_inc_unchecked(&cp->in_pkts);
77295 goto out;
77296 }
77297
77298diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
77299index 66b2c54..c7884e3 100644
77300--- a/net/netfilter/nfnetlink_log.c
77301+++ b/net/netfilter/nfnetlink_log.c
77302@@ -70,7 +70,7 @@ struct nfulnl_instance {
77303 };
77304
77305 static DEFINE_SPINLOCK(instances_lock);
77306-static atomic_t global_seq;
77307+static atomic_unchecked_t global_seq;
77308
77309 #define INSTANCE_BUCKETS 16
77310 static struct hlist_head instance_table[INSTANCE_BUCKETS];
77311@@ -502,7 +502,7 @@ __build_packet_message(struct nfulnl_instance *inst,
77312 /* global sequence number */
77313 if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
77314 NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
77315- htonl(atomic_inc_return(&global_seq)));
77316+ htonl(atomic_inc_return_unchecked(&global_seq)));
77317
77318 if (data_len) {
77319 struct nlattr *nla;
77320diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
77321new file mode 100644
77322index 0000000..6905327
77323--- /dev/null
77324+++ b/net/netfilter/xt_gradm.c
77325@@ -0,0 +1,51 @@
77326+/*
77327+ * gradm match for netfilter
77328