]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-2.9-3.2.11-201203181401.patch
projects / thirdparty / grsecurity-scrape.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Auto commit, 1 new patch{es}.
[thirdparty/grsecurity-scrape.git] / test / grsecurity-2.9-3.2.11-201203181401.patch
CommitLineData
f54c964d
PK		 1diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2index dfa6fc6..df93044 100644
3--- a/Documentation/dontdiff
4+++ b/Documentation/dontdiff
5@@ -2,9 +2,11 @@
6 *.aux
7 *.bin
8 *.bz2
9+*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13+*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17@@ -14,6 +16,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21+*.gmo
22 *.grep
23 *.grp
24 *.gz
25@@ -48,9 +51,11 @@
26 *.tab.h
27 *.tex
28 *.ver
29+*.vim
30 *.xml
31 *.xz
32 *_MODULES
33+*_reg_safe.h
34 *_vga16.c
35 *~
36 \#*#
37@@ -70,6 +75,7 @@ Kerntypes
38 Module.markers
39 Module.symvers
40 PENDING
41+PERF*
42 SCCS
43 System.map*
44 TAGS
45@@ -93,19 +99,24 @@ bounds.h
46 bsetup
47 btfixupprep
48 build
49+builtin-policy.h
50 bvmlinux
51 bzImage*
52 capability_names.h
53 capflags.c
54 classlist.h*
55+clut_vga16.c
56+common-cmds.h
57 comp*.log
58 compile.h*
59 conf
60 config
61 config-*
62 config_data.h*
63+config.c
64 config.mak
65 config.mak.autogen
66+config.tmp
67 conmakehash
68 consolemap_deftbl.c*
69 cpustr.h
70@@ -116,9 +127,11 @@ devlist.h*
71 dnotify_test
72 docproc
73 dslm
74+dtc-lexer.lex.c
75 elf2ecoff
76 elfconfig.h*
77 evergreen_reg_safe.h
78+exception_policy.conf
79 fixdep
80 flask.h
81 fore200e_mkfirm
82@@ -126,12 +139,15 @@ fore200e_pca_fw.c*
83 gconf
84 gconf.glade.h
85 gen-devlist
86+gen-kdb_cmds.c
87 gen_crc32table
88 gen_init_cpio
89 generated
90 genheaders
91 genksyms
92 *_gray256.c
93+hash
94+hid-example
95 hpet_example
96 hugepage-mmap
97 hugepage-shm
98@@ -146,7 +162,7 @@ int32.c
99 int4.c
100 int8.c
101 kallsyms
102-kconfig
103+kern_constants.h
104 keywords.c
105 ksym.c*
106 ksym.h*
107@@ -154,7 +170,7 @@ kxgettext
108 lkc_defs.h
109 lex.c
110 lex.*.c
111-linux
112+lib1funcs.S
113 logo_*.c
114 logo_*_clut224.c
115 logo_*_mono.c
116@@ -166,14 +182,15 @@ machtypes.h
117 map
118 map_hugetlb
119 maui_boot.h
120-media
121 mconf
122+mdp
123 miboot*
124 mk_elfconfig
125 mkboot
126 mkbugboot
127 mkcpustr
128 mkdep
129+mkpiggy
130 mkprep
131 mkregtable
132 mktables
133@@ -209,6 +226,7 @@ r300_reg_safe.h
134 r420_reg_safe.h
135 r600_reg_safe.h
136 recordmcount
137+regdb.c
138 relocs
139 rlim_names.h
140 rn50_reg_safe.h
141@@ -219,6 +237,7 @@ setup
142 setup.bin
143 setup.elf
144 sImage
145+slabinfo
146 sm_tbl*
147 split-include
148 syscalltab.h
149@@ -229,6 +248,7 @@ tftpboot.img
150 timeconst.h
151 times.h*
152 trix_boot.h
153+user_constants.h
154 utsrelease.h*
155 vdso-syms.lds
156 vdso.lds
157@@ -246,7 +266,9 @@ vmlinux
158 vmlinux-*
159 vmlinux.aout
160 vmlinux.bin.all
161+vmlinux.bin.bz2
162 vmlinux.lds
163+vmlinux.relocs
164 vmlinuz
165 voffset.h
166 vsyscall.lds
167@@ -254,9 +276,11 @@ vsyscall_32.lds
168 wanxlfw.inc
169 uImage
170 unifdef
171+utsrelease.h
172 wakeup.bin
173 wakeup.elf
174 wakeup.lds
175 zImage*
176 zconf.hash.c
177+zconf.lex.c
178 zoffset.h
179diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
180index 81c287f..d456d02 100644
181--- a/Documentation/kernel-parameters.txt
182+++ b/Documentation/kernel-parameters.txt
183@@ -1935,6 +1935,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
184 the specified number of seconds. This is to be used if
185 your oopses keep scrolling off the screen.
186
187+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
188+ virtualization environments that don't cope well with the
189+ expand down segment used by UDEREF on X86-32 or the frequent
190+ page table updates on X86-64.
191+
192+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
193+
194 pcbit= [HW,ISDN]
195
196 pcd. [PARIDE]
197diff --git a/Makefile b/Makefile
198index 4b76371..b091a81 100644
199--- a/Makefile
200+++ b/Makefile
201@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
202
203 HOSTCC = gcc
204 HOSTCXX = g++
205-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
206-HOSTCXXFLAGS = -O2
207+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
208+HOSTCLFAGS += $(call cc-option, -Wno-empty-body)
209+HOSTCXXFLAGS = -O2 -Wall -W -fno-delete-null-pointer-checks
210
211 # Decide whether to build built-in, modular, or both.
212 # Normally, just do built-in.
213@@ -407,8 +408,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exc
214 # Rules shared between *config targets and build targets
215
216 # Basic helpers built in scripts/
217-PHONY += scripts_basic
218-scripts_basic:
219+PHONY += scripts_basic gcc-plugins
220+scripts_basic: gcc-plugins
221 $(Q)$(MAKE) $(build)=scripts/basic
222 $(Q)rm -f .tmp_quiet_recordmcount
223
224@@ -564,6 +565,53 @@ else
225 KBUILD_CFLAGS += -O2
226 endif
227
228+ifndef DISABLE_PAX_PLUGINS
229+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
230+ifndef DISABLE_PAX_CONSTIFY_PLUGIN
231+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
232+endif
233+ifdef CONFIG_PAX_MEMORY_STACKLEAK
234+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
235+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
236+endif
237+ifdef CONFIG_KALLOCSTAT_PLUGIN
238+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
239+endif
240+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
241+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
242+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
243+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
244+endif
245+ifdef CONFIG_CHECKER_PLUGIN
246+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
247+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
248+endif
249+endif
250+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
251+ifdef CONFIG_PAX_SIZE_OVERFLOW
252+SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
253+endif
254+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
255+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS) $(SIZE_OVERFLOW_PLUGIN_CFLAGS)
256+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
257+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN SIZE_OVERFLOW_PLUGIN
258+ifeq ($(KBUILD_EXTMOD),)
259+gcc-plugins:
260+ $(Q)$(MAKE) $(build)=tools/gcc
261+else
262+gcc-plugins: ;
263+endif
264+else
265+gcc-plugins:
266+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
267+ $(error Your gcc installation does not support plugins. If the necessary headers for plugin support are missing, they should be installed. On Debian, apt-get install gcc-<ver>-plugin-dev. If you choose to ignore this error and lessen the improvements provided by this patch, re-run make with the DISABLE_PAX_PLUGINS=y argument.))
268+else
269+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
270+endif
271+ $(Q)echo "PAX_MEMORY_STACKLEAK and other features will be less secure"
272+endif
273+endif
274+
275 include $(srctree)/arch/$(SRCARCH)/Makefile
276
277 ifneq ($(CONFIG_FRAME_WARN),0)
278@@ -708,7 +756,7 @@ export mod_strip_cmd
279
280
281 ifeq ($(KBUILD_EXTMOD),)
282-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
283+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
284
285 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
286 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
287@@ -932,6 +980,8 @@ vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE
288
289 # The actual objects are generated when descending,
290 # make sure no implicit rule kicks in
291+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
292+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
293 $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
294
295 # Handle descending into subdirectories listed in $(vmlinux-dirs)
296@@ -941,7 +991,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
297 # Error messages still appears in the original language
298
299 PHONY += $(vmlinux-dirs)
300-$(vmlinux-dirs): prepare scripts
301+$(vmlinux-dirs): gcc-plugins prepare scripts
302 $(Q)$(MAKE) $(build)=$@
303
304 # Store (new) KERNELRELASE string in include/config/kernel.release
305@@ -985,6 +1035,7 @@ prepare0: archprepare FORCE
306 $(Q)$(MAKE) $(build)=.
307
308 # All the preparing..
309+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
310 prepare: prepare0
311
312 # Generate some files
313@@ -1086,6 +1137,8 @@ all: modules
314 # using awk while concatenating to the final file.
315
316 PHONY += modules
317+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
318+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
319 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
320 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
321 @$(kecho) ' Building modules, stage 2.';
322@@ -1101,7 +1154,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
323
324 # Target to prepare building external modules
325 PHONY += modules_prepare
326-modules_prepare: prepare scripts
327+modules_prepare: gcc-plugins prepare scripts
328
329 # Target to install modules
330 PHONY += modules_install
331@@ -1198,6 +1251,7 @@ distclean: mrproper
332 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
333 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
334 -o -name '.*.rej' \
335+ -o -name '.*.rej' -o -name '*.so' \
336 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
337 -type f -print | xargs rm -f
338
339@@ -1358,6 +1412,8 @@ PHONY += $(module-dirs) modules
340 $(module-dirs): crmodverdir $(objtree)/Module.symvers
341 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
342
343+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
344+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
345 modules: $(module-dirs)
346 @$(kecho) ' Building modules, stage 2.';
347 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
348@@ -1484,17 +1540,21 @@ else
349 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
350 endif
351
352-%.s: %.c prepare scripts FORCE
353+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
354+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
355+%.s: %.c gcc-plugins prepare scripts FORCE
356 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
357 %.i: %.c prepare scripts FORCE
358 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
359-%.o: %.c prepare scripts FORCE
360+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
361+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
362+%.o: %.c gcc-plugins prepare scripts FORCE
363 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
364 %.lst: %.c prepare scripts FORCE
365 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
366-%.s: %.S prepare scripts FORCE
367+%.s: %.S gcc-plugins prepare scripts FORCE
368 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
369-%.o: %.S prepare scripts FORCE
370+%.o: %.S gcc-plugins prepare scripts FORCE
371 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
372 %.symtypes: %.c prepare scripts FORCE
373 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
374@@ -1504,11 +1564,15 @@ endif
375 $(cmd_crmodverdir)
376 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
377 $(build)=$(build-dir)
378-%/: prepare scripts FORCE
379+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
380+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
381+%/: gcc-plugins prepare scripts FORCE
382 $(cmd_crmodverdir)
383 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
384 $(build)=$(build-dir)
385-%.ko: prepare scripts FORCE
386+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
387+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
388+%.ko: gcc-plugins prepare scripts FORCE
389 $(cmd_crmodverdir)
390 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
391 $(build)=$(build-dir) $(@:.ko=.o)
392diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
393index 640f909..48b6597 100644
394--- a/arch/alpha/include/asm/atomic.h
395+++ b/arch/alpha/include/asm/atomic.h
396@@ -250,6 +250,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
397 #define atomic_dec(v) atomic_sub(1,(v))
398 #define atomic64_dec(v) atomic64_sub(1,(v))
399
400+#define atomic64_read_unchecked(v) atomic64_read(v)
401+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
402+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
403+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
404+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
405+#define atomic64_inc_unchecked(v) atomic64_inc(v)
406+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
407+#define atomic64_dec_unchecked(v) atomic64_dec(v)
408+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
409+
410 #define smp_mb__before_atomic_dec() smp_mb()
411 #define smp_mb__after_atomic_dec() smp_mb()
412 #define smp_mb__before_atomic_inc() smp_mb()
413diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
414index ad368a9..fbe0f25 100644
415--- a/arch/alpha/include/asm/cache.h
416+++ b/arch/alpha/include/asm/cache.h
417@@ -4,19 +4,19 @@
418 #ifndef __ARCH_ALPHA_CACHE_H
419 #define __ARCH_ALPHA_CACHE_H
420
421+#include <linux/const.h>
422
423 /* Bytes per L1 (data) cache line. */
424 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
425-# define L1_CACHE_BYTES 64
426 # define L1_CACHE_SHIFT 6
427 #else
428 /* Both EV4 and EV5 are write-through, read-allocate,
429 direct-mapped, physical.
430 */
431-# define L1_CACHE_BYTES 32
432 # define L1_CACHE_SHIFT 5
433 #endif
434
435+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
436 #define SMP_CACHE_BYTES L1_CACHE_BYTES
437
438 #endif
439diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
440index da5449e..7418343 100644
441--- a/arch/alpha/include/asm/elf.h
442+++ b/arch/alpha/include/asm/elf.h
443@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
444
445 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
446
447+#ifdef CONFIG_PAX_ASLR
448+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
449+
450+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
451+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
452+#endif
453+
454 /* $0 is set by ld.so to a pointer to a function which might be
455 registered using atexit. This provides a mean for the dynamic
456 linker to call DT_FINI functions for shared libraries that have
457diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
458index de98a73..bd4f1f8 100644
459--- a/arch/alpha/include/asm/pgtable.h
460+++ b/arch/alpha/include/asm/pgtable.h
461@@ -101,6 +101,17 @@ struct vm_area_struct;
462 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
463 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
464 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
465+
466+#ifdef CONFIG_PAX_PAGEEXEC
467+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
468+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
469+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
470+#else
471+# define PAGE_SHARED_NOEXEC PAGE_SHARED
472+# define PAGE_COPY_NOEXEC PAGE_COPY
473+# define PAGE_READONLY_NOEXEC PAGE_READONLY
474+#endif
475+
476 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
477
478 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
479diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
480index 2fd00b7..cfd5069 100644
481--- a/arch/alpha/kernel/module.c
482+++ b/arch/alpha/kernel/module.c
483@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
484
485 /* The small sections were sorted to the end of the segment.
486 The following should definitely cover them. */
487- gp = (u64)me->module_core + me->core_size - 0x8000;
488+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
489 got = sechdrs[me->arch.gotsecindex].sh_addr;
490
491 for (i = 0; i < n; i++) {
492diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
493index 01e8715..be0e80f 100644
494--- a/arch/alpha/kernel/osf_sys.c
495+++ b/arch/alpha/kernel/osf_sys.c
496@@ -1147,7 +1147,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
497 /* At this point: (!vma || addr < vma->vm_end). */
498 if (limit - len < addr)
499 return -ENOMEM;
500- if (!vma || addr + len <= vma->vm_start)
501+ if (check_heap_stack_gap(vma, addr, len))
502 return addr;
503 addr = vma->vm_end;
504 vma = vma->vm_next;
505@@ -1183,6 +1183,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
506 merely specific addresses, but regions of memory -- perhaps
507 this feature should be incorporated into all ports? */
508
509+#ifdef CONFIG_PAX_RANDMMAP
510+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
511+#endif
512+
513 if (addr) {
514 addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
515 if (addr != (unsigned long) -ENOMEM)
516@@ -1190,8 +1194,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
517 }
518
519 /* Next, try allocating at TASK_UNMAPPED_BASE. */
520- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
521- len, limit);
522+ addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base), len, limit);
523+
524 if (addr != (unsigned long) -ENOMEM)
525 return addr;
526
527diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
528index fadd5f8..904e73a 100644
529--- a/arch/alpha/mm/fault.c
530+++ b/arch/alpha/mm/fault.c
531@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
532 __reload_thread(pcb);
533 }
534
535+#ifdef CONFIG_PAX_PAGEEXEC
536+/*
537+ * PaX: decide what to do with offenders (regs->pc = fault address)
538+ *
539+ * returns 1 when task should be killed
540+ * 2 when patched PLT trampoline was detected
541+ * 3 when unpatched PLT trampoline was detected
542+ */
543+static int pax_handle_fetch_fault(struct pt_regs *regs)
544+{
545+
546+#ifdef CONFIG_PAX_EMUPLT
547+ int err;
548+
549+ do { /* PaX: patched PLT emulation #1 */
550+ unsigned int ldah, ldq, jmp;
551+
552+ err = get_user(ldah, (unsigned int *)regs->pc);
553+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
554+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
555+
556+ if (err)
557+ break;
558+
559+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
560+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
561+ jmp == 0x6BFB0000U)
562+ {
563+ unsigned long r27, addr;
564+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
565+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
566+
567+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
568+ err = get_user(r27, (unsigned long *)addr);
569+ if (err)
570+ break;
571+
572+ regs->r27 = r27;
573+ regs->pc = r27;
574+ return 2;
575+ }
576+ } while (0);
577+
578+ do { /* PaX: patched PLT emulation #2 */
579+ unsigned int ldah, lda, br;
580+
581+ err = get_user(ldah, (unsigned int *)regs->pc);
582+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
583+ err |= get_user(br, (unsigned int *)(regs->pc+8));
584+
585+ if (err)
586+ break;
587+
588+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
589+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
590+ (br & 0xFFE00000U) == 0xC3E00000U)
591+ {
592+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
593+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
594+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
595+
596+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
597+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
598+ return 2;
599+ }
600+ } while (0);
601+
602+ do { /* PaX: unpatched PLT emulation */
603+ unsigned int br;
604+
605+ err = get_user(br, (unsigned int *)regs->pc);
606+
607+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
608+ unsigned int br2, ldq, nop, jmp;
609+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
610+
611+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
612+ err = get_user(br2, (unsigned int *)addr);
613+ err |= get_user(ldq, (unsigned int *)(addr+4));
614+ err |= get_user(nop, (unsigned int *)(addr+8));
615+ err |= get_user(jmp, (unsigned int *)(addr+12));
616+ err |= get_user(resolver, (unsigned long *)(addr+16));
617+
618+ if (err)
619+ break;
620+
621+ if (br2 == 0xC3600000U &&
622+ ldq == 0xA77B000CU &&
623+ nop == 0x47FF041FU &&
624+ jmp == 0x6B7B0000U)
625+ {
626+ regs->r28 = regs->pc+4;
627+ regs->r27 = addr+16;
628+ regs->pc = resolver;
629+ return 3;
630+ }
631+ }
632+ } while (0);
633+#endif
634+
635+ return 1;
636+}
637+
638+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
639+{
640+ unsigned long i;
641+
642+ printk(KERN_ERR "PAX: bytes at PC: ");
643+ for (i = 0; i < 5; i++) {
644+ unsigned int c;
645+ if (get_user(c, (unsigned int *)pc+i))
646+ printk(KERN_CONT "???????? ");
647+ else
648+ printk(KERN_CONT "%08x ", c);
649+ }
650+ printk("\n");
651+}
652+#endif
653
654 /*
655 * This routine handles page faults. It determines the address,
656@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
657 good_area:
658 si_code = SEGV_ACCERR;
659 if (cause < 0) {
660- if (!(vma->vm_flags & VM_EXEC))
661+ if (!(vma->vm_flags & VM_EXEC)) {
662+
663+#ifdef CONFIG_PAX_PAGEEXEC
664+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
665+ goto bad_area;
666+
667+ up_read(&mm->mmap_sem);
668+ switch (pax_handle_fetch_fault(regs)) {
669+
670+#ifdef CONFIG_PAX_EMUPLT
671+ case 2:
672+ case 3:
673+ return;
674+#endif
675+
676+ }
677+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
678+ do_group_exit(SIGKILL);
679+#else
680 goto bad_area;
681+#endif
682+
683+ }
684 } else if (!cause) {
685 /* Allow reads even for write-only mappings */
686 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
687diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
688index 86976d0..683de93 100644
689--- a/arch/arm/include/asm/atomic.h
690+++ b/arch/arm/include/asm/atomic.h
691@@ -15,6 +15,10 @@
692 #include <linux/types.h>
693 #include <asm/system.h>
694
695+#ifdef CONFIG_GENERIC_ATOMIC64
696+#include <asm-generic/atomic64.h>
697+#endif
698+
699 #define ATOMIC_INIT(i) { (i) }
700
701 #ifdef __KERNEL__
702@@ -25,7 +29,15 @@
703 * atomic_set() is the clrex or dummy strex done on every exception return.
704 */
705 #define atomic_read(v) (*(volatile int *)&(v)->counter)
706+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
707+{
708+ return v->counter;
709+}
710 #define atomic_set(v,i) (((v)->counter) = (i))
711+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
712+{
713+ v->counter = i;
714+}
715
716 #if __LINUX_ARM_ARCH__ >= 6
717
718@@ -40,6 +52,35 @@ static inline void atomic_add(int i, atomic_t *v)
719 int result;
720
721 __asm__ __volatile__("@ atomic_add\n"
722+"1: ldrex %1, [%3]\n"
723+" adds %0, %1, %4\n"
724+
725+#ifdef CONFIG_PAX_REFCOUNT
726+" bvc 3f\n"
727+"2: bkpt 0xf103\n"
728+"3:\n"
729+#endif
730+
731+" strex %1, %0, [%3]\n"
732+" teq %1, #0\n"
733+" bne 1b"
734+
735+#ifdef CONFIG_PAX_REFCOUNT
736+"\n4:\n"
737+ _ASM_EXTABLE(2b, 4b)
738+#endif
739+
740+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
741+ : "r" (&v->counter), "Ir" (i)
742+ : "cc");
743+}
744+
745+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
746+{
747+ unsigned long tmp;
748+ int result;
749+
750+ __asm__ __volatile__("@ atomic_add_unchecked\n"
751 "1: ldrex %0, [%3]\n"
752 " add %0, %0, %4\n"
753 " strex %1, %0, [%3]\n"
754@@ -58,6 +99,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
755 smp_mb();
756
757 __asm__ __volatile__("@ atomic_add_return\n"
758+"1: ldrex %1, [%3]\n"
759+" adds %0, %1, %4\n"
760+
761+#ifdef CONFIG_PAX_REFCOUNT
762+" bvc 3f\n"
763+" mov %0, %1\n"
764+"2: bkpt 0xf103\n"
765+"3:\n"
766+#endif
767+
768+" strex %1, %0, [%3]\n"
769+" teq %1, #0\n"
770+" bne 1b"
771+
772+#ifdef CONFIG_PAX_REFCOUNT
773+"\n4:\n"
774+ _ASM_EXTABLE(2b, 4b)
775+#endif
776+
777+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
778+ : "r" (&v->counter), "Ir" (i)
779+ : "cc");
780+
781+ smp_mb();
782+
783+ return result;
784+}
785+
786+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
787+{
788+ unsigned long tmp;
789+ int result;
790+
791+ smp_mb();
792+
793+ __asm__ __volatile__("@ atomic_add_return_unchecked\n"
794 "1: ldrex %0, [%3]\n"
795 " add %0, %0, %4\n"
796 " strex %1, %0, [%3]\n"
797@@ -78,6 +155,35 @@ static inline void atomic_sub(int i, atomic_t *v)
798 int result;
799
800 __asm__ __volatile__("@ atomic_sub\n"
801+"1: ldrex %1, [%3]\n"
802+" subs %0, %1, %4\n"
803+
804+#ifdef CONFIG_PAX_REFCOUNT
805+" bvc 3f\n"
806+"2: bkpt 0xf103\n"
807+"3:\n"
808+#endif
809+
810+" strex %1, %0, [%3]\n"
811+" teq %1, #0\n"
812+" bne 1b"
813+
814+#ifdef CONFIG_PAX_REFCOUNT
815+"\n4:\n"
816+ _ASM_EXTABLE(2b, 4b)
817+#endif
818+
819+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
820+ : "r" (&v->counter), "Ir" (i)
821+ : "cc");
822+}
823+
824+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
825+{
826+ unsigned long tmp;
827+ int result;
828+
829+ __asm__ __volatile__("@ atomic_sub_unchecked\n"
830 "1: ldrex %0, [%3]\n"
831 " sub %0, %0, %4\n"
832 " strex %1, %0, [%3]\n"
833@@ -96,11 +202,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
834 smp_mb();
835
836 __asm__ __volatile__("@ atomic_sub_return\n"
837-"1: ldrex %0, [%3]\n"
838-" sub %0, %0, %4\n"
839+"1: ldrex %1, [%3]\n"
840+" sub %0, %1, %4\n"
841+
842+#ifdef CONFIG_PAX_REFCOUNT
843+" bvc 3f\n"
844+" mov %0, %1\n"
845+"2: bkpt 0xf103\n"
846+"3:\n"
847+#endif
848+
849 " strex %1, %0, [%3]\n"
850 " teq %1, #0\n"
851 " bne 1b"
852+
853+#ifdef CONFIG_PAX_REFCOUNT
854+"\n4:\n"
855+ _ASM_EXTABLE(2b, 4b)
856+#endif
857+
858 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
859 : "r" (&v->counter), "Ir" (i)
860 : "cc");
861@@ -132,6 +252,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
862 return oldval;
863 }
864
865+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
866+{
867+ unsigned long oldval, res;
868+
869+ smp_mb();
870+
871+ do {
872+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
873+ "ldrex %1, [%3]\n"
874+ "mov %0, #0\n"
875+ "teq %1, %4\n"
876+ "strexeq %0, %5, [%3]\n"
877+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
878+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
879+ : "cc");
880+ } while (res);
881+
882+ smp_mb();
883+
884+ return oldval;
885+}
886+
887 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
888 {
889 unsigned long tmp, tmp2;
890@@ -207,6 +349,10 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
891 #endif /* __LINUX_ARM_ARCH__ */
892
893 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
894+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
895+{
896+ return xchg(&v->counter, new);
897+}
898
899 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
900 {
901@@ -219,11 +365,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
902 }
903
904 #define atomic_inc(v) atomic_add(1, v)
905+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
906+{
907+ atomic_add_unchecked(1, v);
908+}
909 #define atomic_dec(v) atomic_sub(1, v)
910+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
911+{
912+ atomic_sub_unchecked(1, v);
913+}
914
915 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
916+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
917+{
918+ return atomic_add_return_unchecked(1, v) == 0;
919+}
920 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
921 #define atomic_inc_return(v) (atomic_add_return(1, v))
922+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
923+{
924+ return atomic_add_return_unchecked(1, v);
925+}
926 #define atomic_dec_return(v) (atomic_sub_return(1, v))
927 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
928
929@@ -239,6 +401,14 @@ typedef struct {
930 u64 __aligned(8) counter;
931 } atomic64_t;
932
933+#ifdef CONFIG_PAX_REFCOUNT
934+typedef struct {
935+ u64 __aligned(8) counter;
936+} atomic64_unchecked_t;
937+#else
938+typedef atomic64_t atomic64_unchecked_t;
939+#endif
940+
941 #define ATOMIC64_INIT(i) { (i) }
942
943 static inline u64 atomic64_read(atomic64_t *v)
944@@ -254,6 +424,19 @@ static inline u64 atomic64_read(atomic64_t *v)
945 return result;
946 }
947
948+static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *v)
949+{
950+ u64 result;
951+
952+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
953+" ldrexd %0, %H0, [%1]"
954+ : "=&r" (result)
955+ : "r" (&v->counter), "Qo" (v->counter)
956+ );
957+
958+ return result;
959+}
960+
961 static inline void atomic64_set(atomic64_t *v, u64 i)
962 {
963 u64 tmp;
964@@ -268,6 +451,20 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
965 : "cc");
966 }
967
968+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
969+{
970+ u64 tmp;
971+
972+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
973+"1: ldrexd %0, %H0, [%2]\n"
974+" strexd %0, %3, %H3, [%2]\n"
975+" teq %0, #0\n"
976+" bne 1b"
977+ : "=&r" (tmp), "=Qo" (v->counter)
978+ : "r" (&v->counter), "r" (i)
979+ : "cc");
980+}
981+
982 static inline void atomic64_add(u64 i, atomic64_t *v)
983 {
984 u64 result;
985@@ -276,6 +473,36 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
986 __asm__ __volatile__("@ atomic64_add\n"
987 "1: ldrexd %0, %H0, [%3]\n"
988 " adds %0, %0, %4\n"
989+" adcs %H0, %H0, %H4\n"
990+
991+#ifdef CONFIG_PAX_REFCOUNT
992+" bvc 3f\n"
993+"2: bkpt 0xf103\n"
994+"3:\n"
995+#endif
996+
997+" strexd %1, %0, %H0, [%3]\n"
998+" teq %1, #0\n"
999+" bne 1b"
1000+
1001+#ifdef CONFIG_PAX_REFCOUNT
1002+"\n4:\n"
1003+ _ASM_EXTABLE(2b, 4b)
1004+#endif
1005+
1006+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1007+ : "r" (&v->counter), "r" (i)
1008+ : "cc");
1009+}
1010+
1011+static inline void atomic64_add_unchecked(u64 i, atomic64_unchecked_t *v)
1012+{
1013+ u64 result;
1014+ unsigned long tmp;
1015+
1016+ __asm__ __volatile__("@ atomic64_add_unchecked\n"
1017+"1: ldrexd %0, %H0, [%3]\n"
1018+" adds %0, %0, %4\n"
1019 " adc %H0, %H0, %H4\n"
1020 " strexd %1, %0, %H0, [%3]\n"
1021 " teq %1, #0\n"
1022@@ -287,12 +514,49 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1023
1024 static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
1025 {
1026- u64 result;
1027- unsigned long tmp;
1028+ u64 result, tmp;
1029
1030 smp_mb();
1031
1032 __asm__ __volatile__("@ atomic64_add_return\n"
1033+"1: ldrexd %1, %H1, [%3]\n"
1034+" adds %0, %1, %4\n"
1035+" adcs %H0, %H1, %H4\n"
1036+
1037+#ifdef CONFIG_PAX_REFCOUNT
1038+" bvc 3f\n"
1039+" mov %0, %1\n"
1040+" mov %H0, %H1\n"
1041+"2: bkpt 0xf103\n"
1042+"3:\n"
1043+#endif
1044+
1045+" strexd %1, %0, %H0, [%3]\n"
1046+" teq %1, #0\n"
1047+" bne 1b"
1048+
1049+#ifdef CONFIG_PAX_REFCOUNT
1050+"\n4:\n"
1051+ _ASM_EXTABLE(2b, 4b)
1052+#endif
1053+
1054+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1055+ : "r" (&v->counter), "r" (i)
1056+ : "cc");
1057+
1058+ smp_mb();
1059+
1060+ return result;
1061+}
1062+
1063+static inline u64 atomic64_add_return_unchecked(u64 i, atomic64_unchecked_t *v)
1064+{
1065+ u64 result;
1066+ unsigned long tmp;
1067+
1068+ smp_mb();
1069+
1070+ __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
1071 "1: ldrexd %0, %H0, [%3]\n"
1072 " adds %0, %0, %4\n"
1073 " adc %H0, %H0, %H4\n"
1074@@ -316,6 +580,36 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1075 __asm__ __volatile__("@ atomic64_sub\n"
1076 "1: ldrexd %0, %H0, [%3]\n"
1077 " subs %0, %0, %4\n"
1078+" sbcs %H0, %H0, %H4\n"
1079+
1080+#ifdef CONFIG_PAX_REFCOUNT
1081+" bvc 3f\n"
1082+"2: bkpt 0xf103\n"
1083+"3:\n"
1084+#endif
1085+
1086+" strexd %1, %0, %H0, [%3]\n"
1087+" teq %1, #0\n"
1088+" bne 1b"
1089+
1090+#ifdef CONFIG_PAX_REFCOUNT
1091+"\n4:\n"
1092+ _ASM_EXTABLE(2b, 4b)
1093+#endif
1094+
1095+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1096+ : "r" (&v->counter), "r" (i)
1097+ : "cc");
1098+}
1099+
1100+static inline void atomic64_sub_unchecked(u64 i, atomic64_unchecked_t *v)
1101+{
1102+ u64 result;
1103+ unsigned long tmp;
1104+
1105+ __asm__ __volatile__("@ atomic64_sub_unchecked\n"
1106+"1: ldrexd %0, %H0, [%3]\n"
1107+" subs %0, %0, %4\n"
1108 " sbc %H0, %H0, %H4\n"
1109 " strexd %1, %0, %H0, [%3]\n"
1110 " teq %1, #0\n"
1111@@ -327,18 +621,32 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1112
1113 static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
1114 {
1115- u64 result;
1116- unsigned long tmp;
1117+ u64 result, tmp;
1118
1119 smp_mb();
1120
1121 __asm__ __volatile__("@ atomic64_sub_return\n"
1122-"1: ldrexd %0, %H0, [%3]\n"
1123-" subs %0, %0, %4\n"
1124-" sbc %H0, %H0, %H4\n"
1125+"1: ldrexd %1, %H1, [%3]\n"
1126+" subs %0, %1, %4\n"
1127+" sbc %H0, %H1, %H4\n"
1128+
1129+#ifdef CONFIG_PAX_REFCOUNT
1130+" bvc 3f\n"
1131+" mov %0, %1\n"
1132+" mov %H0, %H1\n"
1133+"2: bkpt 0xf103\n"
1134+"3:\n"
1135+#endif
1136+
1137 " strexd %1, %0, %H0, [%3]\n"
1138 " teq %1, #0\n"
1139 " bne 1b"
1140+
1141+#ifdef CONFIG_PAX_REFCOUNT
1142+"\n4:\n"
1143+ _ASM_EXTABLE(2b, 4b)
1144+#endif
1145+
1146 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1147 : "r" (&v->counter), "r" (i)
1148 : "cc");
1149@@ -372,6 +680,30 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
1150 return oldval;
1151 }
1152
1153+static inline u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old, u64 new)
1154+{
1155+ u64 oldval;
1156+ unsigned long res;
1157+
1158+ smp_mb();
1159+
1160+ do {
1161+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1162+ "ldrexd %1, %H1, [%3]\n"
1163+ "mov %0, #0\n"
1164+ "teq %1, %4\n"
1165+ "teqeq %H1, %H4\n"
1166+ "strexdeq %0, %5, %H5, [%3]"
1167+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1168+ : "r" (&ptr->counter), "r" (old), "r" (new)
1169+ : "cc");
1170+ } while (res);
1171+
1172+ smp_mb();
1173+
1174+ return oldval;
1175+}
1176+
1177 static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1178 {
1179 u64 result;
1180@@ -395,21 +727,34 @@ static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1181
1182 static inline u64 atomic64_dec_if_positive(atomic64_t *v)
1183 {
1184- u64 result;
1185- unsigned long tmp;
1186+ u64 result, tmp;
1187
1188 smp_mb();
1189
1190 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1191-"1: ldrexd %0, %H0, [%3]\n"
1192-" subs %0, %0, #1\n"
1193-" sbc %H0, %H0, #0\n"
1194+"1: ldrexd %1, %H1, [%3]\n"
1195+" subs %0, %1, #1\n"
1196+" sbc %H0, %H1, #0\n"
1197+
1198+#ifdef CONFIG_PAX_REFCOUNT
1199+" bvc 3f\n"
1200+" mov %0, %1\n"
1201+" mov %H0, %H1\n"
1202+"2: bkpt 0xf103\n"
1203+"3:\n"
1204+#endif
1205+
1206 " teq %H0, #0\n"
1207-" bmi 2f\n"
1208+" bmi 4f\n"
1209 " strexd %1, %0, %H0, [%3]\n"
1210 " teq %1, #0\n"
1211 " bne 1b\n"
1212-"2:"
1213+"4:\n"
1214+
1215+#ifdef CONFIG_PAX_REFCOUNT
1216+ _ASM_EXTABLE(2b, 4b)
1217+#endif
1218+
1219 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1220 : "r" (&v->counter)
1221 : "cc");
1222@@ -432,13 +777,25 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1223 " teq %0, %5\n"
1224 " teqeq %H0, %H5\n"
1225 " moveq %1, #0\n"
1226-" beq 2f\n"
1227+" beq 4f\n"
1228 " adds %0, %0, %6\n"
1229 " adc %H0, %H0, %H6\n"
1230+
1231+#ifdef CONFIG_PAX_REFCOUNT
1232+" bvc 3f\n"
1233+"2: bkpt 0xf103\n"
1234+"3:\n"
1235+#endif
1236+
1237 " strexd %2, %0, %H0, [%4]\n"
1238 " teq %2, #0\n"
1239 " bne 1b\n"
1240-"2:"
1241+"4:\n"
1242+
1243+#ifdef CONFIG_PAX_REFCOUNT
1244+ _ASM_EXTABLE(2b, 4b)
1245+#endif
1246+
1247 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1248 : "r" (&v->counter), "r" (u), "r" (a)
1249 : "cc");
1250@@ -451,10 +808,13 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1251
1252 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1253 #define atomic64_inc(v) atomic64_add(1LL, (v))
1254+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1255 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1256+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1257 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1258 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1259 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1260+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1261 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1262 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1263 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1264diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1265index 75fe66b..2255c86 100644
1266--- a/arch/arm/include/asm/cache.h
1267+++ b/arch/arm/include/asm/cache.h
1268@@ -4,8 +4,10 @@
1269 #ifndef __ASMARM_CACHE_H
1270 #define __ASMARM_CACHE_H
1271
1272+#include <linux/const.h>
1273+
1274 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1275-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1276+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1277
1278 /*
1279 * Memory returned by kmalloc() may be used for DMA, so we must make
1280diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1281index d5d8d5c..ad92c96 100644
1282--- a/arch/arm/include/asm/cacheflush.h
1283+++ b/arch/arm/include/asm/cacheflush.h
1284@@ -108,7 +108,7 @@ struct cpu_cache_fns {
1285 void (*dma_unmap_area)(const void *, size_t, int);
1286
1287 void (*dma_flush_range)(const void *, const void *);
1288-};
1289+} __no_const;
1290
1291 /*
1292 * Select the calling method
1293diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1294index 0e9ce8d..6ef1e03 100644
1295--- a/arch/arm/include/asm/elf.h
1296+++ b/arch/arm/include/asm/elf.h
1297@@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1298 the loader. We need to make sure that it is out of the way of the program
1299 that it will "exec", and that there is sufficient room for the brk. */
1300
1301-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1302+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1303+
1304+#ifdef CONFIG_PAX_ASLR
1305+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1306+
1307+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1308+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1309+#endif
1310
1311 /* When the program starts, a1 contains a pointer to a function to be
1312 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1313@@ -126,10 +133,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1314 extern void elf_set_personality(const struct elf32_hdr *);
1315 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1316
1317-struct mm_struct;
1318-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1319-#define arch_randomize_brk arch_randomize_brk
1320-
1321 extern int vectors_user_mapping(void);
1322 #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
1323 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
1324diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1325index e51b1e8..32a3113 100644
1326--- a/arch/arm/include/asm/kmap_types.h
1327+++ b/arch/arm/include/asm/kmap_types.h
1328@@ -21,6 +21,7 @@ enum km_type {
1329 KM_L1_CACHE,
1330 KM_L2_CACHE,
1331 KM_KDB,
1332+ KM_CLEARPAGE,
1333 KM_TYPE_NR
1334 };
1335
1336diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1337index 53426c6..c7baff3 100644
1338--- a/arch/arm/include/asm/outercache.h
1339+++ b/arch/arm/include/asm/outercache.h
1340@@ -35,7 +35,7 @@ struct outer_cache_fns {
1341 #endif
1342 void (*set_debug)(unsigned long);
1343 void (*resume)(void);
1344-};
1345+} __no_const;
1346
1347 #ifdef CONFIG_OUTER_CACHE
1348
1349diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1350index ca94653..6ac0d56 100644
1351--- a/arch/arm/include/asm/page.h
1352+++ b/arch/arm/include/asm/page.h
1353@@ -123,7 +123,7 @@ struct cpu_user_fns {
1354 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1355 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1356 unsigned long vaddr, struct vm_area_struct *vma);
1357-};
1358+} __no_const;
1359
1360 #ifdef MULTI_USER
1361 extern struct cpu_user_fns cpu_user;
1362diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
1363index 984014b..a6d914f 100644
1364--- a/arch/arm/include/asm/system.h
1365+++ b/arch/arm/include/asm/system.h
1366@@ -90,6 +90,8 @@ void hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int,
1367
1368 #define xchg(ptr,x) \
1369 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1370+#define xchg_unchecked(ptr,x) \
1371+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1372
1373 extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
1374
1375@@ -101,7 +103,7 @@ extern int __pure cpu_architecture(void);
1376 extern void cpu_init(void);
1377
1378 void arm_machine_restart(char mode, const char *cmd);
1379-extern void (*arm_pm_restart)(char str, const char *cmd);
1380+extern void (*arm_pm_restart)(char str, const char *cmd) __noreturn;
1381
1382 #define UDBG_UNDEFINED (1 << 0)
1383 #define UDBG_SYSCALL (1 << 1)
1384@@ -526,6 +528,13 @@ static inline unsigned long long __cmpxchg64_mb(volatile void *ptr,
1385
1386 #endif /* __LINUX_ARM_ARCH__ >= 6 */
1387
1388+#define _ASM_EXTABLE(from, to) \
1389+" .pushsection __ex_table,\"a\"\n"\
1390+" .align 3\n" \
1391+" .long " #from ", " #to"\n" \
1392+" .popsection"
1393+
1394+
1395 #endif /* __ASSEMBLY__ */
1396
1397 #define arch_align_stack(x) (x)
1398diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
1399index b293616..96310e5 100644
1400--- a/arch/arm/include/asm/uaccess.h
1401+++ b/arch/arm/include/asm/uaccess.h
1402@@ -22,6 +22,8 @@
1403 #define VERIFY_READ 0
1404 #define VERIFY_WRITE 1
1405
1406+extern void check_object_size(const void *ptr, unsigned long n, bool to);
1407+
1408 /*
1409 * The exception table consists of pairs of addresses: the first is the
1410 * address of an instruction that is allowed to fault, and the second is
1411@@ -387,8 +389,23 @@ do { \
1412
1413
1414 #ifdef CONFIG_MMU
1415-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
1416-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
1417+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
1418+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
1419+
1420+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
1421+{
1422+ if (!__builtin_constant_p(n))
1423+ check_object_size(to, n, false);
1424+ return ___copy_from_user(to, from, n);
1425+}
1426+
1427+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
1428+{
1429+ if (!__builtin_constant_p(n))
1430+ check_object_size(from, n, true);
1431+ return ___copy_to_user(to, from, n);
1432+}
1433+
1434 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
1435 extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
1436 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
1437@@ -403,6 +420,9 @@ extern unsigned long __must_check __strnlen_user(const char __user *s, long n);
1438
1439 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
1440 {
1441+ if ((long)n < 0)
1442+ return n;
1443+
1444 if (access_ok(VERIFY_READ, from, n))
1445 n = __copy_from_user(to, from, n);
1446 else /* security hole - plug it */
1447@@ -412,6 +432,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
1448
1449 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
1450 {
1451+ if ((long)n < 0)
1452+ return n;
1453+
1454 if (access_ok(VERIFY_WRITE, to, n))
1455 n = __copy_to_user(to, from, n);
1456 return n;
1457diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
1458index 5b0bce6..becd81c 100644
1459--- a/arch/arm/kernel/armksyms.c
1460+++ b/arch/arm/kernel/armksyms.c
1461@@ -95,8 +95,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
1462 #ifdef CONFIG_MMU
1463 EXPORT_SYMBOL(copy_page);
1464
1465-EXPORT_SYMBOL(__copy_from_user);
1466-EXPORT_SYMBOL(__copy_to_user);
1467+EXPORT_SYMBOL(___copy_from_user);
1468+EXPORT_SYMBOL(___copy_to_user);
1469 EXPORT_SYMBOL(__clear_user);
1470
1471 EXPORT_SYMBOL(__get_user_1);
1472diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
1473index 3d0c6fb..9d326fa 100644
1474--- a/arch/arm/kernel/process.c
1475+++ b/arch/arm/kernel/process.c
1476@@ -28,7 +28,6 @@
1477 #include <linux/tick.h>
1478 #include <linux/utsname.h>
1479 #include <linux/uaccess.h>
1480-#include <linux/random.h>
1481 #include <linux/hw_breakpoint.h>
1482 #include <linux/cpuidle.h>
1483
1484@@ -92,7 +91,7 @@ static int __init hlt_setup(char *__unused)
1485 __setup("nohlt", nohlt_setup);
1486 __setup("hlt", hlt_setup);
1487
1488-void arm_machine_restart(char mode, const char *cmd)
1489+__noreturn void arm_machine_restart(char mode, const char *cmd)
1490 {
1491 /* Disable interrupts first */
1492 local_irq_disable();
1493@@ -134,7 +133,7 @@ void arm_machine_restart(char mode, const char *cmd)
1494 void (*pm_power_off)(void);
1495 EXPORT_SYMBOL(pm_power_off);
1496
1497-void (*arm_pm_restart)(char str, const char *cmd) = arm_machine_restart;
1498+void (*arm_pm_restart)(char str, const char *cmd) __noreturn = arm_machine_restart;
1499 EXPORT_SYMBOL_GPL(arm_pm_restart);
1500
1501 static void do_nothing(void *unused)
1502@@ -248,6 +247,7 @@ void machine_power_off(void)
1503 machine_shutdown();
1504 if (pm_power_off)
1505 pm_power_off();
1506+ BUG();
1507 }
1508
1509 void machine_restart(char *cmd)
1510@@ -484,12 +484,6 @@ unsigned long get_wchan(struct task_struct *p)
1511 return 0;
1512 }
1513
1514-unsigned long arch_randomize_brk(struct mm_struct *mm)
1515-{
1516- unsigned long range_end = mm->brk + 0x02000000;
1517- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
1518-}
1519-
1520 #ifdef CONFIG_MMU
1521 /*
1522 * The vectors page is always readable from user space for the
1523diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
1524index 8fc2c8f..064c150 100644
1525--- a/arch/arm/kernel/setup.c
1526+++ b/arch/arm/kernel/setup.c
1527@@ -108,13 +108,13 @@ struct processor processor __read_mostly;
1528 struct cpu_tlb_fns cpu_tlb __read_mostly;
1529 #endif
1530 #ifdef MULTI_USER
1531-struct cpu_user_fns cpu_user __read_mostly;
1532+struct cpu_user_fns cpu_user __read_only;
1533 #endif
1534 #ifdef MULTI_CACHE
1535-struct cpu_cache_fns cpu_cache __read_mostly;
1536+struct cpu_cache_fns cpu_cache __read_only;
1537 #endif
1538 #ifdef CONFIG_OUTER_CACHE
1539-struct outer_cache_fns outer_cache __read_mostly;
1540+struct outer_cache_fns outer_cache __read_only;
1541 EXPORT_SYMBOL(outer_cache);
1542 #endif
1543
1544diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
1545index 99a5727..a3d5bb1 100644
1546--- a/arch/arm/kernel/traps.c
1547+++ b/arch/arm/kernel/traps.c
1548@@ -259,6 +259,8 @@ static int __die(const char *str, int err, struct thread_info *thread, struct pt
1549
1550 static DEFINE_RAW_SPINLOCK(die_lock);
1551
1552+extern void gr_handle_kernel_exploit(void);
1553+
1554 /*
1555 * This function is protected against re-entrancy.
1556 */
1557@@ -288,6 +290,9 @@ void die(const char *str, struct pt_regs *regs, int err)
1558 panic("Fatal exception in interrupt");
1559 if (panic_on_oops)
1560 panic("Fatal exception");
1561+
1562+ gr_handle_kernel_exploit();
1563+
1564 if (ret != NOTIFY_STOP)
1565 do_exit(SIGSEGV);
1566 }
1567diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
1568index 66a477a..bee61d3 100644
1569--- a/arch/arm/lib/copy_from_user.S
1570+++ b/arch/arm/lib/copy_from_user.S
1571@@ -16,7 +16,7 @@
1572 /*
1573 * Prototype:
1574 *
1575- * size_t __copy_from_user(void *to, const void *from, size_t n)
1576+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
1577 *
1578 * Purpose:
1579 *
1580@@ -84,11 +84,11 @@
1581
1582 .text
1583
1584-ENTRY(__copy_from_user)
1585+ENTRY(___copy_from_user)
1586
1587 #include "copy_template.S"
1588
1589-ENDPROC(__copy_from_user)
1590+ENDPROC(___copy_from_user)
1591
1592 .pushsection .fixup,"ax"
1593 .align 0
1594diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
1595index 6ee2f67..d1cce76 100644
1596--- a/arch/arm/lib/copy_page.S
1597+++ b/arch/arm/lib/copy_page.S
1598@@ -10,6 +10,7 @@
1599 * ASM optimised string functions
1600 */
1601 #include <linux/linkage.h>
1602+#include <linux/const.h>
1603 #include <asm/assembler.h>
1604 #include <asm/asm-offsets.h>
1605 #include <asm/cache.h>
1606diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
1607index d066df6..df28194 100644
1608--- a/arch/arm/lib/copy_to_user.S
1609+++ b/arch/arm/lib/copy_to_user.S
1610@@ -16,7 +16,7 @@
1611 /*
1612 * Prototype:
1613 *
1614- * size_t __copy_to_user(void *to, const void *from, size_t n)
1615+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
1616 *
1617 * Purpose:
1618 *
1619@@ -88,11 +88,11 @@
1620 .text
1621
1622 ENTRY(__copy_to_user_std)
1623-WEAK(__copy_to_user)
1624+WEAK(___copy_to_user)
1625
1626 #include "copy_template.S"
1627
1628-ENDPROC(__copy_to_user)
1629+ENDPROC(___copy_to_user)
1630 ENDPROC(__copy_to_user_std)
1631
1632 .pushsection .fixup,"ax"
1633diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
1634index d0ece2a..5ae2f39 100644
1635--- a/arch/arm/lib/uaccess.S
1636+++ b/arch/arm/lib/uaccess.S
1637@@ -20,7 +20,7 @@
1638
1639 #define PAGE_SHIFT 12
1640
1641-/* Prototype: int __copy_to_user(void *to, const char *from, size_t n)
1642+/* Prototype: int ___copy_to_user(void *to, const char *from, size_t n)
1643 * Purpose : copy a block to user memory from kernel memory
1644 * Params : to - user memory
1645 * : from - kernel memory
1646@@ -40,7 +40,7 @@ USER( T(strgtb) r3, [r0], #1) @ May fault
1647 sub r2, r2, ip
1648 b .Lc2u_dest_aligned
1649
1650-ENTRY(__copy_to_user)
1651+ENTRY(___copy_to_user)
1652 stmfd sp!, {r2, r4 - r7, lr}
1653 cmp r2, #4
1654 blt .Lc2u_not_enough
1655@@ -278,14 +278,14 @@ USER( T(strgeb) r3, [r0], #1) @ May fault
1656 ldrgtb r3, [r1], #0
1657 USER( T(strgtb) r3, [r0], #1) @ May fault
1658 b .Lc2u_finished
1659-ENDPROC(__copy_to_user)
1660+ENDPROC(___copy_to_user)
1661
1662 .pushsection .fixup,"ax"
1663 .align 0
1664 9001: ldmfd sp!, {r0, r4 - r7, pc}
1665 .popsection
1666
1667-/* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);
1668+/* Prototype: unsigned long ___copy_from_user(void *to,const void *from,unsigned long n);
1669 * Purpose : copy a block from user memory to kernel memory
1670 * Params : to - kernel memory
1671 * : from - user memory
1672@@ -304,7 +304,7 @@ USER( T(ldrgtb) r3, [r1], #1) @ May fault
1673 sub r2, r2, ip
1674 b .Lcfu_dest_aligned
1675
1676-ENTRY(__copy_from_user)
1677+ENTRY(___copy_from_user)
1678 stmfd sp!, {r0, r2, r4 - r7, lr}
1679 cmp r2, #4
1680 blt .Lcfu_not_enough
1681@@ -544,7 +544,7 @@ USER( T(ldrgeb) r3, [r1], #1) @ May fault
1682 USER( T(ldrgtb) r3, [r1], #1) @ May fault
1683 strgtb r3, [r0], #1
1684 b .Lcfu_finished
1685-ENDPROC(__copy_from_user)
1686+ENDPROC(___copy_from_user)
1687
1688 .pushsection .fixup,"ax"
1689 .align 0
1690diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
1691index 025f742..8432b08 100644
1692--- a/arch/arm/lib/uaccess_with_memcpy.c
1693+++ b/arch/arm/lib/uaccess_with_memcpy.c
1694@@ -104,7 +104,7 @@ out:
1695 }
1696
1697 unsigned long
1698-__copy_to_user(void __user *to, const void *from, unsigned long n)
1699+___copy_to_user(void __user *to, const void *from, unsigned long n)
1700 {
1701 /*
1702 * This test is stubbed out of the main function above to keep
1703diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
1704index e9d5f4a..f099699 100644
1705--- a/arch/arm/mach-omap2/board-n8x0.c
1706+++ b/arch/arm/mach-omap2/board-n8x0.c
1707@@ -593,7 +593,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
1708 }
1709 #endif
1710
1711-static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
1712+static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
1713 .late_init = n8x0_menelaus_late_init,
1714 };
1715
1716diff --git a/arch/arm/mach-ux500/mbox-db5500.c b/arch/arm/mach-ux500/mbox-db5500.c
1717index 2b2d51c..0127490 100644
1718--- a/arch/arm/mach-ux500/mbox-db5500.c
1719+++ b/arch/arm/mach-ux500/mbox-db5500.c
1720@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct device *dev,
1721 return sprintf(buf, "0x%X\n", mbox_value);
1722 }
1723
1724-static DEVICE_ATTR(fifo, S_IWUGO | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
1725+static DEVICE_ATTR(fifo, S_IWUSR | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
1726
1727 static int mbox_show(struct seq_file *s, void *data)
1728 {
1729diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
1730index aa33949..d366075 100644
1731--- a/arch/arm/mm/fault.c
1732+++ b/arch/arm/mm/fault.c
1733@@ -183,6 +183,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
1734 }
1735 #endif
1736
1737+#ifdef CONFIG_PAX_PAGEEXEC
1738+ if (fsr & FSR_LNX_PF) {
1739+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
1740+ do_group_exit(SIGKILL);
1741+ }
1742+#endif
1743+
1744 tsk->thread.address = addr;
1745 tsk->thread.error_code = fsr;
1746 tsk->thread.trap_no = 14;
1747@@ -384,6 +391,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
1748 }
1749 #endif /* CONFIG_MMU */
1750
1751+#ifdef CONFIG_PAX_PAGEEXEC
1752+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1753+{
1754+ long i;
1755+
1756+ printk(KERN_ERR "PAX: bytes at PC: ");
1757+ for (i = 0; i < 20; i++) {
1758+ unsigned char c;
1759+ if (get_user(c, (__force unsigned char __user *)pc+i))
1760+ printk(KERN_CONT "?? ");
1761+ else
1762+ printk(KERN_CONT "%02x ", c);
1763+ }
1764+ printk("\n");
1765+
1766+ printk(KERN_ERR "PAX: bytes at SP-4: ");
1767+ for (i = -1; i < 20; i++) {
1768+ unsigned long c;
1769+ if (get_user(c, (__force unsigned long __user *)sp+i))
1770+ printk(KERN_CONT "???????? ");
1771+ else
1772+ printk(KERN_CONT "%08lx ", c);
1773+ }
1774+ printk("\n");
1775+}
1776+#endif
1777+
1778 /*
1779 * First Level Translation Fault Handler
1780 *
1781@@ -628,6 +662,20 @@ do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
1782 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
1783 struct siginfo info;
1784
1785+#ifdef CONFIG_PAX_REFCOUNT
1786+ if (fsr_fs(ifsr) == 2) {
1787+ unsigned int bkpt;
1788+
1789+ if (!probe_kernel_address((unsigned int *)addr, bkpt) && bkpt == 0xe12f1073) {
1790+ current->thread.error_code = ifsr;
1791+ current->thread.trap_no = 0;
1792+ pax_report_refcount_overflow(regs);
1793+ fixup_exception(regs);
1794+ return;
1795+ }
1796+ }
1797+#endif
1798+
1799 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
1800 return;
1801
1802diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
1803index 44b628e..623ee2a 100644
1804--- a/arch/arm/mm/mmap.c
1805+++ b/arch/arm/mm/mmap.c
1806@@ -54,6 +54,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1807 if (len > TASK_SIZE)
1808 return -ENOMEM;
1809
1810+#ifdef CONFIG_PAX_RANDMMAP
1811+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
1812+#endif
1813+
1814 if (addr) {
1815 if (do_align)
1816 addr = COLOUR_ALIGN(addr, pgoff);
1817@@ -61,15 +65,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1818 addr = PAGE_ALIGN(addr);
1819
1820 vma = find_vma(mm, addr);
1821- if (TASK_SIZE - len >= addr &&
1822- (!vma || addr + len <= vma->vm_start))
1823+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
1824 return addr;
1825 }
1826 if (len > mm->cached_hole_size) {
1827- start_addr = addr = mm->free_area_cache;
1828+ start_addr = addr = mm->free_area_cache;
1829 } else {
1830- start_addr = addr = TASK_UNMAPPED_BASE;
1831- mm->cached_hole_size = 0;
1832+ start_addr = addr = mm->mmap_base;
1833+ mm->cached_hole_size = 0;
1834 }
1835 /* 8 bits of randomness in 20 address space bits */
1836 if ((current->flags & PF_RANDOMIZE) &&
1837@@ -89,14 +92,14 @@ full_search:
1838 * Start a new search - just in case we missed
1839 * some holes.
1840 */
1841- if (start_addr != TASK_UNMAPPED_BASE) {
1842- start_addr = addr = TASK_UNMAPPED_BASE;
1843+ if (start_addr != mm->mmap_base) {
1844+ start_addr = addr = mm->mmap_base;
1845 mm->cached_hole_size = 0;
1846 goto full_search;
1847 }
1848 return -ENOMEM;
1849 }
1850- if (!vma || addr + len <= vma->vm_start) {
1851+ if (check_heap_stack_gap(vma, addr, len)) {
1852 /*
1853 * Remember the place where we stopped the search:
1854 */
1855diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
1856index 4c1a363..df311d0 100644
1857--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
1858+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
1859@@ -41,7 +41,7 @@ struct samsung_dma_ops {
1860 int (*started)(unsigned ch);
1861 int (*flush)(unsigned ch);
1862 int (*stop)(unsigned ch);
1863-};
1864+} __no_const;
1865
1866 extern void *samsung_dmadev_get_ops(void);
1867 extern void *s3c_dma_get_ops(void);
1868diff --git a/arch/arm/plat-samsung/include/plat/ehci.h b/arch/arm/plat-samsung/include/plat/ehci.h
1869index 5f28cae..3d23723 100644
1870--- a/arch/arm/plat-samsung/include/plat/ehci.h
1871+++ b/arch/arm/plat-samsung/include/plat/ehci.h
1872@@ -14,7 +14,7 @@
1873 struct s5p_ehci_platdata {
1874 int (*phy_init)(struct platform_device *pdev, int type);
1875 int (*phy_exit)(struct platform_device *pdev, int type);
1876-};
1877+} __no_const;
1878
1879 extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
1880
1881diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
1882index c3a58a1..78fbf54 100644
1883--- a/arch/avr32/include/asm/cache.h
1884+++ b/arch/avr32/include/asm/cache.h
1885@@ -1,8 +1,10 @@
1886 #ifndef __ASM_AVR32_CACHE_H
1887 #define __ASM_AVR32_CACHE_H
1888
1889+#include <linux/const.h>
1890+
1891 #define L1_CACHE_SHIFT 5
1892-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1893+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1894
1895 /*
1896 * Memory returned by kmalloc() may be used for DMA, so we must make
1897diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
1898index 3b3159b..425ea94 100644
1899--- a/arch/avr32/include/asm/elf.h
1900+++ b/arch/avr32/include/asm/elf.h
1901@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
1902 the loader. We need to make sure that it is out of the way of the program
1903 that it will "exec", and that there is sufficient room for the brk. */
1904
1905-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1906+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1907
1908+#ifdef CONFIG_PAX_ASLR
1909+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
1910+
1911+#define PAX_DELTA_MMAP_LEN 15
1912+#define PAX_DELTA_STACK_LEN 15
1913+#endif
1914
1915 /* This yields a mask that user programs can use to figure out what
1916 instruction set this CPU supports. This could be done in user space,
1917diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
1918index b7f5c68..556135c 100644
1919--- a/arch/avr32/include/asm/kmap_types.h
1920+++ b/arch/avr32/include/asm/kmap_types.h
1921@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
1922 D(11) KM_IRQ1,
1923 D(12) KM_SOFTIRQ0,
1924 D(13) KM_SOFTIRQ1,
1925-D(14) KM_TYPE_NR
1926+D(14) KM_CLEARPAGE,
1927+D(15) KM_TYPE_NR
1928 };
1929
1930 #undef D
1931diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
1932index f7040a1..db9f300 100644
1933--- a/arch/avr32/mm/fault.c
1934+++ b/arch/avr32/mm/fault.c
1935@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
1936
1937 int exception_trace = 1;
1938
1939+#ifdef CONFIG_PAX_PAGEEXEC
1940+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1941+{
1942+ unsigned long i;
1943+
1944+ printk(KERN_ERR "PAX: bytes at PC: ");
1945+ for (i = 0; i < 20; i++) {
1946+ unsigned char c;
1947+ if (get_user(c, (unsigned char *)pc+i))
1948+ printk(KERN_CONT "???????? ");
1949+ else
1950+ printk(KERN_CONT "%02x ", c);
1951+ }
1952+ printk("\n");
1953+}
1954+#endif
1955+
1956 /*
1957 * This routine handles page faults. It determines the address and the
1958 * problem, and then passes it off to one of the appropriate routines.
1959@@ -156,6 +173,16 @@ bad_area:
1960 up_read(&mm->mmap_sem);
1961
1962 if (user_mode(regs)) {
1963+
1964+#ifdef CONFIG_PAX_PAGEEXEC
1965+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
1966+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
1967+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
1968+ do_group_exit(SIGKILL);
1969+ }
1970+ }
1971+#endif
1972+
1973 if (exception_trace && printk_ratelimit())
1974 printk("%s%s[%d]: segfault at %08lx pc %08lx "
1975 "sp %08lx ecr %lu\n",
1976diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
1977index 568885a..f8008df 100644
1978--- a/arch/blackfin/include/asm/cache.h
1979+++ b/arch/blackfin/include/asm/cache.h
1980@@ -7,6 +7,7 @@
1981 #ifndef __ARCH_BLACKFIN_CACHE_H
1982 #define __ARCH_BLACKFIN_CACHE_H
1983
1984+#include <linux/const.h>
1985 #include <linux/linkage.h> /* for asmlinkage */
1986
1987 /*
1988@@ -14,7 +15,7 @@
1989 * Blackfin loads 32 bytes for cache
1990 */
1991 #define L1_CACHE_SHIFT 5
1992-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1993+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1994 #define SMP_CACHE_BYTES L1_CACHE_BYTES
1995
1996 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
1997diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
1998index aea2718..3639a60 100644
1999--- a/arch/cris/include/arch-v10/arch/cache.h
2000+++ b/arch/cris/include/arch-v10/arch/cache.h
2001@@ -1,8 +1,9 @@
2002 #ifndef _ASM_ARCH_CACHE_H
2003 #define _ASM_ARCH_CACHE_H
2004
2005+#include <linux/const.h>
2006 /* Etrax 100LX have 32-byte cache-lines. */
2007-#define L1_CACHE_BYTES 32
2008 #define L1_CACHE_SHIFT 5
2009+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2010
2011 #endif /* _ASM_ARCH_CACHE_H */
2012diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
2013index 1de779f..336fad3 100644
2014--- a/arch/cris/include/arch-v32/arch/cache.h
2015+++ b/arch/cris/include/arch-v32/arch/cache.h
2016@@ -1,11 +1,12 @@
2017 #ifndef _ASM_CRIS_ARCH_CACHE_H
2018 #define _ASM_CRIS_ARCH_CACHE_H
2019
2020+#include <linux/const.h>
2021 #include <arch/hwregs/dma.h>
2022
2023 /* A cache-line is 32 bytes. */
2024-#define L1_CACHE_BYTES 32
2025 #define L1_CACHE_SHIFT 5
2026+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2027
2028 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
2029
2030diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
2031index 0d8a7d6..d0c9ff5 100644
2032--- a/arch/frv/include/asm/atomic.h
2033+++ b/arch/frv/include/asm/atomic.h
2034@@ -241,6 +241,16 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v);
2035 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
2036 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
2037
2038+#define atomic64_read_unchecked(v) atomic64_read(v)
2039+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2040+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2041+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2042+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2043+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2044+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2045+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2046+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2047+
2048 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
2049 {
2050 int c, old;
2051diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
2052index 2797163..c2a401d 100644
2053--- a/arch/frv/include/asm/cache.h
2054+++ b/arch/frv/include/asm/cache.h
2055@@ -12,10 +12,11 @@
2056 #ifndef __ASM_CACHE_H
2057 #define __ASM_CACHE_H
2058
2059+#include <linux/const.h>
2060
2061 /* bytes per L1 cache line */
2062 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
2063-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2064+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2065
2066 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2067 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2068diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
2069index f8e16b2..c73ff79 100644
2070--- a/arch/frv/include/asm/kmap_types.h
2071+++ b/arch/frv/include/asm/kmap_types.h
2072@@ -23,6 +23,7 @@ enum km_type {
2073 KM_IRQ1,
2074 KM_SOFTIRQ0,
2075 KM_SOFTIRQ1,
2076+ KM_CLEARPAGE,
2077 KM_TYPE_NR
2078 };
2079
2080diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
2081index 385fd30..6c3d97e 100644
2082--- a/arch/frv/mm/elf-fdpic.c
2083+++ b/arch/frv/mm/elf-fdpic.c
2084@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2085 if (addr) {
2086 addr = PAGE_ALIGN(addr);
2087 vma = find_vma(current->mm, addr);
2088- if (TASK_SIZE - len >= addr &&
2089- (!vma || addr + len <= vma->vm_start))
2090+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
2091 goto success;
2092 }
2093
2094@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2095 for (; vma; vma = vma->vm_next) {
2096 if (addr > limit)
2097 break;
2098- if (addr + len <= vma->vm_start)
2099+ if (check_heap_stack_gap(vma, addr, len))
2100 goto success;
2101 addr = vma->vm_end;
2102 }
2103@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2104 for (; vma; vma = vma->vm_next) {
2105 if (addr > limit)
2106 break;
2107- if (addr + len <= vma->vm_start)
2108+ if (check_heap_stack_gap(vma, addr, len))
2109 goto success;
2110 addr = vma->vm_end;
2111 }
2112diff --git a/arch/h8300/include/asm/cache.h b/arch/h8300/include/asm/cache.h
2113index c635028..6d9445a 100644
2114--- a/arch/h8300/include/asm/cache.h
2115+++ b/arch/h8300/include/asm/cache.h
2116@@ -1,8 +1,10 @@
2117 #ifndef __ARCH_H8300_CACHE_H
2118 #define __ARCH_H8300_CACHE_H
2119
2120+#include <linux/const.h>
2121+
2122 /* bytes per L1 cache line */
2123-#define L1_CACHE_BYTES 4
2124+#define L1_CACHE_BYTES _AC(4,UL)
2125
2126 /* m68k-elf-gcc 2.95.2 doesn't like these */
2127
2128diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
2129index 0f01de2..d37d309 100644
2130--- a/arch/hexagon/include/asm/cache.h
2131+++ b/arch/hexagon/include/asm/cache.h
2132@@ -21,9 +21,11 @@
2133 #ifndef __ASM_CACHE_H
2134 #define __ASM_CACHE_H
2135
2136+#include <linux/const.h>
2137+
2138 /* Bytes per L1 cache line */
2139-#define L1_CACHE_SHIFT (5)
2140-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2141+#define L1_CACHE_SHIFT 5
2142+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2143
2144 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
2145 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
2146diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
2147index 3fad89e..3047da5 100644
2148--- a/arch/ia64/include/asm/atomic.h
2149+++ b/arch/ia64/include/asm/atomic.h
2150@@ -209,6 +209,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
2151 #define atomic64_inc(v) atomic64_add(1, (v))
2152 #define atomic64_dec(v) atomic64_sub(1, (v))
2153
2154+#define atomic64_read_unchecked(v) atomic64_read(v)
2155+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2156+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2157+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2158+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2159+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2160+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2161+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2162+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2163+
2164 /* Atomic operations are already serializing */
2165 #define smp_mb__before_atomic_dec() barrier()
2166 #define smp_mb__after_atomic_dec() barrier()
2167diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
2168index 988254a..e1ee885 100644
2169--- a/arch/ia64/include/asm/cache.h
2170+++ b/arch/ia64/include/asm/cache.h
2171@@ -1,6 +1,7 @@
2172 #ifndef _ASM_IA64_CACHE_H
2173 #define _ASM_IA64_CACHE_H
2174
2175+#include <linux/const.h>
2176
2177 /*
2178 * Copyright (C) 1998-2000 Hewlett-Packard Co
2179@@ -9,7 +10,7 @@
2180
2181 /* Bytes per L1 (data) cache line. */
2182 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
2183-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2184+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2185
2186 #ifdef CONFIG_SMP
2187 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2188diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
2189index b5298eb..67c6e62 100644
2190--- a/arch/ia64/include/asm/elf.h
2191+++ b/arch/ia64/include/asm/elf.h
2192@@ -42,6 +42,13 @@
2193 */
2194 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
2195
2196+#ifdef CONFIG_PAX_ASLR
2197+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
2198+
2199+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2200+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2201+#endif
2202+
2203 #define PT_IA_64_UNWIND 0x70000001
2204
2205 /* IA-64 relocations: */
2206diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
2207index 1a97af3..7529d31 100644
2208--- a/arch/ia64/include/asm/pgtable.h
2209+++ b/arch/ia64/include/asm/pgtable.h
2210@@ -12,7 +12,7 @@
2211 * David Mosberger-Tang <davidm@hpl.hp.com>
2212 */
2213
2214-
2215+#include <linux/const.h>
2216 #include <asm/mman.h>
2217 #include <asm/page.h>
2218 #include <asm/processor.h>
2219@@ -143,6 +143,17 @@
2220 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2221 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2222 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
2223+
2224+#ifdef CONFIG_PAX_PAGEEXEC
2225+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
2226+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2227+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2228+#else
2229+# define PAGE_SHARED_NOEXEC PAGE_SHARED
2230+# define PAGE_READONLY_NOEXEC PAGE_READONLY
2231+# define PAGE_COPY_NOEXEC PAGE_COPY
2232+#endif
2233+
2234 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
2235 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
2236 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
2237diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
2238index b77768d..e0795eb 100644
2239--- a/arch/ia64/include/asm/spinlock.h
2240+++ b/arch/ia64/include/asm/spinlock.h
2241@@ -72,7 +72,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
2242 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
2243
2244 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
2245- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
2246+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
2247 }
2248
2249 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
2250diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
2251index 449c8c0..432a3d2 100644
2252--- a/arch/ia64/include/asm/uaccess.h
2253+++ b/arch/ia64/include/asm/uaccess.h
2254@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2255 const void *__cu_from = (from); \
2256 long __cu_len = (n); \
2257 \
2258- if (__access_ok(__cu_to, __cu_len, get_fs())) \
2259+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \
2260 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
2261 __cu_len; \
2262 })
2263@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2264 long __cu_len = (n); \
2265 \
2266 __chk_user_ptr(__cu_from); \
2267- if (__access_ok(__cu_from, __cu_len, get_fs())) \
2268+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \
2269 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
2270 __cu_len; \
2271 })
2272diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
2273index 24603be..948052d 100644
2274--- a/arch/ia64/kernel/module.c
2275+++ b/arch/ia64/kernel/module.c
2276@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
2277 void
2278 module_free (struct module *mod, void *module_region)
2279 {
2280- if (mod && mod->arch.init_unw_table &&
2281- module_region == mod->module_init) {
2282+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
2283 unw_remove_unwind_table(mod->arch.init_unw_table);
2284 mod->arch.init_unw_table = NULL;
2285 }
2286@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
2287 }
2288
2289 static inline int
2290+in_init_rx (const struct module *mod, uint64_t addr)
2291+{
2292+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
2293+}
2294+
2295+static inline int
2296+in_init_rw (const struct module *mod, uint64_t addr)
2297+{
2298+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
2299+}
2300+
2301+static inline int
2302 in_init (const struct module *mod, uint64_t addr)
2303 {
2304- return addr - (uint64_t) mod->module_init < mod->init_size;
2305+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
2306+}
2307+
2308+static inline int
2309+in_core_rx (const struct module *mod, uint64_t addr)
2310+{
2311+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
2312+}
2313+
2314+static inline int
2315+in_core_rw (const struct module *mod, uint64_t addr)
2316+{
2317+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
2318 }
2319
2320 static inline int
2321 in_core (const struct module *mod, uint64_t addr)
2322 {
2323- return addr - (uint64_t) mod->module_core < mod->core_size;
2324+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
2325 }
2326
2327 static inline int
2328@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
2329 break;
2330
2331 case RV_BDREL:
2332- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
2333+ if (in_init_rx(mod, val))
2334+ val -= (uint64_t) mod->module_init_rx;
2335+ else if (in_init_rw(mod, val))
2336+ val -= (uint64_t) mod->module_init_rw;
2337+ else if (in_core_rx(mod, val))
2338+ val -= (uint64_t) mod->module_core_rx;
2339+ else if (in_core_rw(mod, val))
2340+ val -= (uint64_t) mod->module_core_rw;
2341 break;
2342
2343 case RV_LTV:
2344@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
2345 * addresses have been selected...
2346 */
2347 uint64_t gp;
2348- if (mod->core_size > MAX_LTOFF)
2349+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
2350 /*
2351 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
2352 * at the end of the module.
2353 */
2354- gp = mod->core_size - MAX_LTOFF / 2;
2355+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
2356 else
2357- gp = mod->core_size / 2;
2358- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
2359+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
2360+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
2361 mod->arch.gp = gp;
2362 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
2363 }
2364diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
2365index 609d500..7dde2a8 100644
2366--- a/arch/ia64/kernel/sys_ia64.c
2367+++ b/arch/ia64/kernel/sys_ia64.c
2368@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2369 if (REGION_NUMBER(addr) == RGN_HPAGE)
2370 addr = 0;
2371 #endif
2372+
2373+#ifdef CONFIG_PAX_RANDMMAP
2374+ if (mm->pax_flags & MF_PAX_RANDMMAP)
2375+ addr = mm->free_area_cache;
2376+ else
2377+#endif
2378+
2379 if (!addr)
2380 addr = mm->free_area_cache;
2381
2382@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2383 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
2384 /* At this point: (!vma || addr < vma->vm_end). */
2385 if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
2386- if (start_addr != TASK_UNMAPPED_BASE) {
2387+ if (start_addr != mm->mmap_base) {
2388 /* Start a new search --- just in case we missed some holes. */
2389- addr = TASK_UNMAPPED_BASE;
2390+ addr = mm->mmap_base;
2391 goto full_search;
2392 }
2393 return -ENOMEM;
2394 }
2395- if (!vma || addr + len <= vma->vm_start) {
2396+ if (check_heap_stack_gap(vma, addr, len)) {
2397 /* Remember the address where we stopped this search: */
2398 mm->free_area_cache = addr + len;
2399 return addr;
2400diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
2401index 53c0ba0..2accdde 100644
2402--- a/arch/ia64/kernel/vmlinux.lds.S
2403+++ b/arch/ia64/kernel/vmlinux.lds.S
2404@@ -199,7 +199,7 @@ SECTIONS {
2405 /* Per-cpu data: */
2406 . = ALIGN(PERCPU_PAGE_SIZE);
2407 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
2408- __phys_per_cpu_start = __per_cpu_load;
2409+ __phys_per_cpu_start = per_cpu_load;
2410 /*
2411 * ensure percpu data fits
2412 * into percpu page size
2413diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
2414index 20b3593..1ce77f0 100644
2415--- a/arch/ia64/mm/fault.c
2416+++ b/arch/ia64/mm/fault.c
2417@@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned long address)
2418 return pte_present(pte);
2419 }
2420
2421+#ifdef CONFIG_PAX_PAGEEXEC
2422+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2423+{
2424+ unsigned long i;
2425+
2426+ printk(KERN_ERR "PAX: bytes at PC: ");
2427+ for (i = 0; i < 8; i++) {
2428+ unsigned int c;
2429+ if (get_user(c, (unsigned int *)pc+i))
2430+ printk(KERN_CONT "???????? ");
2431+ else
2432+ printk(KERN_CONT "%08x ", c);
2433+ }
2434+ printk("\n");
2435+}
2436+#endif
2437+
2438 void __kprobes
2439 ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
2440 {
2441@@ -146,9 +163,23 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
2442 mask = ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
2443 | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
2444
2445- if ((vma->vm_flags & mask) != mask)
2446+ if ((vma->vm_flags & mask) != mask) {
2447+
2448+#ifdef CONFIG_PAX_PAGEEXEC
2449+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
2450+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
2451+ goto bad_area;
2452+
2453+ up_read(&mm->mmap_sem);
2454+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
2455+ do_group_exit(SIGKILL);
2456+ }
2457+#endif
2458+
2459 goto bad_area;
2460
2461+ }
2462+
2463 /*
2464 * If for any reason at all we couldn't handle the fault, make
2465 * sure we exit gracefully rather than endlessly redo the
2466diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
2467index 5ca674b..e0e1b70 100644
2468--- a/arch/ia64/mm/hugetlbpage.c
2469+++ b/arch/ia64/mm/hugetlbpage.c
2470@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
2471 /* At this point: (!vmm || addr < vmm->vm_end). */
2472 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
2473 return -ENOMEM;
2474- if (!vmm || (addr + len) <= vmm->vm_start)
2475+ if (check_heap_stack_gap(vmm, addr, len))
2476 return addr;
2477 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
2478 }
2479diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
2480index 00cb0e2..2ad8024 100644
2481--- a/arch/ia64/mm/init.c
2482+++ b/arch/ia64/mm/init.c
2483@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
2484 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
2485 vma->vm_end = vma->vm_start + PAGE_SIZE;
2486 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
2487+
2488+#ifdef CONFIG_PAX_PAGEEXEC
2489+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
2490+ vma->vm_flags &= ~VM_EXEC;
2491+
2492+#ifdef CONFIG_PAX_MPROTECT
2493+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
2494+ vma->vm_flags &= ~VM_MAYEXEC;
2495+#endif
2496+
2497+ }
2498+#endif
2499+
2500 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
2501 down_write(&current->mm->mmap_sem);
2502 if (insert_vm_struct(current->mm, vma)) {
2503diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
2504index 40b3ee9..8c2c112 100644
2505--- a/arch/m32r/include/asm/cache.h
2506+++ b/arch/m32r/include/asm/cache.h
2507@@ -1,8 +1,10 @@
2508 #ifndef _ASM_M32R_CACHE_H
2509 #define _ASM_M32R_CACHE_H
2510
2511+#include <linux/const.h>
2512+
2513 /* L1 cache line size */
2514 #define L1_CACHE_SHIFT 4
2515-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2516+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2517
2518 #endif /* _ASM_M32R_CACHE_H */
2519diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
2520index 82abd15..d95ae5d 100644
2521--- a/arch/m32r/lib/usercopy.c
2522+++ b/arch/m32r/lib/usercopy.c
2523@@ -14,6 +14,9 @@
2524 unsigned long
2525 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2526 {
2527+ if ((long)n < 0)
2528+ return n;
2529+
2530 prefetch(from);
2531 if (access_ok(VERIFY_WRITE, to, n))
2532 __copy_user(to,from,n);
2533@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2534 unsigned long
2535 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
2536 {
2537+ if ((long)n < 0)
2538+ return n;
2539+
2540 prefetchw(to);
2541 if (access_ok(VERIFY_READ, from, n))
2542 __copy_user_zeroing(to,from,n);
2543diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
2544index 0395c51..5f26031 100644
2545--- a/arch/m68k/include/asm/cache.h
2546+++ b/arch/m68k/include/asm/cache.h
2547@@ -4,9 +4,11 @@
2548 #ifndef __ARCH_M68K_CACHE_H
2549 #define __ARCH_M68K_CACHE_H
2550
2551+#include <linux/const.h>
2552+
2553 /* bytes per L1 cache line */
2554 #define L1_CACHE_SHIFT 4
2555-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
2556+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2557
2558 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
2559
2560diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
2561index 4efe96a..60e8699 100644
2562--- a/arch/microblaze/include/asm/cache.h
2563+++ b/arch/microblaze/include/asm/cache.h
2564@@ -13,11 +13,12 @@
2565 #ifndef _ASM_MICROBLAZE_CACHE_H
2566 #define _ASM_MICROBLAZE_CACHE_H
2567
2568+#include <linux/const.h>
2569 #include <asm/registers.h>
2570
2571 #define L1_CACHE_SHIFT 5
2572 /* word-granular cache in microblaze */
2573-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2574+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2575
2576 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2577
2578diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
2579index 1d93f81..67794d0 100644
2580--- a/arch/mips/include/asm/atomic.h
2581+++ b/arch/mips/include/asm/atomic.h
2582@@ -21,6 +21,10 @@
2583 #include <asm/war.h>
2584 #include <asm/system.h>
2585
2586+#ifdef CONFIG_GENERIC_ATOMIC64
2587+#include <asm-generic/atomic64.h>
2588+#endif
2589+
2590 #define ATOMIC_INIT(i) { (i) }
2591
2592 /*
2593@@ -765,6 +769,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
2594 */
2595 #define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)
2596
2597+#define atomic64_read_unchecked(v) atomic64_read(v)
2598+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2599+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2600+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2601+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2602+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2603+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2604+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2605+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2606+
2607 #endif /* CONFIG_64BIT */
2608
2609 /*
2610diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
2611index b4db69f..8f3b093 100644
2612--- a/arch/mips/include/asm/cache.h
2613+++ b/arch/mips/include/asm/cache.h
2614@@ -9,10 +9,11 @@
2615 #ifndef _ASM_CACHE_H
2616 #define _ASM_CACHE_H
2617
2618+#include <linux/const.h>
2619 #include <kmalloc.h>
2620
2621 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
2622-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2623+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2624
2625 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2626 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2627diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
2628index 455c0ac..ad65fbe 100644
2629--- a/arch/mips/include/asm/elf.h
2630+++ b/arch/mips/include/asm/elf.h
2631@@ -372,13 +372,16 @@ extern const char *__elf_platform;
2632 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
2633 #endif
2634
2635+#ifdef CONFIG_PAX_ASLR
2636+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2637+
2638+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2639+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2640+#endif
2641+
2642 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
2643 struct linux_binprm;
2644 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
2645 int uses_interp);
2646
2647-struct mm_struct;
2648-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
2649-#define arch_randomize_brk arch_randomize_brk
2650-
2651 #endif /* _ASM_ELF_H */
2652diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
2653index e59cd1a..8e329d6 100644
2654--- a/arch/mips/include/asm/page.h
2655+++ b/arch/mips/include/asm/page.h
2656@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
2657 #ifdef CONFIG_CPU_MIPS32
2658 typedef struct { unsigned long pte_low, pte_high; } pte_t;
2659 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
2660- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
2661+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
2662 #else
2663 typedef struct { unsigned long long pte; } pte_t;
2664 #define pte_val(x) ((x).pte)
2665diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h
2666index 6018c80..7c37203 100644
2667--- a/arch/mips/include/asm/system.h
2668+++ b/arch/mips/include/asm/system.h
2669@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
2670 */
2671 #define __ARCH_WANT_UNLOCKED_CTXSW
2672
2673-extern unsigned long arch_align_stack(unsigned long sp);
2674+#define arch_align_stack(x) ((x) & ~0xfUL)
2675
2676 #endif /* _ASM_SYSTEM_H */
2677diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
2678index 9fdd8bc..4bd7f1a 100644
2679--- a/arch/mips/kernel/binfmt_elfn32.c
2680+++ b/arch/mips/kernel/binfmt_elfn32.c
2681@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2682 #undef ELF_ET_DYN_BASE
2683 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2684
2685+#ifdef CONFIG_PAX_ASLR
2686+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2687+
2688+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2689+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2690+#endif
2691+
2692 #include <asm/processor.h>
2693 #include <linux/module.h>
2694 #include <linux/elfcore.h>
2695diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
2696index ff44823..97f8906 100644
2697--- a/arch/mips/kernel/binfmt_elfo32.c
2698+++ b/arch/mips/kernel/binfmt_elfo32.c
2699@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2700 #undef ELF_ET_DYN_BASE
2701 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2702
2703+#ifdef CONFIG_PAX_ASLR
2704+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2705+
2706+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2707+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2708+#endif
2709+
2710 #include <asm/processor.h>
2711
2712 /*
2713diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
2714index c47f96e..661d418 100644
2715--- a/arch/mips/kernel/process.c
2716+++ b/arch/mips/kernel/process.c
2717@@ -481,15 +481,3 @@ unsigned long get_wchan(struct task_struct *task)
2718 out:
2719 return pc;
2720 }
2721-
2722-/*
2723- * Don't forget that the stack pointer must be aligned on a 8 bytes
2724- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
2725- */
2726-unsigned long arch_align_stack(unsigned long sp)
2727-{
2728- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
2729- sp -= get_random_int() & ~PAGE_MASK;
2730-
2731- return sp & ALMASK;
2732-}
2733diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
2734index 937cf33..adb39bb 100644
2735--- a/arch/mips/mm/fault.c
2736+++ b/arch/mips/mm/fault.c
2737@@ -28,6 +28,23 @@
2738 #include <asm/highmem.h> /* For VMALLOC_END */
2739 #include <linux/kdebug.h>
2740
2741+#ifdef CONFIG_PAX_PAGEEXEC
2742+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2743+{
2744+ unsigned long i;
2745+
2746+ printk(KERN_ERR "PAX: bytes at PC: ");
2747+ for (i = 0; i < 5; i++) {
2748+ unsigned int c;
2749+ if (get_user(c, (unsigned int *)pc+i))
2750+ printk(KERN_CONT "???????? ");
2751+ else
2752+ printk(KERN_CONT "%08x ", c);
2753+ }
2754+ printk("\n");
2755+}
2756+#endif
2757+
2758 /*
2759 * This routine handles page faults. It determines the address,
2760 * and the problem, and then passes it off to one of the appropriate
2761diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
2762index 302d779..7d35bf8 100644
2763--- a/arch/mips/mm/mmap.c
2764+++ b/arch/mips/mm/mmap.c
2765@@ -95,6 +95,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2766 do_color_align = 1;
2767
2768 /* requesting a specific address */
2769+
2770+#ifdef CONFIG_PAX_RANDMMAP
2771+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
2772+#endif
2773+
2774 if (addr) {
2775 if (do_color_align)
2776 addr = COLOUR_ALIGN(addr, pgoff);
2777@@ -102,8 +107,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2778 addr = PAGE_ALIGN(addr);
2779
2780 vma = find_vma(mm, addr);
2781- if (TASK_SIZE - len >= addr &&
2782- (!vma || addr + len <= vma->vm_start))
2783+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len))
2784 return addr;
2785 }
2786
2787@@ -118,7 +122,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2788 /* At this point: (!vma || addr < vma->vm_end). */
2789 if (TASK_SIZE - len < addr)
2790 return -ENOMEM;
2791- if (!vma || addr + len <= vma->vm_start)
2792+ if (check_heap_stack_gap(vmm, addr, len))
2793 return addr;
2794 addr = vma->vm_end;
2795 if (do_color_align)
2796@@ -145,7 +149,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2797 /* make sure it can fit in the remaining address space */
2798 if (likely(addr > len)) {
2799 vma = find_vma(mm, addr - len);
2800- if (!vma || addr <= vma->vm_start) {
2801+ if (check_heap_stack_gap(vmm, addr - len, len))
2802 /* cache the address as a hint for next time */
2803 return mm->free_area_cache = addr - len;
2804 }
2805@@ -165,7 +169,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2806 * return with success:
2807 */
2808 vma = find_vma(mm, addr);
2809- if (likely(!vma || addr + len <= vma->vm_start)) {
2810+ if (check_heap_stack_gap(vmm, addr, len)) {
2811 /* cache the address as a hint for next time */
2812 return mm->free_area_cache = addr;
2813 }
2814@@ -242,30 +246,3 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
2815 mm->unmap_area = arch_unmap_area_topdown;
2816 }
2817 }
2818-
2819-static inline unsigned long brk_rnd(void)
2820-{
2821- unsigned long rnd = get_random_int();
2822-
2823- rnd = rnd << PAGE_SHIFT;
2824- /* 8MB for 32bit, 256MB for 64bit */
2825- if (TASK_IS_32BIT_ADDR)
2826- rnd = rnd & 0x7ffffful;
2827- else
2828- rnd = rnd & 0xffffffful;
2829-
2830- return rnd;
2831-}
2832-
2833-unsigned long arch_randomize_brk(struct mm_struct *mm)
2834-{
2835- unsigned long base = mm->brk;
2836- unsigned long ret;
2837-
2838- ret = PAGE_ALIGN(base + brk_rnd());
2839-
2840- if (ret < mm->brk)
2841- return mm->brk;
2842-
2843- return ret;
2844-}
2845diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
2846index 967d144..db12197 100644
2847--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
2848+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
2849@@ -11,12 +11,14 @@
2850 #ifndef _ASM_PROC_CACHE_H
2851 #define _ASM_PROC_CACHE_H
2852
2853+#include <linux/const.h>
2854+
2855 /* L1 cache */
2856
2857 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
2858 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
2859-#define L1_CACHE_BYTES 16 /* bytes per entry */
2860 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
2861+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
2862 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
2863
2864 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
2865diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2866index bcb5df2..84fabd2 100644
2867--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2868+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2869@@ -16,13 +16,15 @@
2870 #ifndef _ASM_PROC_CACHE_H
2871 #define _ASM_PROC_CACHE_H
2872
2873+#include <linux/const.h>
2874+
2875 /*
2876 * L1 cache
2877 */
2878 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
2879 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
2880-#define L1_CACHE_BYTES 32 /* bytes per entry */
2881 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
2882+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
2883 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
2884
2885 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
2886diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
2887index 4ce7a01..449202a 100644
2888--- a/arch/openrisc/include/asm/cache.h
2889+++ b/arch/openrisc/include/asm/cache.h
2890@@ -19,11 +19,13 @@
2891 #ifndef __ASM_OPENRISC_CACHE_H
2892 #define __ASM_OPENRISC_CACHE_H
2893
2894+#include <linux/const.h>
2895+
2896 /* FIXME: How can we replace these with values from the CPU...
2897 * they shouldn't be hard-coded!
2898 */
2899
2900-#define L1_CACHE_BYTES 16
2901 #define L1_CACHE_SHIFT 4
2902+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2903
2904 #endif /* __ASM_OPENRISC_CACHE_H */
2905diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
2906index 4054b31..a10c105 100644
2907--- a/arch/parisc/include/asm/atomic.h
2908+++ b/arch/parisc/include/asm/atomic.h
2909@@ -335,6 +335,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
2910
2911 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
2912
2913+#define atomic64_read_unchecked(v) atomic64_read(v)
2914+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2915+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2916+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2917+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2918+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2919+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2920+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2921+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2922+
2923 #endif /* !CONFIG_64BIT */
2924
2925
2926diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
2927index 47f11c7..3420df2 100644
2928--- a/arch/parisc/include/asm/cache.h
2929+++ b/arch/parisc/include/asm/cache.h
2930@@ -5,6 +5,7 @@
2931 #ifndef __ARCH_PARISC_CACHE_H
2932 #define __ARCH_PARISC_CACHE_H
2933
2934+#include <linux/const.h>
2935
2936 /*
2937 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
2938@@ -15,13 +16,13 @@
2939 * just ruin performance.
2940 */
2941 #ifdef CONFIG_PA20
2942-#define L1_CACHE_BYTES 64
2943 #define L1_CACHE_SHIFT 6
2944 #else
2945-#define L1_CACHE_BYTES 32
2946 #define L1_CACHE_SHIFT 5
2947 #endif
2948
2949+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2950+
2951 #ifndef __ASSEMBLY__
2952
2953 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2954diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
2955index 19f6cb1..6c78cf2 100644
2956--- a/arch/parisc/include/asm/elf.h
2957+++ b/arch/parisc/include/asm/elf.h
2958@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
2959
2960 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
2961
2962+#ifdef CONFIG_PAX_ASLR
2963+#define PAX_ELF_ET_DYN_BASE 0x10000UL
2964+
2965+#define PAX_DELTA_MMAP_LEN 16
2966+#define PAX_DELTA_STACK_LEN 16
2967+#endif
2968+
2969 /* This yields a mask that user programs can use to figure out what
2970 instruction set this CPU supports. This could be done in user space,
2971 but it's not easy, and we've already done it here. */
2972diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
2973index 22dadeb..f6c2be4 100644
2974--- a/arch/parisc/include/asm/pgtable.h
2975+++ b/arch/parisc/include/asm/pgtable.h
2976@@ -210,6 +210,17 @@ struct vm_area_struct;
2977 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
2978 #define PAGE_COPY PAGE_EXECREAD
2979 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
2980+
2981+#ifdef CONFIG_PAX_PAGEEXEC
2982+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
2983+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
2984+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
2985+#else
2986+# define PAGE_SHARED_NOEXEC PAGE_SHARED
2987+# define PAGE_COPY_NOEXEC PAGE_COPY
2988+# define PAGE_READONLY_NOEXEC PAGE_READONLY
2989+#endif
2990+
2991 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
2992 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
2993 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
2994diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
2995index 5e34ccf..672bc9c 100644
2996--- a/arch/parisc/kernel/module.c
2997+++ b/arch/parisc/kernel/module.c
2998@@ -98,16 +98,38 @@
2999
3000 /* three functions to determine where in the module core
3001 * or init pieces the location is */
3002+static inline int in_init_rx(struct module *me, void *loc)
3003+{
3004+ return (loc >= me->module_init_rx &&
3005+ loc < (me->module_init_rx + me->init_size_rx));
3006+}
3007+
3008+static inline int in_init_rw(struct module *me, void *loc)
3009+{
3010+ return (loc >= me->module_init_rw &&
3011+ loc < (me->module_init_rw + me->init_size_rw));
3012+}
3013+
3014 static inline int in_init(struct module *me, void *loc)
3015 {
3016- return (loc >= me->module_init &&
3017- loc <= (me->module_init + me->init_size));
3018+ return in_init_rx(me, loc) || in_init_rw(me, loc);
3019+}
3020+
3021+static inline int in_core_rx(struct module *me, void *loc)
3022+{
3023+ return (loc >= me->module_core_rx &&
3024+ loc < (me->module_core_rx + me->core_size_rx));
3025+}
3026+
3027+static inline int in_core_rw(struct module *me, void *loc)
3028+{
3029+ return (loc >= me->module_core_rw &&
3030+ loc < (me->module_core_rw + me->core_size_rw));
3031 }
3032
3033 static inline int in_core(struct module *me, void *loc)
3034 {
3035- return (loc >= me->module_core &&
3036- loc <= (me->module_core + me->core_size));
3037+ return in_core_rx(me, loc) || in_core_rw(me, loc);
3038 }
3039
3040 static inline int in_local(struct module *me, void *loc)
3041@@ -373,13 +395,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
3042 }
3043
3044 /* align things a bit */
3045- me->core_size = ALIGN(me->core_size, 16);
3046- me->arch.got_offset = me->core_size;
3047- me->core_size += gots * sizeof(struct got_entry);
3048+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
3049+ me->arch.got_offset = me->core_size_rw;
3050+ me->core_size_rw += gots * sizeof(struct got_entry);
3051
3052- me->core_size = ALIGN(me->core_size, 16);
3053- me->arch.fdesc_offset = me->core_size;
3054- me->core_size += fdescs * sizeof(Elf_Fdesc);
3055+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
3056+ me->arch.fdesc_offset = me->core_size_rw;
3057+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
3058
3059 me->arch.got_max = gots;
3060 me->arch.fdesc_max = fdescs;
3061@@ -397,7 +419,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3062
3063 BUG_ON(value == 0);
3064
3065- got = me->module_core + me->arch.got_offset;
3066+ got = me->module_core_rw + me->arch.got_offset;
3067 for (i = 0; got[i].addr; i++)
3068 if (got[i].addr == value)
3069 goto out;
3070@@ -415,7 +437,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3071 #ifdef CONFIG_64BIT
3072 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3073 {
3074- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
3075+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
3076
3077 if (!value) {
3078 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
3079@@ -433,7 +455,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3080
3081 /* Create new one */
3082 fdesc->addr = value;
3083- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3084+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3085 return (Elf_Addr)fdesc;
3086 }
3087 #endif /* CONFIG_64BIT */
3088@@ -845,7 +867,7 @@ register_unwind_table(struct module *me,
3089
3090 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
3091 end = table + sechdrs[me->arch.unwind_section].sh_size;
3092- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3093+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3094
3095 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
3096 me->arch.unwind_section, table, end, gp);
3097diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
3098index c9b9322..02d8940 100644
3099--- a/arch/parisc/kernel/sys_parisc.c
3100+++ b/arch/parisc/kernel/sys_parisc.c
3101@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
3102 /* At this point: (!vma || addr < vma->vm_end). */
3103 if (TASK_SIZE - len < addr)
3104 return -ENOMEM;
3105- if (!vma || addr + len <= vma->vm_start)
3106+ if (check_heap_stack_gap(vma, addr, len))
3107 return addr;
3108 addr = vma->vm_end;
3109 }
3110@@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
3111 /* At this point: (!vma || addr < vma->vm_end). */
3112 if (TASK_SIZE - len < addr)
3113 return -ENOMEM;
3114- if (!vma || addr + len <= vma->vm_start)
3115+ if (check_heap_stack_gap(vma, addr, len))
3116 return addr;
3117 addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
3118 if (addr < vma->vm_end) /* handle wraparound */
3119@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
3120 if (flags & MAP_FIXED)
3121 return addr;
3122 if (!addr)
3123- addr = TASK_UNMAPPED_BASE;
3124+ addr = current->mm->mmap_base;
3125
3126 if (filp) {
3127 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
3128diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
3129index f19e660..414fe24 100644
3130--- a/arch/parisc/kernel/traps.c
3131+++ b/arch/parisc/kernel/traps.c
3132@@ -733,9 +733,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
3133
3134 down_read(&current->mm->mmap_sem);
3135 vma = find_vma(current->mm,regs->iaoq[0]);
3136- if (vma && (regs->iaoq[0] >= vma->vm_start)
3137- && (vma->vm_flags & VM_EXEC)) {
3138-
3139+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
3140 fault_address = regs->iaoq[0];
3141 fault_space = regs->iasq[0];
3142
3143diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
3144index 18162ce..94de376 100644
3145--- a/arch/parisc/mm/fault.c
3146+++ b/arch/parisc/mm/fault.c
3147@@ -15,6 +15,7 @@
3148 #include <linux/sched.h>
3149 #include <linux/interrupt.h>
3150 #include <linux/module.h>
3151+#include <linux/unistd.h>
3152
3153 #include <asm/uaccess.h>
3154 #include <asm/traps.h>
3155@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
3156 static unsigned long
3157 parisc_acctyp(unsigned long code, unsigned int inst)
3158 {
3159- if (code == 6 || code == 16)
3160+ if (code == 6 || code == 7 || code == 16)
3161 return VM_EXEC;
3162
3163 switch (inst & 0xf0000000) {
3164@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
3165 }
3166 #endif
3167
3168+#ifdef CONFIG_PAX_PAGEEXEC
3169+/*
3170+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
3171+ *
3172+ * returns 1 when task should be killed
3173+ * 2 when rt_sigreturn trampoline was detected
3174+ * 3 when unpatched PLT trampoline was detected
3175+ */
3176+static int pax_handle_fetch_fault(struct pt_regs *regs)
3177+{
3178+
3179+#ifdef CONFIG_PAX_EMUPLT
3180+ int err;
3181+
3182+ do { /* PaX: unpatched PLT emulation */
3183+ unsigned int bl, depwi;
3184+
3185+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
3186+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
3187+
3188+ if (err)
3189+ break;
3190+
3191+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
3192+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
3193+
3194+ err = get_user(ldw, (unsigned int *)addr);
3195+ err |= get_user(bv, (unsigned int *)(addr+4));
3196+ err |= get_user(ldw2, (unsigned int *)(addr+8));
3197+
3198+ if (err)
3199+ break;
3200+
3201+ if (ldw == 0x0E801096U &&
3202+ bv == 0xEAC0C000U &&
3203+ ldw2 == 0x0E881095U)
3204+ {
3205+ unsigned int resolver, map;
3206+
3207+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
3208+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
3209+ if (err)
3210+ break;
3211+
3212+ regs->gr[20] = instruction_pointer(regs)+8;
3213+ regs->gr[21] = map;
3214+ regs->gr[22] = resolver;
3215+ regs->iaoq[0] = resolver | 3UL;
3216+ regs->iaoq[1] = regs->iaoq[0] + 4;
3217+ return 3;
3218+ }
3219+ }
3220+ } while (0);
3221+#endif
3222+
3223+#ifdef CONFIG_PAX_EMUTRAMP
3224+
3225+#ifndef CONFIG_PAX_EMUSIGRT
3226+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
3227+ return 1;
3228+#endif
3229+
3230+ do { /* PaX: rt_sigreturn emulation */
3231+ unsigned int ldi1, ldi2, bel, nop;
3232+
3233+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
3234+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
3235+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
3236+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
3237+
3238+ if (err)
3239+ break;
3240+
3241+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
3242+ ldi2 == 0x3414015AU &&
3243+ bel == 0xE4008200U &&
3244+ nop == 0x08000240U)
3245+ {
3246+ regs->gr[25] = (ldi1 & 2) >> 1;
3247+ regs->gr[20] = __NR_rt_sigreturn;
3248+ regs->gr[31] = regs->iaoq[1] + 16;
3249+ regs->sr[0] = regs->iasq[1];
3250+ regs->iaoq[0] = 0x100UL;
3251+ regs->iaoq[1] = regs->iaoq[0] + 4;
3252+ regs->iasq[0] = regs->sr[2];
3253+ regs->iasq[1] = regs->sr[2];
3254+ return 2;
3255+ }
3256+ } while (0);
3257+#endif
3258+
3259+ return 1;
3260+}
3261+
3262+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3263+{
3264+ unsigned long i;
3265+
3266+ printk(KERN_ERR "PAX: bytes at PC: ");
3267+ for (i = 0; i < 5; i++) {
3268+ unsigned int c;
3269+ if (get_user(c, (unsigned int *)pc+i))
3270+ printk(KERN_CONT "???????? ");
3271+ else
3272+ printk(KERN_CONT "%08x ", c);
3273+ }
3274+ printk("\n");
3275+}
3276+#endif
3277+
3278 int fixup_exception(struct pt_regs *regs)
3279 {
3280 const struct exception_table_entry *fix;
3281@@ -192,8 +303,33 @@ good_area:
3282
3283 acc_type = parisc_acctyp(code,regs->iir);
3284
3285- if ((vma->vm_flags & acc_type) != acc_type)
3286+ if ((vma->vm_flags & acc_type) != acc_type) {
3287+
3288+#ifdef CONFIG_PAX_PAGEEXEC
3289+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
3290+ (address & ~3UL) == instruction_pointer(regs))
3291+ {
3292+ up_read(&mm->mmap_sem);
3293+ switch (pax_handle_fetch_fault(regs)) {
3294+
3295+#ifdef CONFIG_PAX_EMUPLT
3296+ case 3:
3297+ return;
3298+#endif
3299+
3300+#ifdef CONFIG_PAX_EMUTRAMP
3301+ case 2:
3302+ return;
3303+#endif
3304+
3305+ }
3306+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
3307+ do_group_exit(SIGKILL);
3308+ }
3309+#endif
3310+
3311 goto bad_area;
3312+ }
3313
3314 /*
3315 * If for any reason at all we couldn't handle the fault, make
3316diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
3317index 02e41b5..ec6e26c 100644
3318--- a/arch/powerpc/include/asm/atomic.h
3319+++ b/arch/powerpc/include/asm/atomic.h
3320@@ -469,6 +469,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
3321
3322 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3323
3324+#define atomic64_read_unchecked(v) atomic64_read(v)
3325+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
3326+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
3327+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
3328+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
3329+#define atomic64_inc_unchecked(v) atomic64_inc(v)
3330+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
3331+#define atomic64_dec_unchecked(v) atomic64_dec(v)
3332+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
3333+
3334 #endif /* __powerpc64__ */
3335
3336 #endif /* __KERNEL__ */
3337diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
3338index 4b50941..5605819 100644
3339--- a/arch/powerpc/include/asm/cache.h
3340+++ b/arch/powerpc/include/asm/cache.h
3341@@ -3,6 +3,7 @@
3342
3343 #ifdef __KERNEL__
3344
3345+#include <linux/const.h>
3346
3347 /* bytes per L1 cache line */
3348 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
3349@@ -22,7 +23,7 @@
3350 #define L1_CACHE_SHIFT 7
3351 #endif
3352
3353-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
3354+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
3355
3356 #define SMP_CACHE_BYTES L1_CACHE_BYTES
3357
3358diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
3359index 3bf9cca..e7457d0 100644
3360--- a/arch/powerpc/include/asm/elf.h
3361+++ b/arch/powerpc/include/asm/elf.h
3362@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
3363 the loader. We need to make sure that it is out of the way of the program
3364 that it will "exec", and that there is sufficient room for the brk. */
3365
3366-extern unsigned long randomize_et_dyn(unsigned long base);
3367-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
3368+#define ELF_ET_DYN_BASE (0x20000000)
3369+
3370+#ifdef CONFIG_PAX_ASLR
3371+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
3372+
3373+#ifdef __powerpc64__
3374+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
3375+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
3376+#else
3377+#define PAX_DELTA_MMAP_LEN 15
3378+#define PAX_DELTA_STACK_LEN 15
3379+#endif
3380+#endif
3381
3382 /*
3383 * Our registers are always unsigned longs, whether we're a 32 bit
3384@@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
3385 (0x7ff >> (PAGE_SHIFT - 12)) : \
3386 (0x3ffff >> (PAGE_SHIFT - 12)))
3387
3388-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
3389-#define arch_randomize_brk arch_randomize_brk
3390-
3391 #endif /* __KERNEL__ */
3392
3393 /*
3394diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
3395index bca8fdc..61e9580 100644
3396--- a/arch/powerpc/include/asm/kmap_types.h
3397+++ b/arch/powerpc/include/asm/kmap_types.h
3398@@ -27,6 +27,7 @@ enum km_type {
3399 KM_PPC_SYNC_PAGE,
3400 KM_PPC_SYNC_ICACHE,
3401 KM_KDB,
3402+ KM_CLEARPAGE,
3403 KM_TYPE_NR
3404 };
3405
3406diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
3407index d4a7f64..451de1c 100644
3408--- a/arch/powerpc/include/asm/mman.h
3409+++ b/arch/powerpc/include/asm/mman.h
3410@@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
3411 }
3412 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
3413
3414-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
3415+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
3416 {
3417 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
3418 }
3419diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
3420index dd9c4fd..a2ced87 100644
3421--- a/arch/powerpc/include/asm/page.h
3422+++ b/arch/powerpc/include/asm/page.h
3423@@ -141,8 +141,9 @@ extern phys_addr_t kernstart_addr;
3424 * and needs to be executable. This means the whole heap ends
3425 * up being executable.
3426 */
3427-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3428- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3429+#define VM_DATA_DEFAULT_FLAGS32 \
3430+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3431+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3432
3433 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3434 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3435@@ -170,6 +171,9 @@ extern phys_addr_t kernstart_addr;
3436 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
3437 #endif
3438
3439+#define ktla_ktva(addr) (addr)
3440+#define ktva_ktla(addr) (addr)
3441+
3442 /*
3443 * Use the top bit of the higher-level page table entries to indicate whether
3444 * the entries we point to contain hugepages. This works because we know that
3445diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
3446index fb40ede..d3ce956 100644
3447--- a/arch/powerpc/include/asm/page_64.h
3448+++ b/arch/powerpc/include/asm/page_64.h
3449@@ -144,15 +144,18 @@ do { \
3450 * stack by default, so in the absence of a PT_GNU_STACK program header
3451 * we turn execute permission off.
3452 */
3453-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3454- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3455+#define VM_STACK_DEFAULT_FLAGS32 \
3456+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3457+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3458
3459 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3460 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3461
3462+#ifndef CONFIG_PAX_PAGEEXEC
3463 #define VM_STACK_DEFAULT_FLAGS \
3464 (is_32bit_task() ? \
3465 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
3466+#endif
3467
3468 #include <asm-generic/getorder.h>
3469
3470diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
3471index 88b0bd9..e32bc67 100644
3472--- a/arch/powerpc/include/asm/pgtable.h
3473+++ b/arch/powerpc/include/asm/pgtable.h
3474@@ -2,6 +2,7 @@
3475 #define _ASM_POWERPC_PGTABLE_H
3476 #ifdef __KERNEL__
3477
3478+#include <linux/const.h>
3479 #ifndef __ASSEMBLY__
3480 #include <asm/processor.h> /* For TASK_SIZE */
3481 #include <asm/mmu.h>
3482diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
3483index 4aad413..85d86bf 100644
3484--- a/arch/powerpc/include/asm/pte-hash32.h
3485+++ b/arch/powerpc/include/asm/pte-hash32.h
3486@@ -21,6 +21,7 @@
3487 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
3488 #define _PAGE_USER 0x004 /* usermode access allowed */
3489 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
3490+#define _PAGE_EXEC _PAGE_GUARDED
3491 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
3492 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
3493 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
3494diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
3495index 559da19..7e5835c 100644
3496--- a/arch/powerpc/include/asm/reg.h
3497+++ b/arch/powerpc/include/asm/reg.h
3498@@ -212,6 +212,7 @@
3499 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
3500 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
3501 #define DSISR_NOHPTE 0x40000000 /* no translation found */
3502+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
3503 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
3504 #define DSISR_ISSTORE 0x02000000 /* access was a store */
3505 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
3506diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
3507index e30a13d..2b7d994 100644
3508--- a/arch/powerpc/include/asm/system.h
3509+++ b/arch/powerpc/include/asm/system.h
3510@@ -530,7 +530,7 @@ __cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new,
3511 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
3512 #endif
3513
3514-extern unsigned long arch_align_stack(unsigned long sp);
3515+#define arch_align_stack(x) ((x) & ~0xfUL)
3516
3517 /* Used in very early kernel initialization. */
3518 extern unsigned long reloc_offset(void);
3519diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
3520index bd0fb84..a42a14b 100644
3521--- a/arch/powerpc/include/asm/uaccess.h
3522+++ b/arch/powerpc/include/asm/uaccess.h
3523@@ -13,6 +13,8 @@
3524 #define VERIFY_READ 0
3525 #define VERIFY_WRITE 1
3526
3527+extern void check_object_size(const void *ptr, unsigned long n, bool to);
3528+
3529 /*
3530 * The fs value determines whether argument validity checking should be
3531 * performed or not. If get_fs() == USER_DS, checking is performed, with
3532@@ -327,52 +329,6 @@ do { \
3533 extern unsigned long __copy_tofrom_user(void __user *to,
3534 const void __user *from, unsigned long size);
3535
3536-#ifndef __powerpc64__
3537-
3538-static inline unsigned long copy_from_user(void *to,
3539- const void __user *from, unsigned long n)
3540-{
3541- unsigned long over;
3542-
3543- if (access_ok(VERIFY_READ, from, n))
3544- return __copy_tofrom_user((__force void __user *)to, from, n);
3545- if ((unsigned long)from < TASK_SIZE) {
3546- over = (unsigned long)from + n - TASK_SIZE;
3547- return __copy_tofrom_user((__force void __user *)to, from,
3548- n - over) + over;
3549- }
3550- return n;
3551-}
3552-
3553-static inline unsigned long copy_to_user(void __user *to,
3554- const void *from, unsigned long n)
3555-{
3556- unsigned long over;
3557-
3558- if (access_ok(VERIFY_WRITE, to, n))
3559- return __copy_tofrom_user(to, (__force void __user *)from, n);
3560- if ((unsigned long)to < TASK_SIZE) {
3561- over = (unsigned long)to + n - TASK_SIZE;
3562- return __copy_tofrom_user(to, (__force void __user *)from,
3563- n - over) + over;
3564- }
3565- return n;
3566-}
3567-
3568-#else /* __powerpc64__ */
3569-
3570-#define __copy_in_user(to, from, size) \
3571- __copy_tofrom_user((to), (from), (size))
3572-
3573-extern unsigned long copy_from_user(void *to, const void __user *from,
3574- unsigned long n);
3575-extern unsigned long copy_to_user(void __user *to, const void *from,
3576- unsigned long n);
3577-extern unsigned long copy_in_user(void __user *to, const void __user *from,
3578- unsigned long n);
3579-
3580-#endif /* __powerpc64__ */
3581-
3582 static inline unsigned long __copy_from_user_inatomic(void *to,
3583 const void __user *from, unsigned long n)
3584 {
3585@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
3586 if (ret == 0)
3587 return 0;
3588 }
3589+
3590+ if (!__builtin_constant_p(n))
3591+ check_object_size(to, n, false);
3592+
3593 return __copy_tofrom_user((__force void __user *)to, from, n);
3594 }
3595
3596@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
3597 if (ret == 0)
3598 return 0;
3599 }
3600+
3601+ if (!__builtin_constant_p(n))
3602+ check_object_size(from, n, true);
3603+
3604 return __copy_tofrom_user(to, (__force const void __user *)from, n);
3605 }
3606
3607@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_user(void __user *to,
3608 return __copy_to_user_inatomic(to, from, size);
3609 }
3610
3611+#ifndef __powerpc64__
3612+
3613+static inline unsigned long __must_check copy_from_user(void *to,
3614+ const void __user *from, unsigned long n)
3615+{
3616+ unsigned long over;
3617+
3618+ if ((long)n < 0)
3619+ return n;
3620+
3621+ if (access_ok(VERIFY_READ, from, n)) {
3622+ if (!__builtin_constant_p(n))
3623+ check_object_size(to, n, false);
3624+ return __copy_tofrom_user((__force void __user *)to, from, n);
3625+ }
3626+ if ((unsigned long)from < TASK_SIZE) {
3627+ over = (unsigned long)from + n - TASK_SIZE;
3628+ if (!__builtin_constant_p(n - over))
3629+ check_object_size(to, n - over, false);
3630+ return __copy_tofrom_user((__force void __user *)to, from,
3631+ n - over) + over;
3632+ }
3633+ return n;
3634+}
3635+
3636+static inline unsigned long __must_check copy_to_user(void __user *to,
3637+ const void *from, unsigned long n)
3638+{
3639+ unsigned long over;
3640+
3641+ if ((long)n < 0)
3642+ return n;
3643+
3644+ if (access_ok(VERIFY_WRITE, to, n)) {
3645+ if (!__builtin_constant_p(n))
3646+ check_object_size(from, n, true);
3647+ return __copy_tofrom_user(to, (__force void __user *)from, n);
3648+ }
3649+ if ((unsigned long)to < TASK_SIZE) {
3650+ over = (unsigned long)to + n - TASK_SIZE;
3651+ if (!__builtin_constant_p(n))
3652+ check_object_size(from, n - over, true);
3653+ return __copy_tofrom_user(to, (__force void __user *)from,
3654+ n - over) + over;
3655+ }
3656+ return n;
3657+}
3658+
3659+#else /* __powerpc64__ */
3660+
3661+#define __copy_in_user(to, from, size) \
3662+ __copy_tofrom_user((to), (from), (size))
3663+
3664+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
3665+{
3666+ if ((long)n < 0 || n > INT_MAX)
3667+ return n;
3668+
3669+ if (!__builtin_constant_p(n))
3670+ check_object_size(to, n, false);
3671+
3672+ if (likely(access_ok(VERIFY_READ, from, n)))
3673+ n = __copy_from_user(to, from, n);
3674+ else
3675+ memset(to, 0, n);
3676+ return n;
3677+}
3678+
3679+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
3680+{
3681+ if ((long)n < 0 || n > INT_MAX)
3682+ return n;
3683+
3684+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
3685+ if (!__builtin_constant_p(n))
3686+ check_object_size(from, n, true);
3687+ n = __copy_to_user(to, from, n);
3688+ }
3689+ return n;
3690+}
3691+
3692+extern unsigned long copy_in_user(void __user *to, const void __user *from,
3693+ unsigned long n);
3694+
3695+#endif /* __powerpc64__ */
3696+
3697 extern unsigned long __clear_user(void __user *addr, unsigned long size);
3698
3699 static inline unsigned long clear_user(void __user *addr, unsigned long size)
3700diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
3701index 429983c..7af363b 100644
3702--- a/arch/powerpc/kernel/exceptions-64e.S
3703+++ b/arch/powerpc/kernel/exceptions-64e.S
3704@@ -587,6 +587,7 @@ storage_fault_common:
3705 std r14,_DAR(r1)
3706 std r15,_DSISR(r1)
3707 addi r3,r1,STACK_FRAME_OVERHEAD
3708+ bl .save_nvgprs
3709 mr r4,r14
3710 mr r5,r15
3711 ld r14,PACA_EXGEN+EX_R14(r13)
3712@@ -596,8 +597,7 @@ storage_fault_common:
3713 cmpdi r3,0
3714 bne- 1f
3715 b .ret_from_except_lite
3716-1: bl .save_nvgprs
3717- mr r5,r3
3718+1: mr r5,r3
3719 addi r3,r1,STACK_FRAME_OVERHEAD
3720 ld r4,_DAR(r1)
3721 bl .bad_page_fault
3722diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
3723index cf9c69b..ebc9640 100644
3724--- a/arch/powerpc/kernel/exceptions-64s.S
3725+++ b/arch/powerpc/kernel/exceptions-64s.S
3726@@ -1004,10 +1004,10 @@ handle_page_fault:
3727 11: ld r4,_DAR(r1)
3728 ld r5,_DSISR(r1)
3729 addi r3,r1,STACK_FRAME_OVERHEAD
3730+ bl .save_nvgprs
3731 bl .do_page_fault
3732 cmpdi r3,0
3733 beq+ 13f
3734- bl .save_nvgprs
3735 mr r5,r3
3736 addi r3,r1,STACK_FRAME_OVERHEAD
3737 lwz r4,_DAR(r1)
3738diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
3739index 745c1e7..59d97a6 100644
3740--- a/arch/powerpc/kernel/irq.c
3741+++ b/arch/powerpc/kernel/irq.c
3742@@ -547,9 +547,6 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
3743 host->ops = ops;
3744 host->of_node = of_node_get(of_node);
3745
3746- if (host->ops->match == NULL)
3747- host->ops->match = default_irq_host_match;
3748-
3749 raw_spin_lock_irqsave(&irq_big_lock, flags);
3750
3751 /* If it's a legacy controller, check for duplicates and
3752@@ -622,7 +619,12 @@ struct irq_host *irq_find_host(struct device_node *node)
3753 */
3754 raw_spin_lock_irqsave(&irq_big_lock, flags);
3755 list_for_each_entry(h, &irq_hosts, link)
3756- if (h->ops->match(h, node)) {
3757+ if (h->ops->match) {
3758+ if (h->ops->match(h, node)) {
3759+ found = h;
3760+ break;
3761+ }
3762+ } else if (default_irq_host_match(h, node)) {
3763 found = h;
3764 break;
3765 }
3766diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
3767index 0b6d796..d760ddb 100644
3768--- a/arch/powerpc/kernel/module_32.c
3769+++ b/arch/powerpc/kernel/module_32.c
3770@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
3771 me->arch.core_plt_section = i;
3772 }
3773 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
3774- printk("Module doesn't contain .plt or .init.plt sections.\n");
3775+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
3776 return -ENOEXEC;
3777 }
3778
3779@@ -192,11 +192,16 @@ static uint32_t do_plt_call(void *location,
3780
3781 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
3782 /* Init, or core PLT? */
3783- if (location >= mod->module_core
3784- && location < mod->module_core + mod->core_size)
3785+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
3786+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
3787 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
3788- else
3789+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
3790+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
3791 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
3792+ else {
3793+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
3794+ return ~0UL;
3795+ }
3796
3797 /* Find this entry, or if that fails, the next avail. entry */
3798 while (entry->jump[0]) {
3799diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
3800index 6457574..08b28d3 100644
3801--- a/arch/powerpc/kernel/process.c
3802+++ b/arch/powerpc/kernel/process.c
3803@@ -660,8 +660,8 @@ void show_regs(struct pt_regs * regs)
3804 * Lookup NIP late so we have the best change of getting the
3805 * above info out without failing
3806 */
3807- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
3808- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
3809+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
3810+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
3811 #endif
3812 show_stack(current, (unsigned long *) regs->gpr[1]);
3813 if (!user_mode(regs))
3814@@ -1165,10 +1165,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
3815 newsp = stack[0];
3816 ip = stack[STACK_FRAME_LR_SAVE];
3817 if (!firstframe || ip != lr) {
3818- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
3819+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
3820 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
3821 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
3822- printk(" (%pS)",
3823+ printk(" (%pA)",
3824 (void *)current->ret_stack[curr_frame].ret);
3825 curr_frame--;
3826 }
3827@@ -1188,7 +1188,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
3828 struct pt_regs *regs = (struct pt_regs *)
3829 (sp + STACK_FRAME_OVERHEAD);
3830 lr = regs->link;
3831- printk("--- Exception: %lx at %pS\n LR = %pS\n",
3832+ printk("--- Exception: %lx at %pA\n LR = %pA\n",
3833 regs->trap, (void *)regs->nip, (void *)lr);
3834 firstframe = 1;
3835 }
3836@@ -1263,58 +1263,3 @@ void thread_info_cache_init(void)
3837 }
3838
3839 #endif /* THREAD_SHIFT < PAGE_SHIFT */
3840-
3841-unsigned long arch_align_stack(unsigned long sp)
3842-{
3843- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
3844- sp -= get_random_int() & ~PAGE_MASK;
3845- return sp & ~0xf;
3846-}
3847-
3848-static inline unsigned long brk_rnd(void)
3849-{
3850- unsigned long rnd = 0;
3851-
3852- /* 8MB for 32bit, 1GB for 64bit */
3853- if (is_32bit_task())
3854- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
3855- else
3856- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
3857-
3858- return rnd << PAGE_SHIFT;
3859-}
3860-
3861-unsigned long arch_randomize_brk(struct mm_struct *mm)
3862-{
3863- unsigned long base = mm->brk;
3864- unsigned long ret;
3865-
3866-#ifdef CONFIG_PPC_STD_MMU_64
3867- /*
3868- * If we are using 1TB segments and we are allowed to randomise
3869- * the heap, we can put it above 1TB so it is backed by a 1TB
3870- * segment. Otherwise the heap will be in the bottom 1TB
3871- * which always uses 256MB segments and this may result in a
3872- * performance penalty.
3873- */
3874- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
3875- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
3876-#endif
3877-
3878- ret = PAGE_ALIGN(base + brk_rnd());
3879-
3880- if (ret < mm->brk)
3881- return mm->brk;
3882-
3883- return ret;
3884-}
3885-
3886-unsigned long randomize_et_dyn(unsigned long base)
3887-{
3888- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
3889-
3890- if (ret < base)
3891- return base;
3892-
3893- return ret;
3894-}
3895diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
3896index 836a5a1..27289a3 100644
3897--- a/arch/powerpc/kernel/signal_32.c
3898+++ b/arch/powerpc/kernel/signal_32.c
3899@@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
3900 /* Save user registers on the stack */
3901 frame = &rt_sf->uc.uc_mcontext;
3902 addr = frame;
3903- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
3904+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
3905 if (save_user_regs(regs, frame, 0, 1))
3906 goto badframe;
3907 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
3908diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
3909index a50b5ec..547078a 100644
3910--- a/arch/powerpc/kernel/signal_64.c
3911+++ b/arch/powerpc/kernel/signal_64.c
3912@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
3913 current->thread.fpscr.val = 0;
3914
3915 /* Set up to return from userspace. */
3916- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
3917+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
3918 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
3919 } else {
3920 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
3921diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
3922index 5459d14..10f8070 100644
3923--- a/arch/powerpc/kernel/traps.c
3924+++ b/arch/powerpc/kernel/traps.c
3925@@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void)
3926 static inline void pmac_backlight_unblank(void) { }
3927 #endif
3928
3929+extern void gr_handle_kernel_exploit(void);
3930+
3931 int die(const char *str, struct pt_regs *regs, long err)
3932 {
3933 static struct {
3934@@ -171,6 +173,8 @@ int die(const char *str, struct pt_regs *regs, long err)
3935 if (panic_on_oops)
3936 panic("Fatal exception");
3937
3938+ gr_handle_kernel_exploit();
3939+
3940 oops_exit();
3941 do_exit(err);
3942
3943diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
3944index 7d14bb6..1305601 100644
3945--- a/arch/powerpc/kernel/vdso.c
3946+++ b/arch/powerpc/kernel/vdso.c
3947@@ -35,6 +35,7 @@
3948 #include <asm/firmware.h>
3949 #include <asm/vdso.h>
3950 #include <asm/vdso_datapage.h>
3951+#include <asm/mman.h>
3952
3953 #include "setup.h"
3954
3955@@ -219,7 +220,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
3956 vdso_base = VDSO32_MBASE;
3957 #endif
3958
3959- current->mm->context.vdso_base = 0;
3960+ current->mm->context.vdso_base = ~0UL;
3961
3962 /* vDSO has a problem and was disabled, just don't "enable" it for the
3963 * process
3964@@ -239,7 +240,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
3965 vdso_base = get_unmapped_area(NULL, vdso_base,
3966 (vdso_pages << PAGE_SHIFT) +
3967 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
3968- 0, 0);
3969+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
3970 if (IS_ERR_VALUE(vdso_base)) {
3971 rc = vdso_base;
3972 goto fail_mmapsem;
3973diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
3974index 5eea6f3..5d10396 100644
3975--- a/arch/powerpc/lib/usercopy_64.c
3976+++ b/arch/powerpc/lib/usercopy_64.c
3977@@ -9,22 +9,6 @@
3978 #include <linux/module.h>
3979 #include <asm/uaccess.h>
3980
3981-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
3982-{
3983- if (likely(access_ok(VERIFY_READ, from, n)))
3984- n = __copy_from_user(to, from, n);
3985- else
3986- memset(to, 0, n);
3987- return n;
3988-}
3989-
3990-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
3991-{
3992- if (likely(access_ok(VERIFY_WRITE, to, n)))
3993- n = __copy_to_user(to, from, n);
3994- return n;
3995-}
3996-
3997 unsigned long copy_in_user(void __user *to, const void __user *from,
3998 unsigned long n)
3999 {
4000@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
4001 return n;
4002 }
4003
4004-EXPORT_SYMBOL(copy_from_user);
4005-EXPORT_SYMBOL(copy_to_user);
4006 EXPORT_SYMBOL(copy_in_user);
4007
4008diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
4009index 5efe8c9..db9ceef 100644
4010--- a/arch/powerpc/mm/fault.c
4011+++ b/arch/powerpc/mm/fault.c
4012@@ -32,6 +32,10 @@
4013 #include <linux/perf_event.h>
4014 #include <linux/magic.h>
4015 #include <linux/ratelimit.h>
4016+#include <linux/slab.h>
4017+#include <linux/pagemap.h>
4018+#include <linux/compiler.h>
4019+#include <linux/unistd.h>
4020
4021 #include <asm/firmware.h>
4022 #include <asm/page.h>
4023@@ -43,6 +47,7 @@
4024 #include <asm/tlbflush.h>
4025 #include <asm/siginfo.h>
4026 #include <mm/mmu_decl.h>
4027+#include <asm/ptrace.h>
4028
4029 #ifdef CONFIG_KPROBES
4030 static inline int notify_page_fault(struct pt_regs *regs)
4031@@ -66,6 +71,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
4032 }
4033 #endif
4034
4035+#ifdef CONFIG_PAX_PAGEEXEC
4036+/*
4037+ * PaX: decide what to do with offenders (regs->nip = fault address)
4038+ *
4039+ * returns 1 when task should be killed
4040+ */
4041+static int pax_handle_fetch_fault(struct pt_regs *regs)
4042+{
4043+ return 1;
4044+}
4045+
4046+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4047+{
4048+ unsigned long i;
4049+
4050+ printk(KERN_ERR "PAX: bytes at PC: ");
4051+ for (i = 0; i < 5; i++) {
4052+ unsigned int c;
4053+ if (get_user(c, (unsigned int __user *)pc+i))
4054+ printk(KERN_CONT "???????? ");
4055+ else
4056+ printk(KERN_CONT "%08x ", c);
4057+ }
4058+ printk("\n");
4059+}
4060+#endif
4061+
4062 /*
4063 * Check whether the instruction at regs->nip is a store using
4064 * an update addressing form which will update r1.
4065@@ -136,7 +168,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
4066 * indicate errors in DSISR but can validly be set in SRR1.
4067 */
4068 if (trap == 0x400)
4069- error_code &= 0x48200000;
4070+ error_code &= 0x58200000;
4071 else
4072 is_write = error_code & DSISR_ISSTORE;
4073 #else
4074@@ -259,7 +291,7 @@ good_area:
4075 * "undefined". Of those that can be set, this is the only
4076 * one which seems bad.
4077 */
4078- if (error_code & 0x10000000)
4079+ if (error_code & DSISR_GUARDED)
4080 /* Guarded storage error. */
4081 goto bad_area;
4082 #endif /* CONFIG_8xx */
4083@@ -274,7 +306,7 @@ good_area:
4084 * processors use the same I/D cache coherency mechanism
4085 * as embedded.
4086 */
4087- if (error_code & DSISR_PROTFAULT)
4088+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
4089 goto bad_area;
4090 #endif /* CONFIG_PPC_STD_MMU */
4091
4092@@ -343,6 +375,23 @@ bad_area:
4093 bad_area_nosemaphore:
4094 /* User mode accesses cause a SIGSEGV */
4095 if (user_mode(regs)) {
4096+
4097+#ifdef CONFIG_PAX_PAGEEXEC
4098+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4099+#ifdef CONFIG_PPC_STD_MMU
4100+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
4101+#else
4102+ if (is_exec && regs->nip == address) {
4103+#endif
4104+ switch (pax_handle_fetch_fault(regs)) {
4105+ }
4106+
4107+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
4108+ do_group_exit(SIGKILL);
4109+ }
4110+ }
4111+#endif
4112+
4113 _exception(SIGSEGV, regs, code, address);
4114 return 0;
4115 }
4116diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
4117index 5a783d8..c23e14b 100644
4118--- a/arch/powerpc/mm/mmap_64.c
4119+++ b/arch/powerpc/mm/mmap_64.c
4120@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4121 */
4122 if (mmap_is_legacy()) {
4123 mm->mmap_base = TASK_UNMAPPED_BASE;
4124+
4125+#ifdef CONFIG_PAX_RANDMMAP
4126+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4127+ mm->mmap_base += mm->delta_mmap;
4128+#endif
4129+
4130 mm->get_unmapped_area = arch_get_unmapped_area;
4131 mm->unmap_area = arch_unmap_area;
4132 } else {
4133 mm->mmap_base = mmap_base();
4134+
4135+#ifdef CONFIG_PAX_RANDMMAP
4136+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4137+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4138+#endif
4139+
4140 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4141 mm->unmap_area = arch_unmap_area_topdown;
4142 }
4143diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
4144index 73709f7..6b90313 100644
4145--- a/arch/powerpc/mm/slice.c
4146+++ b/arch/powerpc/mm/slice.c
4147@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
4148 if ((mm->task_size - len) < addr)
4149 return 0;
4150 vma = find_vma(mm, addr);
4151- return (!vma || (addr + len) <= vma->vm_start);
4152+ return check_heap_stack_gap(vma, addr, len);
4153 }
4154
4155 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
4156@@ -256,7 +256,7 @@ full_search:
4157 addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
4158 continue;
4159 }
4160- if (!vma || addr + len <= vma->vm_start) {
4161+ if (check_heap_stack_gap(vma, addr, len)) {
4162 /*
4163 * Remember the place where we stopped the search:
4164 */
4165@@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4166 }
4167 }
4168
4169- addr = mm->mmap_base;
4170- while (addr > len) {
4171+ if (mm->mmap_base < len)
4172+ addr = -ENOMEM;
4173+ else
4174+ addr = mm->mmap_base - len;
4175+
4176+ while (!IS_ERR_VALUE(addr)) {
4177 /* Go down by chunk size */
4178- addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
4179+ addr = _ALIGN_DOWN(addr, 1ul << pshift);
4180
4181 /* Check for hit with different page size */
4182 mask = slice_range_to_mask(addr, len);
4183@@ -336,7 +340,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4184 * return with success:
4185 */
4186 vma = find_vma(mm, addr);
4187- if (!vma || (addr + len) <= vma->vm_start) {
4188+ if (check_heap_stack_gap(vma, addr, len)) {
4189 /* remember the address as a hint for next time */
4190 if (use_cache)
4191 mm->free_area_cache = addr;
4192@@ -348,7 +352,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4193 mm->cached_hole_size = vma->vm_start - addr;
4194
4195 /* try just below the current vma->vm_start */
4196- addr = vma->vm_start;
4197+ addr = skip_heap_stack_gap(vma, len);
4198 }
4199
4200 /*
4201@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
4202 if (fixed && addr > (mm->task_size - len))
4203 return -EINVAL;
4204
4205+#ifdef CONFIG_PAX_RANDMMAP
4206+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
4207+ addr = 0;
4208+#endif
4209+
4210 /* If hint, make sure it matches our alignment restrictions */
4211 if (!fixed && addr) {
4212 addr = _ALIGN_UP(addr, 1ul << pshift);
4213diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
4214index 8517d2a..d2738d4 100644
4215--- a/arch/s390/include/asm/atomic.h
4216+++ b/arch/s390/include/asm/atomic.h
4217@@ -326,6 +326,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
4218 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
4219 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
4220
4221+#define atomic64_read_unchecked(v) atomic64_read(v)
4222+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4223+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4224+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4225+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4226+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4227+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4228+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4229+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4230+
4231 #define smp_mb__before_atomic_dec() smp_mb()
4232 #define smp_mb__after_atomic_dec() smp_mb()
4233 #define smp_mb__before_atomic_inc() smp_mb()
4234diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
4235index 2a30d5a..5e5586f 100644
4236--- a/arch/s390/include/asm/cache.h
4237+++ b/arch/s390/include/asm/cache.h
4238@@ -11,8 +11,10 @@
4239 #ifndef __ARCH_S390_CACHE_H
4240 #define __ARCH_S390_CACHE_H
4241
4242-#define L1_CACHE_BYTES 256
4243+#include <linux/const.h>
4244+
4245 #define L1_CACHE_SHIFT 8
4246+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4247 #define NET_SKB_PAD 32
4248
4249 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4250diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
4251index 547f1a6..0b22b53 100644
4252--- a/arch/s390/include/asm/elf.h
4253+++ b/arch/s390/include/asm/elf.h
4254@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
4255 the loader. We need to make sure that it is out of the way of the program
4256 that it will "exec", and that there is sufficient room for the brk. */
4257
4258-extern unsigned long randomize_et_dyn(unsigned long base);
4259-#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
4260+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
4261+
4262+#ifdef CONFIG_PAX_ASLR
4263+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
4264+
4265+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4266+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4267+#endif
4268
4269 /* This yields a mask that user programs can use to figure out what
4270 instruction set this CPU supports. */
4271@@ -211,7 +217,4 @@ struct linux_binprm;
4272 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
4273 int arch_setup_additional_pages(struct linux_binprm *, int);
4274
4275-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
4276-#define arch_randomize_brk arch_randomize_brk
4277-
4278 #endif
4279diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h
4280index ef573c1..75a1ce6 100644
4281--- a/arch/s390/include/asm/system.h
4282+++ b/arch/s390/include/asm/system.h
4283@@ -262,7 +262,7 @@ extern void (*_machine_restart)(char *command);
4284 extern void (*_machine_halt)(void);
4285 extern void (*_machine_power_off)(void);
4286
4287-extern unsigned long arch_align_stack(unsigned long sp);
4288+#define arch_align_stack(x) ((x) & ~0xfUL)
4289
4290 static inline int tprot(unsigned long addr)
4291 {
4292diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
4293index 2b23885..e136e31 100644
4294--- a/arch/s390/include/asm/uaccess.h
4295+++ b/arch/s390/include/asm/uaccess.h
4296@@ -235,6 +235,10 @@ static inline unsigned long __must_check
4297 copy_to_user(void __user *to, const void *from, unsigned long n)
4298 {
4299 might_fault();
4300+
4301+ if ((long)n < 0)
4302+ return n;
4303+
4304 if (access_ok(VERIFY_WRITE, to, n))
4305 n = __copy_to_user(to, from, n);
4306 return n;
4307@@ -260,6 +264,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
4308 static inline unsigned long __must_check
4309 __copy_from_user(void *to, const void __user *from, unsigned long n)
4310 {
4311+ if ((long)n < 0)
4312+ return n;
4313+
4314 if (__builtin_constant_p(n) && (n <= 256))
4315 return uaccess.copy_from_user_small(n, from, to);
4316 else
4317@@ -294,6 +301,10 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
4318 unsigned int sz = __compiletime_object_size(to);
4319
4320 might_fault();
4321+
4322+ if ((long)n < 0)
4323+ return n;
4324+
4325 if (unlikely(sz != -1 && sz < n)) {
4326 copy_from_user_overflow();
4327 return n;
4328diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
4329index dfcb343..eda788a 100644
4330--- a/arch/s390/kernel/module.c
4331+++ b/arch/s390/kernel/module.c
4332@@ -161,11 +161,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
4333
4334 /* Increase core size by size of got & plt and set start
4335 offsets for got and plt. */
4336- me->core_size = ALIGN(me->core_size, 4);
4337- me->arch.got_offset = me->core_size;
4338- me->core_size += me->arch.got_size;
4339- me->arch.plt_offset = me->core_size;
4340- me->core_size += me->arch.plt_size;
4341+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
4342+ me->arch.got_offset = me->core_size_rw;
4343+ me->core_size_rw += me->arch.got_size;
4344+ me->arch.plt_offset = me->core_size_rx;
4345+ me->core_size_rx += me->arch.plt_size;
4346 return 0;
4347 }
4348
4349@@ -242,7 +242,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4350 if (info->got_initialized == 0) {
4351 Elf_Addr *gotent;
4352
4353- gotent = me->module_core + me->arch.got_offset +
4354+ gotent = me->module_core_rw + me->arch.got_offset +
4355 info->got_offset;
4356 *gotent = val;
4357 info->got_initialized = 1;
4358@@ -266,7 +266,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4359 else if (r_type == R_390_GOTENT ||
4360 r_type == R_390_GOTPLTENT)
4361 *(unsigned int *) loc =
4362- (val + (Elf_Addr) me->module_core - loc) >> 1;
4363+ (val + (Elf_Addr) me->module_core_rw - loc) >> 1;
4364 else if (r_type == R_390_GOT64 ||
4365 r_type == R_390_GOTPLT64)
4366 *(unsigned long *) loc = val;
4367@@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4368 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
4369 if (info->plt_initialized == 0) {
4370 unsigned int *ip;
4371- ip = me->module_core + me->arch.plt_offset +
4372+ ip = me->module_core_rx + me->arch.plt_offset +
4373 info->plt_offset;
4374 #ifndef CONFIG_64BIT
4375 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
4376@@ -305,7 +305,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4377 val - loc + 0xffffUL < 0x1ffffeUL) ||
4378 (r_type == R_390_PLT32DBL &&
4379 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
4380- val = (Elf_Addr) me->module_core +
4381+ val = (Elf_Addr) me->module_core_rx +
4382 me->arch.plt_offset +
4383 info->plt_offset;
4384 val += rela->r_addend - loc;
4385@@ -327,7 +327,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4386 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
4387 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
4388 val = val + rela->r_addend -
4389- ((Elf_Addr) me->module_core + me->arch.got_offset);
4390+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
4391 if (r_type == R_390_GOTOFF16)
4392 *(unsigned short *) loc = val;
4393 else if (r_type == R_390_GOTOFF32)
4394@@ -337,7 +337,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4395 break;
4396 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
4397 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
4398- val = (Elf_Addr) me->module_core + me->arch.got_offset +
4399+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
4400 rela->r_addend - loc;
4401 if (r_type == R_390_GOTPC)
4402 *(unsigned int *) loc = val;
4403diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
4404index 53088e2..9f44a36 100644
4405--- a/arch/s390/kernel/process.c
4406+++ b/arch/s390/kernel/process.c
4407@@ -320,39 +320,3 @@ unsigned long get_wchan(struct task_struct *p)
4408 }
4409 return 0;
4410 }
4411-
4412-unsigned long arch_align_stack(unsigned long sp)
4413-{
4414- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
4415- sp -= get_random_int() & ~PAGE_MASK;
4416- return sp & ~0xf;
4417-}
4418-
4419-static inline unsigned long brk_rnd(void)
4420-{
4421- /* 8MB for 32bit, 1GB for 64bit */
4422- if (is_32bit_task())
4423- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
4424- else
4425- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
4426-}
4427-
4428-unsigned long arch_randomize_brk(struct mm_struct *mm)
4429-{
4430- unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd());
4431-
4432- if (ret < mm->brk)
4433- return mm->brk;
4434- return ret;
4435-}
4436-
4437-unsigned long randomize_et_dyn(unsigned long base)
4438-{
4439- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
4440-
4441- if (!(current->flags & PF_RANDOMIZE))
4442- return base;
4443- if (ret < base)
4444- return base;
4445- return ret;
4446-}
4447diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
4448index a0155c0..34cc491 100644
4449--- a/arch/s390/mm/mmap.c
4450+++ b/arch/s390/mm/mmap.c
4451@@ -92,10 +92,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4452 */
4453 if (mmap_is_legacy()) {
4454 mm->mmap_base = TASK_UNMAPPED_BASE;
4455+
4456+#ifdef CONFIG_PAX_RANDMMAP
4457+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4458+ mm->mmap_base += mm->delta_mmap;
4459+#endif
4460+
4461 mm->get_unmapped_area = arch_get_unmapped_area;
4462 mm->unmap_area = arch_unmap_area;
4463 } else {
4464 mm->mmap_base = mmap_base();
4465+
4466+#ifdef CONFIG_PAX_RANDMMAP
4467+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4468+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4469+#endif
4470+
4471 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4472 mm->unmap_area = arch_unmap_area_topdown;
4473 }
4474@@ -167,10 +179,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4475 */
4476 if (mmap_is_legacy()) {
4477 mm->mmap_base = TASK_UNMAPPED_BASE;
4478+
4479+#ifdef CONFIG_PAX_RANDMMAP
4480+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4481+ mm->mmap_base += mm->delta_mmap;
4482+#endif
4483+
4484 mm->get_unmapped_area = s390_get_unmapped_area;
4485 mm->unmap_area = arch_unmap_area;
4486 } else {
4487 mm->mmap_base = mmap_base();
4488+
4489+#ifdef CONFIG_PAX_RANDMMAP
4490+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4491+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4492+#endif
4493+
4494 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
4495 mm->unmap_area = arch_unmap_area_topdown;
4496 }
4497diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
4498index ae3d59f..f65f075 100644
4499--- a/arch/score/include/asm/cache.h
4500+++ b/arch/score/include/asm/cache.h
4501@@ -1,7 +1,9 @@
4502 #ifndef _ASM_SCORE_CACHE_H
4503 #define _ASM_SCORE_CACHE_H
4504
4505+#include <linux/const.h>
4506+
4507 #define L1_CACHE_SHIFT 4
4508-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4509+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4510
4511 #endif /* _ASM_SCORE_CACHE_H */
4512diff --git a/arch/score/include/asm/system.h b/arch/score/include/asm/system.h
4513index 589d5c7..669e274 100644
4514--- a/arch/score/include/asm/system.h
4515+++ b/arch/score/include/asm/system.h
4516@@ -17,7 +17,7 @@ do { \
4517 #define finish_arch_switch(prev) do {} while (0)
4518
4519 typedef void (*vi_handler_t)(void);
4520-extern unsigned long arch_align_stack(unsigned long sp);
4521+#define arch_align_stack(x) (x)
4522
4523 #define mb() barrier()
4524 #define rmb() barrier()
4525diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
4526index 25d0803..d6c8e36 100644
4527--- a/arch/score/kernel/process.c
4528+++ b/arch/score/kernel/process.c
4529@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_struct *task)
4530
4531 return task_pt_regs(task)->cp0_epc;
4532 }
4533-
4534-unsigned long arch_align_stack(unsigned long sp)
4535-{
4536- return sp;
4537-}
4538diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
4539index ef9e555..331bd29 100644
4540--- a/arch/sh/include/asm/cache.h
4541+++ b/arch/sh/include/asm/cache.h
4542@@ -9,10 +9,11 @@
4543 #define __ASM_SH_CACHE_H
4544 #ifdef __KERNEL__
4545
4546+#include <linux/const.h>
4547 #include <linux/init.h>
4548 #include <cpu/cache.h>
4549
4550-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4551+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4552
4553 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4554
4555diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
4556index afeb710..d1d1289 100644
4557--- a/arch/sh/mm/mmap.c
4558+++ b/arch/sh/mm/mmap.c
4559@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
4560 addr = PAGE_ALIGN(addr);
4561
4562 vma = find_vma(mm, addr);
4563- if (TASK_SIZE - len >= addr &&
4564- (!vma || addr + len <= vma->vm_start))
4565+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4566 return addr;
4567 }
4568
4569@@ -106,7 +105,7 @@ full_search:
4570 }
4571 return -ENOMEM;
4572 }
4573- if (likely(!vma || addr + len <= vma->vm_start)) {
4574+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4575 /*
4576 * Remember the place where we stopped the search:
4577 */
4578@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4579 addr = PAGE_ALIGN(addr);
4580
4581 vma = find_vma(mm, addr);
4582- if (TASK_SIZE - len >= addr &&
4583- (!vma || addr + len <= vma->vm_start))
4584+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4585 return addr;
4586 }
4587
4588@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4589 /* make sure it can fit in the remaining address space */
4590 if (likely(addr > len)) {
4591 vma = find_vma(mm, addr-len);
4592- if (!vma || addr <= vma->vm_start) {
4593+ if (check_heap_stack_gap(vma, addr - len, len)) {
4594 /* remember the address as a hint for next time */
4595 return (mm->free_area_cache = addr-len);
4596 }
4597@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4598 if (unlikely(mm->mmap_base < len))
4599 goto bottomup;
4600
4601- addr = mm->mmap_base-len;
4602- if (do_colour_align)
4603- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4604+ addr = mm->mmap_base - len;
4605
4606 do {
4607+ if (do_colour_align)
4608+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4609 /*
4610 * Lookup failure means no vma is above this address,
4611 * else if new region fits below vma->vm_start,
4612 * return with success:
4613 */
4614 vma = find_vma(mm, addr);
4615- if (likely(!vma || addr+len <= vma->vm_start)) {
4616+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4617 /* remember the address as a hint for next time */
4618 return (mm->free_area_cache = addr);
4619 }
4620@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4621 mm->cached_hole_size = vma->vm_start - addr;
4622
4623 /* try just below the current vma->vm_start */
4624- addr = vma->vm_start-len;
4625- if (do_colour_align)
4626- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4627- } while (likely(len < vma->vm_start));
4628+ addr = skip_heap_stack_gap(vma, len);
4629+ } while (!IS_ERR_VALUE(addr));
4630
4631 bottomup:
4632 /*
4633diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
4634index f92602e..27060b2 100644
4635--- a/arch/sparc/Kconfig
4636+++ b/arch/sparc/Kconfig
4637@@ -31,6 +31,7 @@ config SPARC
4638
4639 config SPARC32
4640 def_bool !64BIT
4641+ select GENERIC_ATOMIC64
4642
4643 config SPARC64
4644 def_bool 64BIT
4645diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
4646index ad1fb5d..b117d90 100644
4647--- a/arch/sparc/Makefile
4648+++ b/arch/sparc/Makefile
4649@@ -31,7 +31,7 @@ UTS_MACHINE := sparc
4650
4651 #KBUILD_CFLAGS += -g -pipe -fcall-used-g5 -fcall-used-g7
4652 KBUILD_CFLAGS += -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7
4653-KBUILD_AFLAGS += -m32
4654+KBUILD_AFLAGS += -m32 -Wa,-Av8
4655
4656 #LDFLAGS_vmlinux = -N -Ttext 0xf0004000
4657 # Since 2.5.40, the first stage is left not btfix-ed.
4658@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/
4659 # Export what is needed by arch/sparc/boot/Makefile
4660 export VMLINUX_INIT VMLINUX_MAIN
4661 VMLINUX_INIT := $(head-y) $(init-y)
4662-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
4663+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
4664 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
4665 VMLINUX_MAIN += $(drivers-y) $(net-y)
4666
4667diff --git a/arch/sparc/include/asm/atomic_32.h b/arch/sparc/include/asm/atomic_32.h
4668index 5c3c8b6..ba822fa 100644
4669--- a/arch/sparc/include/asm/atomic_32.h
4670+++ b/arch/sparc/include/asm/atomic_32.h
4671@@ -13,6 +13,8 @@
4672
4673 #include <linux/types.h>
4674
4675+#include <asm-generic/atomic64.h>
4676+
4677 #ifdef __KERNEL__
4678
4679 #include <asm/system.h>
4680diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
4681index 9f421df..b81fc12 100644
4682--- a/arch/sparc/include/asm/atomic_64.h
4683+++ b/arch/sparc/include/asm/atomic_64.h
4684@@ -14,18 +14,40 @@
4685 #define ATOMIC64_INIT(i) { (i) }
4686
4687 #define atomic_read(v) (*(volatile int *)&(v)->counter)
4688+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
4689+{
4690+ return v->counter;
4691+}
4692 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
4693+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
4694+{
4695+ return v->counter;
4696+}
4697
4698 #define atomic_set(v, i) (((v)->counter) = i)
4699+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
4700+{
4701+ v->counter = i;
4702+}
4703 #define atomic64_set(v, i) (((v)->counter) = i)
4704+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
4705+{
4706+ v->counter = i;
4707+}
4708
4709 extern void atomic_add(int, atomic_t *);
4710+extern void atomic_add_unchecked(int, atomic_unchecked_t *);
4711 extern void atomic64_add(long, atomic64_t *);
4712+extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
4713 extern void atomic_sub(int, atomic_t *);
4714+extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
4715 extern void atomic64_sub(long, atomic64_t *);
4716+extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
4717
4718 extern int atomic_add_ret(int, atomic_t *);
4719+extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
4720 extern long atomic64_add_ret(long, atomic64_t *);
4721+extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
4722 extern int atomic_sub_ret(int, atomic_t *);
4723 extern long atomic64_sub_ret(long, atomic64_t *);
4724
4725@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4726 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
4727
4728 #define atomic_inc_return(v) atomic_add_ret(1, v)
4729+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
4730+{
4731+ return atomic_add_ret_unchecked(1, v);
4732+}
4733 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
4734+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
4735+{
4736+ return atomic64_add_ret_unchecked(1, v);
4737+}
4738
4739 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
4740 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
4741
4742 #define atomic_add_return(i, v) atomic_add_ret(i, v)
4743+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
4744+{
4745+ return atomic_add_ret_unchecked(i, v);
4746+}
4747 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
4748+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
4749+{
4750+ return atomic64_add_ret_unchecked(i, v);
4751+}
4752
4753 /*
4754 * atomic_inc_and_test - increment and test
4755@@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4756 * other cases.
4757 */
4758 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
4759+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
4760+{
4761+ return atomic_inc_return_unchecked(v) == 0;
4762+}
4763 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
4764
4765 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
4766@@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4767 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
4768
4769 #define atomic_inc(v) atomic_add(1, v)
4770+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
4771+{
4772+ atomic_add_unchecked(1, v);
4773+}
4774 #define atomic64_inc(v) atomic64_add(1, v)
4775+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
4776+{
4777+ atomic64_add_unchecked(1, v);
4778+}
4779
4780 #define atomic_dec(v) atomic_sub(1, v)
4781+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
4782+{
4783+ atomic_sub_unchecked(1, v);
4784+}
4785 #define atomic64_dec(v) atomic64_sub(1, v)
4786+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
4787+{
4788+ atomic64_sub_unchecked(1, v);
4789+}
4790
4791 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
4792 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
4793
4794 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
4795+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
4796+{
4797+ return cmpxchg(&v->counter, old, new);
4798+}
4799 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
4800+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
4801+{
4802+ return xchg(&v->counter, new);
4803+}
4804
4805 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
4806 {
4807- int c, old;
4808+ int c, old, new;
4809 c = atomic_read(v);
4810 for (;;) {
4811- if (unlikely(c == (u)))
4812+ if (unlikely(c == u))
4813 break;
4814- old = atomic_cmpxchg((v), c, c + (a));
4815+
4816+ asm volatile("addcc %2, %0, %0\n"
4817+
4818+#ifdef CONFIG_PAX_REFCOUNT
4819+ "tvs %%icc, 6\n"
4820+#endif
4821+
4822+ : "=r" (new)
4823+ : "0" (c), "ir" (a)
4824+ : "cc");
4825+
4826+ old = atomic_cmpxchg(v, c, new);
4827 if (likely(old == c))
4828 break;
4829 c = old;
4830@@ -89,20 +166,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
4831 #define atomic64_cmpxchg(v, o, n) \
4832 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
4833 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
4834+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
4835+{
4836+ return xchg(&v->counter, new);
4837+}
4838
4839 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
4840 {
4841- long c, old;
4842+ long c, old, new;
4843 c = atomic64_read(v);
4844 for (;;) {
4845- if (unlikely(c == (u)))
4846+ if (unlikely(c == u))
4847 break;
4848- old = atomic64_cmpxchg((v), c, c + (a));
4849+
4850+ asm volatile("addcc %2, %0, %0\n"
4851+
4852+#ifdef CONFIG_PAX_REFCOUNT
4853+ "tvs %%xcc, 6\n"
4854+#endif
4855+
4856+ : "=r" (new)
4857+ : "0" (c), "ir" (a)
4858+ : "cc");
4859+
4860+ old = atomic64_cmpxchg(v, c, new);
4861 if (likely(old == c))
4862 break;
4863 c = old;
4864 }
4865- return c != (u);
4866+ return c != u;
4867 }
4868
4869 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
4870diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
4871index 69358b5..9d0d492 100644
4872--- a/arch/sparc/include/asm/cache.h
4873+++ b/arch/sparc/include/asm/cache.h
4874@@ -7,10 +7,12 @@
4875 #ifndef _SPARC_CACHE_H
4876 #define _SPARC_CACHE_H
4877
4878+#include <linux/const.h>
4879+
4880 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
4881
4882 #define L1_CACHE_SHIFT 5
4883-#define L1_CACHE_BYTES 32
4884+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4885
4886 #ifdef CONFIG_SPARC32
4887 #define SMP_CACHE_BYTES_SHIFT 5
4888diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
4889index 4269ca6..e3da77f 100644
4890--- a/arch/sparc/include/asm/elf_32.h
4891+++ b/arch/sparc/include/asm/elf_32.h
4892@@ -114,6 +114,13 @@ typedef struct {
4893
4894 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
4895
4896+#ifdef CONFIG_PAX_ASLR
4897+#define PAX_ELF_ET_DYN_BASE 0x10000UL
4898+
4899+#define PAX_DELTA_MMAP_LEN 16
4900+#define PAX_DELTA_STACK_LEN 16
4901+#endif
4902+
4903 /* This yields a mask that user programs can use to figure out what
4904 instruction set this cpu supports. This can NOT be done in userspace
4905 on Sparc. */
4906diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
4907index 7df8b7f..4946269 100644
4908--- a/arch/sparc/include/asm/elf_64.h
4909+++ b/arch/sparc/include/asm/elf_64.h
4910@@ -180,6 +180,13 @@ typedef struct {
4911 #define ELF_ET_DYN_BASE 0x0000010000000000UL
4912 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
4913
4914+#ifdef CONFIG_PAX_ASLR
4915+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
4916+
4917+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
4918+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
4919+#endif
4920+
4921 extern unsigned long sparc64_elf_hwcap;
4922 #define ELF_HWCAP sparc64_elf_hwcap
4923
4924diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h
4925index 156707b..aefa786 100644
4926--- a/arch/sparc/include/asm/page_32.h
4927+++ b/arch/sparc/include/asm/page_32.h
4928@@ -8,6 +8,8 @@
4929 #ifndef _SPARC_PAGE_H
4930 #define _SPARC_PAGE_H
4931
4932+#include <linux/const.h>
4933+
4934 #define PAGE_SHIFT 12
4935
4936 #ifndef __ASSEMBLY__
4937diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
4938index a790cc6..091ed94 100644
4939--- a/arch/sparc/include/asm/pgtable_32.h
4940+++ b/arch/sparc/include/asm/pgtable_32.h
4941@@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
4942 BTFIXUPDEF_INT(page_none)
4943 BTFIXUPDEF_INT(page_copy)
4944 BTFIXUPDEF_INT(page_readonly)
4945+
4946+#ifdef CONFIG_PAX_PAGEEXEC
4947+BTFIXUPDEF_INT(page_shared_noexec)
4948+BTFIXUPDEF_INT(page_copy_noexec)
4949+BTFIXUPDEF_INT(page_readonly_noexec)
4950+#endif
4951+
4952 BTFIXUPDEF_INT(page_kernel)
4953
4954 #define PMD_SHIFT SUN4C_PMD_SHIFT
4955@@ -66,6 +73,16 @@ extern pgprot_t PAGE_SHARED;
4956 #define PAGE_COPY __pgprot(BTFIXUP_INT(page_copy))
4957 #define PAGE_READONLY __pgprot(BTFIXUP_INT(page_readonly))
4958
4959+#ifdef CONFIG_PAX_PAGEEXEC
4960+extern pgprot_t PAGE_SHARED_NOEXEC;
4961+# define PAGE_COPY_NOEXEC __pgprot(BTFIXUP_INT(page_copy_noexec))
4962+# define PAGE_READONLY_NOEXEC __pgprot(BTFIXUP_INT(page_readonly_noexec))
4963+#else
4964+# define PAGE_SHARED_NOEXEC PAGE_SHARED
4965+# define PAGE_COPY_NOEXEC PAGE_COPY
4966+# define PAGE_READONLY_NOEXEC PAGE_READONLY
4967+#endif
4968+
4969 extern unsigned long page_kernel;
4970
4971 #ifdef MODULE
4972diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
4973index f6ae2b2..b03ffc7 100644
4974--- a/arch/sparc/include/asm/pgtsrmmu.h
4975+++ b/arch/sparc/include/asm/pgtsrmmu.h
4976@@ -115,6 +115,13 @@
4977 SRMMU_EXEC | SRMMU_REF)
4978 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
4979 SRMMU_EXEC | SRMMU_REF)
4980+
4981+#ifdef CONFIG_PAX_PAGEEXEC
4982+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
4983+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4984+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4985+#endif
4986+
4987 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
4988 SRMMU_DIRTY | SRMMU_REF)
4989
4990diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
4991index 9689176..63c18ea 100644
4992--- a/arch/sparc/include/asm/spinlock_64.h
4993+++ b/arch/sparc/include/asm/spinlock_64.h
4994@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
4995
4996 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
4997
4998-static void inline arch_read_lock(arch_rwlock_t *lock)
4999+static inline void arch_read_lock(arch_rwlock_t *lock)
5000 {
5001 unsigned long tmp1, tmp2;
5002
5003 __asm__ __volatile__ (
5004 "1: ldsw [%2], %0\n"
5005 " brlz,pn %0, 2f\n"
5006-"4: add %0, 1, %1\n"
5007+"4: addcc %0, 1, %1\n"
5008+
5009+#ifdef CONFIG_PAX_REFCOUNT
5010+" tvs %%icc, 6\n"
5011+#endif
5012+
5013 " cas [%2], %0, %1\n"
5014 " cmp %0, %1\n"
5015 " bne,pn %%icc, 1b\n"
5016@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
5017 " .previous"
5018 : "=&r" (tmp1), "=&r" (tmp2)
5019 : "r" (lock)
5020- : "memory");
5021+ : "memory", "cc");
5022 }
5023
5024-static int inline arch_read_trylock(arch_rwlock_t *lock)
5025+static inline int arch_read_trylock(arch_rwlock_t *lock)
5026 {
5027 int tmp1, tmp2;
5028
5029@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5030 "1: ldsw [%2], %0\n"
5031 " brlz,a,pn %0, 2f\n"
5032 " mov 0, %0\n"
5033-" add %0, 1, %1\n"
5034+" addcc %0, 1, %1\n"
5035+
5036+#ifdef CONFIG_PAX_REFCOUNT
5037+" tvs %%icc, 6\n"
5038+#endif
5039+
5040 " cas [%2], %0, %1\n"
5041 " cmp %0, %1\n"
5042 " bne,pn %%icc, 1b\n"
5043@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5044 return tmp1;
5045 }
5046
5047-static void inline arch_read_unlock(arch_rwlock_t *lock)
5048+static inline void arch_read_unlock(arch_rwlock_t *lock)
5049 {
5050 unsigned long tmp1, tmp2;
5051
5052 __asm__ __volatile__(
5053 "1: lduw [%2], %0\n"
5054-" sub %0, 1, %1\n"
5055+" subcc %0, 1, %1\n"
5056+
5057+#ifdef CONFIG_PAX_REFCOUNT
5058+" tvs %%icc, 6\n"
5059+#endif
5060+
5061 " cas [%2], %0, %1\n"
5062 " cmp %0, %1\n"
5063 " bne,pn %%xcc, 1b\n"
5064@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
5065 : "memory");
5066 }
5067
5068-static void inline arch_write_lock(arch_rwlock_t *lock)
5069+static inline void arch_write_lock(arch_rwlock_t *lock)
5070 {
5071 unsigned long mask, tmp1, tmp2;
5072
5073@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
5074 : "memory");
5075 }
5076
5077-static void inline arch_write_unlock(arch_rwlock_t *lock)
5078+static inline void arch_write_unlock(arch_rwlock_t *lock)
5079 {
5080 __asm__ __volatile__(
5081 " stw %%g0, [%0]"
5082@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
5083 : "memory");
5084 }
5085
5086-static int inline arch_write_trylock(arch_rwlock_t *lock)
5087+static inline int arch_write_trylock(arch_rwlock_t *lock)
5088 {
5089 unsigned long mask, tmp1, tmp2, result;
5090
5091diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
5092index fa57532..e1a4c53 100644
5093--- a/arch/sparc/include/asm/thread_info_32.h
5094+++ b/arch/sparc/include/asm/thread_info_32.h
5095@@ -50,6 +50,8 @@ struct thread_info {
5096 unsigned long w_saved;
5097
5098 struct restart_block restart_block;
5099+
5100+ unsigned long lowest_stack;
5101 };
5102
5103 /*
5104diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
5105index 60d86be..952dea1 100644
5106--- a/arch/sparc/include/asm/thread_info_64.h
5107+++ b/arch/sparc/include/asm/thread_info_64.h
5108@@ -63,6 +63,8 @@ struct thread_info {
5109 struct pt_regs *kern_una_regs;
5110 unsigned int kern_una_insn;
5111
5112+ unsigned long lowest_stack;
5113+
5114 unsigned long fpregs[0] __attribute__ ((aligned(64)));
5115 };
5116
5117diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
5118index e88fbe5..96b0ce5 100644
5119--- a/arch/sparc/include/asm/uaccess.h
5120+++ b/arch/sparc/include/asm/uaccess.h
5121@@ -1,5 +1,13 @@
5122 #ifndef ___ASM_SPARC_UACCESS_H
5123 #define ___ASM_SPARC_UACCESS_H
5124+
5125+#ifdef __KERNEL__
5126+#ifndef __ASSEMBLY__
5127+#include <linux/types.h>
5128+extern void check_object_size(const void *ptr, unsigned long n, bool to);
5129+#endif
5130+#endif
5131+
5132 #if defined(__sparc__) && defined(__arch64__)
5133 #include <asm/uaccess_64.h>
5134 #else
5135diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
5136index 8303ac4..07f333d 100644
5137--- a/arch/sparc/include/asm/uaccess_32.h
5138+++ b/arch/sparc/include/asm/uaccess_32.h
5139@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
5140
5141 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
5142 {
5143- if (n && __access_ok((unsigned long) to, n))
5144+ if ((long)n < 0)
5145+ return n;
5146+
5147+ if (n && __access_ok((unsigned long) to, n)) {
5148+ if (!__builtin_constant_p(n))
5149+ check_object_size(from, n, true);
5150 return __copy_user(to, (__force void __user *) from, n);
5151- else
5152+ } else
5153 return n;
5154 }
5155
5156 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
5157 {
5158+ if ((long)n < 0)
5159+ return n;
5160+
5161+ if (!__builtin_constant_p(n))
5162+ check_object_size(from, n, true);
5163+
5164 return __copy_user(to, (__force void __user *) from, n);
5165 }
5166
5167 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
5168 {
5169- if (n && __access_ok((unsigned long) from, n))
5170+ if ((long)n < 0)
5171+ return n;
5172+
5173+ if (n && __access_ok((unsigned long) from, n)) {
5174+ if (!__builtin_constant_p(n))
5175+ check_object_size(to, n, false);
5176 return __copy_user((__force void __user *) to, from, n);
5177- else
5178+ } else
5179 return n;
5180 }
5181
5182 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
5183 {
5184+ if ((long)n < 0)
5185+ return n;
5186+
5187 return __copy_user((__force void __user *) to, from, n);
5188 }
5189
5190diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
5191index 3e1449f..5293a0e 100644
5192--- a/arch/sparc/include/asm/uaccess_64.h
5193+++ b/arch/sparc/include/asm/uaccess_64.h
5194@@ -10,6 +10,7 @@
5195 #include <linux/compiler.h>
5196 #include <linux/string.h>
5197 #include <linux/thread_info.h>
5198+#include <linux/kernel.h>
5199 #include <asm/asi.h>
5200 #include <asm/system.h>
5201 #include <asm/spitfire.h>
5202@@ -213,8 +214,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
5203 static inline unsigned long __must_check
5204 copy_from_user(void *to, const void __user *from, unsigned long size)
5205 {
5206- unsigned long ret = ___copy_from_user(to, from, size);
5207+ unsigned long ret;
5208
5209+ if ((long)size < 0 || size > INT_MAX)
5210+ return size;
5211+
5212+ if (!__builtin_constant_p(size))
5213+ check_object_size(to, size, false);
5214+
5215+ ret = ___copy_from_user(to, from, size);
5216 if (unlikely(ret))
5217 ret = copy_from_user_fixup(to, from, size);
5218
5219@@ -230,8 +238,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
5220 static inline unsigned long __must_check
5221 copy_to_user(void __user *to, const void *from, unsigned long size)
5222 {
5223- unsigned long ret = ___copy_to_user(to, from, size);
5224+ unsigned long ret;
5225
5226+ if ((long)size < 0 || size > INT_MAX)
5227+ return size;
5228+
5229+ if (!__builtin_constant_p(size))
5230+ check_object_size(from, size, true);
5231+
5232+ ret = ___copy_to_user(to, from, size);
5233 if (unlikely(ret))
5234 ret = copy_to_user_fixup(to, from, size);
5235 return ret;
5236diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
5237index cb85458..e063f17 100644
5238--- a/arch/sparc/kernel/Makefile
5239+++ b/arch/sparc/kernel/Makefile
5240@@ -3,7 +3,7 @@
5241 #
5242
5243 asflags-y := -ansi
5244-ccflags-y := -Werror
5245+#ccflags-y := -Werror
5246
5247 extra-y := head_$(BITS).o
5248 extra-y += init_task.o
5249diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
5250index f793742..4d880af 100644
5251--- a/arch/sparc/kernel/process_32.c
5252+++ b/arch/sparc/kernel/process_32.c
5253@@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
5254 rw->ins[4], rw->ins[5],
5255 rw->ins[6],
5256 rw->ins[7]);
5257- printk("%pS\n", (void *) rw->ins[7]);
5258+ printk("%pA\n", (void *) rw->ins[7]);
5259 rw = (struct reg_window32 *) rw->ins[6];
5260 }
5261 spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
5262@@ -271,14 +271,14 @@ void show_regs(struct pt_regs *r)
5263
5264 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
5265 r->psr, r->pc, r->npc, r->y, print_tainted());
5266- printk("PC: <%pS>\n", (void *) r->pc);
5267+ printk("PC: <%pA>\n", (void *) r->pc);
5268 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5269 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
5270 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
5271 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5272 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
5273 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
5274- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
5275+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
5276
5277 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5278 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
5279@@ -313,7 +313,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5280 rw = (struct reg_window32 *) fp;
5281 pc = rw->ins[7];
5282 printk("[%08lx : ", pc);
5283- printk("%pS ] ", (void *) pc);
5284+ printk("%pA ] ", (void *) pc);
5285 fp = rw->ins[6];
5286 } while (++count < 16);
5287 printk("\n");
5288diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
5289index 3739a06..48b2ff0 100644
5290--- a/arch/sparc/kernel/process_64.c
5291+++ b/arch/sparc/kernel/process_64.c
5292@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_regs *regs)
5293 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
5294 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
5295 if (regs->tstate & TSTATE_PRIV)
5296- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
5297+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
5298 }
5299
5300 void show_regs(struct pt_regs *regs)
5301 {
5302 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
5303 regs->tpc, regs->tnpc, regs->y, print_tainted());
5304- printk("TPC: <%pS>\n", (void *) regs->tpc);
5305+ printk("TPC: <%pA>\n", (void *) regs->tpc);
5306 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
5307 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
5308 regs->u_regs[3]);
5309@@ -200,7 +200,7 @@ void show_regs(struct pt_regs *regs)
5310 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
5311 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
5312 regs->u_regs[15]);
5313- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
5314+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
5315 show_regwindow(regs);
5316 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
5317 }
5318@@ -285,7 +285,7 @@ void arch_trigger_all_cpu_backtrace(void)
5319 ((tp && tp->task) ? tp->task->pid : -1));
5320
5321 if (gp->tstate & TSTATE_PRIV) {
5322- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
5323+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
5324 (void *) gp->tpc,
5325 (void *) gp->o7,
5326 (void *) gp->i7,
5327diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
5328index 42b282f..28ce9f2 100644
5329--- a/arch/sparc/kernel/sys_sparc_32.c
5330+++ b/arch/sparc/kernel/sys_sparc_32.c
5331@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5332 if (ARCH_SUN4C && len > 0x20000000)
5333 return -ENOMEM;
5334 if (!addr)
5335- addr = TASK_UNMAPPED_BASE;
5336+ addr = current->mm->mmap_base;
5337
5338 if (flags & MAP_SHARED)
5339 addr = COLOUR_ALIGN(addr);
5340@@ -71,7 +71,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5341 }
5342 if (TASK_SIZE - PAGE_SIZE - len < addr)
5343 return -ENOMEM;
5344- if (!vmm || addr + len <= vmm->vm_start)
5345+ if (check_heap_stack_gap(vmm, addr, len))
5346 return addr;
5347 addr = vmm->vm_end;
5348 if (flags & MAP_SHARED)
5349diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
5350index 441521a..b767073 100644
5351--- a/arch/sparc/kernel/sys_sparc_64.c
5352+++ b/arch/sparc/kernel/sys_sparc_64.c
5353@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5354 /* We do not accept a shared mapping if it would violate
5355 * cache aliasing constraints.
5356 */
5357- if ((flags & MAP_SHARED) &&
5358+ if ((filp || (flags & MAP_SHARED)) &&
5359 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5360 return -EINVAL;
5361 return addr;
5362@@ -139,6 +139,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5363 if (filp || (flags & MAP_SHARED))
5364 do_color_align = 1;
5365
5366+#ifdef CONFIG_PAX_RANDMMAP
5367+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
5368+#endif
5369+
5370 if (addr) {
5371 if (do_color_align)
5372 addr = COLOUR_ALIGN(addr, pgoff);
5373@@ -146,15 +150,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5374 addr = PAGE_ALIGN(addr);
5375
5376 vma = find_vma(mm, addr);
5377- if (task_size - len >= addr &&
5378- (!vma || addr + len <= vma->vm_start))
5379+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5380 return addr;
5381 }
5382
5383 if (len > mm->cached_hole_size) {
5384- start_addr = addr = mm->free_area_cache;
5385+ start_addr = addr = mm->free_area_cache;
5386 } else {
5387- start_addr = addr = TASK_UNMAPPED_BASE;
5388+ start_addr = addr = mm->mmap_base;
5389 mm->cached_hole_size = 0;
5390 }
5391
5392@@ -174,14 +177,14 @@ full_search:
5393 vma = find_vma(mm, VA_EXCLUDE_END);
5394 }
5395 if (unlikely(task_size < addr)) {
5396- if (start_addr != TASK_UNMAPPED_BASE) {
5397- start_addr = addr = TASK_UNMAPPED_BASE;
5398+ if (start_addr != mm->mmap_base) {
5399+ start_addr = addr = mm->mmap_base;
5400 mm->cached_hole_size = 0;
5401 goto full_search;
5402 }
5403 return -ENOMEM;
5404 }
5405- if (likely(!vma || addr + len <= vma->vm_start)) {
5406+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5407 /*
5408 * Remember the place where we stopped the search:
5409 */
5410@@ -215,7 +218,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5411 /* We do not accept a shared mapping if it would violate
5412 * cache aliasing constraints.
5413 */
5414- if ((flags & MAP_SHARED) &&
5415+ if ((filp || (flags & MAP_SHARED)) &&
5416 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5417 return -EINVAL;
5418 return addr;
5419@@ -236,8 +239,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5420 addr = PAGE_ALIGN(addr);
5421
5422 vma = find_vma(mm, addr);
5423- if (task_size - len >= addr &&
5424- (!vma || addr + len <= vma->vm_start))
5425+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5426 return addr;
5427 }
5428
5429@@ -258,7 +260,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5430 /* make sure it can fit in the remaining address space */
5431 if (likely(addr > len)) {
5432 vma = find_vma(mm, addr-len);
5433- if (!vma || addr <= vma->vm_start) {
5434+ if (check_heap_stack_gap(vma, addr - len, len)) {
5435 /* remember the address as a hint for next time */
5436 return (mm->free_area_cache = addr-len);
5437 }
5438@@ -267,18 +269,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5439 if (unlikely(mm->mmap_base < len))
5440 goto bottomup;
5441
5442- addr = mm->mmap_base-len;
5443- if (do_color_align)
5444- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5445+ addr = mm->mmap_base - len;
5446
5447 do {
5448+ if (do_color_align)
5449+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5450 /*
5451 * Lookup failure means no vma is above this address,
5452 * else if new region fits below vma->vm_start,
5453 * return with success:
5454 */
5455 vma = find_vma(mm, addr);
5456- if (likely(!vma || addr+len <= vma->vm_start)) {
5457+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5458 /* remember the address as a hint for next time */
5459 return (mm->free_area_cache = addr);
5460 }
5461@@ -288,10 +290,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5462 mm->cached_hole_size = vma->vm_start - addr;
5463
5464 /* try just below the current vma->vm_start */
5465- addr = vma->vm_start-len;
5466- if (do_color_align)
5467- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5468- } while (likely(len < vma->vm_start));
5469+ addr = skip_heap_stack_gap(vma, len);
5470+ } while (!IS_ERR_VALUE(addr));
5471
5472 bottomup:
5473 /*
5474@@ -390,6 +390,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5475 gap == RLIM_INFINITY ||
5476 sysctl_legacy_va_layout) {
5477 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
5478+
5479+#ifdef CONFIG_PAX_RANDMMAP
5480+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5481+ mm->mmap_base += mm->delta_mmap;
5482+#endif
5483+
5484 mm->get_unmapped_area = arch_get_unmapped_area;
5485 mm->unmap_area = arch_unmap_area;
5486 } else {
5487@@ -402,6 +408,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5488 gap = (task_size / 6 * 5);
5489
5490 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
5491+
5492+#ifdef CONFIG_PAX_RANDMMAP
5493+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5494+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
5495+#endif
5496+
5497 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
5498 mm->unmap_area = arch_unmap_area_topdown;
5499 }
5500diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
5501index 591f20c..0f1b925 100644
5502--- a/arch/sparc/kernel/traps_32.c
5503+++ b/arch/sparc/kernel/traps_32.c
5504@@ -45,6 +45,8 @@ static void instruction_dump(unsigned long *pc)
5505 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
5506 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
5507
5508+extern void gr_handle_kernel_exploit(void);
5509+
5510 void die_if_kernel(char *str, struct pt_regs *regs)
5511 {
5512 static int die_counter;
5513@@ -77,15 +79,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5514 count++ < 30 &&
5515 (((unsigned long) rw) >= PAGE_OFFSET) &&
5516 !(((unsigned long) rw) & 0x7)) {
5517- printk("Caller[%08lx]: %pS\n", rw->ins[7],
5518+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
5519 (void *) rw->ins[7]);
5520 rw = (struct reg_window32 *)rw->ins[6];
5521 }
5522 }
5523 printk("Instruction DUMP:");
5524 instruction_dump ((unsigned long *) regs->pc);
5525- if(regs->psr & PSR_PS)
5526+ if(regs->psr & PSR_PS) {
5527+ gr_handle_kernel_exploit();
5528 do_exit(SIGKILL);
5529+ }
5530 do_exit(SIGSEGV);
5531 }
5532
5533diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
5534index 0cbdaa4..438e4c9 100644
5535--- a/arch/sparc/kernel/traps_64.c
5536+++ b/arch/sparc/kernel/traps_64.c
5537@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
5538 i + 1,
5539 p->trapstack[i].tstate, p->trapstack[i].tpc,
5540 p->trapstack[i].tnpc, p->trapstack[i].tt);
5541- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
5542+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
5543 }
5544 }
5545
5546@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
5547
5548 lvl -= 0x100;
5549 if (regs->tstate & TSTATE_PRIV) {
5550+
5551+#ifdef CONFIG_PAX_REFCOUNT
5552+ if (lvl == 6)
5553+ pax_report_refcount_overflow(regs);
5554+#endif
5555+
5556 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
5557 die_if_kernel(buffer, regs);
5558 }
5559@@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
5560 void bad_trap_tl1(struct pt_regs *regs, long lvl)
5561 {
5562 char buffer[32];
5563-
5564+
5565 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
5566 0, lvl, SIGTRAP) == NOTIFY_STOP)
5567 return;
5568
5569+#ifdef CONFIG_PAX_REFCOUNT
5570+ if (lvl == 6)
5571+ pax_report_refcount_overflow(regs);
5572+#endif
5573+
5574 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
5575
5576 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
5577@@ -1141,7 +1152,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
5578 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
5579 printk("%s" "ERROR(%d): ",
5580 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
5581- printk("TPC<%pS>\n", (void *) regs->tpc);
5582+ printk("TPC<%pA>\n", (void *) regs->tpc);
5583 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
5584 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
5585 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
5586@@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5587 smp_processor_id(),
5588 (type & 0x1) ? 'I' : 'D',
5589 regs->tpc);
5590- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
5591+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
5592 panic("Irrecoverable Cheetah+ parity error.");
5593 }
5594
5595@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5596 smp_processor_id(),
5597 (type & 0x1) ? 'I' : 'D',
5598 regs->tpc);
5599- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
5600+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
5601 }
5602
5603 struct sun4v_error_entry {
5604@@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
5605
5606 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
5607 regs->tpc, tl);
5608- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
5609+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
5610 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5611- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
5612+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
5613 (void *) regs->u_regs[UREG_I7]);
5614 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
5615 "pte[%lx] error[%lx]\n",
5616@@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
5617
5618 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
5619 regs->tpc, tl);
5620- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
5621+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
5622 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5623- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
5624+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
5625 (void *) regs->u_regs[UREG_I7]);
5626 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
5627 "pte[%lx] error[%lx]\n",
5628@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5629 fp = (unsigned long)sf->fp + STACK_BIAS;
5630 }
5631
5632- printk(" [%016lx] %pS\n", pc, (void *) pc);
5633+ printk(" [%016lx] %pA\n", pc, (void *) pc);
5634 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
5635 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
5636 int index = tsk->curr_ret_stack;
5637 if (tsk->ret_stack && index >= graph) {
5638 pc = tsk->ret_stack[index - graph].ret;
5639- printk(" [%016lx] %pS\n", pc, (void *) pc);
5640+ printk(" [%016lx] %pA\n", pc, (void *) pc);
5641 graph++;
5642 }
5643 }
5644@@ -2226,6 +2237,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
5645 return (struct reg_window *) (fp + STACK_BIAS);
5646 }
5647
5648+extern void gr_handle_kernel_exploit(void);
5649+
5650 void die_if_kernel(char *str, struct pt_regs *regs)
5651 {
5652 static int die_counter;
5653@@ -2254,7 +2267,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5654 while (rw &&
5655 count++ < 30 &&
5656 kstack_valid(tp, (unsigned long) rw)) {
5657- printk("Caller[%016lx]: %pS\n", rw->ins[7],
5658+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
5659 (void *) rw->ins[7]);
5660
5661 rw = kernel_stack_up(rw);
5662@@ -2267,8 +2280,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5663 }
5664 user_instruction_dump ((unsigned int __user *) regs->tpc);
5665 }
5666- if (regs->tstate & TSTATE_PRIV)
5667+ if (regs->tstate & TSTATE_PRIV) {
5668+ gr_handle_kernel_exploit();
5669 do_exit(SIGKILL);
5670+ }
5671 do_exit(SIGSEGV);
5672 }
5673 EXPORT_SYMBOL(die_if_kernel);
5674diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
5675index 76e4ac1..78f8bb1 100644
5676--- a/arch/sparc/kernel/unaligned_64.c
5677+++ b/arch/sparc/kernel/unaligned_64.c
5678@@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs *regs)
5679 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
5680
5681 if (__ratelimit(&ratelimit)) {
5682- printk("Kernel unaligned access at TPC[%lx] %pS\n",
5683+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
5684 regs->tpc, (void *) regs->tpc);
5685 }
5686 }
5687diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
5688index a3fc437..fea9957 100644
5689--- a/arch/sparc/lib/Makefile
5690+++ b/arch/sparc/lib/Makefile
5691@@ -2,7 +2,7 @@
5692 #
5693
5694 asflags-y := -ansi -DST_DIV0=0x02
5695-ccflags-y := -Werror
5696+#ccflags-y := -Werror
5697
5698 lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
5699 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
5700diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
5701index 59186e0..f747d7a 100644
5702--- a/arch/sparc/lib/atomic_64.S
5703+++ b/arch/sparc/lib/atomic_64.S
5704@@ -18,7 +18,12 @@
5705 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5706 BACKOFF_SETUP(%o2)
5707 1: lduw [%o1], %g1
5708- add %g1, %o0, %g7
5709+ addcc %g1, %o0, %g7
5710+
5711+#ifdef CONFIG_PAX_REFCOUNT
5712+ tvs %icc, 6
5713+#endif
5714+
5715 cas [%o1], %g1, %g7
5716 cmp %g1, %g7
5717 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5718@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5719 2: BACKOFF_SPIN(%o2, %o3, 1b)
5720 .size atomic_add, .-atomic_add
5721
5722+ .globl atomic_add_unchecked
5723+ .type atomic_add_unchecked,#function
5724+atomic_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5725+ BACKOFF_SETUP(%o2)
5726+1: lduw [%o1], %g1
5727+ add %g1, %o0, %g7
5728+ cas [%o1], %g1, %g7
5729+ cmp %g1, %g7
5730+ bne,pn %icc, 2f
5731+ nop
5732+ retl
5733+ nop
5734+2: BACKOFF_SPIN(%o2, %o3, 1b)
5735+ .size atomic_add_unchecked, .-atomic_add_unchecked
5736+
5737 .globl atomic_sub
5738 .type atomic_sub,#function
5739 atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5740 BACKOFF_SETUP(%o2)
5741 1: lduw [%o1], %g1
5742- sub %g1, %o0, %g7
5743+ subcc %g1, %o0, %g7
5744+
5745+#ifdef CONFIG_PAX_REFCOUNT
5746+ tvs %icc, 6
5747+#endif
5748+
5749 cas [%o1], %g1, %g7
5750 cmp %g1, %g7
5751 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5752@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5753 2: BACKOFF_SPIN(%o2, %o3, 1b)
5754 .size atomic_sub, .-atomic_sub
5755
5756+ .globl atomic_sub_unchecked
5757+ .type atomic_sub_unchecked,#function
5758+atomic_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
5759+ BACKOFF_SETUP(%o2)
5760+1: lduw [%o1], %g1
5761+ sub %g1, %o0, %g7
5762+ cas [%o1], %g1, %g7
5763+ cmp %g1, %g7
5764+ bne,pn %icc, 2f
5765+ nop
5766+ retl
5767+ nop
5768+2: BACKOFF_SPIN(%o2, %o3, 1b)
5769+ .size atomic_sub_unchecked, .-atomic_sub_unchecked
5770+
5771 .globl atomic_add_ret
5772 .type atomic_add_ret,#function
5773 atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5774 BACKOFF_SETUP(%o2)
5775 1: lduw [%o1], %g1
5776- add %g1, %o0, %g7
5777+ addcc %g1, %o0, %g7
5778+
5779+#ifdef CONFIG_PAX_REFCOUNT
5780+ tvs %icc, 6
5781+#endif
5782+
5783 cas [%o1], %g1, %g7
5784 cmp %g1, %g7
5785 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5786@@ -58,12 +103,33 @@ atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5787 2: BACKOFF_SPIN(%o2, %o3, 1b)
5788 .size atomic_add_ret, .-atomic_add_ret
5789
5790+ .globl atomic_add_ret_unchecked
5791+ .type atomic_add_ret_unchecked,#function
5792+atomic_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5793+ BACKOFF_SETUP(%o2)
5794+1: lduw [%o1], %g1
5795+ addcc %g1, %o0, %g7
5796+ cas [%o1], %g1, %g7
5797+ cmp %g1, %g7
5798+ bne,pn %icc, 2f
5799+ add %g7, %o0, %g7
5800+ sra %g7, 0, %o0
5801+ retl
5802+ nop
5803+2: BACKOFF_SPIN(%o2, %o3, 1b)
5804+ .size atomic_add_ret_unchecked, .-atomic_add_ret_unchecked
5805+
5806 .globl atomic_sub_ret
5807 .type atomic_sub_ret,#function
5808 atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5809 BACKOFF_SETUP(%o2)
5810 1: lduw [%o1], %g1
5811- sub %g1, %o0, %g7
5812+ subcc %g1, %o0, %g7
5813+
5814+#ifdef CONFIG_PAX_REFCOUNT
5815+ tvs %icc, 6
5816+#endif
5817+
5818 cas [%o1], %g1, %g7
5819 cmp %g1, %g7
5820 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5821@@ -78,7 +144,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5822 atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5823 BACKOFF_SETUP(%o2)
5824 1: ldx [%o1], %g1
5825- add %g1, %o0, %g7
5826+ addcc %g1, %o0, %g7
5827+
5828+#ifdef CONFIG_PAX_REFCOUNT
5829+ tvs %xcc, 6
5830+#endif
5831+
5832 casx [%o1], %g1, %g7
5833 cmp %g1, %g7
5834 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5835@@ -88,12 +159,32 @@ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5836 2: BACKOFF_SPIN(%o2, %o3, 1b)
5837 .size atomic64_add, .-atomic64_add
5838
5839+ .globl atomic64_add_unchecked
5840+ .type atomic64_add_unchecked,#function
5841+atomic64_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5842+ BACKOFF_SETUP(%o2)
5843+1: ldx [%o1], %g1
5844+ addcc %g1, %o0, %g7
5845+ casx [%o1], %g1, %g7
5846+ cmp %g1, %g7
5847+ bne,pn %xcc, 2f
5848+ nop
5849+ retl
5850+ nop
5851+2: BACKOFF_SPIN(%o2, %o3, 1b)
5852+ .size atomic64_add_unchecked, .-atomic64_add_unchecked
5853+
5854 .globl atomic64_sub
5855 .type atomic64_sub,#function
5856 atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5857 BACKOFF_SETUP(%o2)
5858 1: ldx [%o1], %g1
5859- sub %g1, %o0, %g7
5860+ subcc %g1, %o0, %g7
5861+
5862+#ifdef CONFIG_PAX_REFCOUNT
5863+ tvs %xcc, 6
5864+#endif
5865+
5866 casx [%o1], %g1, %g7
5867 cmp %g1, %g7
5868 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5869@@ -103,12 +194,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5870 2: BACKOFF_SPIN(%o2, %o3, 1b)
5871 .size atomic64_sub, .-atomic64_sub
5872
5873+ .globl atomic64_sub_unchecked
5874+ .type atomic64_sub_unchecked,#function
5875+atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
5876+ BACKOFF_SETUP(%o2)
5877+1: ldx [%o1], %g1
5878+ subcc %g1, %o0, %g7
5879+ casx [%o1], %g1, %g7
5880+ cmp %g1, %g7
5881+ bne,pn %xcc, 2f
5882+ nop
5883+ retl
5884+ nop
5885+2: BACKOFF_SPIN(%o2, %o3, 1b)
5886+ .size atomic64_sub_unchecked, .-atomic64_sub_unchecked
5887+
5888 .globl atomic64_add_ret
5889 .type atomic64_add_ret,#function
5890 atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5891 BACKOFF_SETUP(%o2)
5892 1: ldx [%o1], %g1
5893- add %g1, %o0, %g7
5894+ addcc %g1, %o0, %g7
5895+
5896+#ifdef CONFIG_PAX_REFCOUNT
5897+ tvs %xcc, 6
5898+#endif
5899+
5900 casx [%o1], %g1, %g7
5901 cmp %g1, %g7
5902 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5903@@ -118,12 +229,33 @@ atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5904 2: BACKOFF_SPIN(%o2, %o3, 1b)
5905 .size atomic64_add_ret, .-atomic64_add_ret
5906
5907+ .globl atomic64_add_ret_unchecked
5908+ .type atomic64_add_ret_unchecked,#function
5909+atomic64_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5910+ BACKOFF_SETUP(%o2)
5911+1: ldx [%o1], %g1
5912+ addcc %g1, %o0, %g7
5913+ casx [%o1], %g1, %g7
5914+ cmp %g1, %g7
5915+ bne,pn %xcc, 2f
5916+ add %g7, %o0, %g7
5917+ mov %g7, %o0
5918+ retl
5919+ nop
5920+2: BACKOFF_SPIN(%o2, %o3, 1b)
5921+ .size atomic64_add_ret_unchecked, .-atomic64_add_ret_unchecked
5922+
5923 .globl atomic64_sub_ret
5924 .type atomic64_sub_ret,#function
5925 atomic64_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5926 BACKOFF_SETUP(%o2)
5927 1: ldx [%o1], %g1
5928- sub %g1, %o0, %g7
5929+ subcc %g1, %o0, %g7
5930+
5931+#ifdef CONFIG_PAX_REFCOUNT
5932+ tvs %xcc, 6
5933+#endif
5934+
5935 casx [%o1], %g1, %g7
5936 cmp %g1, %g7
5937 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5938diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
5939index 1b30bb3..b4a16c7 100644
5940--- a/arch/sparc/lib/ksyms.c
5941+++ b/arch/sparc/lib/ksyms.c
5942@@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write);
5943
5944 /* Atomic counter implementation. */
5945 EXPORT_SYMBOL(atomic_add);
5946+EXPORT_SYMBOL(atomic_add_unchecked);
5947 EXPORT_SYMBOL(atomic_add_ret);
5948+EXPORT_SYMBOL(atomic_add_ret_unchecked);
5949 EXPORT_SYMBOL(atomic_sub);
5950+EXPORT_SYMBOL(atomic_sub_unchecked);
5951 EXPORT_SYMBOL(atomic_sub_ret);
5952 EXPORT_SYMBOL(atomic64_add);
5953+EXPORT_SYMBOL(atomic64_add_unchecked);
5954 EXPORT_SYMBOL(atomic64_add_ret);
5955+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
5956 EXPORT_SYMBOL(atomic64_sub);
5957+EXPORT_SYMBOL(atomic64_sub_unchecked);
5958 EXPORT_SYMBOL(atomic64_sub_ret);
5959
5960 /* Atomic bit operations. */
5961diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
5962index 301421c..e2535d1 100644
5963--- a/arch/sparc/mm/Makefile
5964+++ b/arch/sparc/mm/Makefile
5965@@ -2,7 +2,7 @@
5966 #
5967
5968 asflags-y := -ansi
5969-ccflags-y := -Werror
5970+#ccflags-y := -Werror
5971
5972 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
5973 obj-y += fault_$(BITS).o
5974diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
5975index 8023fd7..c8e89e9 100644
5976--- a/arch/sparc/mm/fault_32.c
5977+++ b/arch/sparc/mm/fault_32.c
5978@@ -21,6 +21,9 @@
5979 #include <linux/perf_event.h>
5980 #include <linux/interrupt.h>
5981 #include <linux/kdebug.h>
5982+#include <linux/slab.h>
5983+#include <linux/pagemap.h>
5984+#include <linux/compiler.h>
5985
5986 #include <asm/system.h>
5987 #include <asm/page.h>
5988@@ -208,6 +211,268 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
5989 return safe_compute_effective_address(regs, insn);
5990 }
5991
5992+#ifdef CONFIG_PAX_PAGEEXEC
5993+#ifdef CONFIG_PAX_DLRESOLVE
5994+static void pax_emuplt_close(struct vm_area_struct *vma)
5995+{
5996+ vma->vm_mm->call_dl_resolve = 0UL;
5997+}
5998+
5999+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
6000+{
6001+ unsigned int *kaddr;
6002+
6003+ vmf->page = alloc_page(GFP_HIGHUSER);
6004+ if (!vmf->page)
6005+ return VM_FAULT_OOM;
6006+
6007+ kaddr = kmap(vmf->page);
6008+ memset(kaddr, 0, PAGE_SIZE);
6009+ kaddr[0] = 0x9DE3BFA8U; /* save */
6010+ flush_dcache_page(vmf->page);
6011+ kunmap(vmf->page);
6012+ return VM_FAULT_MAJOR;
6013+}
6014+
6015+static const struct vm_operations_struct pax_vm_ops = {
6016+ .close = pax_emuplt_close,
6017+ .fault = pax_emuplt_fault
6018+};
6019+
6020+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6021+{
6022+ int ret;
6023+
6024+ INIT_LIST_HEAD(&vma->anon_vma_chain);
6025+ vma->vm_mm = current->mm;
6026+ vma->vm_start = addr;
6027+ vma->vm_end = addr + PAGE_SIZE;
6028+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6029+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6030+ vma->vm_ops = &pax_vm_ops;
6031+
6032+ ret = insert_vm_struct(current->mm, vma);
6033+ if (ret)
6034+ return ret;
6035+
6036+ ++current->mm->total_vm;
6037+ return 0;
6038+}
6039+#endif
6040+
6041+/*
6042+ * PaX: decide what to do with offenders (regs->pc = fault address)
6043+ *
6044+ * returns 1 when task should be killed
6045+ * 2 when patched PLT trampoline was detected
6046+ * 3 when unpatched PLT trampoline was detected
6047+ */
6048+static int pax_handle_fetch_fault(struct pt_regs *regs)
6049+{
6050+
6051+#ifdef CONFIG_PAX_EMUPLT
6052+ int err;
6053+
6054+ do { /* PaX: patched PLT emulation #1 */
6055+ unsigned int sethi1, sethi2, jmpl;
6056+
6057+ err = get_user(sethi1, (unsigned int *)regs->pc);
6058+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
6059+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
6060+
6061+ if (err)
6062+ break;
6063+
6064+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6065+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
6066+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
6067+ {
6068+ unsigned int addr;
6069+
6070+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6071+ addr = regs->u_regs[UREG_G1];
6072+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6073+ regs->pc = addr;
6074+ regs->npc = addr+4;
6075+ return 2;
6076+ }
6077+ } while (0);
6078+
6079+ { /* PaX: patched PLT emulation #2 */
6080+ unsigned int ba;
6081+
6082+ err = get_user(ba, (unsigned int *)regs->pc);
6083+
6084+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
6085+ unsigned int addr;
6086+
6087+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6088+ regs->pc = addr;
6089+ regs->npc = addr+4;
6090+ return 2;
6091+ }
6092+ }
6093+
6094+ do { /* PaX: patched PLT emulation #3 */
6095+ unsigned int sethi, jmpl, nop;
6096+
6097+ err = get_user(sethi, (unsigned int *)regs->pc);
6098+ err |= get_user(jmpl, (unsigned int *)(regs->pc+4));
6099+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
6100+
6101+ if (err)
6102+ break;
6103+
6104+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6105+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
6106+ nop == 0x01000000U)
6107+ {
6108+ unsigned int addr;
6109+
6110+ addr = (sethi & 0x003FFFFFU) << 10;
6111+ regs->u_regs[UREG_G1] = addr;
6112+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6113+ regs->pc = addr;
6114+ regs->npc = addr+4;
6115+ return 2;
6116+ }
6117+ } while (0);
6118+
6119+ do { /* PaX: unpatched PLT emulation step 1 */
6120+ unsigned int sethi, ba, nop;
6121+
6122+ err = get_user(sethi, (unsigned int *)regs->pc);
6123+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
6124+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
6125+
6126+ if (err)
6127+ break;
6128+
6129+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6130+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6131+ nop == 0x01000000U)
6132+ {
6133+ unsigned int addr, save, call;
6134+
6135+ if ((ba & 0xFFC00000U) == 0x30800000U)
6136+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6137+ else
6138+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
6139+
6140+ err = get_user(save, (unsigned int *)addr);
6141+ err |= get_user(call, (unsigned int *)(addr+4));
6142+ err |= get_user(nop, (unsigned int *)(addr+8));
6143+ if (err)
6144+ break;
6145+
6146+#ifdef CONFIG_PAX_DLRESOLVE
6147+ if (save == 0x9DE3BFA8U &&
6148+ (call & 0xC0000000U) == 0x40000000U &&
6149+ nop == 0x01000000U)
6150+ {
6151+ struct vm_area_struct *vma;
6152+ unsigned long call_dl_resolve;
6153+
6154+ down_read(&current->mm->mmap_sem);
6155+ call_dl_resolve = current->mm->call_dl_resolve;
6156+ up_read(&current->mm->mmap_sem);
6157+ if (likely(call_dl_resolve))
6158+ goto emulate;
6159+
6160+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6161+
6162+ down_write(&current->mm->mmap_sem);
6163+ if (current->mm->call_dl_resolve) {
6164+ call_dl_resolve = current->mm->call_dl_resolve;
6165+ up_write(&current->mm->mmap_sem);
6166+ if (vma)
6167+ kmem_cache_free(vm_area_cachep, vma);
6168+ goto emulate;
6169+ }
6170+
6171+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6172+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6173+ up_write(&current->mm->mmap_sem);
6174+ if (vma)
6175+ kmem_cache_free(vm_area_cachep, vma);
6176+ return 1;
6177+ }
6178+
6179+ if (pax_insert_vma(vma, call_dl_resolve)) {
6180+ up_write(&current->mm->mmap_sem);
6181+ kmem_cache_free(vm_area_cachep, vma);
6182+ return 1;
6183+ }
6184+
6185+ current->mm->call_dl_resolve = call_dl_resolve;
6186+ up_write(&current->mm->mmap_sem);
6187+
6188+emulate:
6189+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6190+ regs->pc = call_dl_resolve;
6191+ regs->npc = addr+4;
6192+ return 3;
6193+ }
6194+#endif
6195+
6196+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6197+ if ((save & 0xFFC00000U) == 0x05000000U &&
6198+ (call & 0xFFFFE000U) == 0x85C0A000U &&
6199+ nop == 0x01000000U)
6200+ {
6201+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6202+ regs->u_regs[UREG_G2] = addr + 4;
6203+ addr = (save & 0x003FFFFFU) << 10;
6204+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6205+ regs->pc = addr;
6206+ regs->npc = addr+4;
6207+ return 3;
6208+ }
6209+ }
6210+ } while (0);
6211+
6212+ do { /* PaX: unpatched PLT emulation step 2 */
6213+ unsigned int save, call, nop;
6214+
6215+ err = get_user(save, (unsigned int *)(regs->pc-4));
6216+ err |= get_user(call, (unsigned int *)regs->pc);
6217+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
6218+ if (err)
6219+ break;
6220+
6221+ if (save == 0x9DE3BFA8U &&
6222+ (call & 0xC0000000U) == 0x40000000U &&
6223+ nop == 0x01000000U)
6224+ {
6225+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
6226+
6227+ regs->u_regs[UREG_RETPC] = regs->pc;
6228+ regs->pc = dl_resolve;
6229+ regs->npc = dl_resolve+4;
6230+ return 3;
6231+ }
6232+ } while (0);
6233+#endif
6234+
6235+ return 1;
6236+}
6237+
6238+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6239+{
6240+ unsigned long i;
6241+
6242+ printk(KERN_ERR "PAX: bytes at PC: ");
6243+ for (i = 0; i < 8; i++) {
6244+ unsigned int c;
6245+ if (get_user(c, (unsigned int *)pc+i))
6246+ printk(KERN_CONT "???????? ");
6247+ else
6248+ printk(KERN_CONT "%08x ", c);
6249+ }
6250+ printk("\n");
6251+}
6252+#endif
6253+
6254 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
6255 int text_fault)
6256 {
6257@@ -280,6 +545,24 @@ good_area:
6258 if(!(vma->vm_flags & VM_WRITE))
6259 goto bad_area;
6260 } else {
6261+
6262+#ifdef CONFIG_PAX_PAGEEXEC
6263+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
6264+ up_read(&mm->mmap_sem);
6265+ switch (pax_handle_fetch_fault(regs)) {
6266+
6267+#ifdef CONFIG_PAX_EMUPLT
6268+ case 2:
6269+ case 3:
6270+ return;
6271+#endif
6272+
6273+ }
6274+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
6275+ do_group_exit(SIGKILL);
6276+ }
6277+#endif
6278+
6279 /* Allow reads even for write-only mappings */
6280 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
6281 goto bad_area;
6282diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
6283index 504c062..6fcb9c6 100644
6284--- a/arch/sparc/mm/fault_64.c
6285+++ b/arch/sparc/mm/fault_64.c
6286@@ -21,6 +21,9 @@
6287 #include <linux/kprobes.h>
6288 #include <linux/kdebug.h>
6289 #include <linux/percpu.h>
6290+#include <linux/slab.h>
6291+#include <linux/pagemap.h>
6292+#include <linux/compiler.h>
6293
6294 #include <asm/page.h>
6295 #include <asm/pgtable.h>
6296@@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
6297 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
6298 regs->tpc);
6299 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
6300- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
6301+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
6302 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
6303 dump_stack();
6304 unhandled_fault(regs->tpc, current, regs);
6305@@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
6306 show_regs(regs);
6307 }
6308
6309+#ifdef CONFIG_PAX_PAGEEXEC
6310+#ifdef CONFIG_PAX_DLRESOLVE
6311+static void pax_emuplt_close(struct vm_area_struct *vma)
6312+{
6313+ vma->vm_mm->call_dl_resolve = 0UL;
6314+}
6315+
6316+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
6317+{
6318+ unsigned int *kaddr;
6319+
6320+ vmf->page = alloc_page(GFP_HIGHUSER);
6321+ if (!vmf->page)
6322+ return VM_FAULT_OOM;
6323+
6324+ kaddr = kmap(vmf->page);
6325+ memset(kaddr, 0, PAGE_SIZE);
6326+ kaddr[0] = 0x9DE3BFA8U; /* save */
6327+ flush_dcache_page(vmf->page);
6328+ kunmap(vmf->page);
6329+ return VM_FAULT_MAJOR;
6330+}
6331+
6332+static const struct vm_operations_struct pax_vm_ops = {
6333+ .close = pax_emuplt_close,
6334+ .fault = pax_emuplt_fault
6335+};
6336+
6337+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6338+{
6339+ int ret;
6340+
6341+ INIT_LIST_HEAD(&vma->anon_vma_chain);
6342+ vma->vm_mm = current->mm;
6343+ vma->vm_start = addr;
6344+ vma->vm_end = addr + PAGE_SIZE;
6345+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6346+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6347+ vma->vm_ops = &pax_vm_ops;
6348+
6349+ ret = insert_vm_struct(current->mm, vma);
6350+ if (ret)
6351+ return ret;
6352+
6353+ ++current->mm->total_vm;
6354+ return 0;
6355+}
6356+#endif
6357+
6358+/*
6359+ * PaX: decide what to do with offenders (regs->tpc = fault address)
6360+ *
6361+ * returns 1 when task should be killed
6362+ * 2 when patched PLT trampoline was detected
6363+ * 3 when unpatched PLT trampoline was detected
6364+ */
6365+static int pax_handle_fetch_fault(struct pt_regs *regs)
6366+{
6367+
6368+#ifdef CONFIG_PAX_EMUPLT
6369+ int err;
6370+
6371+ do { /* PaX: patched PLT emulation #1 */
6372+ unsigned int sethi1, sethi2, jmpl;
6373+
6374+ err = get_user(sethi1, (unsigned int *)regs->tpc);
6375+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
6376+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
6377+
6378+ if (err)
6379+ break;
6380+
6381+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6382+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
6383+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
6384+ {
6385+ unsigned long addr;
6386+
6387+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6388+ addr = regs->u_regs[UREG_G1];
6389+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6390+
6391+ if (test_thread_flag(TIF_32BIT))
6392+ addr &= 0xFFFFFFFFUL;
6393+
6394+ regs->tpc = addr;
6395+ regs->tnpc = addr+4;
6396+ return 2;
6397+ }
6398+ } while (0);
6399+
6400+ { /* PaX: patched PLT emulation #2 */
6401+ unsigned int ba;
6402+
6403+ err = get_user(ba, (unsigned int *)regs->tpc);
6404+
6405+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
6406+ unsigned long addr;
6407+
6408+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6409+
6410+ if (test_thread_flag(TIF_32BIT))
6411+ addr &= 0xFFFFFFFFUL;
6412+
6413+ regs->tpc = addr;
6414+ regs->tnpc = addr+4;
6415+ return 2;
6416+ }
6417+ }
6418+
6419+ do { /* PaX: patched PLT emulation #3 */
6420+ unsigned int sethi, jmpl, nop;
6421+
6422+ err = get_user(sethi, (unsigned int *)regs->tpc);
6423+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+4));
6424+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6425+
6426+ if (err)
6427+ break;
6428+
6429+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6430+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
6431+ nop == 0x01000000U)
6432+ {
6433+ unsigned long addr;
6434+
6435+ addr = (sethi & 0x003FFFFFU) << 10;
6436+ regs->u_regs[UREG_G1] = addr;
6437+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6438+
6439+ if (test_thread_flag(TIF_32BIT))
6440+ addr &= 0xFFFFFFFFUL;
6441+
6442+ regs->tpc = addr;
6443+ regs->tnpc = addr+4;
6444+ return 2;
6445+ }
6446+ } while (0);
6447+
6448+ do { /* PaX: patched PLT emulation #4 */
6449+ unsigned int sethi, mov1, call, mov2;
6450+
6451+ err = get_user(sethi, (unsigned int *)regs->tpc);
6452+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
6453+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
6454+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
6455+
6456+ if (err)
6457+ break;
6458+
6459+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6460+ mov1 == 0x8210000FU &&
6461+ (call & 0xC0000000U) == 0x40000000U &&
6462+ mov2 == 0x9E100001U)
6463+ {
6464+ unsigned long addr;
6465+
6466+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
6467+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6468+
6469+ if (test_thread_flag(TIF_32BIT))
6470+ addr &= 0xFFFFFFFFUL;
6471+
6472+ regs->tpc = addr;
6473+ regs->tnpc = addr+4;
6474+ return 2;
6475+ }
6476+ } while (0);
6477+
6478+ do { /* PaX: patched PLT emulation #5 */
6479+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
6480+
6481+ err = get_user(sethi, (unsigned int *)regs->tpc);
6482+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6483+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6484+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
6485+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
6486+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
6487+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
6488+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
6489+
6490+ if (err)
6491+ break;
6492+
6493+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6494+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
6495+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6496+ (or1 & 0xFFFFE000U) == 0x82106000U &&
6497+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
6498+ sllx == 0x83287020U &&
6499+ jmpl == 0x81C04005U &&
6500+ nop == 0x01000000U)
6501+ {
6502+ unsigned long addr;
6503+
6504+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6505+ regs->u_regs[UREG_G1] <<= 32;
6506+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6507+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6508+ regs->tpc = addr;
6509+ regs->tnpc = addr+4;
6510+ return 2;
6511+ }
6512+ } while (0);
6513+
6514+ do { /* PaX: patched PLT emulation #6 */
6515+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
6516+
6517+ err = get_user(sethi, (unsigned int *)regs->tpc);
6518+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6519+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6520+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
6521+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
6522+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
6523+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
6524+
6525+ if (err)
6526+ break;
6527+
6528+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6529+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
6530+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6531+ sllx == 0x83287020U &&
6532+ (or & 0xFFFFE000U) == 0x8A116000U &&
6533+ jmpl == 0x81C04005U &&
6534+ nop == 0x01000000U)
6535+ {
6536+ unsigned long addr;
6537+
6538+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
6539+ regs->u_regs[UREG_G1] <<= 32;
6540+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
6541+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6542+ regs->tpc = addr;
6543+ regs->tnpc = addr+4;
6544+ return 2;
6545+ }
6546+ } while (0);
6547+
6548+ do { /* PaX: unpatched PLT emulation step 1 */
6549+ unsigned int sethi, ba, nop;
6550+
6551+ err = get_user(sethi, (unsigned int *)regs->tpc);
6552+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6553+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6554+
6555+ if (err)
6556+ break;
6557+
6558+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6559+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6560+ nop == 0x01000000U)
6561+ {
6562+ unsigned long addr;
6563+ unsigned int save, call;
6564+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
6565+
6566+ if ((ba & 0xFFC00000U) == 0x30800000U)
6567+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6568+ else
6569+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6570+
6571+ if (test_thread_flag(TIF_32BIT))
6572+ addr &= 0xFFFFFFFFUL;
6573+
6574+ err = get_user(save, (unsigned int *)addr);
6575+ err |= get_user(call, (unsigned int *)(addr+4));
6576+ err |= get_user(nop, (unsigned int *)(addr+8));
6577+ if (err)
6578+ break;
6579+
6580+#ifdef CONFIG_PAX_DLRESOLVE
6581+ if (save == 0x9DE3BFA8U &&
6582+ (call & 0xC0000000U) == 0x40000000U &&
6583+ nop == 0x01000000U)
6584+ {
6585+ struct vm_area_struct *vma;
6586+ unsigned long call_dl_resolve;
6587+
6588+ down_read(&current->mm->mmap_sem);
6589+ call_dl_resolve = current->mm->call_dl_resolve;
6590+ up_read(&current->mm->mmap_sem);
6591+ if (likely(call_dl_resolve))
6592+ goto emulate;
6593+
6594+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6595+
6596+ down_write(&current->mm->mmap_sem);
6597+ if (current->mm->call_dl_resolve) {
6598+ call_dl_resolve = current->mm->call_dl_resolve;
6599+ up_write(&current->mm->mmap_sem);
6600+ if (vma)
6601+ kmem_cache_free(vm_area_cachep, vma);
6602+ goto emulate;
6603+ }
6604+
6605+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6606+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6607+ up_write(&current->mm->mmap_sem);
6608+ if (vma)
6609+ kmem_cache_free(vm_area_cachep, vma);
6610+ return 1;
6611+ }
6612+
6613+ if (pax_insert_vma(vma, call_dl_resolve)) {
6614+ up_write(&current->mm->mmap_sem);
6615+ kmem_cache_free(vm_area_cachep, vma);
6616+ return 1;
6617+ }
6618+
6619+ current->mm->call_dl_resolve = call_dl_resolve;
6620+ up_write(&current->mm->mmap_sem);
6621+
6622+emulate:
6623+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6624+ regs->tpc = call_dl_resolve;
6625+ regs->tnpc = addr+4;
6626+ return 3;
6627+ }
6628+#endif
6629+
6630+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6631+ if ((save & 0xFFC00000U) == 0x05000000U &&
6632+ (call & 0xFFFFE000U) == 0x85C0A000U &&
6633+ nop == 0x01000000U)
6634+ {
6635+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6636+ regs->u_regs[UREG_G2] = addr + 4;
6637+ addr = (save & 0x003FFFFFU) << 10;
6638+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6639+
6640+ if (test_thread_flag(TIF_32BIT))
6641+ addr &= 0xFFFFFFFFUL;
6642+
6643+ regs->tpc = addr;
6644+ regs->tnpc = addr+4;
6645+ return 3;
6646+ }
6647+
6648+ /* PaX: 64-bit PLT stub */
6649+ err = get_user(sethi1, (unsigned int *)addr);
6650+ err |= get_user(sethi2, (unsigned int *)(addr+4));
6651+ err |= get_user(or1, (unsigned int *)(addr+8));
6652+ err |= get_user(or2, (unsigned int *)(addr+12));
6653+ err |= get_user(sllx, (unsigned int *)(addr+16));
6654+ err |= get_user(add, (unsigned int *)(addr+20));
6655+ err |= get_user(jmpl, (unsigned int *)(addr+24));
6656+ err |= get_user(nop, (unsigned int *)(addr+28));
6657+ if (err)
6658+ break;
6659+
6660+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
6661+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6662+ (or1 & 0xFFFFE000U) == 0x88112000U &&
6663+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
6664+ sllx == 0x89293020U &&
6665+ add == 0x8A010005U &&
6666+ jmpl == 0x89C14000U &&
6667+ nop == 0x01000000U)
6668+ {
6669+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6670+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6671+ regs->u_regs[UREG_G4] <<= 32;
6672+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6673+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
6674+ regs->u_regs[UREG_G4] = addr + 24;
6675+ addr = regs->u_regs[UREG_G5];
6676+ regs->tpc = addr;
6677+ regs->tnpc = addr+4;
6678+ return 3;
6679+ }
6680+ }
6681+ } while (0);
6682+
6683+#ifdef CONFIG_PAX_DLRESOLVE
6684+ do { /* PaX: unpatched PLT emulation step 2 */
6685+ unsigned int save, call, nop;
6686+
6687+ err = get_user(save, (unsigned int *)(regs->tpc-4));
6688+ err |= get_user(call, (unsigned int *)regs->tpc);
6689+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
6690+ if (err)
6691+ break;
6692+
6693+ if (save == 0x9DE3BFA8U &&
6694+ (call & 0xC0000000U) == 0x40000000U &&
6695+ nop == 0x01000000U)
6696+ {
6697+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6698+
6699+ if (test_thread_flag(TIF_32BIT))
6700+ dl_resolve &= 0xFFFFFFFFUL;
6701+
6702+ regs->u_regs[UREG_RETPC] = regs->tpc;
6703+ regs->tpc = dl_resolve;
6704+ regs->tnpc = dl_resolve+4;
6705+ return 3;
6706+ }
6707+ } while (0);
6708+#endif
6709+
6710+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
6711+ unsigned int sethi, ba, nop;
6712+
6713+ err = get_user(sethi, (unsigned int *)regs->tpc);
6714+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6715+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6716+
6717+ if (err)
6718+ break;
6719+
6720+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6721+ (ba & 0xFFF00000U) == 0x30600000U &&
6722+ nop == 0x01000000U)
6723+ {
6724+ unsigned long addr;
6725+
6726+ addr = (sethi & 0x003FFFFFU) << 10;
6727+ regs->u_regs[UREG_G1] = addr;
6728+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6729+
6730+ if (test_thread_flag(TIF_32BIT))
6731+ addr &= 0xFFFFFFFFUL;
6732+
6733+ regs->tpc = addr;
6734+ regs->tnpc = addr+4;
6735+ return 2;
6736+ }
6737+ } while (0);
6738+
6739+#endif
6740+
6741+ return 1;
6742+}
6743+
6744+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6745+{
6746+ unsigned long i;
6747+
6748+ printk(KERN_ERR "PAX: bytes at PC: ");
6749+ for (i = 0; i < 8; i++) {
6750+ unsigned int c;
6751+ if (get_user(c, (unsigned int *)pc+i))
6752+ printk(KERN_CONT "???????? ");
6753+ else
6754+ printk(KERN_CONT "%08x ", c);
6755+ }
6756+ printk("\n");
6757+}
6758+#endif
6759+
6760 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6761 {
6762 struct mm_struct *mm = current->mm;
6763@@ -340,6 +794,29 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6764 if (!vma)
6765 goto bad_area;
6766
6767+#ifdef CONFIG_PAX_PAGEEXEC
6768+ /* PaX: detect ITLB misses on non-exec pages */
6769+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
6770+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
6771+ {
6772+ if (address != regs->tpc)
6773+ goto good_area;
6774+
6775+ up_read(&mm->mmap_sem);
6776+ switch (pax_handle_fetch_fault(regs)) {
6777+
6778+#ifdef CONFIG_PAX_EMUPLT
6779+ case 2:
6780+ case 3:
6781+ return;
6782+#endif
6783+
6784+ }
6785+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
6786+ do_group_exit(SIGKILL);
6787+ }
6788+#endif
6789+
6790 /* Pure DTLB misses do not tell us whether the fault causing
6791 * load/store/atomic was a write or not, it only says that there
6792 * was no match. So in such a case we (carefully) read the
6793diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
6794index 07e1453..0a7d9e9 100644
6795--- a/arch/sparc/mm/hugetlbpage.c
6796+++ b/arch/sparc/mm/hugetlbpage.c
6797@@ -67,7 +67,7 @@ full_search:
6798 }
6799 return -ENOMEM;
6800 }
6801- if (likely(!vma || addr + len <= vma->vm_start)) {
6802+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6803 /*
6804 * Remember the place where we stopped the search:
6805 */
6806@@ -106,7 +106,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6807 /* make sure it can fit in the remaining address space */
6808 if (likely(addr > len)) {
6809 vma = find_vma(mm, addr-len);
6810- if (!vma || addr <= vma->vm_start) {
6811+ if (check_heap_stack_gap(vma, addr - len, len)) {
6812 /* remember the address as a hint for next time */
6813 return (mm->free_area_cache = addr-len);
6814 }
6815@@ -115,16 +115,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6816 if (unlikely(mm->mmap_base < len))
6817 goto bottomup;
6818
6819- addr = (mm->mmap_base-len) & HPAGE_MASK;
6820+ addr = mm->mmap_base - len;
6821
6822 do {
6823+ addr &= HPAGE_MASK;
6824 /*
6825 * Lookup failure means no vma is above this address,
6826 * else if new region fits below vma->vm_start,
6827 * return with success:
6828 */
6829 vma = find_vma(mm, addr);
6830- if (likely(!vma || addr+len <= vma->vm_start)) {
6831+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6832 /* remember the address as a hint for next time */
6833 return (mm->free_area_cache = addr);
6834 }
6835@@ -134,8 +135,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6836 mm->cached_hole_size = vma->vm_start - addr;
6837
6838 /* try just below the current vma->vm_start */
6839- addr = (vma->vm_start-len) & HPAGE_MASK;
6840- } while (likely(len < vma->vm_start));
6841+ addr = skip_heap_stack_gap(vma, len);
6842+ } while (!IS_ERR_VALUE(addr));
6843
6844 bottomup:
6845 /*
6846@@ -181,8 +182,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
6847 if (addr) {
6848 addr = ALIGN(addr, HPAGE_SIZE);
6849 vma = find_vma(mm, addr);
6850- if (task_size - len >= addr &&
6851- (!vma || addr + len <= vma->vm_start))
6852+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
6853 return addr;
6854 }
6855 if (mm->get_unmapped_area == arch_get_unmapped_area)
6856diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
6857index 7b00de6..78239f4 100644
6858--- a/arch/sparc/mm/init_32.c
6859+++ b/arch/sparc/mm/init_32.c
6860@@ -316,6 +316,9 @@ extern void device_scan(void);
6861 pgprot_t PAGE_SHARED __read_mostly;
6862 EXPORT_SYMBOL(PAGE_SHARED);
6863
6864+pgprot_t PAGE_SHARED_NOEXEC __read_mostly;
6865+EXPORT_SYMBOL(PAGE_SHARED_NOEXEC);
6866+
6867 void __init paging_init(void)
6868 {
6869 switch(sparc_cpu_model) {
6870@@ -344,17 +347,17 @@ void __init paging_init(void)
6871
6872 /* Initialize the protection map with non-constant, MMU dependent values. */
6873 protection_map[0] = PAGE_NONE;
6874- protection_map[1] = PAGE_READONLY;
6875- protection_map[2] = PAGE_COPY;
6876- protection_map[3] = PAGE_COPY;
6877+ protection_map[1] = PAGE_READONLY_NOEXEC;
6878+ protection_map[2] = PAGE_COPY_NOEXEC;
6879+ protection_map[3] = PAGE_COPY_NOEXEC;
6880 protection_map[4] = PAGE_READONLY;
6881 protection_map[5] = PAGE_READONLY;
6882 protection_map[6] = PAGE_COPY;
6883 protection_map[7] = PAGE_COPY;
6884 protection_map[8] = PAGE_NONE;
6885- protection_map[9] = PAGE_READONLY;
6886- protection_map[10] = PAGE_SHARED;
6887- protection_map[11] = PAGE_SHARED;
6888+ protection_map[9] = PAGE_READONLY_NOEXEC;
6889+ protection_map[10] = PAGE_SHARED_NOEXEC;
6890+ protection_map[11] = PAGE_SHARED_NOEXEC;
6891 protection_map[12] = PAGE_READONLY;
6892 protection_map[13] = PAGE_READONLY;
6893 protection_map[14] = PAGE_SHARED;
6894diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
6895index cbef74e..c38fead 100644
6896--- a/arch/sparc/mm/srmmu.c
6897+++ b/arch/sparc/mm/srmmu.c
6898@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
6899 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
6900 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
6901 BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY));
6902+
6903+#ifdef CONFIG_PAX_PAGEEXEC
6904+ PAGE_SHARED_NOEXEC = pgprot_val(SRMMU_PAGE_SHARED_NOEXEC);
6905+ BTFIXUPSET_INT(page_copy_noexec, pgprot_val(SRMMU_PAGE_COPY_NOEXEC));
6906+ BTFIXUPSET_INT(page_readonly_noexec, pgprot_val(SRMMU_PAGE_RDONLY_NOEXEC));
6907+#endif
6908+
6909 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
6910 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
6911
6912diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
6913index 27fe667..36d474c 100644
6914--- a/arch/tile/include/asm/atomic_64.h
6915+++ b/arch/tile/include/asm/atomic_64.h
6916@@ -142,6 +142,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
6917
6918 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
6919
6920+#define atomic64_read_unchecked(v) atomic64_read(v)
6921+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
6922+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
6923+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
6924+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
6925+#define atomic64_inc_unchecked(v) atomic64_inc(v)
6926+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
6927+#define atomic64_dec_unchecked(v) atomic64_dec(v)
6928+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
6929+
6930 /* Atomic dec and inc don't implement barrier, so provide them if needed. */
6931 #define smp_mb__before_atomic_dec() smp_mb()
6932 #define smp_mb__after_atomic_dec() smp_mb()
6933diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
6934index 392e533..536b092 100644
6935--- a/arch/tile/include/asm/cache.h
6936+++ b/arch/tile/include/asm/cache.h
6937@@ -15,11 +15,12 @@
6938 #ifndef _ASM_TILE_CACHE_H
6939 #define _ASM_TILE_CACHE_H
6940
6941+#include <linux/const.h>
6942 #include <arch/chip.h>
6943
6944 /* bytes per L1 data cache line */
6945 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
6946-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6947+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6948
6949 /* bytes per L2 cache line */
6950 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
6951diff --git a/arch/um/Makefile b/arch/um/Makefile
6952index 7730af6..cce5b19 100644
6953--- a/arch/um/Makefile
6954+++ b/arch/um/Makefile
6955@@ -61,6 +61,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
6956 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
6957 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
6958
6959+ifdef CONSTIFY_PLUGIN
6960+USER_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
6961+endif
6962+
6963 #This will adjust *FLAGS accordingly to the platform.
6964 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
6965
6966diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
6967index 19e1bdd..3665b77 100644
6968--- a/arch/um/include/asm/cache.h
6969+++ b/arch/um/include/asm/cache.h
6970@@ -1,6 +1,7 @@
6971 #ifndef __UM_CACHE_H
6972 #define __UM_CACHE_H
6973
6974+#include <linux/const.h>
6975
6976 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
6977 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
6978@@ -12,6 +13,6 @@
6979 # define L1_CACHE_SHIFT 5
6980 #endif
6981
6982-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6983+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6984
6985 #endif
6986diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
6987index 6c03acd..a5e0215 100644
6988--- a/arch/um/include/asm/kmap_types.h
6989+++ b/arch/um/include/asm/kmap_types.h
6990@@ -23,6 +23,7 @@ enum km_type {
6991 KM_IRQ1,
6992 KM_SOFTIRQ0,
6993 KM_SOFTIRQ1,
6994+ KM_CLEARPAGE,
6995 KM_TYPE_NR
6996 };
6997
6998diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
6999index 7cfc3ce..cbd1a58 100644
7000--- a/arch/um/include/asm/page.h
7001+++ b/arch/um/include/asm/page.h
7002@@ -14,6 +14,9 @@
7003 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
7004 #define PAGE_MASK (~(PAGE_SIZE-1))
7005
7006+#define ktla_ktva(addr) (addr)
7007+#define ktva_ktla(addr) (addr)
7008+
7009 #ifndef __ASSEMBLY__
7010
7011 struct page;
7012diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
7013index c533835..84db18e 100644
7014--- a/arch/um/kernel/process.c
7015+++ b/arch/um/kernel/process.c
7016@@ -406,22 +406,6 @@ int singlestepping(void * t)
7017 return 2;
7018 }
7019
7020-/*
7021- * Only x86 and x86_64 have an arch_align_stack().
7022- * All other arches have "#define arch_align_stack(x) (x)"
7023- * in their asm/system.h
7024- * As this is included in UML from asm-um/system-generic.h,
7025- * we can use it to behave as the subarch does.
7026- */
7027-#ifndef arch_align_stack
7028-unsigned long arch_align_stack(unsigned long sp)
7029-{
7030- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
7031- sp -= get_random_int() % 8192;
7032- return sp & ~0xf;
7033-}
7034-#endif
7035-
7036 unsigned long get_wchan(struct task_struct *p)
7037 {
7038 unsigned long stack_page, sp, ip;
7039diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
7040index ad8f795..2c7eec6 100644
7041--- a/arch/unicore32/include/asm/cache.h
7042+++ b/arch/unicore32/include/asm/cache.h
7043@@ -12,8 +12,10 @@
7044 #ifndef __UNICORE_CACHE_H__
7045 #define __UNICORE_CACHE_H__
7046
7047-#define L1_CACHE_SHIFT (5)
7048-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7049+#include <linux/const.h>
7050+
7051+#define L1_CACHE_SHIFT 5
7052+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7053
7054 /*
7055 * Memory returned by kmalloc() may be used for DMA, so we must make
7056diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
7057index efb4294..61bc18c 100644
7058--- a/arch/x86/Kconfig
7059+++ b/arch/x86/Kconfig
7060@@ -235,7 +235,7 @@ config X86_HT
7061
7062 config X86_32_LAZY_GS
7063 def_bool y
7064- depends on X86_32 && !CC_STACKPROTECTOR
7065+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
7066
7067 config ARCH_HWEIGHT_CFLAGS
7068 string
7069@@ -1022,7 +1022,7 @@ choice
7070
7071 config NOHIGHMEM
7072 bool "off"
7073- depends on !X86_NUMAQ
7074+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7075 ---help---
7076 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
7077 However, the address space of 32-bit x86 processors is only 4
7078@@ -1059,7 +1059,7 @@ config NOHIGHMEM
7079
7080 config HIGHMEM4G
7081 bool "4GB"
7082- depends on !X86_NUMAQ
7083+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7084 ---help---
7085 Select this if you have a 32-bit processor and between 1 and 4
7086 gigabytes of physical RAM.
7087@@ -1113,7 +1113,7 @@ config PAGE_OFFSET
7088 hex
7089 default 0xB0000000 if VMSPLIT_3G_OPT
7090 default 0x80000000 if VMSPLIT_2G
7091- default 0x78000000 if VMSPLIT_2G_OPT
7092+ default 0x70000000 if VMSPLIT_2G_OPT
7093 default 0x40000000 if VMSPLIT_1G
7094 default 0xC0000000
7095 depends on X86_32
7096@@ -1496,6 +1496,7 @@ config SECCOMP
7097
7098 config CC_STACKPROTECTOR
7099 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
7100+ depends on X86_64 || !PAX_MEMORY_UDEREF
7101 ---help---
7102 This option turns on the -fstack-protector GCC feature. This
7103 feature puts, at the beginning of functions, a canary value on
7104@@ -1553,6 +1554,7 @@ config KEXEC_JUMP
7105 config PHYSICAL_START
7106 hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
7107 default "0x1000000"
7108+ range 0x400000 0x40000000
7109 ---help---
7110 This gives the physical address where the kernel is loaded.
7111
7112@@ -1616,6 +1618,7 @@ config X86_NEED_RELOCS
7113 config PHYSICAL_ALIGN
7114 hex "Alignment value to which kernel should be aligned" if X86_32
7115 default "0x1000000"
7116+ range 0x400000 0x1000000 if PAX_KERNEXEC
7117 range 0x2000 0x1000000
7118 ---help---
7119 This value puts the alignment restrictions on physical address
7120@@ -1647,9 +1650,10 @@ config HOTPLUG_CPU
7121 Say N if you want to disable CPU hotplug.
7122
7123 config COMPAT_VDSO
7124- def_bool y
7125+ def_bool n
7126 prompt "Compat VDSO support"
7127 depends on X86_32 || IA32_EMULATION
7128+ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
7129 ---help---
7130 Map the 32-bit VDSO to the predictable old-style address too.
7131
7132diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
7133index e3ca7e0..b30b28a 100644
7134--- a/arch/x86/Kconfig.cpu
7135+++ b/arch/x86/Kconfig.cpu
7136@@ -341,7 +341,7 @@ config X86_PPRO_FENCE
7137
7138 config X86_F00F_BUG
7139 def_bool y
7140- depends on M586MMX || M586TSC || M586 || M486 || M386
7141+ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
7142
7143 config X86_INVD_BUG
7144 def_bool y
7145@@ -365,7 +365,7 @@ config X86_POPAD_OK
7146
7147 config X86_ALIGNMENT_16
7148 def_bool y
7149- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7150+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7151
7152 config X86_INTEL_USERCOPY
7153 def_bool y
7154@@ -411,7 +411,7 @@ config X86_CMPXCHG64
7155 # generates cmov.
7156 config X86_CMOV
7157 def_bool y
7158- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7159+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7160
7161 config X86_MINIMUM_CPU_FAMILY
7162 int
7163diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
7164index bf56e17..05f9891 100644
7165--- a/arch/x86/Kconfig.debug
7166+++ b/arch/x86/Kconfig.debug
7167@@ -81,7 +81,7 @@ config X86_PTDUMP
7168 config DEBUG_RODATA
7169 bool "Write protect kernel read-only data structures"
7170 default y
7171- depends on DEBUG_KERNEL
7172+ depends on DEBUG_KERNEL && BROKEN
7173 ---help---
7174 Mark the kernel read-only data as write-protected in the pagetables,
7175 in order to catch accidental (and incorrect) writes to such const
7176@@ -99,7 +99,7 @@ config DEBUG_RODATA_TEST
7177
7178 config DEBUG_SET_MODULE_RONX
7179 bool "Set loadable kernel module data as NX and text as RO"
7180- depends on MODULES
7181+ depends on MODULES && BROKEN
7182 ---help---
7183 This option helps catch unintended modifications to loadable
7184 kernel module's text and read-only data. It also prevents execution
7185diff --git a/arch/x86/Makefile b/arch/x86/Makefile
7186index b02e509..2631e48 100644
7187--- a/arch/x86/Makefile
7188+++ b/arch/x86/Makefile
7189@@ -46,6 +46,7 @@ else
7190 UTS_MACHINE := x86_64
7191 CHECKFLAGS += -D__x86_64__ -m64
7192
7193+ biarch := $(call cc-option,-m64)
7194 KBUILD_AFLAGS += -m64
7195 KBUILD_CFLAGS += -m64
7196
7197@@ -195,3 +196,12 @@ define archhelp
7198 echo ' FDARGS="..." arguments for the booted kernel'
7199 echo ' FDINITRD=file initrd for the booted kernel'
7200 endef
7201+
7202+define OLD_LD
7203+
7204+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
7205+*** Please upgrade your binutils to 2.18 or newer
7206+endef
7207+
7208+archprepare:
7209+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
7210diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
7211index 95365a8..52f857b 100644
7212--- a/arch/x86/boot/Makefile
7213+++ b/arch/x86/boot/Makefile
7214@@ -63,6 +63,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
7215 $(call cc-option, -fno-stack-protector) \
7216 $(call cc-option, -mpreferred-stack-boundary=2)
7217 KBUILD_CFLAGS += $(call cc-option, -m32)
7218+ifdef CONSTIFY_PLUGIN
7219+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7220+endif
7221 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7222 GCOV_PROFILE := n
7223
7224diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
7225index 878e4b9..20537ab 100644
7226--- a/arch/x86/boot/bitops.h
7227+++ b/arch/x86/boot/bitops.h
7228@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7229 u8 v;
7230 const u32 *p = (const u32 *)addr;
7231
7232- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7233+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7234 return v;
7235 }
7236
7237@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7238
7239 static inline void set_bit(int nr, void *addr)
7240 {
7241- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7242+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7243 }
7244
7245 #endif /* BOOT_BITOPS_H */
7246diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
7247index c7093bd..d4247ffe0 100644
7248--- a/arch/x86/boot/boot.h
7249+++ b/arch/x86/boot/boot.h
7250@@ -85,7 +85,7 @@ static inline void io_delay(void)
7251 static inline u16 ds(void)
7252 {
7253 u16 seg;
7254- asm("movw %%ds,%0" : "=rm" (seg));
7255+ asm volatile("movw %%ds,%0" : "=rm" (seg));
7256 return seg;
7257 }
7258
7259@@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t addr)
7260 static inline int memcmp(const void *s1, const void *s2, size_t len)
7261 {
7262 u8 diff;
7263- asm("repe; cmpsb; setnz %0"
7264+ asm volatile("repe; cmpsb; setnz %0"
7265 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
7266 return diff;
7267 }
7268diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
7269index 09664ef..edc5d03 100644
7270--- a/arch/x86/boot/compressed/Makefile
7271+++ b/arch/x86/boot/compressed/Makefile
7272@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
7273 KBUILD_CFLAGS += $(cflags-y)
7274 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
7275 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
7276+ifdef CONSTIFY_PLUGIN
7277+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7278+endif
7279
7280 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7281 GCOV_PROFILE := n
7282diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
7283index 67a655a..b924059 100644
7284--- a/arch/x86/boot/compressed/head_32.S
7285+++ b/arch/x86/boot/compressed/head_32.S
7286@@ -76,7 +76,7 @@ ENTRY(startup_32)
7287 notl %eax
7288 andl %eax, %ebx
7289 #else
7290- movl $LOAD_PHYSICAL_ADDR, %ebx
7291+ movl $____LOAD_PHYSICAL_ADDR, %ebx
7292 #endif
7293
7294 /* Target address to relocate to for decompression */
7295@@ -162,7 +162,7 @@ relocated:
7296 * and where it was actually loaded.
7297 */
7298 movl %ebp, %ebx
7299- subl $LOAD_PHYSICAL_ADDR, %ebx
7300+ subl $____LOAD_PHYSICAL_ADDR, %ebx
7301 jz 2f /* Nothing to be done if loaded at compiled addr. */
7302 /*
7303 * Process relocations.
7304@@ -170,8 +170,7 @@ relocated:
7305
7306 1: subl $4, %edi
7307 movl (%edi), %ecx
7308- testl %ecx, %ecx
7309- jz 2f
7310+ jecxz 2f
7311 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
7312 jmp 1b
7313 2:
7314diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
7315index 35af09d..99c9676 100644
7316--- a/arch/x86/boot/compressed/head_64.S
7317+++ b/arch/x86/boot/compressed/head_64.S
7318@@ -91,7 +91,7 @@ ENTRY(startup_32)
7319 notl %eax
7320 andl %eax, %ebx
7321 #else
7322- movl $LOAD_PHYSICAL_ADDR, %ebx
7323+ movl $____LOAD_PHYSICAL_ADDR, %ebx
7324 #endif
7325
7326 /* Target address to relocate to for decompression */
7327@@ -233,7 +233,7 @@ ENTRY(startup_64)
7328 notq %rax
7329 andq %rax, %rbp
7330 #else
7331- movq $LOAD_PHYSICAL_ADDR, %rbp
7332+ movq $____LOAD_PHYSICAL_ADDR, %rbp
7333 #endif
7334
7335 /* Target address to relocate to for decompression */
7336diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
7337index 3a19d04..7c1d55a 100644
7338--- a/arch/x86/boot/compressed/misc.c
7339+++ b/arch/x86/boot/compressed/misc.c
7340@@ -310,7 +310,7 @@ static void parse_elf(void *output)
7341 case PT_LOAD:
7342 #ifdef CONFIG_RELOCATABLE
7343 dest = output;
7344- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
7345+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
7346 #else
7347 dest = (void *)(phdr->p_paddr);
7348 #endif
7349@@ -363,7 +363,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
7350 error("Destination address too large");
7351 #endif
7352 #ifndef CONFIG_RELOCATABLE
7353- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
7354+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
7355 error("Wrong destination address");
7356 #endif
7357
7358diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
7359index 89bbf4e..869908e 100644
7360--- a/arch/x86/boot/compressed/relocs.c
7361+++ b/arch/x86/boot/compressed/relocs.c
7362@@ -13,8 +13,11 @@
7363
7364 static void die(char *fmt, ...);
7365
7366+#include "../../../../include/generated/autoconf.h"
7367+
7368 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
7369 static Elf32_Ehdr ehdr;
7370+static Elf32_Phdr *phdr;
7371 static unsigned long reloc_count, reloc_idx;
7372 static unsigned long *relocs;
7373
7374@@ -270,9 +273,39 @@ static void read_ehdr(FILE *fp)
7375 }
7376 }
7377
7378+static void read_phdrs(FILE *fp)
7379+{
7380+ unsigned int i;
7381+
7382+ phdr = calloc(ehdr.e_phnum, sizeof(Elf32_Phdr));
7383+ if (!phdr) {
7384+ die("Unable to allocate %d program headers\n",
7385+ ehdr.e_phnum);
7386+ }
7387+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
7388+ die("Seek to %d failed: %s\n",
7389+ ehdr.e_phoff, strerror(errno));
7390+ }
7391+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
7392+ die("Cannot read ELF program headers: %s\n",
7393+ strerror(errno));
7394+ }
7395+ for(i = 0; i < ehdr.e_phnum; i++) {
7396+ phdr[i].p_type = elf32_to_cpu(phdr[i].p_type);
7397+ phdr[i].p_offset = elf32_to_cpu(phdr[i].p_offset);
7398+ phdr[i].p_vaddr = elf32_to_cpu(phdr[i].p_vaddr);
7399+ phdr[i].p_paddr = elf32_to_cpu(phdr[i].p_paddr);
7400+ phdr[i].p_filesz = elf32_to_cpu(phdr[i].p_filesz);
7401+ phdr[i].p_memsz = elf32_to_cpu(phdr[i].p_memsz);
7402+ phdr[i].p_flags = elf32_to_cpu(phdr[i].p_flags);
7403+ phdr[i].p_align = elf32_to_cpu(phdr[i].p_align);
7404+ }
7405+
7406+}
7407+
7408 static void read_shdrs(FILE *fp)
7409 {
7410- int i;
7411+ unsigned int i;
7412 Elf32_Shdr shdr;
7413
7414 secs = calloc(ehdr.e_shnum, sizeof(struct section));
7415@@ -307,7 +340,7 @@ static void read_shdrs(FILE *fp)
7416
7417 static void read_strtabs(FILE *fp)
7418 {
7419- int i;
7420+ unsigned int i;
7421 for (i = 0; i < ehdr.e_shnum; i++) {
7422 struct section *sec = &secs[i];
7423 if (sec->shdr.sh_type != SHT_STRTAB) {
7424@@ -332,7 +365,7 @@ static void read_strtabs(FILE *fp)
7425
7426 static void read_symtabs(FILE *fp)
7427 {
7428- int i,j;
7429+ unsigned int i,j;
7430 for (i = 0; i < ehdr.e_shnum; i++) {
7431 struct section *sec = &secs[i];
7432 if (sec->shdr.sh_type != SHT_SYMTAB) {
7433@@ -365,7 +398,9 @@ static void read_symtabs(FILE *fp)
7434
7435 static void read_relocs(FILE *fp)
7436 {
7437- int i,j;
7438+ unsigned int i,j;
7439+ uint32_t base;
7440+
7441 for (i = 0; i < ehdr.e_shnum; i++) {
7442 struct section *sec = &secs[i];
7443 if (sec->shdr.sh_type != SHT_REL) {
7444@@ -385,9 +420,18 @@ static void read_relocs(FILE *fp)
7445 die("Cannot read symbol table: %s\n",
7446 strerror(errno));
7447 }
7448+ base = 0;
7449+ for (j = 0; j < ehdr.e_phnum; j++) {
7450+ if (phdr[j].p_type != PT_LOAD )
7451+ continue;
7452+ 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)
7453+ continue;
7454+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
7455+ break;
7456+ }
7457 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
7458 Elf32_Rel *rel = &sec->reltab[j];
7459- rel->r_offset = elf32_to_cpu(rel->r_offset);
7460+ rel->r_offset = elf32_to_cpu(rel->r_offset) + base;
7461 rel->r_info = elf32_to_cpu(rel->r_info);
7462 }
7463 }
7464@@ -396,14 +440,14 @@ static void read_relocs(FILE *fp)
7465
7466 static void print_absolute_symbols(void)
7467 {
7468- int i;
7469+ unsigned int i;
7470 printf("Absolute symbols\n");
7471 printf(" Num: Value Size Type Bind Visibility Name\n");
7472 for (i = 0; i < ehdr.e_shnum; i++) {
7473 struct section *sec = &secs[i];
7474 char *sym_strtab;
7475 Elf32_Sym *sh_symtab;
7476- int j;
7477+ unsigned int j;
7478
7479 if (sec->shdr.sh_type != SHT_SYMTAB) {
7480 continue;
7481@@ -431,14 +475,14 @@ static void print_absolute_symbols(void)
7482
7483 static void print_absolute_relocs(void)
7484 {
7485- int i, printed = 0;
7486+ unsigned int i, printed = 0;
7487
7488 for (i = 0; i < ehdr.e_shnum; i++) {
7489 struct section *sec = &secs[i];
7490 struct section *sec_applies, *sec_symtab;
7491 char *sym_strtab;
7492 Elf32_Sym *sh_symtab;
7493- int j;
7494+ unsigned int j;
7495 if (sec->shdr.sh_type != SHT_REL) {
7496 continue;
7497 }
7498@@ -499,13 +543,13 @@ static void print_absolute_relocs(void)
7499
7500 static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7501 {
7502- int i;
7503+ unsigned int i;
7504 /* Walk through the relocations */
7505 for (i = 0; i < ehdr.e_shnum; i++) {
7506 char *sym_strtab;
7507 Elf32_Sym *sh_symtab;
7508 struct section *sec_applies, *sec_symtab;
7509- int j;
7510+ unsigned int j;
7511 struct section *sec = &secs[i];
7512
7513 if (sec->shdr.sh_type != SHT_REL) {
7514@@ -530,6 +574,22 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7515 !is_rel_reloc(sym_name(sym_strtab, sym))) {
7516 continue;
7517 }
7518+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
7519+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
7520+ continue;
7521+
7522+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
7523+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
7524+ if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
7525+ continue;
7526+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
7527+ continue;
7528+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
7529+ continue;
7530+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
7531+ continue;
7532+#endif
7533+
7534 switch (r_type) {
7535 case R_386_NONE:
7536 case R_386_PC32:
7537@@ -571,7 +631,7 @@ static int cmp_relocs(const void *va, const void *vb)
7538
7539 static void emit_relocs(int as_text)
7540 {
7541- int i;
7542+ unsigned int i;
7543 /* Count how many relocations I have and allocate space for them. */
7544 reloc_count = 0;
7545 walk_relocs(count_reloc);
7546@@ -665,6 +725,7 @@ int main(int argc, char **argv)
7547 fname, strerror(errno));
7548 }
7549 read_ehdr(fp);
7550+ read_phdrs(fp);
7551 read_shdrs(fp);
7552 read_strtabs(fp);
7553 read_symtabs(fp);
7554diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
7555index 4d3ff03..e4972ff 100644
7556--- a/arch/x86/boot/cpucheck.c
7557+++ b/arch/x86/boot/cpucheck.c
7558@@ -74,7 +74,7 @@ static int has_fpu(void)
7559 u16 fcw = -1, fsw = -1;
7560 u32 cr0;
7561
7562- asm("movl %%cr0,%0" : "=r" (cr0));
7563+ asm volatile("movl %%cr0,%0" : "=r" (cr0));
7564 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
7565 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
7566 asm volatile("movl %0,%%cr0" : : "r" (cr0));
7567@@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
7568 {
7569 u32 f0, f1;
7570
7571- asm("pushfl ; "
7572+ asm volatile("pushfl ; "
7573 "pushfl ; "
7574 "popl %0 ; "
7575 "movl %0,%1 ; "
7576@@ -115,7 +115,7 @@ static void get_flags(void)
7577 set_bit(X86_FEATURE_FPU, cpu.flags);
7578
7579 if (has_eflag(X86_EFLAGS_ID)) {
7580- asm("cpuid"
7581+ asm volatile("cpuid"
7582 : "=a" (max_intel_level),
7583 "=b" (cpu_vendor[0]),
7584 "=d" (cpu_vendor[1]),
7585@@ -124,7 +124,7 @@ static void get_flags(void)
7586
7587 if (max_intel_level >= 0x00000001 &&
7588 max_intel_level <= 0x0000ffff) {
7589- asm("cpuid"
7590+ asm volatile("cpuid"
7591 : "=a" (tfms),
7592 "=c" (cpu.flags[4]),
7593 "=d" (cpu.flags[0])
7594@@ -136,7 +136,7 @@ static void get_flags(void)
7595 cpu.model += ((tfms >> 16) & 0xf) << 4;
7596 }
7597
7598- asm("cpuid"
7599+ asm volatile("cpuid"
7600 : "=a" (max_amd_level)
7601 : "a" (0x80000000)
7602 : "ebx", "ecx", "edx");
7603@@ -144,7 +144,7 @@ static void get_flags(void)
7604 if (max_amd_level >= 0x80000001 &&
7605 max_amd_level <= 0x8000ffff) {
7606 u32 eax = 0x80000001;
7607- asm("cpuid"
7608+ asm volatile("cpuid"
7609 : "+a" (eax),
7610 "=c" (cpu.flags[6]),
7611 "=d" (cpu.flags[1])
7612@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7613 u32 ecx = MSR_K7_HWCR;
7614 u32 eax, edx;
7615
7616- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7617+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7618 eax &= ~(1 << 15);
7619- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7620+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7621
7622 get_flags(); /* Make sure it really did something */
7623 err = check_flags();
7624@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7625 u32 ecx = MSR_VIA_FCR;
7626 u32 eax, edx;
7627
7628- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7629+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7630 eax |= (1<<1)|(1<<7);
7631- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7632+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7633
7634 set_bit(X86_FEATURE_CX8, cpu.flags);
7635 err = check_flags();
7636@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7637 u32 eax, edx;
7638 u32 level = 1;
7639
7640- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7641- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7642- asm("cpuid"
7643+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7644+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7645+ asm volatile("cpuid"
7646 : "+a" (level), "=d" (cpu.flags[0])
7647 : : "ecx", "ebx");
7648- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7649+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7650
7651 err = check_flags();
7652 }
7653diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
7654index bdb4d45..0476680 100644
7655--- a/arch/x86/boot/header.S
7656+++ b/arch/x86/boot/header.S
7657@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical pointer to
7658 # single linked list of
7659 # struct setup_data
7660
7661-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
7662+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
7663
7664 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
7665 #define VO_INIT_SIZE (VO__end - VO__text)
7666diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
7667index db75d07..8e6d0af 100644
7668--- a/arch/x86/boot/memory.c
7669+++ b/arch/x86/boot/memory.c
7670@@ -19,7 +19,7 @@
7671
7672 static int detect_memory_e820(void)
7673 {
7674- int count = 0;
7675+ unsigned int count = 0;
7676 struct biosregs ireg, oreg;
7677 struct e820entry *desc = boot_params.e820_map;
7678 static struct e820entry buf; /* static so it is zeroed */
7679diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
7680index 11e8c6e..fdbb1ed 100644
7681--- a/arch/x86/boot/video-vesa.c
7682+++ b/arch/x86/boot/video-vesa.c
7683@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
7684
7685 boot_params.screen_info.vesapm_seg = oreg.es;
7686 boot_params.screen_info.vesapm_off = oreg.di;
7687+ boot_params.screen_info.vesapm_size = oreg.cx;
7688 }
7689
7690 /*
7691diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
7692index 43eda28..5ab5fdb 100644
7693--- a/arch/x86/boot/video.c
7694+++ b/arch/x86/boot/video.c
7695@@ -96,7 +96,7 @@ static void store_mode_params(void)
7696 static unsigned int get_entry(void)
7697 {
7698 char entry_buf[4];
7699- int i, len = 0;
7700+ unsigned int i, len = 0;
7701 int key;
7702 unsigned int v;
7703
7704diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
7705index 5b577d5..3c1fed4 100644
7706--- a/arch/x86/crypto/aes-x86_64-asm_64.S
7707+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
7708@@ -8,6 +8,8 @@
7709 * including this sentence is retained in full.
7710 */
7711
7712+#include <asm/alternative-asm.h>
7713+
7714 .extern crypto_ft_tab
7715 .extern crypto_it_tab
7716 .extern crypto_fl_tab
7717@@ -71,6 +73,8 @@ FUNC: movq r1,r2; \
7718 je B192; \
7719 leaq 32(r9),r9;
7720
7721+#define ret pax_force_retaddr 0, 1; ret
7722+
7723 #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
7724 movq r1,r2; \
7725 movq r3,r4; \
7726diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
7727index be6d9e3..21fbbca 100644
7728--- a/arch/x86/crypto/aesni-intel_asm.S
7729+++ b/arch/x86/crypto/aesni-intel_asm.S
7730@@ -31,6 +31,7 @@
7731
7732 #include <linux/linkage.h>
7733 #include <asm/inst.h>
7734+#include <asm/alternative-asm.h>
7735
7736 #ifdef __x86_64__
7737 .data
7738@@ -1436,7 +1437,9 @@ _return_T_done_decrypt:
7739 pop %r14
7740 pop %r13
7741 pop %r12
7742+ pax_force_retaddr 0, 1
7743 ret
7744+ENDPROC(aesni_gcm_dec)
7745
7746
7747 /*****************************************************************************
7748@@ -1699,7 +1702,9 @@ _return_T_done_encrypt:
7749 pop %r14
7750 pop %r13
7751 pop %r12
7752+ pax_force_retaddr 0, 1
7753 ret
7754+ENDPROC(aesni_gcm_enc)
7755
7756 #endif
7757
7758@@ -1714,6 +1719,7 @@ _key_expansion_256a:
7759 pxor %xmm1, %xmm0
7760 movaps %xmm0, (TKEYP)
7761 add $0x10, TKEYP
7762+ pax_force_retaddr_bts
7763 ret
7764
7765 .align 4
7766@@ -1738,6 +1744,7 @@ _key_expansion_192a:
7767 shufps $0b01001110, %xmm2, %xmm1
7768 movaps %xmm1, 0x10(TKEYP)
7769 add $0x20, TKEYP
7770+ pax_force_retaddr_bts
7771 ret
7772
7773 .align 4
7774@@ -1757,6 +1764,7 @@ _key_expansion_192b:
7775
7776 movaps %xmm0, (TKEYP)
7777 add $0x10, TKEYP
7778+ pax_force_retaddr_bts
7779 ret
7780
7781 .align 4
7782@@ -1769,6 +1777,7 @@ _key_expansion_256b:
7783 pxor %xmm1, %xmm2
7784 movaps %xmm2, (TKEYP)
7785 add $0x10, TKEYP
7786+ pax_force_retaddr_bts
7787 ret
7788
7789 /*
7790@@ -1881,7 +1890,9 @@ ENTRY(aesni_set_key)
7791 #ifndef __x86_64__
7792 popl KEYP
7793 #endif
7794+ pax_force_retaddr 0, 1
7795 ret
7796+ENDPROC(aesni_set_key)
7797
7798 /*
7799 * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)
7800@@ -1902,7 +1913,9 @@ ENTRY(aesni_enc)
7801 popl KLEN
7802 popl KEYP
7803 #endif
7804+ pax_force_retaddr 0, 1
7805 ret
7806+ENDPROC(aesni_enc)
7807
7808 /*
7809 * _aesni_enc1: internal ABI
7810@@ -1959,6 +1972,7 @@ _aesni_enc1:
7811 AESENC KEY STATE
7812 movaps 0x70(TKEYP), KEY
7813 AESENCLAST KEY STATE
7814+ pax_force_retaddr_bts
7815 ret
7816
7817 /*
7818@@ -2067,6 +2081,7 @@ _aesni_enc4:
7819 AESENCLAST KEY STATE2
7820 AESENCLAST KEY STATE3
7821 AESENCLAST KEY STATE4
7822+ pax_force_retaddr_bts
7823 ret
7824
7825 /*
7826@@ -2089,7 +2104,9 @@ ENTRY(aesni_dec)
7827 popl KLEN
7828 popl KEYP
7829 #endif
7830+ pax_force_retaddr 0, 1
7831 ret
7832+ENDPROC(aesni_dec)
7833
7834 /*
7835 * _aesni_dec1: internal ABI
7836@@ -2146,6 +2163,7 @@ _aesni_dec1:
7837 AESDEC KEY STATE
7838 movaps 0x70(TKEYP), KEY
7839 AESDECLAST KEY STATE
7840+ pax_force_retaddr_bts
7841 ret
7842
7843 /*
7844@@ -2254,6 +2272,7 @@ _aesni_dec4:
7845 AESDECLAST KEY STATE2
7846 AESDECLAST KEY STATE3
7847 AESDECLAST KEY STATE4
7848+ pax_force_retaddr_bts
7849 ret
7850
7851 /*
7852@@ -2311,7 +2330,9 @@ ENTRY(aesni_ecb_enc)
7853 popl KEYP
7854 popl LEN
7855 #endif
7856+ pax_force_retaddr 0, 1
7857 ret
7858+ENDPROC(aesni_ecb_enc)
7859
7860 /*
7861 * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7862@@ -2369,7 +2390,9 @@ ENTRY(aesni_ecb_dec)
7863 popl KEYP
7864 popl LEN
7865 #endif
7866+ pax_force_retaddr 0, 1
7867 ret
7868+ENDPROC(aesni_ecb_dec)
7869
7870 /*
7871 * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7872@@ -2410,7 +2433,9 @@ ENTRY(aesni_cbc_enc)
7873 popl LEN
7874 popl IVP
7875 #endif
7876+ pax_force_retaddr 0, 1
7877 ret
7878+ENDPROC(aesni_cbc_enc)
7879
7880 /*
7881 * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7882@@ -2498,7 +2523,9 @@ ENTRY(aesni_cbc_dec)
7883 popl LEN
7884 popl IVP
7885 #endif
7886+ pax_force_retaddr 0, 1
7887 ret
7888+ENDPROC(aesni_cbc_dec)
7889
7890 #ifdef __x86_64__
7891 .align 16
7892@@ -2524,6 +2551,7 @@ _aesni_inc_init:
7893 mov $1, TCTR_LOW
7894 MOVQ_R64_XMM TCTR_LOW INC
7895 MOVQ_R64_XMM CTR TCTR_LOW
7896+ pax_force_retaddr_bts
7897 ret
7898
7899 /*
7900@@ -2552,6 +2580,7 @@ _aesni_inc:
7901 .Linc_low:
7902 movaps CTR, IV
7903 PSHUFB_XMM BSWAP_MASK IV
7904+ pax_force_retaddr_bts
7905 ret
7906
7907 /*
7908@@ -2612,5 +2641,7 @@ ENTRY(aesni_ctr_enc)
7909 .Lctr_enc_ret:
7910 movups IV, (IVP)
7911 .Lctr_enc_just_ret:
7912+ pax_force_retaddr 0, 1
7913 ret
7914+ENDPROC(aesni_ctr_enc)
7915 #endif
7916diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
7917index 391d245..67f35c2 100644
7918--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
7919+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
7920@@ -20,6 +20,8 @@
7921 *
7922 */
7923
7924+#include <asm/alternative-asm.h>
7925+
7926 .file "blowfish-x86_64-asm.S"
7927 .text
7928
7929@@ -151,9 +153,11 @@ __blowfish_enc_blk:
7930 jnz __enc_xor;
7931
7932 write_block();
7933+ pax_force_retaddr 0, 1
7934 ret;
7935 __enc_xor:
7936 xor_block();
7937+ pax_force_retaddr 0, 1
7938 ret;
7939
7940 .align 8
7941@@ -188,6 +192,7 @@ blowfish_dec_blk:
7942
7943 movq %r11, %rbp;
7944
7945+ pax_force_retaddr 0, 1
7946 ret;
7947
7948 /**********************************************************************
7949@@ -342,6 +347,7 @@ __blowfish_enc_blk_4way:
7950
7951 popq %rbx;
7952 popq %rbp;
7953+ pax_force_retaddr 0, 1
7954 ret;
7955
7956 __enc_xor4:
7957@@ -349,6 +355,7 @@ __enc_xor4:
7958
7959 popq %rbx;
7960 popq %rbp;
7961+ pax_force_retaddr 0, 1
7962 ret;
7963
7964 .align 8
7965@@ -386,5 +393,6 @@ blowfish_dec_blk_4way:
7966 popq %rbx;
7967 popq %rbp;
7968
7969+ pax_force_retaddr 0, 1
7970 ret;
7971
7972diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
7973index 6214a9b..1f4fc9a 100644
7974--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
7975+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
7976@@ -1,3 +1,5 @@
7977+#include <asm/alternative-asm.h>
7978+
7979 # enter ECRYPT_encrypt_bytes
7980 .text
7981 .p2align 5
7982@@ -790,6 +792,7 @@ ECRYPT_encrypt_bytes:
7983 add %r11,%rsp
7984 mov %rdi,%rax
7985 mov %rsi,%rdx
7986+ pax_force_retaddr 0, 1
7987 ret
7988 # bytesatleast65:
7989 ._bytesatleast65:
7990@@ -891,6 +894,7 @@ ECRYPT_keysetup:
7991 add %r11,%rsp
7992 mov %rdi,%rax
7993 mov %rsi,%rdx
7994+ pax_force_retaddr
7995 ret
7996 # enter ECRYPT_ivsetup
7997 .text
7998@@ -917,4 +921,5 @@ ECRYPT_ivsetup:
7999 add %r11,%rsp
8000 mov %rdi,%rax
8001 mov %rsi,%rdx
8002+ pax_force_retaddr
8003 ret
8004diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
8005index b2c2f57..8470cab 100644
8006--- a/arch/x86/crypto/sha1_ssse3_asm.S
8007+++ b/arch/x86/crypto/sha1_ssse3_asm.S
8008@@ -28,6 +28,8 @@
8009 * (at your option) any later version.
8010 */
8011
8012+#include <asm/alternative-asm.h>
8013+
8014 #define CTX %rdi // arg1
8015 #define BUF %rsi // arg2
8016 #define CNT %rdx // arg3
8017@@ -104,6 +106,7 @@
8018 pop %r12
8019 pop %rbp
8020 pop %rbx
8021+ pax_force_retaddr 0, 1
8022 ret
8023
8024 .size \name, .-\name
8025diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8026index 5b012a2..36d5364 100644
8027--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8028+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8029@@ -20,6 +20,8 @@
8030 *
8031 */
8032
8033+#include <asm/alternative-asm.h>
8034+
8035 .file "twofish-x86_64-asm-3way.S"
8036 .text
8037
8038@@ -260,6 +262,7 @@ __twofish_enc_blk_3way:
8039 popq %r13;
8040 popq %r14;
8041 popq %r15;
8042+ pax_force_retaddr 0, 1
8043 ret;
8044
8045 __enc_xor3:
8046@@ -271,6 +274,7 @@ __enc_xor3:
8047 popq %r13;
8048 popq %r14;
8049 popq %r15;
8050+ pax_force_retaddr 0, 1
8051 ret;
8052
8053 .global twofish_dec_blk_3way
8054@@ -312,5 +316,6 @@ twofish_dec_blk_3way:
8055 popq %r13;
8056 popq %r14;
8057 popq %r15;
8058+ pax_force_retaddr 0, 1
8059 ret;
8060
8061diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
8062index 7bcf3fc..f53832f 100644
8063--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
8064+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
8065@@ -21,6 +21,7 @@
8066 .text
8067
8068 #include <asm/asm-offsets.h>
8069+#include <asm/alternative-asm.h>
8070
8071 #define a_offset 0
8072 #define b_offset 4
8073@@ -268,6 +269,7 @@ twofish_enc_blk:
8074
8075 popq R1
8076 movq $1,%rax
8077+ pax_force_retaddr 0, 1
8078 ret
8079
8080 twofish_dec_blk:
8081@@ -319,4 +321,5 @@ twofish_dec_blk:
8082
8083 popq R1
8084 movq $1,%rax
8085+ pax_force_retaddr 0, 1
8086 ret
8087diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
8088index fd84387..887aa7e 100644
8089--- a/arch/x86/ia32/ia32_aout.c
8090+++ b/arch/x86/ia32/ia32_aout.c
8091@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
8092 unsigned long dump_start, dump_size;
8093 struct user32 dump;
8094
8095+ memset(&dump, 0, sizeof(dump));
8096+
8097 fs = get_fs();
8098 set_fs(KERNEL_DS);
8099 has_dumped = 1;
8100@@ -315,6 +317,13 @@ static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs)
8101 current->mm->free_area_cache = TASK_UNMAPPED_BASE;
8102 current->mm->cached_hole_size = 0;
8103
8104+ retval = setup_arg_pages(bprm, IA32_STACK_TOP, EXSTACK_DEFAULT);
8105+ if (retval < 0) {
8106+ /* Someone check-me: is this error path enough? */
8107+ send_sig(SIGKILL, current, 0);
8108+ return retval;
8109+ }
8110+
8111 install_exec_creds(bprm);
8112 current->flags &= ~PF_FORKNOEXEC;
8113
8114@@ -410,13 +419,6 @@ beyond_if:
8115
8116 set_brk(current->mm->start_brk, current->mm->brk);
8117
8118- retval = setup_arg_pages(bprm, IA32_STACK_TOP, EXSTACK_DEFAULT);
8119- if (retval < 0) {
8120- /* Someone check-me: is this error path enough? */
8121- send_sig(SIGKILL, current, 0);
8122- return retval;
8123- }
8124-
8125 current->mm->start_stack =
8126 (unsigned long)create_aout_tables((char __user *)bprm->p, bprm);
8127 /* start thread */
8128diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
8129index 6557769..ef6ae89 100644
8130--- a/arch/x86/ia32/ia32_signal.c
8131+++ b/arch/x86/ia32/ia32_signal.c
8132@@ -169,7 +169,7 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
8133 }
8134 seg = get_fs();
8135 set_fs(KERNEL_DS);
8136- ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
8137+ ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
8138 set_fs(seg);
8139 if (ret >= 0 && uoss_ptr) {
8140 if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
8141@@ -370,7 +370,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
8142 */
8143 static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8144 size_t frame_size,
8145- void **fpstate)
8146+ void __user **fpstate)
8147 {
8148 unsigned long sp;
8149
8150@@ -391,7 +391,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8151
8152 if (used_math()) {
8153 sp = sp - sig_xstate_ia32_size;
8154- *fpstate = (struct _fpstate_ia32 *) sp;
8155+ *fpstate = (struct _fpstate_ia32 __user *) sp;
8156 if (save_i387_xstate_ia32(*fpstate) < 0)
8157 return (void __user *) -1L;
8158 }
8159@@ -399,7 +399,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8160 sp -= frame_size;
8161 /* Align the stack pointer according to the i386 ABI,
8162 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
8163- sp = ((sp + 4) & -16ul) - 4;
8164+ sp = ((sp - 12) & -16ul) - 4;
8165 return (void __user *) sp;
8166 }
8167
8168@@ -457,7 +457,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
8169 * These are actually not used anymore, but left because some
8170 * gdb versions depend on them as a marker.
8171 */
8172- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8173+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8174 } put_user_catch(err);
8175
8176 if (err)
8177@@ -499,7 +499,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8178 0xb8,
8179 __NR_ia32_rt_sigreturn,
8180 0x80cd,
8181- 0,
8182+ 0
8183 };
8184
8185 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
8186@@ -529,16 +529,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8187
8188 if (ka->sa.sa_flags & SA_RESTORER)
8189 restorer = ka->sa.sa_restorer;
8190+ else if (current->mm->context.vdso)
8191+ /* Return stub is in 32bit vsyscall page */
8192+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
8193 else
8194- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
8195- rt_sigreturn);
8196+ restorer = &frame->retcode;
8197 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
8198
8199 /*
8200 * Not actually used anymore, but left because some gdb
8201 * versions need it.
8202 */
8203- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8204+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8205 } put_user_catch(err);
8206
8207 if (err)
8208diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
8209index a6253ec..4ad2120 100644
8210--- a/arch/x86/ia32/ia32entry.S
8211+++ b/arch/x86/ia32/ia32entry.S
8212@@ -13,7 +13,9 @@
8213 #include <asm/thread_info.h>
8214 #include <asm/segment.h>
8215 #include <asm/irqflags.h>
8216+#include <asm/pgtable.h>
8217 #include <linux/linkage.h>
8218+#include <asm/alternative-asm.h>
8219
8220 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
8221 #include <linux/elf-em.h>
8222@@ -95,6 +97,32 @@ ENTRY(native_irq_enable_sysexit)
8223 ENDPROC(native_irq_enable_sysexit)
8224 #endif
8225
8226+ .macro pax_enter_kernel_user
8227+ pax_set_fptr_mask
8228+#ifdef CONFIG_PAX_MEMORY_UDEREF
8229+ call pax_enter_kernel_user
8230+#endif
8231+ .endm
8232+
8233+ .macro pax_exit_kernel_user
8234+#ifdef CONFIG_PAX_MEMORY_UDEREF
8235+ call pax_exit_kernel_user
8236+#endif
8237+#ifdef CONFIG_PAX_RANDKSTACK
8238+ pushq %rax
8239+ pushq %r11
8240+ call pax_randomize_kstack
8241+ popq %r11
8242+ popq %rax
8243+#endif
8244+ .endm
8245+
8246+.macro pax_erase_kstack
8247+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
8248+ call pax_erase_kstack
8249+#endif
8250+.endm
8251+
8252 /*
8253 * 32bit SYSENTER instruction entry.
8254 *
8255@@ -121,12 +149,6 @@ ENTRY(ia32_sysenter_target)
8256 CFI_REGISTER rsp,rbp
8257 SWAPGS_UNSAFE_STACK
8258 movq PER_CPU_VAR(kernel_stack), %rsp
8259- addq $(KERNEL_STACK_OFFSET),%rsp
8260- /*
8261- * No need to follow this irqs on/off section: the syscall
8262- * disabled irqs, here we enable it straight after entry:
8263- */
8264- ENABLE_INTERRUPTS(CLBR_NONE)
8265 movl %ebp,%ebp /* zero extension */
8266 pushq_cfi $__USER32_DS
8267 /*CFI_REL_OFFSET ss,0*/
8268@@ -134,25 +156,39 @@ ENTRY(ia32_sysenter_target)
8269 CFI_REL_OFFSET rsp,0
8270 pushfq_cfi
8271 /*CFI_REL_OFFSET rflags,0*/
8272- movl 8*3-THREAD_SIZE+TI_sysenter_return(%rsp), %r10d
8273- CFI_REGISTER rip,r10
8274+ orl $X86_EFLAGS_IF,(%rsp)
8275+ GET_THREAD_INFO(%r11)
8276+ movl TI_sysenter_return(%r11), %r11d
8277+ CFI_REGISTER rip,r11
8278 pushq_cfi $__USER32_CS
8279 /*CFI_REL_OFFSET cs,0*/
8280 movl %eax, %eax
8281- pushq_cfi %r10
8282+ pushq_cfi %r11
8283 CFI_REL_OFFSET rip,0
8284 pushq_cfi %rax
8285 cld
8286 SAVE_ARGS 0,1,0
8287+ pax_enter_kernel_user
8288+ /*
8289+ * No need to follow this irqs on/off section: the syscall
8290+ * disabled irqs, here we enable it straight after entry:
8291+ */
8292+ ENABLE_INTERRUPTS(CLBR_NONE)
8293 /* no need to do an access_ok check here because rbp has been
8294 32bit zero extended */
8295+
8296+#ifdef CONFIG_PAX_MEMORY_UDEREF
8297+ mov $PAX_USER_SHADOW_BASE,%r11
8298+ add %r11,%rbp
8299+#endif
8300+
8301 1: movl (%rbp),%ebp
8302 .section __ex_table,"a"
8303 .quad 1b,ia32_badarg
8304 .previous
8305- GET_THREAD_INFO(%r10)
8306- orl $TS_COMPAT,TI_status(%r10)
8307- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
8308+ GET_THREAD_INFO(%r11)
8309+ orl $TS_COMPAT,TI_status(%r11)
8310+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8311 CFI_REMEMBER_STATE
8312 jnz sysenter_tracesys
8313 cmpq $(IA32_NR_syscalls-1),%rax
8314@@ -162,13 +198,15 @@ sysenter_do_call:
8315 sysenter_dispatch:
8316 call *ia32_sys_call_table(,%rax,8)
8317 movq %rax,RAX-ARGOFFSET(%rsp)
8318- GET_THREAD_INFO(%r10)
8319+ GET_THREAD_INFO(%r11)
8320 DISABLE_INTERRUPTS(CLBR_NONE)
8321 TRACE_IRQS_OFF
8322- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
8323+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8324 jnz sysexit_audit
8325 sysexit_from_sys_call:
8326- andl $~TS_COMPAT,TI_status(%r10)
8327+ pax_exit_kernel_user
8328+ pax_erase_kstack
8329+ andl $~TS_COMPAT,TI_status(%r11)
8330 /* clear IF, that popfq doesn't enable interrupts early */
8331 andl $~0x200,EFLAGS-R11(%rsp)
8332 movl RIP-R11(%rsp),%edx /* User %eip */
8333@@ -194,6 +232,9 @@ sysexit_from_sys_call:
8334 movl %eax,%esi /* 2nd arg: syscall number */
8335 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
8336 call audit_syscall_entry
8337+
8338+ pax_erase_kstack
8339+
8340 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
8341 cmpq $(IA32_NR_syscalls-1),%rax
8342 ja ia32_badsys
8343@@ -205,7 +246,7 @@ sysexit_from_sys_call:
8344 .endm
8345
8346 .macro auditsys_exit exit
8347- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
8348+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8349 jnz ia32_ret_from_sys_call
8350 TRACE_IRQS_ON
8351 sti
8352@@ -215,12 +256,12 @@ sysexit_from_sys_call:
8353 movzbl %al,%edi /* zero-extend that into %edi */
8354 inc %edi /* first arg, 0->1(AUDITSC_SUCCESS), 1->2(AUDITSC_FAILURE) */
8355 call audit_syscall_exit
8356- GET_THREAD_INFO(%r10)
8357+ GET_THREAD_INFO(%r11)
8358 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall return value */
8359 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
8360 cli
8361 TRACE_IRQS_OFF
8362- testl %edi,TI_flags(%r10)
8363+ testl %edi,TI_flags(%r11)
8364 jz \exit
8365 CLEAR_RREGS -ARGOFFSET
8366 jmp int_with_check
8367@@ -238,7 +279,7 @@ sysexit_audit:
8368
8369 sysenter_tracesys:
8370 #ifdef CONFIG_AUDITSYSCALL
8371- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
8372+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8373 jz sysenter_auditsys
8374 #endif
8375 SAVE_REST
8376@@ -246,6 +287,9 @@ sysenter_tracesys:
8377 movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
8378 movq %rsp,%rdi /* &pt_regs -> arg1 */
8379 call syscall_trace_enter
8380+
8381+ pax_erase_kstack
8382+
8383 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8384 RESTORE_REST
8385 cmpq $(IA32_NR_syscalls-1),%rax
8386@@ -277,19 +321,20 @@ ENDPROC(ia32_sysenter_target)
8387 ENTRY(ia32_cstar_target)
8388 CFI_STARTPROC32 simple
8389 CFI_SIGNAL_FRAME
8390- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
8391+ CFI_DEF_CFA rsp,0
8392 CFI_REGISTER rip,rcx
8393 /*CFI_REGISTER rflags,r11*/
8394 SWAPGS_UNSAFE_STACK
8395 movl %esp,%r8d
8396 CFI_REGISTER rsp,r8
8397 movq PER_CPU_VAR(kernel_stack),%rsp
8398+ SAVE_ARGS 8*6,0,0
8399+ pax_enter_kernel_user
8400 /*
8401 * No need to follow this irqs on/off section: the syscall
8402 * disabled irqs and here we enable it straight after entry:
8403 */
8404 ENABLE_INTERRUPTS(CLBR_NONE)
8405- SAVE_ARGS 8,0,0
8406 movl %eax,%eax /* zero extension */
8407 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
8408 movq %rcx,RIP-ARGOFFSET(%rsp)
8409@@ -305,13 +350,19 @@ ENTRY(ia32_cstar_target)
8410 /* no need to do an access_ok check here because r8 has been
8411 32bit zero extended */
8412 /* hardware stack frame is complete now */
8413+
8414+#ifdef CONFIG_PAX_MEMORY_UDEREF
8415+ mov $PAX_USER_SHADOW_BASE,%r11
8416+ add %r11,%r8
8417+#endif
8418+
8419 1: movl (%r8),%r9d
8420 .section __ex_table,"a"
8421 .quad 1b,ia32_badarg
8422 .previous
8423- GET_THREAD_INFO(%r10)
8424- orl $TS_COMPAT,TI_status(%r10)
8425- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
8426+ GET_THREAD_INFO(%r11)
8427+ orl $TS_COMPAT,TI_status(%r11)
8428+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8429 CFI_REMEMBER_STATE
8430 jnz cstar_tracesys
8431 cmpq $IA32_NR_syscalls-1,%rax
8432@@ -321,13 +372,15 @@ cstar_do_call:
8433 cstar_dispatch:
8434 call *ia32_sys_call_table(,%rax,8)
8435 movq %rax,RAX-ARGOFFSET(%rsp)
8436- GET_THREAD_INFO(%r10)
8437+ GET_THREAD_INFO(%r11)
8438 DISABLE_INTERRUPTS(CLBR_NONE)
8439 TRACE_IRQS_OFF
8440- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
8441+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8442 jnz sysretl_audit
8443 sysretl_from_sys_call:
8444- andl $~TS_COMPAT,TI_status(%r10)
8445+ pax_exit_kernel_user
8446+ pax_erase_kstack
8447+ andl $~TS_COMPAT,TI_status(%r11)
8448 RESTORE_ARGS 0,-ARG_SKIP,0,0,0
8449 movl RIP-ARGOFFSET(%rsp),%ecx
8450 CFI_REGISTER rip,rcx
8451@@ -355,7 +408,7 @@ sysretl_audit:
8452
8453 cstar_tracesys:
8454 #ifdef CONFIG_AUDITSYSCALL
8455- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
8456+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8457 jz cstar_auditsys
8458 #endif
8459 xchgl %r9d,%ebp
8460@@ -364,6 +417,9 @@ cstar_tracesys:
8461 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8462 movq %rsp,%rdi /* &pt_regs -> arg1 */
8463 call syscall_trace_enter
8464+
8465+ pax_erase_kstack
8466+
8467 LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
8468 RESTORE_REST
8469 xchgl %ebp,%r9d
8470@@ -409,20 +465,21 @@ ENTRY(ia32_syscall)
8471 CFI_REL_OFFSET rip,RIP-RIP
8472 PARAVIRT_ADJUST_EXCEPTION_FRAME
8473 SWAPGS
8474- /*
8475- * No need to follow this irqs on/off section: the syscall
8476- * disabled irqs and here we enable it straight after entry:
8477- */
8478- ENABLE_INTERRUPTS(CLBR_NONE)
8479 movl %eax,%eax
8480 pushq_cfi %rax
8481 cld
8482 /* note the registers are not zero extended to the sf.
8483 this could be a problem. */
8484 SAVE_ARGS 0,1,0
8485- GET_THREAD_INFO(%r10)
8486- orl $TS_COMPAT,TI_status(%r10)
8487- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
8488+ pax_enter_kernel_user
8489+ /*
8490+ * No need to follow this irqs on/off section: the syscall
8491+ * disabled irqs and here we enable it straight after entry:
8492+ */
8493+ ENABLE_INTERRUPTS(CLBR_NONE)
8494+ GET_THREAD_INFO(%r11)
8495+ orl $TS_COMPAT,TI_status(%r11)
8496+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8497 jnz ia32_tracesys
8498 cmpq $(IA32_NR_syscalls-1),%rax
8499 ja ia32_badsys
8500@@ -441,6 +498,9 @@ ia32_tracesys:
8501 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8502 movq %rsp,%rdi /* &pt_regs -> arg1 */
8503 call syscall_trace_enter
8504+
8505+ pax_erase_kstack
8506+
8507 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8508 RESTORE_REST
8509 cmpq $(IA32_NR_syscalls-1),%rax
8510@@ -455,6 +515,7 @@ ia32_badsys:
8511
8512 quiet_ni_syscall:
8513 movq $-ENOSYS,%rax
8514+ pax_force_retaddr
8515 ret
8516 CFI_ENDPROC
8517
8518diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
8519index f6f5c53..b358b28 100644
8520--- a/arch/x86/ia32/sys_ia32.c
8521+++ b/arch/x86/ia32/sys_ia32.c
8522@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
8523 */
8524 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
8525 {
8526- typeof(ubuf->st_uid) uid = 0;
8527- typeof(ubuf->st_gid) gid = 0;
8528+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
8529+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
8530 SET_UID(uid, stat->uid);
8531 SET_GID(gid, stat->gid);
8532 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
8533@@ -308,8 +308,8 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
8534 }
8535 set_fs(KERNEL_DS);
8536 ret = sys_rt_sigprocmask(how,
8537- set ? (sigset_t __user *)&s : NULL,
8538- oset ? (sigset_t __user *)&s : NULL,
8539+ set ? (sigset_t __force_user *)&s : NULL,
8540+ oset ? (sigset_t __force_user *)&s : NULL,
8541 sigsetsize);
8542 set_fs(old_fs);
8543 if (ret)
8544@@ -332,7 +332,7 @@ asmlinkage long sys32_alarm(unsigned int seconds)
8545 return alarm_setitimer(seconds);
8546 }
8547
8548-asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr,
8549+asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,
8550 int options)
8551 {
8552 return compat_sys_wait4(pid, stat_addr, options, NULL);
8553@@ -353,7 +353,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
8554 mm_segment_t old_fs = get_fs();
8555
8556 set_fs(KERNEL_DS);
8557- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
8558+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
8559 set_fs(old_fs);
8560 if (put_compat_timespec(&t, interval))
8561 return -EFAULT;
8562@@ -369,7 +369,7 @@ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
8563 mm_segment_t old_fs = get_fs();
8564
8565 set_fs(KERNEL_DS);
8566- ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
8567+ ret = sys_rt_sigpending((sigset_t __force_user *)&s, sigsetsize);
8568 set_fs(old_fs);
8569 if (!ret) {
8570 switch (_NSIG_WORDS) {
8571@@ -394,7 +394,7 @@ asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,
8572 if (copy_siginfo_from_user32(&info, uinfo))
8573 return -EFAULT;
8574 set_fs(KERNEL_DS);
8575- ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
8576+ ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force_user *)&info);
8577 set_fs(old_fs);
8578 return ret;
8579 }
8580@@ -439,7 +439,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd,
8581 return -EFAULT;
8582
8583 set_fs(KERNEL_DS);
8584- ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
8585+ ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __force_user *)&of : NULL,
8586 count);
8587 set_fs(old_fs);
8588
8589diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
8590index 091508b..7692c6f 100644
8591--- a/arch/x86/include/asm/alternative-asm.h
8592+++ b/arch/x86/include/asm/alternative-asm.h
8593@@ -4,10 +4,10 @@
8594
8595 #ifdef CONFIG_SMP
8596 .macro LOCK_PREFIX
8597-1: lock
8598+672: lock
8599 .section .smp_locks,"a"
8600 .balign 4
8601- .long 1b - .
8602+ .long 672b - .
8603 .previous
8604 .endm
8605 #else
8606@@ -15,6 +15,45 @@
8607 .endm
8608 #endif
8609
8610+#ifdef KERNEXEC_PLUGIN
8611+ .macro pax_force_retaddr_bts rip=0
8612+ btsq $63,\rip(%rsp)
8613+ .endm
8614+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
8615+ .macro pax_force_retaddr rip=0, reload=0
8616+ btsq $63,\rip(%rsp)
8617+ .endm
8618+ .macro pax_force_fptr ptr
8619+ btsq $63,\ptr
8620+ .endm
8621+ .macro pax_set_fptr_mask
8622+ .endm
8623+#endif
8624+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
8625+ .macro pax_force_retaddr rip=0, reload=0
8626+ .if \reload
8627+ pax_set_fptr_mask
8628+ .endif
8629+ orq %r10,\rip(%rsp)
8630+ .endm
8631+ .macro pax_force_fptr ptr
8632+ orq %r10,\ptr
8633+ .endm
8634+ .macro pax_set_fptr_mask
8635+ movabs $0x8000000000000000,%r10
8636+ .endm
8637+#endif
8638+#else
8639+ .macro pax_force_retaddr rip=0, reload=0
8640+ .endm
8641+ .macro pax_force_fptr ptr
8642+ .endm
8643+ .macro pax_force_retaddr_bts rip=0
8644+ .endm
8645+ .macro pax_set_fptr_mask
8646+ .endm
8647+#endif
8648+
8649 .macro altinstruction_entry orig alt feature orig_len alt_len
8650 .long \orig - .
8651 .long \alt - .
8652diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
8653index 37ad100..7d47faa 100644
8654--- a/arch/x86/include/asm/alternative.h
8655+++ b/arch/x86/include/asm/alternative.h
8656@@ -89,7 +89,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
8657 ".section .discard,\"aw\",@progbits\n" \
8658 " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
8659 ".previous\n" \
8660- ".section .altinstr_replacement, \"ax\"\n" \
8661+ ".section .altinstr_replacement, \"a\"\n" \
8662 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
8663 ".previous"
8664
8665diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
8666index 1a6c09a..fec2432 100644
8667--- a/arch/x86/include/asm/apic.h
8668+++ b/arch/x86/include/asm/apic.h
8669@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
8670
8671 #ifdef CONFIG_X86_LOCAL_APIC
8672
8673-extern unsigned int apic_verbosity;
8674+extern int apic_verbosity;
8675 extern int local_apic_timer_c2_ok;
8676
8677 extern int disable_apic;
8678diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
8679index 20370c6..a2eb9b0 100644
8680--- a/arch/x86/include/asm/apm.h
8681+++ b/arch/x86/include/asm/apm.h
8682@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
8683 __asm__ __volatile__(APM_DO_ZERO_SEGS
8684 "pushl %%edi\n\t"
8685 "pushl %%ebp\n\t"
8686- "lcall *%%cs:apm_bios_entry\n\t"
8687+ "lcall *%%ss:apm_bios_entry\n\t"
8688 "setc %%al\n\t"
8689 "popl %%ebp\n\t"
8690 "popl %%edi\n\t"
8691@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
8692 __asm__ __volatile__(APM_DO_ZERO_SEGS
8693 "pushl %%edi\n\t"
8694 "pushl %%ebp\n\t"
8695- "lcall *%%cs:apm_bios_entry\n\t"
8696+ "lcall *%%ss:apm_bios_entry\n\t"
8697 "setc %%bl\n\t"
8698 "popl %%ebp\n\t"
8699 "popl %%edi\n\t"
8700diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
8701index 58cb6d4..ca9010d 100644
8702--- a/arch/x86/include/asm/atomic.h
8703+++ b/arch/x86/include/asm/atomic.h
8704@@ -22,7 +22,18 @@
8705 */
8706 static inline int atomic_read(const atomic_t *v)
8707 {
8708- return (*(volatile int *)&(v)->counter);
8709+ return (*(volatile const int *)&(v)->counter);
8710+}
8711+
8712+/**
8713+ * atomic_read_unchecked - read atomic variable
8714+ * @v: pointer of type atomic_unchecked_t
8715+ *
8716+ * Atomically reads the value of @v.
8717+ */
8718+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
8719+{
8720+ return (*(volatile const int *)&(v)->counter);
8721 }
8722
8723 /**
8724@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i)
8725 }
8726
8727 /**
8728+ * atomic_set_unchecked - set atomic variable
8729+ * @v: pointer of type atomic_unchecked_t
8730+ * @i: required value
8731+ *
8732+ * Atomically sets the value of @v to @i.
8733+ */
8734+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
8735+{
8736+ v->counter = i;
8737+}
8738+
8739+/**
8740 * atomic_add - add integer to atomic variable
8741 * @i: integer value to add
8742 * @v: pointer of type atomic_t
8743@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *v, int i)
8744 */
8745 static inline void atomic_add(int i, atomic_t *v)
8746 {
8747- asm volatile(LOCK_PREFIX "addl %1,%0"
8748+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8749+
8750+#ifdef CONFIG_PAX_REFCOUNT
8751+ "jno 0f\n"
8752+ LOCK_PREFIX "subl %1,%0\n"
8753+ "int $4\n0:\n"
8754+ _ASM_EXTABLE(0b, 0b)
8755+#endif
8756+
8757+ : "+m" (v->counter)
8758+ : "ir" (i));
8759+}
8760+
8761+/**
8762+ * atomic_add_unchecked - add integer to atomic variable
8763+ * @i: integer value to add
8764+ * @v: pointer of type atomic_unchecked_t
8765+ *
8766+ * Atomically adds @i to @v.
8767+ */
8768+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
8769+{
8770+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8771 : "+m" (v->counter)
8772 : "ir" (i));
8773 }
8774@@ -60,7 +105,29 @@ static inline void atomic_add(int i, atomic_t *v)
8775 */
8776 static inline void atomic_sub(int i, atomic_t *v)
8777 {
8778- asm volatile(LOCK_PREFIX "subl %1,%0"
8779+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8780+
8781+#ifdef CONFIG_PAX_REFCOUNT
8782+ "jno 0f\n"
8783+ LOCK_PREFIX "addl %1,%0\n"
8784+ "int $4\n0:\n"
8785+ _ASM_EXTABLE(0b, 0b)
8786+#endif
8787+
8788+ : "+m" (v->counter)
8789+ : "ir" (i));
8790+}
8791+
8792+/**
8793+ * atomic_sub_unchecked - subtract integer from atomic variable
8794+ * @i: integer value to subtract
8795+ * @v: pointer of type atomic_unchecked_t
8796+ *
8797+ * Atomically subtracts @i from @v.
8798+ */
8799+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
8800+{
8801+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8802 : "+m" (v->counter)
8803 : "ir" (i));
8804 }
8805@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8806 {
8807 unsigned char c;
8808
8809- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
8810+ asm volatile(LOCK_PREFIX "subl %2,%0\n"
8811+
8812+#ifdef CONFIG_PAX_REFCOUNT
8813+ "jno 0f\n"
8814+ LOCK_PREFIX "addl %2,%0\n"
8815+ "int $4\n0:\n"
8816+ _ASM_EXTABLE(0b, 0b)
8817+#endif
8818+
8819+ "sete %1\n"
8820 : "+m" (v->counter), "=qm" (c)
8821 : "ir" (i) : "memory");
8822 return c;
8823@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8824 */
8825 static inline void atomic_inc(atomic_t *v)
8826 {
8827- asm volatile(LOCK_PREFIX "incl %0"
8828+ asm volatile(LOCK_PREFIX "incl %0\n"
8829+
8830+#ifdef CONFIG_PAX_REFCOUNT
8831+ "jno 0f\n"
8832+ LOCK_PREFIX "decl %0\n"
8833+ "int $4\n0:\n"
8834+ _ASM_EXTABLE(0b, 0b)
8835+#endif
8836+
8837+ : "+m" (v->counter));
8838+}
8839+
8840+/**
8841+ * atomic_inc_unchecked - increment atomic variable
8842+ * @v: pointer of type atomic_unchecked_t
8843+ *
8844+ * Atomically increments @v by 1.
8845+ */
8846+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
8847+{
8848+ asm volatile(LOCK_PREFIX "incl %0\n"
8849 : "+m" (v->counter));
8850 }
8851
8852@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *v)
8853 */
8854 static inline void atomic_dec(atomic_t *v)
8855 {
8856- asm volatile(LOCK_PREFIX "decl %0"
8857+ asm volatile(LOCK_PREFIX "decl %0\n"
8858+
8859+#ifdef CONFIG_PAX_REFCOUNT
8860+ "jno 0f\n"
8861+ LOCK_PREFIX "incl %0\n"
8862+ "int $4\n0:\n"
8863+ _ASM_EXTABLE(0b, 0b)
8864+#endif
8865+
8866+ : "+m" (v->counter));
8867+}
8868+
8869+/**
8870+ * atomic_dec_unchecked - decrement atomic variable
8871+ * @v: pointer of type atomic_unchecked_t
8872+ *
8873+ * Atomically decrements @v by 1.
8874+ */
8875+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
8876+{
8877+ asm volatile(LOCK_PREFIX "decl %0\n"
8878 : "+m" (v->counter));
8879 }
8880
8881@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
8882 {
8883 unsigned char c;
8884
8885- asm volatile(LOCK_PREFIX "decl %0; sete %1"
8886+ asm volatile(LOCK_PREFIX "decl %0\n"
8887+
8888+#ifdef CONFIG_PAX_REFCOUNT
8889+ "jno 0f\n"
8890+ LOCK_PREFIX "incl %0\n"
8891+ "int $4\n0:\n"
8892+ _ASM_EXTABLE(0b, 0b)
8893+#endif
8894+
8895+ "sete %1\n"
8896 : "+m" (v->counter), "=qm" (c)
8897 : : "memory");
8898 return c != 0;
8899@@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
8900 {
8901 unsigned char c;
8902
8903- asm volatile(LOCK_PREFIX "incl %0; sete %1"
8904+ asm volatile(LOCK_PREFIX "incl %0\n"
8905+
8906+#ifdef CONFIG_PAX_REFCOUNT
8907+ "jno 0f\n"
8908+ LOCK_PREFIX "decl %0\n"
8909+ "int $4\n0:\n"
8910+ _ASM_EXTABLE(0b, 0b)
8911+#endif
8912+
8913+ "sete %1\n"
8914+ : "+m" (v->counter), "=qm" (c)
8915+ : : "memory");
8916+ return c != 0;
8917+}
8918+
8919+/**
8920+ * atomic_inc_and_test_unchecked - increment and test
8921+ * @v: pointer of type atomic_unchecked_t
8922+ *
8923+ * Atomically increments @v by 1
8924+ * and returns true if the result is zero, or false for all
8925+ * other cases.
8926+ */
8927+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
8928+{
8929+ unsigned char c;
8930+
8931+ asm volatile(LOCK_PREFIX "incl %0\n"
8932+ "sete %1\n"
8933 : "+m" (v->counter), "=qm" (c)
8934 : : "memory");
8935 return c != 0;
8936@@ -157,7 +310,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
8937 {
8938 unsigned char c;
8939
8940- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
8941+ asm volatile(LOCK_PREFIX "addl %2,%0\n"
8942+
8943+#ifdef CONFIG_PAX_REFCOUNT
8944+ "jno 0f\n"
8945+ LOCK_PREFIX "subl %2,%0\n"
8946+ "int $4\n0:\n"
8947+ _ASM_EXTABLE(0b, 0b)
8948+#endif
8949+
8950+ "sets %1\n"
8951 : "+m" (v->counter), "=qm" (c)
8952 : "ir" (i) : "memory");
8953 return c;
8954@@ -179,7 +341,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
8955 goto no_xadd;
8956 #endif
8957 /* Modern 486+ processor */
8958- return i + xadd(&v->counter, i);
8959+ return i + xadd_check_overflow(&v->counter, i);
8960
8961 #ifdef CONFIG_M386
8962 no_xadd: /* Legacy 386 processor */
8963@@ -192,6 +354,34 @@ no_xadd: /* Legacy 386 processor */
8964 }
8965
8966 /**
8967+ * atomic_add_return_unchecked - add integer and return
8968+ * @i: integer value to add
8969+ * @v: pointer of type atomic_unchecked_t
8970+ *
8971+ * Atomically adds @i to @v and returns @i + @v
8972+ */
8973+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
8974+{
8975+#ifdef CONFIG_M386
8976+ int __i;
8977+ unsigned long flags;
8978+ if (unlikely(boot_cpu_data.x86 <= 3))
8979+ goto no_xadd;
8980+#endif
8981+ /* Modern 486+ processor */
8982+ return i + xadd(&v->counter, i);
8983+
8984+#ifdef CONFIG_M386
8985+no_xadd: /* Legacy 386 processor */
8986+ raw_local_irq_save(flags);
8987+ __i = atomic_read_unchecked(v);
8988+ atomic_set_unchecked(v, i + __i);
8989+ raw_local_irq_restore(flags);
8990+ return i + __i;
8991+#endif
8992+}
8993+
8994+/**
8995 * atomic_sub_return - subtract integer and return
8996 * @v: pointer of type atomic_t
8997 * @i: integer value to subtract
8998@@ -204,6 +394,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
8999 }
9000
9001 #define atomic_inc_return(v) (atomic_add_return(1, v))
9002+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9003+{
9004+ return atomic_add_return_unchecked(1, v);
9005+}
9006 #define atomic_dec_return(v) (atomic_sub_return(1, v))
9007
9008 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
9009@@ -211,11 +405,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
9010 return cmpxchg(&v->counter, old, new);
9011 }
9012
9013+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9014+{
9015+ return cmpxchg(&v->counter, old, new);
9016+}
9017+
9018 static inline int atomic_xchg(atomic_t *v, int new)
9019 {
9020 return xchg(&v->counter, new);
9021 }
9022
9023+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9024+{
9025+ return xchg(&v->counter, new);
9026+}
9027+
9028 /**
9029 * __atomic_add_unless - add unless the number is already a given value
9030 * @v: pointer of type atomic_t
9031@@ -227,12 +431,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
9032 */
9033 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9034 {
9035- int c, old;
9036+ int c, old, new;
9037 c = atomic_read(v);
9038 for (;;) {
9039- if (unlikely(c == (u)))
9040+ if (unlikely(c == u))
9041 break;
9042- old = atomic_cmpxchg((v), c, c + (a));
9043+
9044+ asm volatile("addl %2,%0\n"
9045+
9046+#ifdef CONFIG_PAX_REFCOUNT
9047+ "jno 0f\n"
9048+ "subl %2,%0\n"
9049+ "int $4\n0:\n"
9050+ _ASM_EXTABLE(0b, 0b)
9051+#endif
9052+
9053+ : "=r" (new)
9054+ : "0" (c), "ir" (a));
9055+
9056+ old = atomic_cmpxchg(v, c, new);
9057 if (likely(old == c))
9058 break;
9059 c = old;
9060@@ -240,6 +457,48 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9061 return c;
9062 }
9063
9064+/**
9065+ * atomic_inc_not_zero_hint - increment if not null
9066+ * @v: pointer of type atomic_t
9067+ * @hint: probable value of the atomic before the increment
9068+ *
9069+ * This version of atomic_inc_not_zero() gives a hint of probable
9070+ * value of the atomic. This helps processor to not read the memory
9071+ * before doing the atomic read/modify/write cycle, lowering
9072+ * number of bus transactions on some arches.
9073+ *
9074+ * Returns: 0 if increment was not done, 1 otherwise.
9075+ */
9076+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
9077+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
9078+{
9079+ int val, c = hint, new;
9080+
9081+ /* sanity test, should be removed by compiler if hint is a constant */
9082+ if (!hint)
9083+ return __atomic_add_unless(v, 1, 0);
9084+
9085+ do {
9086+ asm volatile("incl %0\n"
9087+
9088+#ifdef CONFIG_PAX_REFCOUNT
9089+ "jno 0f\n"
9090+ "decl %0\n"
9091+ "int $4\n0:\n"
9092+ _ASM_EXTABLE(0b, 0b)
9093+#endif
9094+
9095+ : "=r" (new)
9096+ : "0" (c));
9097+
9098+ val = atomic_cmpxchg(v, c, new);
9099+ if (val == c)
9100+ return 1;
9101+ c = val;
9102+ } while (c);
9103+
9104+ return 0;
9105+}
9106
9107 /*
9108 * atomic_dec_if_positive - decrement by 1 if old value positive
9109diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
9110index 24098aa..1e37723 100644
9111--- a/arch/x86/include/asm/atomic64_32.h
9112+++ b/arch/x86/include/asm/atomic64_32.h
9113@@ -12,6 +12,14 @@ typedef struct {
9114 u64 __aligned(8) counter;
9115 } atomic64_t;
9116
9117+#ifdef CONFIG_PAX_REFCOUNT
9118+typedef struct {
9119+ u64 __aligned(8) counter;
9120+} atomic64_unchecked_t;
9121+#else
9122+typedef atomic64_t atomic64_unchecked_t;
9123+#endif
9124+
9125 #define ATOMIC64_INIT(val) { (val) }
9126
9127 #ifdef CONFIG_X86_CMPXCHG64
9128@@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
9129 }
9130
9131 /**
9132+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
9133+ * @p: pointer to type atomic64_unchecked_t
9134+ * @o: expected value
9135+ * @n: new value
9136+ *
9137+ * Atomically sets @v to @n if it was equal to @o and returns
9138+ * the old value.
9139+ */
9140+
9141+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
9142+{
9143+ return cmpxchg64(&v->counter, o, n);
9144+}
9145+
9146+/**
9147 * atomic64_xchg - xchg atomic64 variable
9148 * @v: pointer to type atomic64_t
9149 * @n: value to assign
9150@@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64_t *v, long long i)
9151 }
9152
9153 /**
9154+ * atomic64_set_unchecked - set atomic64 variable
9155+ * @v: pointer to type atomic64_unchecked_t
9156+ * @n: value to assign
9157+ *
9158+ * Atomically sets the value of @v to @n.
9159+ */
9160+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
9161+{
9162+ unsigned high = (unsigned)(i >> 32);
9163+ unsigned low = (unsigned)i;
9164+ asm volatile(ATOMIC64_ALTERNATIVE(set)
9165+ : "+b" (low), "+c" (high)
9166+ : "S" (v)
9167+ : "eax", "edx", "memory"
9168+ );
9169+}
9170+
9171+/**
9172 * atomic64_read - read atomic64 variable
9173 * @v: pointer to type atomic64_t
9174 *
9175@@ -93,6 +134,22 @@ static inline long long atomic64_read(atomic64_t *v)
9176 }
9177
9178 /**
9179+ * atomic64_read_unchecked - read atomic64 variable
9180+ * @v: pointer to type atomic64_unchecked_t
9181+ *
9182+ * Atomically reads the value of @v and returns it.
9183+ */
9184+static inline long long atomic64_read_unchecked(atomic64_unchecked_t *v)
9185+{
9186+ long long r;
9187+ asm volatile(ATOMIC64_ALTERNATIVE(read_unchecked)
9188+ : "=A" (r), "+c" (v)
9189+ : : "memory"
9190+ );
9191+ return r;
9192+ }
9193+
9194+/**
9195 * atomic64_add_return - add and return
9196 * @i: integer value to add
9197 * @v: pointer to type atomic64_t
9198@@ -108,6 +165,22 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
9199 return i;
9200 }
9201
9202+/**
9203+ * atomic64_add_return_unchecked - add and return
9204+ * @i: integer value to add
9205+ * @v: pointer to type atomic64_unchecked_t
9206+ *
9207+ * Atomically adds @i to @v and returns @i + *@v
9208+ */
9209+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
9210+{
9211+ asm volatile(ATOMIC64_ALTERNATIVE(add_return_unchecked)
9212+ : "+A" (i), "+c" (v)
9213+ : : "memory"
9214+ );
9215+ return i;
9216+}
9217+
9218 /*
9219 * Other variants with different arithmetic operators:
9220 */
9221@@ -131,6 +204,17 @@ static inline long long atomic64_inc_return(atomic64_t *v)
9222 return a;
9223 }
9224
9225+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9226+{
9227+ long long a;
9228+ asm volatile(ATOMIC64_ALTERNATIVE(inc_return_unchecked)
9229+ : "=A" (a)
9230+ : "S" (v)
9231+ : "memory", "ecx"
9232+ );
9233+ return a;
9234+}
9235+
9236 static inline long long atomic64_dec_return(atomic64_t *v)
9237 {
9238 long long a;
9239@@ -159,6 +243,22 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
9240 }
9241
9242 /**
9243+ * atomic64_add_unchecked - add integer to atomic64 variable
9244+ * @i: integer value to add
9245+ * @v: pointer to type atomic64_unchecked_t
9246+ *
9247+ * Atomically adds @i to @v.
9248+ */
9249+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
9250+{
9251+ asm volatile(ATOMIC64_ALTERNATIVE_(add_unchecked, add_return_unchecked)
9252+ : "+A" (i), "+c" (v)
9253+ : : "memory"
9254+ );
9255+ return i;
9256+}
9257+
9258+/**
9259 * atomic64_sub - subtract the atomic64 variable
9260 * @i: integer value to subtract
9261 * @v: pointer to type atomic64_t
9262diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
9263index 0e1cbfc..5623683 100644
9264--- a/arch/x86/include/asm/atomic64_64.h
9265+++ b/arch/x86/include/asm/atomic64_64.h
9266@@ -18,7 +18,19 @@
9267 */
9268 static inline long atomic64_read(const atomic64_t *v)
9269 {
9270- return (*(volatile long *)&(v)->counter);
9271+ return (*(volatile const long *)&(v)->counter);
9272+}
9273+
9274+/**
9275+ * atomic64_read_unchecked - read atomic64 variable
9276+ * @v: pointer of type atomic64_unchecked_t
9277+ *
9278+ * Atomically reads the value of @v.
9279+ * Doesn't imply a read memory barrier.
9280+ */
9281+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9282+{
9283+ return (*(volatile const long *)&(v)->counter);
9284 }
9285
9286 /**
9287@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
9288 }
9289
9290 /**
9291+ * atomic64_set_unchecked - set atomic64 variable
9292+ * @v: pointer to type atomic64_unchecked_t
9293+ * @i: required value
9294+ *
9295+ * Atomically sets the value of @v to @i.
9296+ */
9297+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9298+{
9299+ v->counter = i;
9300+}
9301+
9302+/**
9303 * atomic64_add - add integer to atomic64 variable
9304 * @i: integer value to add
9305 * @v: pointer to type atomic64_t
9306@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
9307 */
9308 static inline void atomic64_add(long i, atomic64_t *v)
9309 {
9310+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
9311+
9312+#ifdef CONFIG_PAX_REFCOUNT
9313+ "jno 0f\n"
9314+ LOCK_PREFIX "subq %1,%0\n"
9315+ "int $4\n0:\n"
9316+ _ASM_EXTABLE(0b, 0b)
9317+#endif
9318+
9319+ : "=m" (v->counter)
9320+ : "er" (i), "m" (v->counter));
9321+}
9322+
9323+/**
9324+ * atomic64_add_unchecked - add integer to atomic64 variable
9325+ * @i: integer value to add
9326+ * @v: pointer to type atomic64_unchecked_t
9327+ *
9328+ * Atomically adds @i to @v.
9329+ */
9330+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
9331+{
9332 asm volatile(LOCK_PREFIX "addq %1,%0"
9333 : "=m" (v->counter)
9334 : "er" (i), "m" (v->counter));
9335@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
9336 */
9337 static inline void atomic64_sub(long i, atomic64_t *v)
9338 {
9339- asm volatile(LOCK_PREFIX "subq %1,%0"
9340+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
9341+
9342+#ifdef CONFIG_PAX_REFCOUNT
9343+ "jno 0f\n"
9344+ LOCK_PREFIX "addq %1,%0\n"
9345+ "int $4\n0:\n"
9346+ _ASM_EXTABLE(0b, 0b)
9347+#endif
9348+
9349+ : "=m" (v->counter)
9350+ : "er" (i), "m" (v->counter));
9351+}
9352+
9353+/**
9354+ * atomic64_sub_unchecked - subtract the atomic64 variable
9355+ * @i: integer value to subtract
9356+ * @v: pointer to type atomic64_unchecked_t
9357+ *
9358+ * Atomically subtracts @i from @v.
9359+ */
9360+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
9361+{
9362+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
9363 : "=m" (v->counter)
9364 : "er" (i), "m" (v->counter));
9365 }
9366@@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9367 {
9368 unsigned char c;
9369
9370- asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
9371+ asm volatile(LOCK_PREFIX "subq %2,%0\n"
9372+
9373+#ifdef CONFIG_PAX_REFCOUNT
9374+ "jno 0f\n"
9375+ LOCK_PREFIX "addq %2,%0\n"
9376+ "int $4\n0:\n"
9377+ _ASM_EXTABLE(0b, 0b)
9378+#endif
9379+
9380+ "sete %1\n"
9381 : "=m" (v->counter), "=qm" (c)
9382 : "er" (i), "m" (v->counter) : "memory");
9383 return c;
9384@@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9385 */
9386 static inline void atomic64_inc(atomic64_t *v)
9387 {
9388+ asm volatile(LOCK_PREFIX "incq %0\n"
9389+
9390+#ifdef CONFIG_PAX_REFCOUNT
9391+ "jno 0f\n"
9392+ LOCK_PREFIX "decq %0\n"
9393+ "int $4\n0:\n"
9394+ _ASM_EXTABLE(0b, 0b)
9395+#endif
9396+
9397+ : "=m" (v->counter)
9398+ : "m" (v->counter));
9399+}
9400+
9401+/**
9402+ * atomic64_inc_unchecked - increment atomic64 variable
9403+ * @v: pointer to type atomic64_unchecked_t
9404+ *
9405+ * Atomically increments @v by 1.
9406+ */
9407+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9408+{
9409 asm volatile(LOCK_PREFIX "incq %0"
9410 : "=m" (v->counter)
9411 : "m" (v->counter));
9412@@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64_t *v)
9413 */
9414 static inline void atomic64_dec(atomic64_t *v)
9415 {
9416- asm volatile(LOCK_PREFIX "decq %0"
9417+ asm volatile(LOCK_PREFIX "decq %0\n"
9418+
9419+#ifdef CONFIG_PAX_REFCOUNT
9420+ "jno 0f\n"
9421+ LOCK_PREFIX "incq %0\n"
9422+ "int $4\n0:\n"
9423+ _ASM_EXTABLE(0b, 0b)
9424+#endif
9425+
9426+ : "=m" (v->counter)
9427+ : "m" (v->counter));
9428+}
9429+
9430+/**
9431+ * atomic64_dec_unchecked - decrement atomic64 variable
9432+ * @v: pointer to type atomic64_t
9433+ *
9434+ * Atomically decrements @v by 1.
9435+ */
9436+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9437+{
9438+ asm volatile(LOCK_PREFIX "decq %0\n"
9439 : "=m" (v->counter)
9440 : "m" (v->counter));
9441 }
9442@@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
9443 {
9444 unsigned char c;
9445
9446- asm volatile(LOCK_PREFIX "decq %0; sete %1"
9447+ asm volatile(LOCK_PREFIX "decq %0\n"
9448+
9449+#ifdef CONFIG_PAX_REFCOUNT
9450+ "jno 0f\n"
9451+ LOCK_PREFIX "incq %0\n"
9452+ "int $4\n0:\n"
9453+ _ASM_EXTABLE(0b, 0b)
9454+#endif
9455+
9456+ "sete %1\n"
9457 : "=m" (v->counter), "=qm" (c)
9458 : "m" (v->counter) : "memory");
9459 return c != 0;
9460@@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
9461 {
9462 unsigned char c;
9463
9464- asm volatile(LOCK_PREFIX "incq %0; sete %1"
9465+ asm volatile(LOCK_PREFIX "incq %0\n"
9466+
9467+#ifdef CONFIG_PAX_REFCOUNT
9468+ "jno 0f\n"
9469+ LOCK_PREFIX "decq %0\n"
9470+ "int $4\n0:\n"
9471+ _ASM_EXTABLE(0b, 0b)
9472+#endif
9473+
9474+ "sete %1\n"
9475 : "=m" (v->counter), "=qm" (c)
9476 : "m" (v->counter) : "memory");
9477 return c != 0;
9478@@ -155,7 +292,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9479 {
9480 unsigned char c;
9481
9482- asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
9483+ asm volatile(LOCK_PREFIX "addq %2,%0\n"
9484+
9485+#ifdef CONFIG_PAX_REFCOUNT
9486+ "jno 0f\n"
9487+ LOCK_PREFIX "subq %2,%0\n"
9488+ "int $4\n0:\n"
9489+ _ASM_EXTABLE(0b, 0b)
9490+#endif
9491+
9492+ "sets %1\n"
9493 : "=m" (v->counter), "=qm" (c)
9494 : "er" (i), "m" (v->counter) : "memory");
9495 return c;
9496@@ -170,6 +316,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9497 */
9498 static inline long atomic64_add_return(long i, atomic64_t *v)
9499 {
9500+ return i + xadd_check_overflow(&v->counter, i);
9501+}
9502+
9503+/**
9504+ * atomic64_add_return_unchecked - add and return
9505+ * @i: integer value to add
9506+ * @v: pointer to type atomic64_unchecked_t
9507+ *
9508+ * Atomically adds @i to @v and returns @i + @v
9509+ */
9510+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
9511+{
9512 return i + xadd(&v->counter, i);
9513 }
9514
9515@@ -179,6 +337,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
9516 }
9517
9518 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
9519+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9520+{
9521+ return atomic64_add_return_unchecked(1, v);
9522+}
9523 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
9524
9525 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9526@@ -186,6 +348,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9527 return cmpxchg(&v->counter, old, new);
9528 }
9529
9530+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
9531+{
9532+ return cmpxchg(&v->counter, old, new);
9533+}
9534+
9535 static inline long atomic64_xchg(atomic64_t *v, long new)
9536 {
9537 return xchg(&v->counter, new);
9538@@ -202,17 +369,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
9539 */
9540 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
9541 {
9542- long c, old;
9543+ long c, old, new;
9544 c = atomic64_read(v);
9545 for (;;) {
9546- if (unlikely(c == (u)))
9547+ if (unlikely(c == u))
9548 break;
9549- old = atomic64_cmpxchg((v), c, c + (a));
9550+
9551+ asm volatile("add %2,%0\n"
9552+
9553+#ifdef CONFIG_PAX_REFCOUNT
9554+ "jno 0f\n"
9555+ "sub %2,%0\n"
9556+ "int $4\n0:\n"
9557+ _ASM_EXTABLE(0b, 0b)
9558+#endif
9559+
9560+ : "=r" (new)
9561+ : "0" (c), "ir" (a));
9562+
9563+ old = atomic64_cmpxchg(v, c, new);
9564 if (likely(old == c))
9565 break;
9566 c = old;
9567 }
9568- return c != (u);
9569+ return c != u;
9570 }
9571
9572 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9573diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
9574index 1775d6e..b65017f 100644
9575--- a/arch/x86/include/asm/bitops.h
9576+++ b/arch/x86/include/asm/bitops.h
9577@@ -38,7 +38,7 @@
9578 * a mask operation on a byte.
9579 */
9580 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
9581-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
9582+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
9583 #define CONST_MASK(nr) (1 << ((nr) & 7))
9584
9585 /**
9586diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
9587index 5e1a2ee..c9f9533 100644
9588--- a/arch/x86/include/asm/boot.h
9589+++ b/arch/x86/include/asm/boot.h
9590@@ -11,10 +11,15 @@
9591 #include <asm/pgtable_types.h>
9592
9593 /* Physical address where kernel should be loaded. */
9594-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9595+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9596 + (CONFIG_PHYSICAL_ALIGN - 1)) \
9597 & ~(CONFIG_PHYSICAL_ALIGN - 1))
9598
9599+#ifndef __ASSEMBLY__
9600+extern unsigned char __LOAD_PHYSICAL_ADDR[];
9601+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
9602+#endif
9603+
9604 /* Minimum kernel alignment, as a power of two */
9605 #ifdef CONFIG_X86_64
9606 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
9607diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
9608index 48f99f1..d78ebf9 100644
9609--- a/arch/x86/include/asm/cache.h
9610+++ b/arch/x86/include/asm/cache.h
9611@@ -5,12 +5,13 @@
9612
9613 /* L1 cache line size */
9614 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
9615-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9616+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9617
9618 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9619+#define __read_only __attribute__((__section__(".data..read_only")))
9620
9621 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
9622-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
9623+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
9624
9625 #ifdef CONFIG_X86_VSMP
9626 #ifdef CONFIG_SMP
9627diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
9628index 4e12668..501d239 100644
9629--- a/arch/x86/include/asm/cacheflush.h
9630+++ b/arch/x86/include/asm/cacheflush.h
9631@@ -26,7 +26,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
9632 unsigned long pg_flags = pg->flags & _PGMT_MASK;
9633
9634 if (pg_flags == _PGMT_DEFAULT)
9635- return -1;
9636+ return ~0UL;
9637 else if (pg_flags == _PGMT_WC)
9638 return _PAGE_CACHE_WC;
9639 else if (pg_flags == _PGMT_UC_MINUS)
9640diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
9641index 46fc474..b02b0f9 100644
9642--- a/arch/x86/include/asm/checksum_32.h
9643+++ b/arch/x86/include/asm/checksum_32.h
9644@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
9645 int len, __wsum sum,
9646 int *src_err_ptr, int *dst_err_ptr);
9647
9648+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
9649+ int len, __wsum sum,
9650+ int *src_err_ptr, int *dst_err_ptr);
9651+
9652+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
9653+ int len, __wsum sum,
9654+ int *src_err_ptr, int *dst_err_ptr);
9655+
9656 /*
9657 * Note: when you get a NULL pointer exception here this means someone
9658 * passed in an incorrect kernel address to one of these functions.
9659@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
9660 int *err_ptr)
9661 {
9662 might_sleep();
9663- return csum_partial_copy_generic((__force void *)src, dst,
9664+ return csum_partial_copy_generic_from_user((__force void *)src, dst,
9665 len, sum, err_ptr, NULL);
9666 }
9667
9668@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
9669 {
9670 might_sleep();
9671 if (access_ok(VERIFY_WRITE, dst, len))
9672- return csum_partial_copy_generic(src, (__force void *)dst,
9673+ return csum_partial_copy_generic_to_user(src, (__force void *)dst,
9674 len, sum, NULL, err_ptr);
9675
9676 if (len)
9677diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
9678index 5d3acdf..6447a02 100644
9679--- a/arch/x86/include/asm/cmpxchg.h
9680+++ b/arch/x86/include/asm/cmpxchg.h
9681@@ -14,6 +14,8 @@ extern void __cmpxchg_wrong_size(void)
9682 __compiletime_error("Bad argument size for cmpxchg");
9683 extern void __xadd_wrong_size(void)
9684 __compiletime_error("Bad argument size for xadd");
9685+extern void __xadd_check_overflow_wrong_size(void)
9686+ __compiletime_error("Bad argument size for xadd_check_overflow");
9687
9688 /*
9689 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
9690@@ -195,6 +197,34 @@ extern void __xadd_wrong_size(void)
9691 __ret; \
9692 })
9693
9694+#define __xadd_check_overflow(ptr, inc, lock) \
9695+ ({ \
9696+ __typeof__ (*(ptr)) __ret = (inc); \
9697+ switch (sizeof(*(ptr))) { \
9698+ case __X86_CASE_L: \
9699+ asm volatile (lock "xaddl %0, %1\n" \
9700+ "jno 0f\n" \
9701+ "mov %0,%1\n" \
9702+ "int $4\n0:\n" \
9703+ _ASM_EXTABLE(0b, 0b) \
9704+ : "+r" (__ret), "+m" (*(ptr)) \
9705+ : : "memory", "cc"); \
9706+ break; \
9707+ case __X86_CASE_Q: \
9708+ asm volatile (lock "xaddq %q0, %1\n" \
9709+ "jno 0f\n" \
9710+ "mov %0,%1\n" \
9711+ "int $4\n0:\n" \
9712+ _ASM_EXTABLE(0b, 0b) \
9713+ : "+r" (__ret), "+m" (*(ptr)) \
9714+ : : "memory", "cc"); \
9715+ break; \
9716+ default: \
9717+ __xadd_check_overflow_wrong_size(); \
9718+ } \
9719+ __ret; \
9720+ })
9721+
9722 /*
9723 * xadd() adds "inc" to "*ptr" and atomically returns the previous
9724 * value of "*ptr".
9725@@ -207,4 +237,6 @@ extern void __xadd_wrong_size(void)
9726 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
9727 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
9728
9729+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
9730+
9731 #endif /* ASM_X86_CMPXCHG_H */
9732diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
9733index f3444f7..051a196 100644
9734--- a/arch/x86/include/asm/cpufeature.h
9735+++ b/arch/x86/include/asm/cpufeature.h
9736@@ -363,7 +363,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
9737 ".section .discard,\"aw\",@progbits\n"
9738 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
9739 ".previous\n"
9740- ".section .altinstr_replacement,\"ax\"\n"
9741+ ".section .altinstr_replacement,\"a\"\n"
9742 "3: movb $1,%0\n"
9743 "4:\n"
9744 ".previous\n"
9745diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
9746index 41935fa..3b40db8 100644
9747--- a/arch/x86/include/asm/desc.h
9748+++ b/arch/x86/include/asm/desc.h
9749@@ -4,6 +4,7 @@
9750 #include <asm/desc_defs.h>
9751 #include <asm/ldt.h>
9752 #include <asm/mmu.h>
9753+#include <asm/pgtable.h>
9754
9755 #include <linux/smp.h>
9756
9757@@ -16,6 +17,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
9758
9759 desc->type = (info->read_exec_only ^ 1) << 1;
9760 desc->type |= info->contents << 2;
9761+ desc->type |= info->seg_not_present ^ 1;
9762
9763 desc->s = 1;
9764 desc->dpl = 0x3;
9765@@ -34,17 +36,12 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
9766 }
9767
9768 extern struct desc_ptr idt_descr;
9769-extern gate_desc idt_table[];
9770-
9771-struct gdt_page {
9772- struct desc_struct gdt[GDT_ENTRIES];
9773-} __attribute__((aligned(PAGE_SIZE)));
9774-
9775-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
9776+extern gate_desc idt_table[256];
9777
9778+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
9779 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
9780 {
9781- return per_cpu(gdt_page, cpu).gdt;
9782+ return cpu_gdt_table[cpu];
9783 }
9784
9785 #ifdef CONFIG_X86_64
9786@@ -69,8 +66,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
9787 unsigned long base, unsigned dpl, unsigned flags,
9788 unsigned short seg)
9789 {
9790- gate->a = (seg << 16) | (base & 0xffff);
9791- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
9792+ gate->gate.offset_low = base;
9793+ gate->gate.seg = seg;
9794+ gate->gate.reserved = 0;
9795+ gate->gate.type = type;
9796+ gate->gate.s = 0;
9797+ gate->gate.dpl = dpl;
9798+ gate->gate.p = 1;
9799+ gate->gate.offset_high = base >> 16;
9800 }
9801
9802 #endif
9803@@ -115,12 +118,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
9804
9805 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
9806 {
9807+ pax_open_kernel();
9808 memcpy(&idt[entry], gate, sizeof(*gate));
9809+ pax_close_kernel();
9810 }
9811
9812 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
9813 {
9814+ pax_open_kernel();
9815 memcpy(&ldt[entry], desc, 8);
9816+ pax_close_kernel();
9817 }
9818
9819 static inline void
9820@@ -134,7 +141,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
9821 default: size = sizeof(*gdt); break;
9822 }
9823
9824+ pax_open_kernel();
9825 memcpy(&gdt[entry], desc, size);
9826+ pax_close_kernel();
9827 }
9828
9829 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
9830@@ -207,7 +216,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
9831
9832 static inline void native_load_tr_desc(void)
9833 {
9834+ pax_open_kernel();
9835 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
9836+ pax_close_kernel();
9837 }
9838
9839 static inline void native_load_gdt(const struct desc_ptr *dtr)
9840@@ -244,8 +255,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
9841 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
9842 unsigned int i;
9843
9844+ pax_open_kernel();
9845 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
9846 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
9847+ pax_close_kernel();
9848 }
9849
9850 #define _LDT_empty(info) \
9851@@ -307,7 +320,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
9852 desc->limit = (limit >> 16) & 0xf;
9853 }
9854
9855-static inline void _set_gate(int gate, unsigned type, void *addr,
9856+static inline void _set_gate(int gate, unsigned type, const void *addr,
9857 unsigned dpl, unsigned ist, unsigned seg)
9858 {
9859 gate_desc s;
9860@@ -326,7 +339,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
9861 * Pentium F0 0F bugfix can have resulted in the mapped
9862 * IDT being write-protected.
9863 */
9864-static inline void set_intr_gate(unsigned int n, void *addr)
9865+static inline void set_intr_gate(unsigned int n, const void *addr)
9866 {
9867 BUG_ON((unsigned)n > 0xFF);
9868 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
9869@@ -356,19 +369,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
9870 /*
9871 * This routine sets up an interrupt gate at directory privilege level 3.
9872 */
9873-static inline void set_system_intr_gate(unsigned int n, void *addr)
9874+static inline void set_system_intr_gate(unsigned int n, const void *addr)
9875 {
9876 BUG_ON((unsigned)n > 0xFF);
9877 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
9878 }
9879
9880-static inline void set_system_trap_gate(unsigned int n, void *addr)
9881+static inline void set_system_trap_gate(unsigned int n, const void *addr)
9882 {
9883 BUG_ON((unsigned)n > 0xFF);
9884 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
9885 }
9886
9887-static inline void set_trap_gate(unsigned int n, void *addr)
9888+static inline void set_trap_gate(unsigned int n, const void *addr)
9889 {
9890 BUG_ON((unsigned)n > 0xFF);
9891 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
9892@@ -377,19 +390,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
9893 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
9894 {
9895 BUG_ON((unsigned)n > 0xFF);
9896- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
9897+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
9898 }
9899
9900-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
9901+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
9902 {
9903 BUG_ON((unsigned)n > 0xFF);
9904 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
9905 }
9906
9907-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
9908+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
9909 {
9910 BUG_ON((unsigned)n > 0xFF);
9911 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
9912 }
9913
9914+#ifdef CONFIG_X86_32
9915+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
9916+{
9917+ struct desc_struct d;
9918+
9919+ if (likely(limit))
9920+ limit = (limit - 1UL) >> PAGE_SHIFT;
9921+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
9922+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
9923+}
9924+#endif
9925+
9926 #endif /* _ASM_X86_DESC_H */
9927diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
9928index 278441f..b95a174 100644
9929--- a/arch/x86/include/asm/desc_defs.h
9930+++ b/arch/x86/include/asm/desc_defs.h
9931@@ -31,6 +31,12 @@ struct desc_struct {
9932 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
9933 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
9934 };
9935+ struct {
9936+ u16 offset_low;
9937+ u16 seg;
9938+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
9939+ unsigned offset_high: 16;
9940+ } gate;
9941 };
9942 } __attribute__((packed));
9943
9944diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
9945index 908b969..a1f4eb4 100644
9946--- a/arch/x86/include/asm/e820.h
9947+++ b/arch/x86/include/asm/e820.h
9948@@ -69,7 +69,7 @@ struct e820map {
9949 #define ISA_START_ADDRESS 0xa0000
9950 #define ISA_END_ADDRESS 0x100000
9951
9952-#define BIOS_BEGIN 0x000a0000
9953+#define BIOS_BEGIN 0x000c0000
9954 #define BIOS_END 0x00100000
9955
9956 #define BIOS_ROM_BASE 0xffe00000
9957diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
9958index 5f962df..7289f09 100644
9959--- a/arch/x86/include/asm/elf.h
9960+++ b/arch/x86/include/asm/elf.h
9961@@ -238,7 +238,25 @@ extern int force_personality32;
9962 the loader. We need to make sure that it is out of the way of the program
9963 that it will "exec", and that there is sufficient room for the brk. */
9964
9965+#ifdef CONFIG_PAX_SEGMEXEC
9966+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
9967+#else
9968 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
9969+#endif
9970+
9971+#ifdef CONFIG_PAX_ASLR
9972+#ifdef CONFIG_X86_32
9973+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
9974+
9975+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
9976+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
9977+#else
9978+#define PAX_ELF_ET_DYN_BASE 0x400000UL
9979+
9980+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
9981+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
9982+#endif
9983+#endif
9984
9985 /* This yields a mask that user programs can use to figure out what
9986 instruction set this CPU supports. This could be done in user space,
9987@@ -291,9 +309,7 @@ do { \
9988
9989 #define ARCH_DLINFO \
9990 do { \
9991- if (vdso_enabled) \
9992- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
9993- (unsigned long)current->mm->context.vdso); \
9994+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
9995 } while (0)
9996
9997 #define AT_SYSINFO 32
9998@@ -304,7 +320,7 @@ do { \
9999
10000 #endif /* !CONFIG_X86_32 */
10001
10002-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
10003+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
10004
10005 #define VDSO_ENTRY \
10006 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
10007@@ -318,9 +334,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
10008 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
10009 #define compat_arch_setup_additional_pages syscall32_setup_pages
10010
10011-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
10012-#define arch_randomize_brk arch_randomize_brk
10013-
10014 /*
10015 * True on X86_32 or when emulating IA32 on X86_64
10016 */
10017diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
10018index cc70c1c..d96d011 100644
10019--- a/arch/x86/include/asm/emergency-restart.h
10020+++ b/arch/x86/include/asm/emergency-restart.h
10021@@ -15,6 +15,6 @@ enum reboot_type {
10022
10023 extern enum reboot_type reboot_type;
10024
10025-extern void machine_emergency_restart(void);
10026+extern void machine_emergency_restart(void) __noreturn;
10027
10028 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
10029diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
10030index dbe82a5..c6d8a00 100644
10031--- a/arch/x86/include/asm/floppy.h
10032+++ b/arch/x86/include/asm/floppy.h
10033@@ -157,6 +157,7 @@ static unsigned long dma_mem_alloc(unsigned long size)
10034 }
10035
10036
10037+static unsigned long vdma_mem_alloc(unsigned long size) __size_overflow(1);
10038 static unsigned long vdma_mem_alloc(unsigned long size)
10039 {
10040 return (unsigned long)vmalloc(size);
10041diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
10042index d09bb03..4ea4194 100644
10043--- a/arch/x86/include/asm/futex.h
10044+++ b/arch/x86/include/asm/futex.h
10045@@ -12,16 +12,18 @@
10046 #include <asm/system.h>
10047
10048 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
10049+ typecheck(u32 __user *, uaddr); \
10050 asm volatile("1:\t" insn "\n" \
10051 "2:\t.section .fixup,\"ax\"\n" \
10052 "3:\tmov\t%3, %1\n" \
10053 "\tjmp\t2b\n" \
10054 "\t.previous\n" \
10055 _ASM_EXTABLE(1b, 3b) \
10056- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
10057+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr))\
10058 : "i" (-EFAULT), "0" (oparg), "1" (0))
10059
10060 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
10061+ typecheck(u32 __user *, uaddr); \
10062 asm volatile("1:\tmovl %2, %0\n" \
10063 "\tmovl\t%0, %3\n" \
10064 "\t" insn "\n" \
10065@@ -34,7 +36,7 @@
10066 _ASM_EXTABLE(1b, 4b) \
10067 _ASM_EXTABLE(2b, 4b) \
10068 : "=&a" (oldval), "=&r" (ret), \
10069- "+m" (*uaddr), "=&r" (tem) \
10070+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
10071 : "r" (oparg), "i" (-EFAULT), "1" (0))
10072
10073 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10074@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10075
10076 switch (op) {
10077 case FUTEX_OP_SET:
10078- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
10079+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
10080 break;
10081 case FUTEX_OP_ADD:
10082- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
10083+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
10084 uaddr, oparg);
10085 break;
10086 case FUTEX_OP_OR:
10087@@ -123,13 +125,13 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
10088 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
10089 return -EFAULT;
10090
10091- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
10092+ asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
10093 "2:\t.section .fixup, \"ax\"\n"
10094 "3:\tmov %3, %0\n"
10095 "\tjmp 2b\n"
10096 "\t.previous\n"
10097 _ASM_EXTABLE(1b, 3b)
10098- : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
10099+ : "+r" (ret), "=a" (oldval), "+m" (*(u32 __user *)____m(uaddr))
10100 : "i" (-EFAULT), "r" (newval), "1" (oldval)
10101 : "memory"
10102 );
10103diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
10104index eb92a6e..b98b2f4 100644
10105--- a/arch/x86/include/asm/hw_irq.h
10106+++ b/arch/x86/include/asm/hw_irq.h
10107@@ -136,8 +136,8 @@ extern void setup_ioapic_dest(void);
10108 extern void enable_IO_APIC(void);
10109
10110 /* Statistics */
10111-extern atomic_t irq_err_count;
10112-extern atomic_t irq_mis_count;
10113+extern atomic_unchecked_t irq_err_count;
10114+extern atomic_unchecked_t irq_mis_count;
10115
10116 /* EISA */
10117 extern void eisa_set_level_irq(unsigned int irq);
10118diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
10119index a850b4d..bae26dc 100644
10120--- a/arch/x86/include/asm/i387.h
10121+++ b/arch/x86/include/asm/i387.h
10122@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
10123 {
10124 int err;
10125
10126+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10127+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10128+ fx = (struct i387_fxsave_struct __user *)((void *)fx + PAX_USER_SHADOW_BASE);
10129+#endif
10130+
10131 /* See comment in fxsave() below. */
10132 #ifdef CONFIG_AS_FXSAVEQ
10133 asm volatile("1: fxrstorq %[fx]\n\t"
10134@@ -121,6 +126,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
10135 {
10136 int err;
10137
10138+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10139+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10140+ fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
10141+#endif
10142+
10143 /*
10144 * Clear the bytes not touched by the fxsave and reserved
10145 * for the SW usage.
10146@@ -424,7 +434,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
10147 static inline bool interrupted_user_mode(void)
10148 {
10149 struct pt_regs *regs = get_irq_regs();
10150- return regs && user_mode_vm(regs);
10151+ return regs && user_mode(regs);
10152 }
10153
10154 /*
10155diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
10156index d8e8eef..99f81ae 100644
10157--- a/arch/x86/include/asm/io.h
10158+++ b/arch/x86/include/asm/io.h
10159@@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
10160
10161 #include <linux/vmalloc.h>
10162
10163+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
10164+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
10165+{
10166+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10167+}
10168+
10169+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
10170+{
10171+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10172+}
10173+
10174 /*
10175 * Convert a virtual cached pointer to an uncached pointer
10176 */
10177diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
10178index bba3cf8..06bc8da 100644
10179--- a/arch/x86/include/asm/irqflags.h
10180+++ b/arch/x86/include/asm/irqflags.h
10181@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
10182 sti; \
10183 sysexit
10184
10185+#define GET_CR0_INTO_RDI mov %cr0, %rdi
10186+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
10187+#define GET_CR3_INTO_RDI mov %cr3, %rdi
10188+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
10189+
10190 #else
10191 #define INTERRUPT_RETURN iret
10192 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
10193diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
10194index 5478825..839e88c 100644
10195--- a/arch/x86/include/asm/kprobes.h
10196+++ b/arch/x86/include/asm/kprobes.h
10197@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
10198 #define RELATIVEJUMP_SIZE 5
10199 #define RELATIVECALL_OPCODE 0xe8
10200 #define RELATIVE_ADDR_SIZE 4
10201-#define MAX_STACK_SIZE 64
10202-#define MIN_STACK_SIZE(ADDR) \
10203- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
10204- THREAD_SIZE - (unsigned long)(ADDR))) \
10205- ? (MAX_STACK_SIZE) \
10206- : (((unsigned long)current_thread_info()) + \
10207- THREAD_SIZE - (unsigned long)(ADDR)))
10208+#define MAX_STACK_SIZE 64UL
10209+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
10210
10211 #define flush_insn_slot(p) do { } while (0)
10212
10213diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
10214index b4973f4..a42170a 100644
10215--- a/arch/x86/include/asm/kvm_host.h
10216+++ b/arch/x86/include/asm/kvm_host.h
10217@@ -459,7 +459,7 @@ struct kvm_arch {
10218 unsigned int n_requested_mmu_pages;
10219 unsigned int n_max_mmu_pages;
10220 unsigned int indirect_shadow_pages;
10221- atomic_t invlpg_counter;
10222+ atomic_unchecked_t invlpg_counter;
10223 struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];
10224 /*
10225 * Hash table of struct kvm_mmu_page.
10226@@ -638,7 +638,7 @@ struct kvm_x86_ops {
10227 int (*check_intercept)(struct kvm_vcpu *vcpu,
10228 struct x86_instruction_info *info,
10229 enum x86_intercept_stage stage);
10230-};
10231+} __do_const;
10232
10233 struct kvm_arch_async_pf {
10234 u32 token;
10235@@ -667,9 +667,9 @@ void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages);
10236 int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3);
10237
10238 int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa,
10239- const void *val, int bytes);
10240+ const void *val, int bytes) __size_overflow(2);
10241 int kvm_pv_mmu_op(struct kvm_vcpu *vcpu, unsigned long bytes,
10242- gpa_t addr, unsigned long *ret);
10243+ gpa_t addr, unsigned long *ret) __size_overflow(2,3);
10244 u8 kvm_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn);
10245
10246 extern bool tdp_enabled;
10247@@ -730,7 +730,7 @@ void kvm_get_cs_db_l_bits(struct kvm_vcpu *vcpu, int *db, int *l);
10248 int kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr);
10249
10250 int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata);
10251-int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data);
10252+int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data) __size_overflow(3);
10253
10254 unsigned long kvm_get_rflags(struct kvm_vcpu *vcpu);
10255 void kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags);
10256@@ -755,7 +755,7 @@ int fx_init(struct kvm_vcpu *vcpu);
10257 void kvm_mmu_flush_tlb(struct kvm_vcpu *vcpu);
10258 void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
10259 const u8 *new, int bytes,
10260- bool guest_initiated);
10261+ bool guest_initiated) __size_overflow(2);
10262 int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva);
10263 void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu);
10264 int kvm_mmu_load(struct kvm_vcpu *vcpu);
10265diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
10266index 9cdae5d..300d20f 100644
10267--- a/arch/x86/include/asm/local.h
10268+++ b/arch/x86/include/asm/local.h
10269@@ -18,26 +18,58 @@ typedef struct {
10270
10271 static inline void local_inc(local_t *l)
10272 {
10273- asm volatile(_ASM_INC "%0"
10274+ asm volatile(_ASM_INC "%0\n"
10275+
10276+#ifdef CONFIG_PAX_REFCOUNT
10277+ "jno 0f\n"
10278+ _ASM_DEC "%0\n"
10279+ "int $4\n0:\n"
10280+ _ASM_EXTABLE(0b, 0b)
10281+#endif
10282+
10283 : "+m" (l->a.counter));
10284 }
10285
10286 static inline void local_dec(local_t *l)
10287 {
10288- asm volatile(_ASM_DEC "%0"
10289+ asm volatile(_ASM_DEC "%0\n"
10290+
10291+#ifdef CONFIG_PAX_REFCOUNT
10292+ "jno 0f\n"
10293+ _ASM_INC "%0\n"
10294+ "int $4\n0:\n"
10295+ _ASM_EXTABLE(0b, 0b)
10296+#endif
10297+
10298 : "+m" (l->a.counter));
10299 }
10300
10301 static inline void local_add(long i, local_t *l)
10302 {
10303- asm volatile(_ASM_ADD "%1,%0"
10304+ asm volatile(_ASM_ADD "%1,%0\n"
10305+
10306+#ifdef CONFIG_PAX_REFCOUNT
10307+ "jno 0f\n"
10308+ _ASM_SUB "%1,%0\n"
10309+ "int $4\n0:\n"
10310+ _ASM_EXTABLE(0b, 0b)
10311+#endif
10312+
10313 : "+m" (l->a.counter)
10314 : "ir" (i));
10315 }
10316
10317 static inline void local_sub(long i, local_t *l)
10318 {
10319- asm volatile(_ASM_SUB "%1,%0"
10320+ asm volatile(_ASM_SUB "%1,%0\n"
10321+
10322+#ifdef CONFIG_PAX_REFCOUNT
10323+ "jno 0f\n"
10324+ _ASM_ADD "%1,%0\n"
10325+ "int $4\n0:\n"
10326+ _ASM_EXTABLE(0b, 0b)
10327+#endif
10328+
10329 : "+m" (l->a.counter)
10330 : "ir" (i));
10331 }
10332@@ -55,7 +87,16 @@ static inline int local_sub_and_test(long i, local_t *l)
10333 {
10334 unsigned char c;
10335
10336- asm volatile(_ASM_SUB "%2,%0; sete %1"
10337+ asm volatile(_ASM_SUB "%2,%0\n"
10338+
10339+#ifdef CONFIG_PAX_REFCOUNT
10340+ "jno 0f\n"
10341+ _ASM_ADD "%2,%0\n"
10342+ "int $4\n0:\n"
10343+ _ASM_EXTABLE(0b, 0b)
10344+#endif
10345+
10346+ "sete %1\n"
10347 : "+m" (l->a.counter), "=qm" (c)
10348 : "ir" (i) : "memory");
10349 return c;
10350@@ -73,7 +114,16 @@ static inline int local_dec_and_test(local_t *l)
10351 {
10352 unsigned char c;
10353
10354- asm volatile(_ASM_DEC "%0; sete %1"
10355+ asm volatile(_ASM_DEC "%0\n"
10356+
10357+#ifdef CONFIG_PAX_REFCOUNT
10358+ "jno 0f\n"
10359+ _ASM_INC "%0\n"
10360+ "int $4\n0:\n"
10361+ _ASM_EXTABLE(0b, 0b)
10362+#endif
10363+
10364+ "sete %1\n"
10365 : "+m" (l->a.counter), "=qm" (c)
10366 : : "memory");
10367 return c != 0;
10368@@ -91,7 +141,16 @@ static inline int local_inc_and_test(local_t *l)
10369 {
10370 unsigned char c;
10371
10372- asm volatile(_ASM_INC "%0; sete %1"
10373+ asm volatile(_ASM_INC "%0\n"
10374+
10375+#ifdef CONFIG_PAX_REFCOUNT
10376+ "jno 0f\n"
10377+ _ASM_DEC "%0\n"
10378+ "int $4\n0:\n"
10379+ _ASM_EXTABLE(0b, 0b)
10380+#endif
10381+
10382+ "sete %1\n"
10383 : "+m" (l->a.counter), "=qm" (c)
10384 : : "memory");
10385 return c != 0;
10386@@ -110,7 +169,16 @@ static inline int local_add_negative(long i, local_t *l)
10387 {
10388 unsigned char c;
10389
10390- asm volatile(_ASM_ADD "%2,%0; sets %1"
10391+ asm volatile(_ASM_ADD "%2,%0\n"
10392+
10393+#ifdef CONFIG_PAX_REFCOUNT
10394+ "jno 0f\n"
10395+ _ASM_SUB "%2,%0\n"
10396+ "int $4\n0:\n"
10397+ _ASM_EXTABLE(0b, 0b)
10398+#endif
10399+
10400+ "sets %1\n"
10401 : "+m" (l->a.counter), "=qm" (c)
10402 : "ir" (i) : "memory");
10403 return c;
10404@@ -133,7 +201,15 @@ static inline long local_add_return(long i, local_t *l)
10405 #endif
10406 /* Modern 486+ processor */
10407 __i = i;
10408- asm volatile(_ASM_XADD "%0, %1;"
10409+ asm volatile(_ASM_XADD "%0, %1\n"
10410+
10411+#ifdef CONFIG_PAX_REFCOUNT
10412+ "jno 0f\n"
10413+ _ASM_MOV "%0,%1\n"
10414+ "int $4\n0:\n"
10415+ _ASM_EXTABLE(0b, 0b)
10416+#endif
10417+
10418 : "+r" (i), "+m" (l->a.counter)
10419 : : "memory");
10420 return i + __i;
10421diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
10422index 593e51d..fa69c9a 100644
10423--- a/arch/x86/include/asm/mman.h
10424+++ b/arch/x86/include/asm/mman.h
10425@@ -5,4 +5,14 @@
10426
10427 #include <asm-generic/mman.h>
10428
10429+#ifdef __KERNEL__
10430+#ifndef __ASSEMBLY__
10431+#ifdef CONFIG_X86_32
10432+#define arch_mmap_check i386_mmap_check
10433+int i386_mmap_check(unsigned long addr, unsigned long len,
10434+ unsigned long flags);
10435+#endif
10436+#endif
10437+#endif
10438+
10439 #endif /* _ASM_X86_MMAN_H */
10440diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
10441index 5f55e69..e20bfb1 100644
10442--- a/arch/x86/include/asm/mmu.h
10443+++ b/arch/x86/include/asm/mmu.h
10444@@ -9,7 +9,7 @@
10445 * we put the segment information here.
10446 */
10447 typedef struct {
10448- void *ldt;
10449+ struct desc_struct *ldt;
10450 int size;
10451
10452 #ifdef CONFIG_X86_64
10453@@ -18,7 +18,19 @@ typedef struct {
10454 #endif
10455
10456 struct mutex lock;
10457- void *vdso;
10458+ unsigned long vdso;
10459+
10460+#ifdef CONFIG_X86_32
10461+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
10462+ unsigned long user_cs_base;
10463+ unsigned long user_cs_limit;
10464+
10465+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10466+ cpumask_t cpu_user_cs_mask;
10467+#endif
10468+
10469+#endif
10470+#endif
10471 } mm_context_t;
10472
10473 #ifdef CONFIG_SMP
10474diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
10475index 6902152..399f3a2 100644
10476--- a/arch/x86/include/asm/mmu_context.h
10477+++ b/arch/x86/include/asm/mmu_context.h
10478@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *mm);
10479
10480 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
10481 {
10482+
10483+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10484+ unsigned int i;
10485+ pgd_t *pgd;
10486+
10487+ pax_open_kernel();
10488+ pgd = get_cpu_pgd(smp_processor_id());
10489+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
10490+ set_pgd_batched(pgd+i, native_make_pgd(0));
10491+ pax_close_kernel();
10492+#endif
10493+
10494 #ifdef CONFIG_SMP
10495 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
10496 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
10497@@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10498 struct task_struct *tsk)
10499 {
10500 unsigned cpu = smp_processor_id();
10501+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10502+ int tlbstate = TLBSTATE_OK;
10503+#endif
10504
10505 if (likely(prev != next)) {
10506 #ifdef CONFIG_SMP
10507+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10508+ tlbstate = percpu_read(cpu_tlbstate.state);
10509+#endif
10510 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10511 percpu_write(cpu_tlbstate.active_mm, next);
10512 #endif
10513 cpumask_set_cpu(cpu, mm_cpumask(next));
10514
10515 /* Re-load page tables */
10516+#ifdef CONFIG_PAX_PER_CPU_PGD
10517+ pax_open_kernel();
10518+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10519+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10520+ pax_close_kernel();
10521+ load_cr3(get_cpu_pgd(cpu));
10522+#else
10523 load_cr3(next->pgd);
10524+#endif
10525
10526 /* stop flush ipis for the previous mm */
10527 cpumask_clear_cpu(cpu, mm_cpumask(prev));
10528@@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10529 */
10530 if (unlikely(prev->context.ldt != next->context.ldt))
10531 load_LDT_nolock(&next->context);
10532- }
10533+
10534+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10535+ if (!(__supported_pte_mask & _PAGE_NX)) {
10536+ smp_mb__before_clear_bit();
10537+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
10538+ smp_mb__after_clear_bit();
10539+ cpu_set(cpu, next->context.cpu_user_cs_mask);
10540+ }
10541+#endif
10542+
10543+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10544+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
10545+ prev->context.user_cs_limit != next->context.user_cs_limit))
10546+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10547 #ifdef CONFIG_SMP
10548+ else if (unlikely(tlbstate != TLBSTATE_OK))
10549+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10550+#endif
10551+#endif
10552+
10553+ }
10554 else {
10555+
10556+#ifdef CONFIG_PAX_PER_CPU_PGD
10557+ pax_open_kernel();
10558+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10559+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10560+ pax_close_kernel();
10561+ load_cr3(get_cpu_pgd(cpu));
10562+#endif
10563+
10564+#ifdef CONFIG_SMP
10565 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10566 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
10567
10568@@ -64,11 +119,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10569 * tlb flush IPI delivery. We must reload CR3
10570 * to make sure to use no freed page tables.
10571 */
10572+
10573+#ifndef CONFIG_PAX_PER_CPU_PGD
10574 load_cr3(next->pgd);
10575+#endif
10576+
10577 load_LDT_nolock(&next->context);
10578+
10579+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
10580+ if (!(__supported_pte_mask & _PAGE_NX))
10581+ cpu_set(cpu, next->context.cpu_user_cs_mask);
10582+#endif
10583+
10584+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10585+#ifdef CONFIG_PAX_PAGEEXEC
10586+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
10587+#endif
10588+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10589+#endif
10590+
10591 }
10592+#endif
10593 }
10594-#endif
10595 }
10596
10597 #define activate_mm(prev, next) \
10598diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
10599index 9eae775..c914fea 100644
10600--- a/arch/x86/include/asm/module.h
10601+++ b/arch/x86/include/asm/module.h
10602@@ -5,6 +5,7 @@
10603
10604 #ifdef CONFIG_X86_64
10605 /* X86_64 does not define MODULE_PROC_FAMILY */
10606+#define MODULE_PROC_FAMILY ""
10607 #elif defined CONFIG_M386
10608 #define MODULE_PROC_FAMILY "386 "
10609 #elif defined CONFIG_M486
10610@@ -59,8 +60,20 @@
10611 #error unknown processor family
10612 #endif
10613
10614-#ifdef CONFIG_X86_32
10615-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
10616+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
10617+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
10618+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
10619+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
10620+#else
10621+#define MODULE_PAX_KERNEXEC ""
10622 #endif
10623
10624+#ifdef CONFIG_PAX_MEMORY_UDEREF
10625+#define MODULE_PAX_UDEREF "UDEREF "
10626+#else
10627+#define MODULE_PAX_UDEREF ""
10628+#endif
10629+
10630+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
10631+
10632 #endif /* _ASM_X86_MODULE_H */
10633diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
10634index 7639dbf..e08a58c 100644
10635--- a/arch/x86/include/asm/page_64_types.h
10636+++ b/arch/x86/include/asm/page_64_types.h
10637@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
10638
10639 /* duplicated to the one in bootmem.h */
10640 extern unsigned long max_pfn;
10641-extern unsigned long phys_base;
10642+extern const unsigned long phys_base;
10643
10644 extern unsigned long __phys_addr(unsigned long);
10645 #define __phys_reloc_hide(x) (x)
10646diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
10647index a7d2db9..edb023e 100644
10648--- a/arch/x86/include/asm/paravirt.h
10649+++ b/arch/x86/include/asm/paravirt.h
10650@@ -667,6 +667,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
10651 val);
10652 }
10653
10654+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
10655+{
10656+ pgdval_t val = native_pgd_val(pgd);
10657+
10658+ if (sizeof(pgdval_t) > sizeof(long))
10659+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
10660+ val, (u64)val >> 32);
10661+ else
10662+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
10663+ val);
10664+}
10665+
10666 static inline void pgd_clear(pgd_t *pgdp)
10667 {
10668 set_pgd(pgdp, __pgd(0));
10669@@ -748,6 +760,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
10670 pv_mmu_ops.set_fixmap(idx, phys, flags);
10671 }
10672
10673+#ifdef CONFIG_PAX_KERNEXEC
10674+static inline unsigned long pax_open_kernel(void)
10675+{
10676+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
10677+}
10678+
10679+static inline unsigned long pax_close_kernel(void)
10680+{
10681+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
10682+}
10683+#else
10684+static inline unsigned long pax_open_kernel(void) { return 0; }
10685+static inline unsigned long pax_close_kernel(void) { return 0; }
10686+#endif
10687+
10688 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
10689
10690 static inline int arch_spin_is_locked(struct arch_spinlock *lock)
10691@@ -964,7 +991,7 @@ extern void default_banner(void);
10692
10693 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
10694 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
10695-#define PARA_INDIRECT(addr) *%cs:addr
10696+#define PARA_INDIRECT(addr) *%ss:addr
10697 #endif
10698
10699 #define INTERRUPT_RETURN \
10700@@ -1041,6 +1068,21 @@ extern void default_banner(void);
10701 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
10702 CLBR_NONE, \
10703 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
10704+
10705+#define GET_CR0_INTO_RDI \
10706+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
10707+ mov %rax,%rdi
10708+
10709+#define SET_RDI_INTO_CR0 \
10710+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
10711+
10712+#define GET_CR3_INTO_RDI \
10713+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
10714+ mov %rax,%rdi
10715+
10716+#define SET_RDI_INTO_CR3 \
10717+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
10718+
10719 #endif /* CONFIG_X86_32 */
10720
10721 #endif /* __ASSEMBLY__ */
10722diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
10723index 8e8b9a4..f07d725 100644
10724--- a/arch/x86/include/asm/paravirt_types.h
10725+++ b/arch/x86/include/asm/paravirt_types.h
10726@@ -84,20 +84,20 @@ struct pv_init_ops {
10727 */
10728 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
10729 unsigned long addr, unsigned len);
10730-};
10731+} __no_const;
10732
10733
10734 struct pv_lazy_ops {
10735 /* Set deferred update mode, used for batching operations. */
10736 void (*enter)(void);
10737 void (*leave)(void);
10738-};
10739+} __no_const;
10740
10741 struct pv_time_ops {
10742 unsigned long long (*sched_clock)(void);
10743 unsigned long long (*steal_clock)(int cpu);
10744 unsigned long (*get_tsc_khz)(void);
10745-};
10746+} __no_const;
10747
10748 struct pv_cpu_ops {
10749 /* hooks for various privileged instructions */
10750@@ -193,7 +193,7 @@ struct pv_cpu_ops {
10751
10752 void (*start_context_switch)(struct task_struct *prev);
10753 void (*end_context_switch)(struct task_struct *next);
10754-};
10755+} __no_const;
10756
10757 struct pv_irq_ops {
10758 /*
10759@@ -224,7 +224,7 @@ struct pv_apic_ops {
10760 unsigned long start_eip,
10761 unsigned long start_esp);
10762 #endif
10763-};
10764+} __no_const;
10765
10766 struct pv_mmu_ops {
10767 unsigned long (*read_cr2)(void);
10768@@ -313,6 +313,7 @@ struct pv_mmu_ops {
10769 struct paravirt_callee_save make_pud;
10770
10771 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
10772+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
10773 #endif /* PAGETABLE_LEVELS == 4 */
10774 #endif /* PAGETABLE_LEVELS >= 3 */
10775
10776@@ -324,6 +325,12 @@ struct pv_mmu_ops {
10777 an mfn. We can tell which is which from the index. */
10778 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
10779 phys_addr_t phys, pgprot_t flags);
10780+
10781+#ifdef CONFIG_PAX_KERNEXEC
10782+ unsigned long (*pax_open_kernel)(void);
10783+ unsigned long (*pax_close_kernel)(void);
10784+#endif
10785+
10786 };
10787
10788 struct arch_spinlock;
10789@@ -334,7 +341,7 @@ struct pv_lock_ops {
10790 void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
10791 int (*spin_trylock)(struct arch_spinlock *lock);
10792 void (*spin_unlock)(struct arch_spinlock *lock);
10793-};
10794+} __no_const;
10795
10796 /* This contains all the paravirt structures: we get a convenient
10797 * number for each function using the offset which we use to indicate
10798diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
10799index b4389a4..b7ff22c 100644
10800--- a/arch/x86/include/asm/pgalloc.h
10801+++ b/arch/x86/include/asm/pgalloc.h
10802@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
10803 pmd_t *pmd, pte_t *pte)
10804 {
10805 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10806+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
10807+}
10808+
10809+static inline void pmd_populate_user(struct mm_struct *mm,
10810+ pmd_t *pmd, pte_t *pte)
10811+{
10812+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10813 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
10814 }
10815
10816diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
10817index 98391db..8f6984e 100644
10818--- a/arch/x86/include/asm/pgtable-2level.h
10819+++ b/arch/x86/include/asm/pgtable-2level.h
10820@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
10821
10822 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
10823 {
10824+ pax_open_kernel();
10825 *pmdp = pmd;
10826+ pax_close_kernel();
10827 }
10828
10829 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
10830diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
10831index effff47..f9e4035 100644
10832--- a/arch/x86/include/asm/pgtable-3level.h
10833+++ b/arch/x86/include/asm/pgtable-3level.h
10834@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
10835
10836 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
10837 {
10838+ pax_open_kernel();
10839 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
10840+ pax_close_kernel();
10841 }
10842
10843 static inline void native_set_pud(pud_t *pudp, pud_t pud)
10844 {
10845+ pax_open_kernel();
10846 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
10847+ pax_close_kernel();
10848 }
10849
10850 /*
10851diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
10852index 18601c8..3d716d1 100644
10853--- a/arch/x86/include/asm/pgtable.h
10854+++ b/arch/x86/include/asm/pgtable.h
10855@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
10856
10857 #ifndef __PAGETABLE_PUD_FOLDED
10858 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
10859+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
10860 #define pgd_clear(pgd) native_pgd_clear(pgd)
10861 #endif
10862
10863@@ -81,12 +82,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
10864
10865 #define arch_end_context_switch(prev) do {} while(0)
10866
10867+#define pax_open_kernel() native_pax_open_kernel()
10868+#define pax_close_kernel() native_pax_close_kernel()
10869 #endif /* CONFIG_PARAVIRT */
10870
10871+#define __HAVE_ARCH_PAX_OPEN_KERNEL
10872+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
10873+
10874+#ifdef CONFIG_PAX_KERNEXEC
10875+static inline unsigned long native_pax_open_kernel(void)
10876+{
10877+ unsigned long cr0;
10878+
10879+ preempt_disable();
10880+ barrier();
10881+ cr0 = read_cr0() ^ X86_CR0_WP;
10882+ BUG_ON(unlikely(cr0 & X86_CR0_WP));
10883+ write_cr0(cr0);
10884+ return cr0 ^ X86_CR0_WP;
10885+}
10886+
10887+static inline unsigned long native_pax_close_kernel(void)
10888+{
10889+ unsigned long cr0;
10890+
10891+ cr0 = read_cr0() ^ X86_CR0_WP;
10892+ BUG_ON(unlikely(!(cr0 & X86_CR0_WP)));
10893+ write_cr0(cr0);
10894+ barrier();
10895+ preempt_enable_no_resched();
10896+ return cr0 ^ X86_CR0_WP;
10897+}
10898+#else
10899+static inline unsigned long native_pax_open_kernel(void) { return 0; }
10900+static inline unsigned long native_pax_close_kernel(void) { return 0; }
10901+#endif
10902+
10903 /*
10904 * The following only work if pte_present() is true.
10905 * Undefined behaviour if not..
10906 */
10907+static inline int pte_user(pte_t pte)
10908+{
10909+ return pte_val(pte) & _PAGE_USER;
10910+}
10911+
10912 static inline int pte_dirty(pte_t pte)
10913 {
10914 return pte_flags(pte) & _PAGE_DIRTY;
10915@@ -196,9 +236,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
10916 return pte_clear_flags(pte, _PAGE_RW);
10917 }
10918
10919+static inline pte_t pte_mkread(pte_t pte)
10920+{
10921+ return __pte(pte_val(pte) | _PAGE_USER);
10922+}
10923+
10924 static inline pte_t pte_mkexec(pte_t pte)
10925 {
10926- return pte_clear_flags(pte, _PAGE_NX);
10927+#ifdef CONFIG_X86_PAE
10928+ if (__supported_pte_mask & _PAGE_NX)
10929+ return pte_clear_flags(pte, _PAGE_NX);
10930+ else
10931+#endif
10932+ return pte_set_flags(pte, _PAGE_USER);
10933+}
10934+
10935+static inline pte_t pte_exprotect(pte_t pte)
10936+{
10937+#ifdef CONFIG_X86_PAE
10938+ if (__supported_pte_mask & _PAGE_NX)
10939+ return pte_set_flags(pte, _PAGE_NX);
10940+ else
10941+#endif
10942+ return pte_clear_flags(pte, _PAGE_USER);
10943 }
10944
10945 static inline pte_t pte_mkdirty(pte_t pte)
10946@@ -390,6 +450,15 @@ pte_t *populate_extra_pte(unsigned long vaddr);
10947 #endif
10948
10949 #ifndef __ASSEMBLY__
10950+
10951+#ifdef CONFIG_PAX_PER_CPU_PGD
10952+extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
10953+static inline pgd_t *get_cpu_pgd(unsigned int cpu)
10954+{
10955+ return cpu_pgd[cpu];
10956+}
10957+#endif
10958+
10959 #include <linux/mm_types.h>
10960
10961 static inline int pte_none(pte_t pte)
10962@@ -560,7 +629,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
10963
10964 static inline int pgd_bad(pgd_t pgd)
10965 {
10966- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
10967+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
10968 }
10969
10970 static inline int pgd_none(pgd_t pgd)
10971@@ -583,7 +652,12 @@ static inline int pgd_none(pgd_t pgd)
10972 * pgd_offset() returns a (pgd_t *)
10973 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
10974 */
10975-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
10976+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
10977+
10978+#ifdef CONFIG_PAX_PER_CPU_PGD
10979+#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
10980+#endif
10981+
10982 /*
10983 * a shortcut which implies the use of the kernel's pgd, instead
10984 * of a process's
10985@@ -594,6 +668,20 @@ static inline int pgd_none(pgd_t pgd)
10986 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
10987 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
10988
10989+#ifdef CONFIG_X86_32
10990+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
10991+#else
10992+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
10993+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
10994+
10995+#ifdef CONFIG_PAX_MEMORY_UDEREF
10996+#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT)
10997+#else
10998+#define PAX_USER_SHADOW_BASE (_AC(0,UL))
10999+#endif
11000+
11001+#endif
11002+
11003 #ifndef __ASSEMBLY__
11004
11005 extern int direct_gbpages;
11006@@ -758,11 +846,23 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
11007 * dst and src can be on the same page, but the range must not overlap,
11008 * and must not cross a page boundary.
11009 */
11010-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
11011+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
11012 {
11013- memcpy(dst, src, count * sizeof(pgd_t));
11014+ pax_open_kernel();
11015+ while (count--)
11016+ *dst++ = *src++;
11017+ pax_close_kernel();
11018 }
11019
11020+#ifdef CONFIG_PAX_PER_CPU_PGD
11021+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11022+#endif
11023+
11024+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11025+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11026+#else
11027+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) {}
11028+#endif
11029
11030 #include <asm-generic/pgtable.h>
11031 #endif /* __ASSEMBLY__ */
11032diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
11033index 0c92113..34a77c6 100644
11034--- a/arch/x86/include/asm/pgtable_32.h
11035+++ b/arch/x86/include/asm/pgtable_32.h
11036@@ -25,9 +25,6 @@
11037 struct mm_struct;
11038 struct vm_area_struct;
11039
11040-extern pgd_t swapper_pg_dir[1024];
11041-extern pgd_t initial_page_table[1024];
11042-
11043 static inline void pgtable_cache_init(void) { }
11044 static inline void check_pgt_cache(void) { }
11045 void paging_init(void);
11046@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11047 # include <asm/pgtable-2level.h>
11048 #endif
11049
11050+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
11051+extern pgd_t initial_page_table[PTRS_PER_PGD];
11052+#ifdef CONFIG_X86_PAE
11053+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
11054+#endif
11055+
11056 #if defined(CONFIG_HIGHPTE)
11057 #define pte_offset_map(dir, address) \
11058 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
11059@@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11060 /* Clear a kernel PTE and flush it from the TLB */
11061 #define kpte_clear_flush(ptep, vaddr) \
11062 do { \
11063+ pax_open_kernel(); \
11064 pte_clear(&init_mm, (vaddr), (ptep)); \
11065+ pax_close_kernel(); \
11066 __flush_tlb_one((vaddr)); \
11067 } while (0)
11068
11069@@ -74,6 +79,9 @@ do { \
11070
11071 #endif /* !__ASSEMBLY__ */
11072
11073+#define HAVE_ARCH_UNMAPPED_AREA
11074+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
11075+
11076 /*
11077 * kern_addr_valid() is (1) for FLATMEM and (0) for
11078 * SPARSEMEM and DISCONTIGMEM
11079diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
11080index ed5903b..c7fe163 100644
11081--- a/arch/x86/include/asm/pgtable_32_types.h
11082+++ b/arch/x86/include/asm/pgtable_32_types.h
11083@@ -8,7 +8,7 @@
11084 */
11085 #ifdef CONFIG_X86_PAE
11086 # include <asm/pgtable-3level_types.h>
11087-# define PMD_SIZE (1UL << PMD_SHIFT)
11088+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
11089 # define PMD_MASK (~(PMD_SIZE - 1))
11090 #else
11091 # include <asm/pgtable-2level_types.h>
11092@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
11093 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
11094 #endif
11095
11096+#ifdef CONFIG_PAX_KERNEXEC
11097+#ifndef __ASSEMBLY__
11098+extern unsigned char MODULES_EXEC_VADDR[];
11099+extern unsigned char MODULES_EXEC_END[];
11100+#endif
11101+#include <asm/boot.h>
11102+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
11103+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
11104+#else
11105+#define ktla_ktva(addr) (addr)
11106+#define ktva_ktla(addr) (addr)
11107+#endif
11108+
11109 #define MODULES_VADDR VMALLOC_START
11110 #define MODULES_END VMALLOC_END
11111 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
11112diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
11113index 975f709..107976d 100644
11114--- a/arch/x86/include/asm/pgtable_64.h
11115+++ b/arch/x86/include/asm/pgtable_64.h
11116@@ -16,10 +16,14 @@
11117
11118 extern pud_t level3_kernel_pgt[512];
11119 extern pud_t level3_ident_pgt[512];
11120+extern pud_t level3_vmalloc_start_pgt[512];
11121+extern pud_t level3_vmalloc_end_pgt[512];
11122+extern pud_t level3_vmemmap_pgt[512];
11123+extern pud_t level2_vmemmap_pgt[512];
11124 extern pmd_t level2_kernel_pgt[512];
11125 extern pmd_t level2_fixmap_pgt[512];
11126-extern pmd_t level2_ident_pgt[512];
11127-extern pgd_t init_level4_pgt[];
11128+extern pmd_t level2_ident_pgt[512*2];
11129+extern pgd_t init_level4_pgt[512];
11130
11131 #define swapper_pg_dir init_level4_pgt
11132
11133@@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
11134
11135 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11136 {
11137+ pax_open_kernel();
11138 *pmdp = pmd;
11139+ pax_close_kernel();
11140 }
11141
11142 static inline void native_pmd_clear(pmd_t *pmd)
11143@@ -107,6 +113,13 @@ static inline void native_pud_clear(pud_t *pud)
11144
11145 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
11146 {
11147+ pax_open_kernel();
11148+ *pgdp = pgd;
11149+ pax_close_kernel();
11150+}
11151+
11152+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
11153+{
11154 *pgdp = pgd;
11155 }
11156
11157diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
11158index 766ea16..5b96cb3 100644
11159--- a/arch/x86/include/asm/pgtable_64_types.h
11160+++ b/arch/x86/include/asm/pgtable_64_types.h
11161@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
11162 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
11163 #define MODULES_END _AC(0xffffffffff000000, UL)
11164 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
11165+#define MODULES_EXEC_VADDR MODULES_VADDR
11166+#define MODULES_EXEC_END MODULES_END
11167+
11168+#define ktla_ktva(addr) (addr)
11169+#define ktva_ktla(addr) (addr)
11170
11171 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
11172diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
11173index 013286a..8b42f4f 100644
11174--- a/arch/x86/include/asm/pgtable_types.h
11175+++ b/arch/x86/include/asm/pgtable_types.h
11176@@ -16,13 +16,12 @@
11177 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
11178 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
11179 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
11180-#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
11181+#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
11182 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
11183 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
11184 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
11185-#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
11186-#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
11187-#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
11188+#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
11189+#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
11190 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
11191
11192 /* If _PAGE_BIT_PRESENT is clear, we use these: */
11193@@ -40,7 +39,6 @@
11194 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
11195 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
11196 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
11197-#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
11198 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
11199 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
11200 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
11201@@ -57,8 +55,10 @@
11202
11203 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
11204 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
11205-#else
11206+#elif defined(CONFIG_KMEMCHECK)
11207 #define _PAGE_NX (_AT(pteval_t, 0))
11208+#else
11209+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
11210 #endif
11211
11212 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
11213@@ -96,6 +96,9 @@
11214 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
11215 _PAGE_ACCESSED)
11216
11217+#define PAGE_READONLY_NOEXEC PAGE_READONLY
11218+#define PAGE_SHARED_NOEXEC PAGE_SHARED
11219+
11220 #define __PAGE_KERNEL_EXEC \
11221 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
11222 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
11223@@ -106,7 +109,7 @@
11224 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
11225 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
11226 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
11227-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
11228+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
11229 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
11230 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
11231 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
11232@@ -168,8 +171,8 @@
11233 * bits are combined, this will alow user to access the high address mapped
11234 * VDSO in the presence of CONFIG_COMPAT_VDSO
11235 */
11236-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
11237-#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
11238+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11239+#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11240 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
11241 #endif
11242
11243@@ -207,7 +210,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
11244 {
11245 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
11246 }
11247+#endif
11248
11249+#if PAGETABLE_LEVELS == 3
11250+#include <asm-generic/pgtable-nopud.h>
11251+#endif
11252+
11253+#if PAGETABLE_LEVELS == 2
11254+#include <asm-generic/pgtable-nopmd.h>
11255+#endif
11256+
11257+#ifndef __ASSEMBLY__
11258 #if PAGETABLE_LEVELS > 3
11259 typedef struct { pudval_t pud; } pud_t;
11260
11261@@ -221,8 +234,6 @@ static inline pudval_t native_pud_val(pud_t pud)
11262 return pud.pud;
11263 }
11264 #else
11265-#include <asm-generic/pgtable-nopud.h>
11266-
11267 static inline pudval_t native_pud_val(pud_t pud)
11268 {
11269 return native_pgd_val(pud.pgd);
11270@@ -242,8 +253,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
11271 return pmd.pmd;
11272 }
11273 #else
11274-#include <asm-generic/pgtable-nopmd.h>
11275-
11276 static inline pmdval_t native_pmd_val(pmd_t pmd)
11277 {
11278 return native_pgd_val(pmd.pud.pgd);
11279@@ -283,7 +292,6 @@ typedef struct page *pgtable_t;
11280
11281 extern pteval_t __supported_pte_mask;
11282 extern void set_nx(void);
11283-extern int nx_enabled;
11284
11285 #define pgprot_writecombine pgprot_writecombine
11286 extern pgprot_t pgprot_writecombine(pgprot_t prot);
11287diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
11288index bb3ee36..781a6b8 100644
11289--- a/arch/x86/include/asm/processor.h
11290+++ b/arch/x86/include/asm/processor.h
11291@@ -268,7 +268,7 @@ struct tss_struct {
11292
11293 } ____cacheline_aligned;
11294
11295-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
11296+extern struct tss_struct init_tss[NR_CPUS];
11297
11298 /*
11299 * Save the original ist values for checking stack pointers during debugging
11300@@ -861,11 +861,18 @@ static inline void spin_lock_prefetch(const void *x)
11301 */
11302 #define TASK_SIZE PAGE_OFFSET
11303 #define TASK_SIZE_MAX TASK_SIZE
11304+
11305+#ifdef CONFIG_PAX_SEGMEXEC
11306+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
11307+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
11308+#else
11309 #define STACK_TOP TASK_SIZE
11310-#define STACK_TOP_MAX STACK_TOP
11311+#endif
11312+
11313+#define STACK_TOP_MAX TASK_SIZE
11314
11315 #define INIT_THREAD { \
11316- .sp0 = sizeof(init_stack) + (long)&init_stack, \
11317+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11318 .vm86_info = NULL, \
11319 .sysenter_cs = __KERNEL_CS, \
11320 .io_bitmap_ptr = NULL, \
11321@@ -879,7 +886,7 @@ static inline void spin_lock_prefetch(const void *x)
11322 */
11323 #define INIT_TSS { \
11324 .x86_tss = { \
11325- .sp0 = sizeof(init_stack) + (long)&init_stack, \
11326+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11327 .ss0 = __KERNEL_DS, \
11328 .ss1 = __KERNEL_CS, \
11329 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
11330@@ -890,11 +897,7 @@ static inline void spin_lock_prefetch(const void *x)
11331 extern unsigned long thread_saved_pc(struct task_struct *tsk);
11332
11333 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
11334-#define KSTK_TOP(info) \
11335-({ \
11336- unsigned long *__ptr = (unsigned long *)(info); \
11337- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
11338-})
11339+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
11340
11341 /*
11342 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
11343@@ -909,7 +912,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11344 #define task_pt_regs(task) \
11345 ({ \
11346 struct pt_regs *__regs__; \
11347- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
11348+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
11349 __regs__ - 1; \
11350 })
11351
11352@@ -919,13 +922,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11353 /*
11354 * User space process size. 47bits minus one guard page.
11355 */
11356-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
11357+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
11358
11359 /* This decides where the kernel will search for a free chunk of vm
11360 * space during mmap's.
11361 */
11362 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
11363- 0xc0000000 : 0xFFFFe000)
11364+ 0xc0000000 : 0xFFFFf000)
11365
11366 #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \
11367 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
11368@@ -936,11 +939,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11369 #define STACK_TOP_MAX TASK_SIZE_MAX
11370
11371 #define INIT_THREAD { \
11372- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11373+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11374 }
11375
11376 #define INIT_TSS { \
11377- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11378+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11379 }
11380
11381 /*
11382@@ -962,6 +965,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
11383 */
11384 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
11385
11386+#ifdef CONFIG_PAX_SEGMEXEC
11387+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
11388+#endif
11389+
11390 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
11391
11392 /* Get/set a process' ability to use the timestamp counter instruction */
11393diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
11394index 3566454..4bdfb8c 100644
11395--- a/arch/x86/include/asm/ptrace.h
11396+++ b/arch/x86/include/asm/ptrace.h
11397@@ -156,28 +156,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
11398 }
11399
11400 /*
11401- * user_mode_vm(regs) determines whether a register set came from user mode.
11402+ * user_mode(regs) determines whether a register set came from user mode.
11403 * This is true if V8086 mode was enabled OR if the register set was from
11404 * protected mode with RPL-3 CS value. This tricky test checks that with
11405 * one comparison. Many places in the kernel can bypass this full check
11406- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
11407+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
11408+ * be used.
11409 */
11410-static inline int user_mode(struct pt_regs *regs)
11411+static inline int user_mode_novm(struct pt_regs *regs)
11412 {
11413 #ifdef CONFIG_X86_32
11414 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
11415 #else
11416- return !!(regs->cs & 3);
11417+ return !!(regs->cs & SEGMENT_RPL_MASK);
11418 #endif
11419 }
11420
11421-static inline int user_mode_vm(struct pt_regs *regs)
11422+static inline int user_mode(struct pt_regs *regs)
11423 {
11424 #ifdef CONFIG_X86_32
11425 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
11426 USER_RPL;
11427 #else
11428- return user_mode(regs);
11429+ return user_mode_novm(regs);
11430 #endif
11431 }
11432
11433@@ -193,15 +194,16 @@ static inline int v8086_mode(struct pt_regs *regs)
11434 #ifdef CONFIG_X86_64
11435 static inline bool user_64bit_mode(struct pt_regs *regs)
11436 {
11437+ unsigned long cs = regs->cs & 0xffff;
11438 #ifndef CONFIG_PARAVIRT
11439 /*
11440 * On non-paravirt systems, this is the only long mode CPL 3
11441 * selector. We do not allow long mode selectors in the LDT.
11442 */
11443- return regs->cs == __USER_CS;
11444+ return cs == __USER_CS;
11445 #else
11446 /* Headers are too twisted for this to go in paravirt.h. */
11447- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
11448+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
11449 #endif
11450 }
11451 #endif
11452diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
11453index 92f29706..a79cbbb 100644
11454--- a/arch/x86/include/asm/reboot.h
11455+++ b/arch/x86/include/asm/reboot.h
11456@@ -6,19 +6,19 @@
11457 struct pt_regs;
11458
11459 struct machine_ops {
11460- void (*restart)(char *cmd);
11461- void (*halt)(void);
11462- void (*power_off)(void);
11463+ void (* __noreturn restart)(char *cmd);
11464+ void (* __noreturn halt)(void);
11465+ void (* __noreturn power_off)(void);
11466 void (*shutdown)(void);
11467 void (*crash_shutdown)(struct pt_regs *);
11468- void (*emergency_restart)(void);
11469-};
11470+ void (* __noreturn emergency_restart)(void);
11471+} __no_const;
11472
11473 extern struct machine_ops machine_ops;
11474
11475 void native_machine_crash_shutdown(struct pt_regs *regs);
11476 void native_machine_shutdown(void);
11477-void machine_real_restart(unsigned int type);
11478+void machine_real_restart(unsigned int type) __noreturn;
11479 /* These must match dispatch_table in reboot_32.S */
11480 #define MRR_BIOS 0
11481 #define MRR_APM 1
11482diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
11483index 2dbe4a7..ce1db00 100644
11484--- a/arch/x86/include/asm/rwsem.h
11485+++ b/arch/x86/include/asm/rwsem.h
11486@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
11487 {
11488 asm volatile("# beginning down_read\n\t"
11489 LOCK_PREFIX _ASM_INC "(%1)\n\t"
11490+
11491+#ifdef CONFIG_PAX_REFCOUNT
11492+ "jno 0f\n"
11493+ LOCK_PREFIX _ASM_DEC "(%1)\n"
11494+ "int $4\n0:\n"
11495+ _ASM_EXTABLE(0b, 0b)
11496+#endif
11497+
11498 /* adds 0x00000001 */
11499 " jns 1f\n"
11500 " call call_rwsem_down_read_failed\n"
11501@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
11502 "1:\n\t"
11503 " mov %1,%2\n\t"
11504 " add %3,%2\n\t"
11505+
11506+#ifdef CONFIG_PAX_REFCOUNT
11507+ "jno 0f\n"
11508+ "sub %3,%2\n"
11509+ "int $4\n0:\n"
11510+ _ASM_EXTABLE(0b, 0b)
11511+#endif
11512+
11513 " jle 2f\n\t"
11514 LOCK_PREFIX " cmpxchg %2,%0\n\t"
11515 " jnz 1b\n\t"
11516@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
11517 long tmp;
11518 asm volatile("# beginning down_write\n\t"
11519 LOCK_PREFIX " xadd %1,(%2)\n\t"
11520+
11521+#ifdef CONFIG_PAX_REFCOUNT
11522+ "jno 0f\n"
11523+ "mov %1,(%2)\n"
11524+ "int $4\n0:\n"
11525+ _ASM_EXTABLE(0b, 0b)
11526+#endif
11527+
11528 /* adds 0xffff0001, returns the old value */
11529 " test %1,%1\n\t"
11530 /* was the count 0 before? */
11531@@ -141,6 +165,14 @@ static inline void __up_read(struct rw_semaphore *sem)
11532 long tmp;
11533 asm volatile("# beginning __up_read\n\t"
11534 LOCK_PREFIX " xadd %1,(%2)\n\t"
11535+
11536+#ifdef CONFIG_PAX_REFCOUNT
11537+ "jno 0f\n"
11538+ "mov %1,(%2)\n"
11539+ "int $4\n0:\n"
11540+ _ASM_EXTABLE(0b, 0b)
11541+#endif
11542+
11543 /* subtracts 1, returns the old value */
11544 " jns 1f\n\t"
11545 " call call_rwsem_wake\n" /* expects old value in %edx */
11546@@ -159,6 +191,14 @@ static inline void __up_write(struct rw_semaphore *sem)
11547 long tmp;
11548 asm volatile("# beginning __up_write\n\t"
11549 LOCK_PREFIX " xadd %1,(%2)\n\t"
11550+
11551+#ifdef CONFIG_PAX_REFCOUNT
11552+ "jno 0f\n"
11553+ "mov %1,(%2)\n"
11554+ "int $4\n0:\n"
11555+ _ASM_EXTABLE(0b, 0b)
11556+#endif
11557+
11558 /* subtracts 0xffff0001, returns the old value */
11559 " jns 1f\n\t"
11560 " call call_rwsem_wake\n" /* expects old value in %edx */
11561@@ -176,6 +216,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11562 {
11563 asm volatile("# beginning __downgrade_write\n\t"
11564 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
11565+
11566+#ifdef CONFIG_PAX_REFCOUNT
11567+ "jno 0f\n"
11568+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
11569+ "int $4\n0:\n"
11570+ _ASM_EXTABLE(0b, 0b)
11571+#endif
11572+
11573 /*
11574 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
11575 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
11576@@ -194,7 +242,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11577 */
11578 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
11579 {
11580- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
11581+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
11582+
11583+#ifdef CONFIG_PAX_REFCOUNT
11584+ "jno 0f\n"
11585+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
11586+ "int $4\n0:\n"
11587+ _ASM_EXTABLE(0b, 0b)
11588+#endif
11589+
11590 : "+m" (sem->count)
11591 : "er" (delta));
11592 }
11593@@ -204,7 +260,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
11594 */
11595 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
11596 {
11597- return delta + xadd(&sem->count, delta);
11598+ return delta + xadd_check_overflow(&sem->count, delta);
11599 }
11600
11601 #endif /* __KERNEL__ */
11602diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
11603index 5e64171..f58957e 100644
11604--- a/arch/x86/include/asm/segment.h
11605+++ b/arch/x86/include/asm/segment.h
11606@@ -64,10 +64,15 @@
11607 * 26 - ESPFIX small SS
11608 * 27 - per-cpu [ offset to per-cpu data area ]
11609 * 28 - stack_canary-20 [ for stack protector ]
11610- * 29 - unused
11611- * 30 - unused
11612+ * 29 - PCI BIOS CS
11613+ * 30 - PCI BIOS DS
11614 * 31 - TSS for double fault handler
11615 */
11616+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
11617+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
11618+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
11619+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
11620+
11621 #define GDT_ENTRY_TLS_MIN 6
11622 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
11623
11624@@ -79,6 +84,8 @@
11625
11626 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
11627
11628+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
11629+
11630 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
11631
11632 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
11633@@ -104,6 +111,12 @@
11634 #define __KERNEL_STACK_CANARY 0
11635 #endif
11636
11637+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
11638+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
11639+
11640+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
11641+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
11642+
11643 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
11644
11645 /*
11646@@ -141,7 +154,7 @@
11647 */
11648
11649 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
11650-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
11651+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
11652
11653
11654 #else
11655@@ -165,6 +178,8 @@
11656 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
11657 #define __USER32_DS __USER_DS
11658
11659+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
11660+
11661 #define GDT_ENTRY_TSS 8 /* needs two entries */
11662 #define GDT_ENTRY_LDT 10 /* needs two entries */
11663 #define GDT_ENTRY_TLS_MIN 12
11664@@ -185,6 +200,7 @@
11665 #endif
11666
11667 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
11668+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
11669 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
11670 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
11671 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
11672diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
11673index 73b11bc..d4a3b63 100644
11674--- a/arch/x86/include/asm/smp.h
11675+++ b/arch/x86/include/asm/smp.h
11676@@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
11677 /* cpus sharing the last level cache: */
11678 DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
11679 DECLARE_PER_CPU(u16, cpu_llc_id);
11680-DECLARE_PER_CPU(int, cpu_number);
11681+DECLARE_PER_CPU(unsigned int, cpu_number);
11682
11683 static inline struct cpumask *cpu_sibling_mask(int cpu)
11684 {
11685@@ -77,7 +77,7 @@ struct smp_ops {
11686
11687 void (*send_call_func_ipi)(const struct cpumask *mask);
11688 void (*send_call_func_single_ipi)(int cpu);
11689-};
11690+} __no_const;
11691
11692 /* Globals due to paravirt */
11693 extern void set_cpu_sibling_map(int cpu);
11694@@ -192,14 +192,8 @@ extern unsigned disabled_cpus __cpuinitdata;
11695 extern int safe_smp_processor_id(void);
11696
11697 #elif defined(CONFIG_X86_64_SMP)
11698-#define raw_smp_processor_id() (percpu_read(cpu_number))
11699-
11700-#define stack_smp_processor_id() \
11701-({ \
11702- struct thread_info *ti; \
11703- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
11704- ti->cpu; \
11705-})
11706+#define raw_smp_processor_id() (percpu_read(cpu_number))
11707+#define stack_smp_processor_id() raw_smp_processor_id()
11708 #define safe_smp_processor_id() smp_processor_id()
11709
11710 #endif
11711diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
11712index 972c260..43ab1fd 100644
11713--- a/arch/x86/include/asm/spinlock.h
11714+++ b/arch/x86/include/asm/spinlock.h
11715@@ -188,6 +188,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
11716 static inline void arch_read_lock(arch_rwlock_t *rw)
11717 {
11718 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
11719+
11720+#ifdef CONFIG_PAX_REFCOUNT
11721+ "jno 0f\n"
11722+ LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
11723+ "int $4\n0:\n"
11724+ _ASM_EXTABLE(0b, 0b)
11725+#endif
11726+
11727 "jns 1f\n"
11728 "call __read_lock_failed\n\t"
11729 "1:\n"
11730@@ -197,6 +205,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
11731 static inline void arch_write_lock(arch_rwlock_t *rw)
11732 {
11733 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
11734+
11735+#ifdef CONFIG_PAX_REFCOUNT
11736+ "jno 0f\n"
11737+ LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
11738+ "int $4\n0:\n"
11739+ _ASM_EXTABLE(0b, 0b)
11740+#endif
11741+
11742 "jz 1f\n"
11743 "call __write_lock_failed\n\t"
11744 "1:\n"
11745@@ -226,13 +242,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
11746
11747 static inline void arch_read_unlock(arch_rwlock_t *rw)
11748 {
11749- asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
11750+ asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
11751+
11752+#ifdef CONFIG_PAX_REFCOUNT
11753+ "jno 0f\n"
11754+ LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
11755+ "int $4\n0:\n"
11756+ _ASM_EXTABLE(0b, 0b)
11757+#endif
11758+
11759 :"+m" (rw->lock) : : "memory");
11760 }
11761
11762 static inline void arch_write_unlock(arch_rwlock_t *rw)
11763 {
11764- asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
11765+ asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
11766+
11767+#ifdef CONFIG_PAX_REFCOUNT
11768+ "jno 0f\n"
11769+ LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
11770+ "int $4\n0:\n"
11771+ _ASM_EXTABLE(0b, 0b)
11772+#endif
11773+
11774 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
11775 }
11776
11777diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
11778index 1575177..cb23f52 100644
11779--- a/arch/x86/include/asm/stackprotector.h
11780+++ b/arch/x86/include/asm/stackprotector.h
11781@@ -48,7 +48,7 @@
11782 * head_32 for boot CPU and setup_per_cpu_areas() for others.
11783 */
11784 #define GDT_STACK_CANARY_INIT \
11785- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
11786+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
11787
11788 /*
11789 * Initialize the stackprotector canary value.
11790@@ -113,7 +113,7 @@ static inline void setup_stack_canary_segment(int cpu)
11791
11792 static inline void load_stack_canary_segment(void)
11793 {
11794-#ifdef CONFIG_X86_32
11795+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
11796 asm volatile ("mov %0, %%gs" : : "r" (0));
11797 #endif
11798 }
11799diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
11800index 70bbe39..4ae2bd4 100644
11801--- a/arch/x86/include/asm/stacktrace.h
11802+++ b/arch/x86/include/asm/stacktrace.h
11803@@ -11,28 +11,20 @@
11804
11805 extern int kstack_depth_to_print;
11806
11807-struct thread_info;
11808+struct task_struct;
11809 struct stacktrace_ops;
11810
11811-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
11812- unsigned long *stack,
11813- unsigned long bp,
11814- const struct stacktrace_ops *ops,
11815- void *data,
11816- unsigned long *end,
11817- int *graph);
11818+typedef unsigned long walk_stack_t(struct task_struct *task,
11819+ void *stack_start,
11820+ unsigned long *stack,
11821+ unsigned long bp,
11822+ const struct stacktrace_ops *ops,
11823+ void *data,
11824+ unsigned long *end,
11825+ int *graph);
11826
11827-extern unsigned long
11828-print_context_stack(struct thread_info *tinfo,
11829- unsigned long *stack, unsigned long bp,
11830- const struct stacktrace_ops *ops, void *data,
11831- unsigned long *end, int *graph);
11832-
11833-extern unsigned long
11834-print_context_stack_bp(struct thread_info *tinfo,
11835- unsigned long *stack, unsigned long bp,
11836- const struct stacktrace_ops *ops, void *data,
11837- unsigned long *end, int *graph);
11838+extern walk_stack_t print_context_stack;
11839+extern walk_stack_t print_context_stack_bp;
11840
11841 /* Generic stack tracer with callbacks */
11842
11843@@ -40,7 +32,7 @@ struct stacktrace_ops {
11844 void (*address)(void *data, unsigned long address, int reliable);
11845 /* On negative return stop dumping */
11846 int (*stack)(void *data, char *name);
11847- walk_stack_t walk_stack;
11848+ walk_stack_t *walk_stack;
11849 };
11850
11851 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
11852diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
11853index cb23852..2dde194 100644
11854--- a/arch/x86/include/asm/sys_ia32.h
11855+++ b/arch/x86/include/asm/sys_ia32.h
11856@@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int, compat_sigset_t __user *,
11857 compat_sigset_t __user *, unsigned int);
11858 asmlinkage long sys32_alarm(unsigned int);
11859
11860-asmlinkage long sys32_waitpid(compat_pid_t, unsigned int *, int);
11861+asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);
11862 asmlinkage long sys32_sysfs(int, u32, u32);
11863
11864 asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
11865diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h
11866index f1d8b44..a4de8b7 100644
11867--- a/arch/x86/include/asm/syscalls.h
11868+++ b/arch/x86/include/asm/syscalls.h
11869@@ -30,7 +30,7 @@ long sys_clone(unsigned long, unsigned long, void __user *,
11870 void __user *, struct pt_regs *);
11871
11872 /* kernel/ldt.c */
11873-asmlinkage int sys_modify_ldt(int, void __user *, unsigned long);
11874+asmlinkage int sys_modify_ldt(int, void __user *, unsigned long) __size_overflow(3);
11875
11876 /* kernel/signal.c */
11877 long sys_rt_sigreturn(struct pt_regs *);
11878diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h
11879index 2d2f01c..f985723 100644
11880--- a/arch/x86/include/asm/system.h
11881+++ b/arch/x86/include/asm/system.h
11882@@ -129,7 +129,7 @@ do { \
11883 "call __switch_to\n\t" \
11884 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
11885 __switch_canary \
11886- "movq %P[thread_info](%%rsi),%%r8\n\t" \
11887+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
11888 "movq %%rax,%%rdi\n\t" \
11889 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
11890 "jnz ret_from_fork\n\t" \
11891@@ -140,7 +140,7 @@ do { \
11892 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
11893 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
11894 [_tif_fork] "i" (_TIF_FORK), \
11895- [thread_info] "i" (offsetof(struct task_struct, stack)), \
11896+ [thread_info] "m" (current_tinfo), \
11897 [current_task] "m" (current_task) \
11898 __switch_canary_iparam \
11899 : "memory", "cc" __EXTRA_CLOBBER)
11900@@ -200,7 +200,7 @@ static inline unsigned long get_limit(unsigned long segment)
11901 {
11902 unsigned long __limit;
11903 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
11904- return __limit + 1;
11905+ return __limit;
11906 }
11907
11908 static inline void native_clts(void)
11909@@ -397,13 +397,13 @@ void enable_hlt(void);
11910
11911 void cpu_idle_wait(void);
11912
11913-extern unsigned long arch_align_stack(unsigned long sp);
11914+#define arch_align_stack(x) ((x) & ~0xfUL)
11915 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
11916
11917 void default_idle(void);
11918 bool set_pm_idle_to_default(void);
11919
11920-void stop_this_cpu(void *dummy);
11921+void stop_this_cpu(void *dummy) __noreturn;
11922
11923 /*
11924 * Force strict CPU ordering.
11925diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
11926index d7ef849..6af292e 100644
11927--- a/arch/x86/include/asm/thread_info.h
11928+++ b/arch/x86/include/asm/thread_info.h
11929@@ -10,6 +10,7 @@
11930 #include <linux/compiler.h>
11931 #include <asm/page.h>
11932 #include <asm/types.h>
11933+#include <asm/percpu.h>
11934
11935 /*
11936 * low level task data that entry.S needs immediate access to
11937@@ -24,7 +25,6 @@ struct exec_domain;
11938 #include <linux/atomic.h>
11939
11940 struct thread_info {
11941- struct task_struct *task; /* main task structure */
11942 struct exec_domain *exec_domain; /* execution domain */
11943 __u32 flags; /* low level flags */
11944 __u32 status; /* thread synchronous flags */
11945@@ -34,18 +34,12 @@ struct thread_info {
11946 mm_segment_t addr_limit;
11947 struct restart_block restart_block;
11948 void __user *sysenter_return;
11949-#ifdef CONFIG_X86_32
11950- unsigned long previous_esp; /* ESP of the previous stack in
11951- case of nested (IRQ) stacks
11952- */
11953- __u8 supervisor_stack[0];
11954-#endif
11955+ unsigned long lowest_stack;
11956 int uaccess_err;
11957 };
11958
11959-#define INIT_THREAD_INFO(tsk) \
11960+#define INIT_THREAD_INFO \
11961 { \
11962- .task = &tsk, \
11963 .exec_domain = &default_exec_domain, \
11964 .flags = 0, \
11965 .cpu = 0, \
11966@@ -56,7 +50,7 @@ struct thread_info {
11967 }, \
11968 }
11969
11970-#define init_thread_info (init_thread_union.thread_info)
11971+#define init_thread_info (init_thread_union.stack)
11972 #define init_stack (init_thread_union.stack)
11973
11974 #else /* !__ASSEMBLY__ */
11975@@ -170,45 +164,40 @@ struct thread_info {
11976 ret; \
11977 })
11978
11979-#ifdef CONFIG_X86_32
11980-
11981-#define STACK_WARN (THREAD_SIZE/8)
11982-/*
11983- * macros/functions for gaining access to the thread information structure
11984- *
11985- * preempt_count needs to be 1 initially, until the scheduler is functional.
11986- */
11987-#ifndef __ASSEMBLY__
11988-
11989-
11990-/* how to get the current stack pointer from C */
11991-register unsigned long current_stack_pointer asm("esp") __used;
11992-
11993-/* how to get the thread information struct from C */
11994-static inline struct thread_info *current_thread_info(void)
11995-{
11996- return (struct thread_info *)
11997- (current_stack_pointer & ~(THREAD_SIZE - 1));
11998-}
11999-
12000-#else /* !__ASSEMBLY__ */
12001-
12002+#ifdef __ASSEMBLY__
12003 /* how to get the thread information struct from ASM */
12004 #define GET_THREAD_INFO(reg) \
12005- movl $-THREAD_SIZE, reg; \
12006- andl %esp, reg
12007+ mov PER_CPU_VAR(current_tinfo), reg
12008
12009 /* use this one if reg already contains %esp */
12010-#define GET_THREAD_INFO_WITH_ESP(reg) \
12011- andl $-THREAD_SIZE, reg
12012+#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
12013+#else
12014+/* how to get the thread information struct from C */
12015+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
12016+
12017+static __always_inline struct thread_info *current_thread_info(void)
12018+{
12019+ return percpu_read_stable(current_tinfo);
12020+}
12021+#endif
12022+
12023+#ifdef CONFIG_X86_32
12024+
12025+#define STACK_WARN (THREAD_SIZE/8)
12026+/*
12027+ * macros/functions for gaining access to the thread information structure
12028+ *
12029+ * preempt_count needs to be 1 initially, until the scheduler is functional.
12030+ */
12031+#ifndef __ASSEMBLY__
12032+
12033+/* how to get the current stack pointer from C */
12034+register unsigned long current_stack_pointer asm("esp") __used;
12035
12036 #endif
12037
12038 #else /* X86_32 */
12039
12040-#include <asm/percpu.h>
12041-#define KERNEL_STACK_OFFSET (5*8)
12042-
12043 /*
12044 * macros/functions for gaining access to the thread information structure
12045 * preempt_count needs to be 1 initially, until the scheduler is functional.
12046@@ -216,21 +205,8 @@ static inline struct thread_info *current_thread_info(void)
12047 #ifndef __ASSEMBLY__
12048 DECLARE_PER_CPU(unsigned long, kernel_stack);
12049
12050-static inline struct thread_info *current_thread_info(void)
12051-{
12052- struct thread_info *ti;
12053- ti = (void *)(percpu_read_stable(kernel_stack) +
12054- KERNEL_STACK_OFFSET - THREAD_SIZE);
12055- return ti;
12056-}
12057-
12058-#else /* !__ASSEMBLY__ */
12059-
12060-/* how to get the thread information struct from ASM */
12061-#define GET_THREAD_INFO(reg) \
12062- movq PER_CPU_VAR(kernel_stack),reg ; \
12063- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
12064-
12065+/* how to get the current stack pointer from C */
12066+register unsigned long current_stack_pointer asm("rsp") __used;
12067 #endif
12068
12069 #endif /* !X86_32 */
12070@@ -264,5 +240,16 @@ extern void arch_task_cache_init(void);
12071 extern void free_thread_info(struct thread_info *ti);
12072 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
12073 #define arch_task_cache_init arch_task_cache_init
12074+
12075+#define __HAVE_THREAD_FUNCTIONS
12076+#define task_thread_info(task) (&(task)->tinfo)
12077+#define task_stack_page(task) ((task)->stack)
12078+#define setup_thread_stack(p, org) do {} while (0)
12079+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
12080+
12081+#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
12082+extern struct task_struct *alloc_task_struct_node(int node);
12083+extern void free_task_struct(struct task_struct *);
12084+
12085 #endif
12086 #endif /* _ASM_X86_THREAD_INFO_H */
12087diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
12088index 36361bf..324f262 100644
12089--- a/arch/x86/include/asm/uaccess.h
12090+++ b/arch/x86/include/asm/uaccess.h
12091@@ -7,12 +7,15 @@
12092 #include <linux/compiler.h>
12093 #include <linux/thread_info.h>
12094 #include <linux/string.h>
12095+#include <linux/sched.h>
12096 #include <asm/asm.h>
12097 #include <asm/page.h>
12098
12099 #define VERIFY_READ 0
12100 #define VERIFY_WRITE 1
12101
12102+extern void check_object_size(const void *ptr, unsigned long n, bool to);
12103+
12104 /*
12105 * The fs value determines whether argument validity checking should be
12106 * performed or not. If get_fs() == USER_DS, checking is performed, with
12107@@ -28,7 +31,12 @@
12108
12109 #define get_ds() (KERNEL_DS)
12110 #define get_fs() (current_thread_info()->addr_limit)
12111+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12112+void __set_fs(mm_segment_t x);
12113+void set_fs(mm_segment_t x);
12114+#else
12115 #define set_fs(x) (current_thread_info()->addr_limit = (x))
12116+#endif
12117
12118 #define segment_eq(a, b) ((a).seg == (b).seg)
12119
12120@@ -76,7 +84,33 @@
12121 * checks that the pointer is in the user space range - after calling
12122 * this function, memory access functions may still return -EFAULT.
12123 */
12124-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12125+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12126+#define access_ok(type, addr, size) \
12127+({ \
12128+ long __size = size; \
12129+ unsigned long __addr = (unsigned long)addr; \
12130+ unsigned long __addr_ao = __addr & PAGE_MASK; \
12131+ unsigned long __end_ao = __addr + __size - 1; \
12132+ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
12133+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
12134+ while(__addr_ao <= __end_ao) { \
12135+ char __c_ao; \
12136+ __addr_ao += PAGE_SIZE; \
12137+ if (__size > PAGE_SIZE) \
12138+ cond_resched(); \
12139+ if (__get_user(__c_ao, (char __user *)__addr)) \
12140+ break; \
12141+ if (type != VERIFY_WRITE) { \
12142+ __addr = __addr_ao; \
12143+ continue; \
12144+ } \
12145+ if (__put_user(__c_ao, (char __user *)__addr)) \
12146+ break; \
12147+ __addr = __addr_ao; \
12148+ } \
12149+ } \
12150+ __ret_ao; \
12151+})
12152
12153 /*
12154 * The exception table consists of pairs of addresses: the first is the
12155@@ -182,12 +216,20 @@ extern int __get_user_bad(void);
12156 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
12157 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
12158
12159-
12160+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12161+#define __copyuser_seg "gs;"
12162+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
12163+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
12164+#else
12165+#define __copyuser_seg
12166+#define __COPYUSER_SET_ES
12167+#define __COPYUSER_RESTORE_ES
12168+#endif
12169
12170 #ifdef CONFIG_X86_32
12171 #define __put_user_asm_u64(x, addr, err, errret) \
12172- asm volatile("1: movl %%eax,0(%2)\n" \
12173- "2: movl %%edx,4(%2)\n" \
12174+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
12175+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
12176 "3:\n" \
12177 ".section .fixup,\"ax\"\n" \
12178 "4: movl %3,%0\n" \
12179@@ -199,8 +241,8 @@ extern int __get_user_bad(void);
12180 : "A" (x), "r" (addr), "i" (errret), "0" (err))
12181
12182 #define __put_user_asm_ex_u64(x, addr) \
12183- asm volatile("1: movl %%eax,0(%1)\n" \
12184- "2: movl %%edx,4(%1)\n" \
12185+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
12186+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
12187 "3:\n" \
12188 _ASM_EXTABLE(1b, 2b - 1b) \
12189 _ASM_EXTABLE(2b, 3b - 2b) \
12190@@ -252,7 +294,7 @@ extern void __put_user_8(void);
12191 __typeof__(*(ptr)) __pu_val; \
12192 __chk_user_ptr(ptr); \
12193 might_fault(); \
12194- __pu_val = x; \
12195+ __pu_val = (x); \
12196 switch (sizeof(*(ptr))) { \
12197 case 1: \
12198 __put_user_x(1, __pu_val, ptr, __ret_pu); \
12199@@ -373,7 +415,7 @@ do { \
12200 } while (0)
12201
12202 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12203- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
12204+ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
12205 "2:\n" \
12206 ".section .fixup,\"ax\"\n" \
12207 "3: mov %3,%0\n" \
12208@@ -381,7 +423,7 @@ do { \
12209 " jmp 2b\n" \
12210 ".previous\n" \
12211 _ASM_EXTABLE(1b, 3b) \
12212- : "=r" (err), ltype(x) \
12213+ : "=r" (err), ltype (x) \
12214 : "m" (__m(addr)), "i" (errret), "0" (err))
12215
12216 #define __get_user_size_ex(x, ptr, size) \
12217@@ -406,7 +448,7 @@ do { \
12218 } while (0)
12219
12220 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
12221- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
12222+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
12223 "2:\n" \
12224 _ASM_EXTABLE(1b, 2b - 1b) \
12225 : ltype(x) : "m" (__m(addr)))
12226@@ -423,13 +465,24 @@ do { \
12227 int __gu_err; \
12228 unsigned long __gu_val; \
12229 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
12230- (x) = (__force __typeof__(*(ptr)))__gu_val; \
12231+ (x) = (__typeof__(*(ptr)))__gu_val; \
12232 __gu_err; \
12233 })
12234
12235 /* FIXME: this hack is definitely wrong -AK */
12236 struct __large_struct { unsigned long buf[100]; };
12237-#define __m(x) (*(struct __large_struct __user *)(x))
12238+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12239+#define ____m(x) \
12240+({ \
12241+ unsigned long ____x = (unsigned long)(x); \
12242+ if (____x < PAX_USER_SHADOW_BASE) \
12243+ ____x += PAX_USER_SHADOW_BASE; \
12244+ (void __user *)____x; \
12245+})
12246+#else
12247+#define ____m(x) (x)
12248+#endif
12249+#define __m(x) (*(struct __large_struct __user *)____m(x))
12250
12251 /*
12252 * Tell gcc we read from memory instead of writing: this is because
12253@@ -437,7 +490,7 @@ struct __large_struct { unsigned long buf[100]; };
12254 * aliasing issues.
12255 */
12256 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12257- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
12258+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
12259 "2:\n" \
12260 ".section .fixup,\"ax\"\n" \
12261 "3: mov %3,%0\n" \
12262@@ -445,10 +498,10 @@ struct __large_struct { unsigned long buf[100]; };
12263 ".previous\n" \
12264 _ASM_EXTABLE(1b, 3b) \
12265 : "=r"(err) \
12266- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
12267+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
12268
12269 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
12270- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
12271+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
12272 "2:\n" \
12273 _ASM_EXTABLE(1b, 2b - 1b) \
12274 : : ltype(x), "m" (__m(addr)))
12275@@ -487,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
12276 * On error, the variable @x is set to zero.
12277 */
12278
12279+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12280+#define __get_user(x, ptr) get_user((x), (ptr))
12281+#else
12282 #define __get_user(x, ptr) \
12283 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
12284+#endif
12285
12286 /**
12287 * __put_user: - Write a simple value into user space, with less checking.
12288@@ -510,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
12289 * Returns zero on success, or -EFAULT on error.
12290 */
12291
12292+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12293+#define __put_user(x, ptr) put_user((x), (ptr))
12294+#else
12295 #define __put_user(x, ptr) \
12296 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
12297+#endif
12298
12299 #define __get_user_unaligned __get_user
12300 #define __put_user_unaligned __put_user
12301@@ -529,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
12302 #define get_user_ex(x, ptr) do { \
12303 unsigned long __gue_val; \
12304 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
12305- (x) = (__force __typeof__(*(ptr)))__gue_val; \
12306+ (x) = (__typeof__(*(ptr)))__gue_val; \
12307 } while (0)
12308
12309 #ifdef CONFIG_X86_WP_WORKS_OK
12310diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
12311index 566e803..4414921 100644
12312--- a/arch/x86/include/asm/uaccess_32.h
12313+++ b/arch/x86/include/asm/uaccess_32.h
12314@@ -11,15 +11,15 @@
12315 #include <asm/page.h>
12316
12317 unsigned long __must_check __copy_to_user_ll
12318- (void __user *to, const void *from, unsigned long n);
12319+ (void __user *to, const void *from, unsigned long n) __size_overflow(3);
12320 unsigned long __must_check __copy_from_user_ll
12321- (void *to, const void __user *from, unsigned long n);
12322+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12323 unsigned long __must_check __copy_from_user_ll_nozero
12324- (void *to, const void __user *from, unsigned long n);
12325+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12326 unsigned long __must_check __copy_from_user_ll_nocache
12327- (void *to, const void __user *from, unsigned long n);
12328+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12329 unsigned long __must_check __copy_from_user_ll_nocache_nozero
12330- (void *to, const void __user *from, unsigned long n);
12331+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12332
12333 /**
12334 * __copy_to_user_inatomic: - Copy a block of data into user space, with less checking.
12335@@ -41,8 +41,13 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
12336 */
12337
12338 static __always_inline unsigned long __must_check
12339+__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) __size_overflow(3);
12340+static __always_inline unsigned long __must_check
12341 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12342 {
12343+ if ((long)n < 0)
12344+ return n;
12345+
12346 if (__builtin_constant_p(n)) {
12347 unsigned long ret;
12348
12349@@ -61,6 +66,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12350 return ret;
12351 }
12352 }
12353+ if (!__builtin_constant_p(n))
12354+ check_object_size(from, n, true);
12355 return __copy_to_user_ll(to, from, n);
12356 }
12357
12358@@ -79,15 +86,23 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12359 * On success, this will be zero.
12360 */
12361 static __always_inline unsigned long __must_check
12362+__copy_to_user(void __user *to, const void *from, unsigned long n) __size_overflow(3);
12363+static __always_inline unsigned long __must_check
12364 __copy_to_user(void __user *to, const void *from, unsigned long n)
12365 {
12366 might_fault();
12367+
12368 return __copy_to_user_inatomic(to, from, n);
12369 }
12370
12371 static __always_inline unsigned long
12372+__copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) __size_overflow(3);
12373+static __always_inline unsigned long
12374 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
12375 {
12376+ if ((long)n < 0)
12377+ return n;
12378+
12379 /* Avoid zeroing the tail if the copy fails..
12380 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
12381 * but as the zeroing behaviour is only significant when n is not
12382@@ -134,9 +149,15 @@ __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
12383 * for explanation of why this is needed.
12384 */
12385 static __always_inline unsigned long
12386+__copy_from_user(void *to, const void __user *from, unsigned long n) __size_overflow(3);
12387+static __always_inline unsigned long
12388 __copy_from_user(void *to, const void __user *from, unsigned long n)
12389 {
12390 might_fault();
12391+
12392+ if ((long)n < 0)
12393+ return n;
12394+
12395 if (__builtin_constant_p(n)) {
12396 unsigned long ret;
12397
12398@@ -152,13 +173,21 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
12399 return ret;
12400 }
12401 }
12402+ if (!__builtin_constant_p(n))
12403+ check_object_size(to, n, false);
12404 return __copy_from_user_ll(to, from, n);
12405 }
12406
12407 static __always_inline unsigned long __copy_from_user_nocache(void *to,
12408+ const void __user *from, unsigned long n) __size_overflow(3);
12409+static __always_inline unsigned long __copy_from_user_nocache(void *to,
12410 const void __user *from, unsigned long n)
12411 {
12412 might_fault();
12413+
12414+ if ((long)n < 0)
12415+ return n;
12416+
12417 if (__builtin_constant_p(n)) {
12418 unsigned long ret;
12419
12420@@ -179,17 +208,24 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
12421
12422 static __always_inline unsigned long
12423 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
12424+ unsigned long n) __size_overflow(3);
12425+static __always_inline unsigned long
12426+__copy_from_user_inatomic_nocache(void *to, const void __user *from,
12427 unsigned long n)
12428 {
12429- return __copy_from_user_ll_nocache_nozero(to, from, n);
12430+ if ((long)n < 0)
12431+ return n;
12432+
12433+ return __copy_from_user_ll_nocache_nozero(to, from, n);
12434 }
12435
12436-unsigned long __must_check copy_to_user(void __user *to,
12437- const void *from, unsigned long n);
12438-unsigned long __must_check _copy_from_user(void *to,
12439- const void __user *from,
12440- unsigned long n);
12441-
12442+extern void copy_to_user_overflow(void)
12443+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
12444+ __compiletime_error("copy_to_user() buffer size is not provably correct")
12445+#else
12446+ __compiletime_warning("copy_to_user() buffer size is not provably correct")
12447+#endif
12448+;
12449
12450 extern void copy_from_user_overflow(void)
12451 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
12452@@ -199,24 +235,72 @@ extern void copy_from_user_overflow(void)
12453 #endif
12454 ;
12455
12456-static inline unsigned long __must_check copy_from_user(void *to,
12457- const void __user *from,
12458- unsigned long n)
12459+/**
12460+ * copy_to_user: - Copy a block of data into user space.
12461+ * @to: Destination address, in user space.
12462+ * @from: Source address, in kernel space.
12463+ * @n: Number of bytes to copy.
12464+ *
12465+ * Context: User context only. This function may sleep.
12466+ *
12467+ * Copy data from kernel space to user space.
12468+ *
12469+ * Returns number of bytes that could not be copied.
12470+ * On success, this will be zero.
12471+ */
12472+static inline unsigned long __must_check
12473+copy_to_user(void __user *to, const void *from, unsigned long n) __size_overflow(3);
12474+static inline unsigned long __must_check
12475+copy_to_user(void __user *to, const void *from, unsigned long n)
12476+{
12477+ int sz = __compiletime_object_size(from);
12478+
12479+ if (unlikely(sz != -1 && sz < n))
12480+ copy_to_user_overflow();
12481+ else if (access_ok(VERIFY_WRITE, to, n))
12482+ n = __copy_to_user(to, from, n);
12483+ return n;
12484+}
12485+
12486+/**
12487+ * copy_from_user: - Copy a block of data from user space.
12488+ * @to: Destination address, in kernel space.
12489+ * @from: Source address, in user space.
12490+ * @n: Number of bytes to copy.
12491+ *
12492+ * Context: User context only. This function may sleep.
12493+ *
12494+ * Copy data from user space to kernel space.
12495+ *
12496+ * Returns number of bytes that could not be copied.
12497+ * On success, this will be zero.
12498+ *
12499+ * If some data could not be copied, this function will pad the copied
12500+ * data to the requested size using zero bytes.
12501+ */
12502+static inline unsigned long __must_check
12503+copy_from_user(void *to, const void __user *from, unsigned long n) __size_overflow(3);
12504+static inline unsigned long __must_check
12505+copy_from_user(void *to, const void __user *from, unsigned long n)
12506 {
12507 int sz = __compiletime_object_size(to);
12508
12509- if (likely(sz == -1 || sz >= n))
12510- n = _copy_from_user(to, from, n);
12511- else
12512+ if (unlikely(sz != -1 && sz < n))
12513 copy_from_user_overflow();
12514-
12515+ else if (access_ok(VERIFY_READ, from, n))
12516+ n = __copy_from_user(to, from, n);
12517+ else if ((long)n > 0) {
12518+ if (!__builtin_constant_p(n))
12519+ check_object_size(to, n, false);
12520+ memset(to, 0, n);
12521+ }
12522 return n;
12523 }
12524
12525 long __must_check strncpy_from_user(char *dst, const char __user *src,
12526- long count);
12527+ unsigned long count) __size_overflow(3);
12528 long __must_check __strncpy_from_user(char *dst,
12529- const char __user *src, long count);
12530+ const char __user *src, unsigned long count) __size_overflow(3);
12531
12532 /**
12533 * strlen_user: - Get the size of a string in user space.
12534@@ -234,8 +318,8 @@ long __must_check __strncpy_from_user(char *dst,
12535 */
12536 #define strlen_user(str) strnlen_user(str, LONG_MAX)
12537
12538-long strnlen_user(const char __user *str, long n);
12539-unsigned long __must_check clear_user(void __user *mem, unsigned long len);
12540-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
12541+long strnlen_user(const char __user *str, unsigned long n);
12542+unsigned long __must_check clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12543+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12544
12545 #endif /* _ASM_X86_UACCESS_32_H */
12546diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
12547index 1c66d30..2582764 100644
12548--- a/arch/x86/include/asm/uaccess_64.h
12549+++ b/arch/x86/include/asm/uaccess_64.h
12550@@ -10,6 +10,9 @@
12551 #include <asm/alternative.h>
12552 #include <asm/cpufeature.h>
12553 #include <asm/page.h>
12554+#include <asm/pgtable.h>
12555+
12556+#define set_fs(x) (current_thread_info()->addr_limit = (x))
12557
12558 /*
12559 * Copy To/From Userspace
12560@@ -17,12 +20,14 @@
12561
12562 /* Handles exceptions in both to and from, but doesn't do access_ok */
12563 __must_check unsigned long
12564-copy_user_generic_string(void *to, const void *from, unsigned len);
12565+copy_user_generic_string(void *to, const void *from, unsigned long len) __size_overflow(3);
12566 __must_check unsigned long
12567-copy_user_generic_unrolled(void *to, const void *from, unsigned len);
12568+copy_user_generic_unrolled(void *to, const void *from, unsigned long len) __size_overflow(3);
12569
12570 static __always_inline __must_check unsigned long
12571-copy_user_generic(void *to, const void *from, unsigned len)
12572+copy_user_generic(void *to, const void *from, unsigned long len) __size_overflow(3);
12573+static __always_inline __must_check unsigned long
12574+copy_user_generic(void *to, const void *from, unsigned long len)
12575 {
12576 unsigned ret;
12577
12578@@ -32,142 +37,237 @@ copy_user_generic(void *to, const void *from, unsigned len)
12579 ASM_OUTPUT2("=a" (ret), "=D" (to), "=S" (from),
12580 "=d" (len)),
12581 "1" (to), "2" (from), "3" (len)
12582- : "memory", "rcx", "r8", "r9", "r10", "r11");
12583+ : "memory", "rcx", "r8", "r9", "r11");
12584 return ret;
12585 }
12586
12587+static __always_inline __must_check unsigned long
12588+__copy_to_user(void __user *to, const void *from, unsigned long len) __size_overflow(3);
12589+static __always_inline __must_check unsigned long
12590+__copy_from_user(void *to, const void __user *from, unsigned long len) __size_overflow(3);
12591 __must_check unsigned long
12592-_copy_to_user(void __user *to, const void *from, unsigned len);
12593-__must_check unsigned long
12594-_copy_from_user(void *to, const void __user *from, unsigned len);
12595-__must_check unsigned long
12596-copy_in_user(void __user *to, const void __user *from, unsigned len);
12597+copy_in_user(void __user *to, const void __user *from, unsigned long len) __size_overflow(3);
12598
12599 static inline unsigned long __must_check copy_from_user(void *to,
12600 const void __user *from,
12601+ unsigned long n) __size_overflow(3);
12602+static inline unsigned long __must_check copy_from_user(void *to,
12603+ const void __user *from,
12604 unsigned long n)
12605 {
12606- int sz = __compiletime_object_size(to);
12607-
12608 might_fault();
12609- if (likely(sz == -1 || sz >= n))
12610- n = _copy_from_user(to, from, n);
12611-#ifdef CONFIG_DEBUG_VM
12612- else
12613- WARN(1, "Buffer overflow detected!\n");
12614-#endif
12615+
12616+ if (access_ok(VERIFY_READ, from, n))
12617+ n = __copy_from_user(to, from, n);
12618+ else if (n < INT_MAX) {
12619+ if (!__builtin_constant_p(n))
12620+ check_object_size(to, n, false);
12621+ memset(to, 0, n);
12622+ }
12623 return n;
12624 }
12625
12626 static __always_inline __must_check
12627-int copy_to_user(void __user *dst, const void *src, unsigned size)
12628+int copy_to_user(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12629+static __always_inline __must_check
12630+int copy_to_user(void __user *dst, const void *src, unsigned long size)
12631 {
12632 might_fault();
12633
12634- return _copy_to_user(dst, src, size);
12635+ if (access_ok(VERIFY_WRITE, dst, size))
12636+ size = __copy_to_user(dst, src, size);
12637+ return size;
12638 }
12639
12640 static __always_inline __must_check
12641-int __copy_from_user(void *dst, const void __user *src, unsigned size)
12642+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
12643+static __always_inline __must_check
12644+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
12645 {
12646- int ret = 0;
12647+ int sz = __compiletime_object_size(dst);
12648+ unsigned ret = 0;
12649
12650 might_fault();
12651- if (!__builtin_constant_p(size))
12652- return copy_user_generic(dst, (__force void *)src, size);
12653+
12654+ if (size > INT_MAX)
12655+ return size;
12656+
12657+#ifdef CONFIG_PAX_MEMORY_UDEREF
12658+ if (!__access_ok(VERIFY_READ, src, size))
12659+ return size;
12660+#endif
12661+
12662+ if (unlikely(sz != -1 && sz < size)) {
12663+#ifdef CONFIG_DEBUG_VM
12664+ WARN(1, "Buffer overflow detected!\n");
12665+#endif
12666+ return size;
12667+ }
12668+
12669+ if (!__builtin_constant_p(size)) {
12670+ check_object_size(dst, size, false);
12671+
12672+#ifdef CONFIG_PAX_MEMORY_UDEREF
12673+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12674+ src += PAX_USER_SHADOW_BASE;
12675+#endif
12676+
12677+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12678+ }
12679 switch (size) {
12680- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
12681+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
12682 ret, "b", "b", "=q", 1);
12683 return ret;
12684- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
12685+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
12686 ret, "w", "w", "=r", 2);
12687 return ret;
12688- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
12689+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
12690 ret, "l", "k", "=r", 4);
12691 return ret;
12692- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
12693+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12694 ret, "q", "", "=r", 8);
12695 return ret;
12696 case 10:
12697- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12698+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12699 ret, "q", "", "=r", 10);
12700 if (unlikely(ret))
12701 return ret;
12702 __get_user_asm(*(u16 *)(8 + (char *)dst),
12703- (u16 __user *)(8 + (char __user *)src),
12704+ (const u16 __user *)(8 + (const char __user *)src),
12705 ret, "w", "w", "=r", 2);
12706 return ret;
12707 case 16:
12708- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12709+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12710 ret, "q", "", "=r", 16);
12711 if (unlikely(ret))
12712 return ret;
12713 __get_user_asm(*(u64 *)(8 + (char *)dst),
12714- (u64 __user *)(8 + (char __user *)src),
12715+ (const u64 __user *)(8 + (const char __user *)src),
12716 ret, "q", "", "=r", 8);
12717 return ret;
12718 default:
12719- return copy_user_generic(dst, (__force void *)src, size);
12720+
12721+#ifdef CONFIG_PAX_MEMORY_UDEREF
12722+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12723+ src += PAX_USER_SHADOW_BASE;
12724+#endif
12725+
12726+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12727 }
12728 }
12729
12730 static __always_inline __must_check
12731-int __copy_to_user(void __user *dst, const void *src, unsigned size)
12732+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12733+static __always_inline __must_check
12734+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
12735 {
12736- int ret = 0;
12737+ int sz = __compiletime_object_size(src);
12738+ unsigned ret = 0;
12739
12740 might_fault();
12741- if (!__builtin_constant_p(size))
12742- return copy_user_generic((__force void *)dst, src, size);
12743+
12744+ if (size > INT_MAX)
12745+ return size;
12746+
12747+#ifdef CONFIG_PAX_MEMORY_UDEREF
12748+ if (!__access_ok(VERIFY_WRITE, dst, size))
12749+ return size;
12750+#endif
12751+
12752+ if (unlikely(sz != -1 && sz < size)) {
12753+#ifdef CONFIG_DEBUG_VM
12754+ WARN(1, "Buffer overflow detected!\n");
12755+#endif
12756+ return size;
12757+ }
12758+
12759+ if (!__builtin_constant_p(size)) {
12760+ check_object_size(src, size, true);
12761+
12762+#ifdef CONFIG_PAX_MEMORY_UDEREF
12763+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12764+ dst += PAX_USER_SHADOW_BASE;
12765+#endif
12766+
12767+ return copy_user_generic((__force_kernel void *)dst, src, size);
12768+ }
12769 switch (size) {
12770- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
12771+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
12772 ret, "b", "b", "iq", 1);
12773 return ret;
12774- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
12775+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
12776 ret, "w", "w", "ir", 2);
12777 return ret;
12778- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
12779+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
12780 ret, "l", "k", "ir", 4);
12781 return ret;
12782- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
12783+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12784 ret, "q", "", "er", 8);
12785 return ret;
12786 case 10:
12787- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
12788+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12789 ret, "q", "", "er", 10);
12790 if (unlikely(ret))
12791 return ret;
12792 asm("":::"memory");
12793- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
12794+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
12795 ret, "w", "w", "ir", 2);
12796 return ret;
12797 case 16:
12798- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
12799+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12800 ret, "q", "", "er", 16);
12801 if (unlikely(ret))
12802 return ret;
12803 asm("":::"memory");
12804- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
12805+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
12806 ret, "q", "", "er", 8);
12807 return ret;
12808 default:
12809- return copy_user_generic((__force void *)dst, src, size);
12810+
12811+#ifdef CONFIG_PAX_MEMORY_UDEREF
12812+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12813+ dst += PAX_USER_SHADOW_BASE;
12814+#endif
12815+
12816+ return copy_user_generic((__force_kernel void *)dst, src, size);
12817 }
12818 }
12819
12820 static __always_inline __must_check
12821-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12822+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size) __size_overflow(3);
12823+static __always_inline __must_check
12824+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size)
12825 {
12826- int ret = 0;
12827+ unsigned ret = 0;
12828
12829 might_fault();
12830- if (!__builtin_constant_p(size))
12831- return copy_user_generic((__force void *)dst,
12832- (__force void *)src, size);
12833+
12834+ if (size > INT_MAX)
12835+ return size;
12836+
12837+#ifdef CONFIG_PAX_MEMORY_UDEREF
12838+ if (!__access_ok(VERIFY_READ, src, size))
12839+ return size;
12840+ if (!__access_ok(VERIFY_WRITE, dst, size))
12841+ return size;
12842+#endif
12843+
12844+ if (!__builtin_constant_p(size)) {
12845+
12846+#ifdef CONFIG_PAX_MEMORY_UDEREF
12847+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12848+ src += PAX_USER_SHADOW_BASE;
12849+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12850+ dst += PAX_USER_SHADOW_BASE;
12851+#endif
12852+
12853+ return copy_user_generic((__force_kernel void *)dst,
12854+ (__force_kernel const void *)src, size);
12855+ }
12856 switch (size) {
12857 case 1: {
12858 u8 tmp;
12859- __get_user_asm(tmp, (u8 __user *)src,
12860+ __get_user_asm(tmp, (const u8 __user *)src,
12861 ret, "b", "b", "=q", 1);
12862 if (likely(!ret))
12863 __put_user_asm(tmp, (u8 __user *)dst,
12864@@ -176,7 +276,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12865 }
12866 case 2: {
12867 u16 tmp;
12868- __get_user_asm(tmp, (u16 __user *)src,
12869+ __get_user_asm(tmp, (const u16 __user *)src,
12870 ret, "w", "w", "=r", 2);
12871 if (likely(!ret))
12872 __put_user_asm(tmp, (u16 __user *)dst,
12873@@ -186,7 +286,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12874
12875 case 4: {
12876 u32 tmp;
12877- __get_user_asm(tmp, (u32 __user *)src,
12878+ __get_user_asm(tmp, (const u32 __user *)src,
12879 ret, "l", "k", "=r", 4);
12880 if (likely(!ret))
12881 __put_user_asm(tmp, (u32 __user *)dst,
12882@@ -195,7 +295,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12883 }
12884 case 8: {
12885 u64 tmp;
12886- __get_user_asm(tmp, (u64 __user *)src,
12887+ __get_user_asm(tmp, (const u64 __user *)src,
12888 ret, "q", "", "=r", 8);
12889 if (likely(!ret))
12890 __put_user_asm(tmp, (u64 __user *)dst,
12891@@ -203,51 +303,103 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12892 return ret;
12893 }
12894 default:
12895- return copy_user_generic((__force void *)dst,
12896- (__force void *)src, size);
12897+
12898+#ifdef CONFIG_PAX_MEMORY_UDEREF
12899+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12900+ src += PAX_USER_SHADOW_BASE;
12901+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12902+ dst += PAX_USER_SHADOW_BASE;
12903+#endif
12904+
12905+ return copy_user_generic((__force_kernel void *)dst,
12906+ (__force_kernel const void *)src, size);
12907 }
12908 }
12909
12910 __must_check long
12911-strncpy_from_user(char *dst, const char __user *src, long count);
12912+strncpy_from_user(char *dst, const char __user *src, unsigned long count) __size_overflow(3);
12913 __must_check long
12914-__strncpy_from_user(char *dst, const char __user *src, long count);
12915-__must_check long strnlen_user(const char __user *str, long n);
12916-__must_check long __strnlen_user(const char __user *str, long n);
12917+__strncpy_from_user(char *dst, const char __user *src, unsigned long count) __size_overflow(3);
12918+__must_check long strnlen_user(const char __user *str, unsigned long n);
12919+__must_check long __strnlen_user(const char __user *str, unsigned long n);
12920 __must_check long strlen_user(const char __user *str);
12921-__must_check unsigned long clear_user(void __user *mem, unsigned long len);
12922-__must_check unsigned long __clear_user(void __user *mem, unsigned long len);
12923+__must_check unsigned long clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12924+__must_check unsigned long __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12925
12926 static __must_check __always_inline int
12927-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
12928+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
12929+static __must_check __always_inline int
12930+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
12931 {
12932- return copy_user_generic(dst, (__force const void *)src, size);
12933+ if (size > INT_MAX)
12934+ return size;
12935+
12936+#ifdef CONFIG_PAX_MEMORY_UDEREF
12937+ if (!__access_ok(VERIFY_READ, src, size))
12938+ return size;
12939+
12940+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12941+ src += PAX_USER_SHADOW_BASE;
12942+#endif
12943+
12944+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12945 }
12946
12947-static __must_check __always_inline int
12948-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
12949+static __must_check __always_inline unsigned long
12950+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12951+static __must_check __always_inline unsigned long
12952+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
12953 {
12954- return copy_user_generic((__force void *)dst, src, size);
12955+ if (size > INT_MAX)
12956+ return size;
12957+
12958+#ifdef CONFIG_PAX_MEMORY_UDEREF
12959+ if (!__access_ok(VERIFY_WRITE, dst, size))
12960+ return size;
12961+
12962+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12963+ dst += PAX_USER_SHADOW_BASE;
12964+#endif
12965+
12966+ return copy_user_generic((__force_kernel void *)dst, src, size);
12967 }
12968
12969-extern long __copy_user_nocache(void *dst, const void __user *src,
12970- unsigned size, int zerorest);
12971+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
12972+ unsigned long size, int zerorest) __size_overflow(3);
12973
12974-static inline int
12975-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
12976+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
12977+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
12978 {
12979 might_sleep();
12980+
12981+ if (size > INT_MAX)
12982+ return size;
12983+
12984+#ifdef CONFIG_PAX_MEMORY_UDEREF
12985+ if (!__access_ok(VERIFY_READ, src, size))
12986+ return size;
12987+#endif
12988+
12989 return __copy_user_nocache(dst, src, size, 1);
12990 }
12991
12992-static inline int
12993-__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12994- unsigned size)
12995+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12996+ unsigned long size) __size_overflow(3);
12997+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12998+ unsigned long size)
12999 {
13000+ if (size > INT_MAX)
13001+ return size;
13002+
13003+#ifdef CONFIG_PAX_MEMORY_UDEREF
13004+ if (!__access_ok(VERIFY_READ, src, size))
13005+ return size;
13006+#endif
13007+
13008 return __copy_user_nocache(dst, src, size, 0);
13009 }
13010
13011-unsigned long
13012-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
13013+extern unsigned long
13014+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
13015
13016 #endif /* _ASM_X86_UACCESS_64_H */
13017diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
13018index bb05228..d763d5b 100644
13019--- a/arch/x86/include/asm/vdso.h
13020+++ b/arch/x86/include/asm/vdso.h
13021@@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
13022 #define VDSO32_SYMBOL(base, name) \
13023 ({ \
13024 extern const char VDSO32_##name[]; \
13025- (void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
13026+ (void __user *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
13027 })
13028 #endif
13029
13030diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
13031index 1971e65..1e3559b 100644
13032--- a/arch/x86/include/asm/x86_init.h
13033+++ b/arch/x86/include/asm/x86_init.h
13034@@ -28,7 +28,7 @@ struct x86_init_mpparse {
13035 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
13036 void (*find_smp_config)(void);
13037 void (*get_smp_config)(unsigned int early);
13038-};
13039+} __no_const;
13040
13041 /**
13042 * struct x86_init_resources - platform specific resource related ops
13043@@ -42,7 +42,7 @@ struct x86_init_resources {
13044 void (*probe_roms)(void);
13045 void (*reserve_resources)(void);
13046 char *(*memory_setup)(void);
13047-};
13048+} __no_const;
13049
13050 /**
13051 * struct x86_init_irqs - platform specific interrupt setup
13052@@ -55,7 +55,7 @@ struct x86_init_irqs {
13053 void (*pre_vector_init)(void);
13054 void (*intr_init)(void);
13055 void (*trap_init)(void);
13056-};
13057+} __no_const;
13058
13059 /**
13060 * struct x86_init_oem - oem platform specific customizing functions
13061@@ -65,7 +65,7 @@ struct x86_init_irqs {
13062 struct x86_init_oem {
13063 void (*arch_setup)(void);
13064 void (*banner)(void);
13065-};
13066+} __no_const;
13067
13068 /**
13069 * struct x86_init_mapping - platform specific initial kernel pagetable setup
13070@@ -76,7 +76,7 @@ struct x86_init_oem {
13071 */
13072 struct x86_init_mapping {
13073 void (*pagetable_reserve)(u64 start, u64 end);
13074-};
13075+} __no_const;
13076
13077 /**
13078 * struct x86_init_paging - platform specific paging functions
13079@@ -86,7 +86,7 @@ struct x86_init_mapping {
13080 struct x86_init_paging {
13081 void (*pagetable_setup_start)(pgd_t *base);
13082 void (*pagetable_setup_done)(pgd_t *base);
13083-};
13084+} __no_const;
13085
13086 /**
13087 * struct x86_init_timers - platform specific timer setup
13088@@ -101,7 +101,7 @@ struct x86_init_timers {
13089 void (*tsc_pre_init)(void);
13090 void (*timer_init)(void);
13091 void (*wallclock_init)(void);
13092-};
13093+} __no_const;
13094
13095 /**
13096 * struct x86_init_iommu - platform specific iommu setup
13097@@ -109,7 +109,7 @@ struct x86_init_timers {
13098 */
13099 struct x86_init_iommu {
13100 int (*iommu_init)(void);
13101-};
13102+} __no_const;
13103
13104 /**
13105 * struct x86_init_pci - platform specific pci init functions
13106@@ -123,7 +123,7 @@ struct x86_init_pci {
13107 int (*init)(void);
13108 void (*init_irq)(void);
13109 void (*fixup_irqs)(void);
13110-};
13111+} __no_const;
13112
13113 /**
13114 * struct x86_init_ops - functions for platform specific setup
13115@@ -139,7 +139,7 @@ struct x86_init_ops {
13116 struct x86_init_timers timers;
13117 struct x86_init_iommu iommu;
13118 struct x86_init_pci pci;
13119-};
13120+} __no_const;
13121
13122 /**
13123 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
13124@@ -147,7 +147,7 @@ struct x86_init_ops {
13125 */
13126 struct x86_cpuinit_ops {
13127 void (*setup_percpu_clockev)(void);
13128-};
13129+} __no_const;
13130
13131 /**
13132 * struct x86_platform_ops - platform specific runtime functions
13133@@ -169,7 +169,7 @@ struct x86_platform_ops {
13134 void (*nmi_init)(void);
13135 unsigned char (*get_nmi_reason)(void);
13136 int (*i8042_detect)(void);
13137-};
13138+} __no_const;
13139
13140 struct pci_dev;
13141
13142@@ -177,7 +177,7 @@ struct x86_msi_ops {
13143 int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
13144 void (*teardown_msi_irq)(unsigned int irq);
13145 void (*teardown_msi_irqs)(struct pci_dev *dev);
13146-};
13147+} __no_const;
13148
13149 extern struct x86_init_ops x86_init;
13150 extern struct x86_cpuinit_ops x86_cpuinit;
13151diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
13152index c6ce245..ffbdab7 100644
13153--- a/arch/x86/include/asm/xsave.h
13154+++ b/arch/x86/include/asm/xsave.h
13155@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13156 {
13157 int err;
13158
13159+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13160+ if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
13161+ buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
13162+#endif
13163+
13164 /*
13165 * Clear the xsave header first, so that reserved fields are
13166 * initialized to zero.
13167@@ -96,10 +101,15 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13168 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
13169 {
13170 int err;
13171- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
13172+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
13173 u32 lmask = mask;
13174 u32 hmask = mask >> 32;
13175
13176+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13177+ if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
13178+ xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
13179+#endif
13180+
13181 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
13182 "2:\n"
13183 ".section .fixup,\"ax\"\n"
13184diff --git a/arch/x86/kernel/acpi/realmode/Makefile b/arch/x86/kernel/acpi/realmode/Makefile
13185index 6a564ac..9b1340c 100644
13186--- a/arch/x86/kernel/acpi/realmode/Makefile
13187+++ b/arch/x86/kernel/acpi/realmode/Makefile
13188@@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D_WAKEUP -D__KERNEL__ \
13189 $(call cc-option, -fno-stack-protector) \
13190 $(call cc-option, -mpreferred-stack-boundary=2)
13191 KBUILD_CFLAGS += $(call cc-option, -m32)
13192+ifdef CONSTIFY_PLUGIN
13193+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
13194+endif
13195 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
13196 GCOV_PROFILE := n
13197
13198diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S
13199index b4fd836..4358fe3 100644
13200--- a/arch/x86/kernel/acpi/realmode/wakeup.S
13201+++ b/arch/x86/kernel/acpi/realmode/wakeup.S
13202@@ -108,6 +108,9 @@ wakeup_code:
13203 /* Do any other stuff... */
13204
13205 #ifndef CONFIG_64BIT
13206+ /* Recheck NX bit overrides (64bit path does this in trampoline */
13207+ call verify_cpu
13208+
13209 /* This could also be done in C code... */
13210 movl pmode_cr3, %eax
13211 movl %eax, %cr3
13212@@ -131,6 +134,7 @@ wakeup_code:
13213 movl pmode_cr0, %eax
13214 movl %eax, %cr0
13215 jmp pmode_return
13216+# include "../../verify_cpu.S"
13217 #else
13218 pushw $0
13219 pushw trampoline_segment
13220diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
13221index 103b6ab..2004d0a 100644
13222--- a/arch/x86/kernel/acpi/sleep.c
13223+++ b/arch/x86/kernel/acpi/sleep.c
13224@@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
13225 header->trampoline_segment = trampoline_address() >> 4;
13226 #ifdef CONFIG_SMP
13227 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
13228+
13229+ pax_open_kernel();
13230 early_gdt_descr.address =
13231 (unsigned long)get_cpu_gdt_table(smp_processor_id());
13232+ pax_close_kernel();
13233+
13234 initial_gs = per_cpu_offset(smp_processor_id());
13235 #endif
13236 initial_code = (unsigned long)wakeup_long64;
13237diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
13238index 13ab720..95d5442 100644
13239--- a/arch/x86/kernel/acpi/wakeup_32.S
13240+++ b/arch/x86/kernel/acpi/wakeup_32.S
13241@@ -30,13 +30,11 @@ wakeup_pmode_return:
13242 # and restore the stack ... but you need gdt for this to work
13243 movl saved_context_esp, %esp
13244
13245- movl %cs:saved_magic, %eax
13246- cmpl $0x12345678, %eax
13247+ cmpl $0x12345678, saved_magic
13248 jne bogus_magic
13249
13250 # jump to place where we left off
13251- movl saved_eip, %eax
13252- jmp *%eax
13253+ jmp *(saved_eip)
13254
13255 bogus_magic:
13256 jmp bogus_magic
13257diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
13258index 1f84794..e23f862 100644
13259--- a/arch/x86/kernel/alternative.c
13260+++ b/arch/x86/kernel/alternative.c
13261@@ -276,6 +276,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
13262 */
13263 for (a = start; a < end; a++) {
13264 instr = (u8 *)&a->instr_offset + a->instr_offset;
13265+
13266+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13267+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13268+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
13269+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13270+#endif
13271+
13272 replacement = (u8 *)&a->repl_offset + a->repl_offset;
13273 BUG_ON(a->replacementlen > a->instrlen);
13274 BUG_ON(a->instrlen > sizeof(insnbuf));
13275@@ -307,10 +314,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
13276 for (poff = start; poff < end; poff++) {
13277 u8 *ptr = (u8 *)poff + *poff;
13278
13279+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13280+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13281+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
13282+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13283+#endif
13284+
13285 if (!*poff || ptr < text || ptr >= text_end)
13286 continue;
13287 /* turn DS segment override prefix into lock prefix */
13288- if (*ptr == 0x3e)
13289+ if (*ktla_ktva(ptr) == 0x3e)
13290 text_poke(ptr, ((unsigned char []){0xf0}), 1);
13291 };
13292 mutex_unlock(&text_mutex);
13293@@ -328,10 +341,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
13294 for (poff = start; poff < end; poff++) {
13295 u8 *ptr = (u8 *)poff + *poff;
13296
13297+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13298+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13299+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
13300+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13301+#endif
13302+
13303 if (!*poff || ptr < text || ptr >= text_end)
13304 continue;
13305 /* turn lock prefix into DS segment override prefix */
13306- if (*ptr == 0xf0)
13307+ if (*ktla_ktva(ptr) == 0xf0)
13308 text_poke(ptr, ((unsigned char []){0x3E}), 1);
13309 };
13310 mutex_unlock(&text_mutex);
13311@@ -500,7 +519,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
13312
13313 BUG_ON(p->len > MAX_PATCH_LEN);
13314 /* prep the buffer with the original instructions */
13315- memcpy(insnbuf, p->instr, p->len);
13316+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
13317 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
13318 (unsigned long)p->instr, p->len);
13319
13320@@ -568,7 +587,7 @@ void __init alternative_instructions(void)
13321 if (smp_alt_once)
13322 free_init_pages("SMP alternatives",
13323 (unsigned long)__smp_locks,
13324- (unsigned long)__smp_locks_end);
13325+ PAGE_ALIGN((unsigned long)__smp_locks_end));
13326
13327 restart_nmi();
13328 }
13329@@ -585,13 +604,17 @@ void __init alternative_instructions(void)
13330 * instructions. And on the local CPU you need to be protected again NMI or MCE
13331 * handlers seeing an inconsistent instruction while you patch.
13332 */
13333-void *__init_or_module text_poke_early(void *addr, const void *opcode,
13334+void *__kprobes text_poke_early(void *addr, const void *opcode,
13335 size_t len)
13336 {
13337 unsigned long flags;
13338 local_irq_save(flags);
13339- memcpy(addr, opcode, len);
13340+
13341+ pax_open_kernel();
13342+ memcpy(ktla_ktva(addr), opcode, len);
13343 sync_core();
13344+ pax_close_kernel();
13345+
13346 local_irq_restore(flags);
13347 /* Could also do a CLFLUSH here to speed up CPU recovery; but
13348 that causes hangs on some VIA CPUs. */
13349@@ -613,36 +636,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
13350 */
13351 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
13352 {
13353- unsigned long flags;
13354- char *vaddr;
13355+ unsigned char *vaddr = ktla_ktva(addr);
13356 struct page *pages[2];
13357- int i;
13358+ size_t i;
13359
13360 if (!core_kernel_text((unsigned long)addr)) {
13361- pages[0] = vmalloc_to_page(addr);
13362- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
13363+ pages[0] = vmalloc_to_page(vaddr);
13364+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
13365 } else {
13366- pages[0] = virt_to_page(addr);
13367+ pages[0] = virt_to_page(vaddr);
13368 WARN_ON(!PageReserved(pages[0]));
13369- pages[1] = virt_to_page(addr + PAGE_SIZE);
13370+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
13371 }
13372 BUG_ON(!pages[0]);
13373- local_irq_save(flags);
13374- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
13375- if (pages[1])
13376- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
13377- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
13378- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
13379- clear_fixmap(FIX_TEXT_POKE0);
13380- if (pages[1])
13381- clear_fixmap(FIX_TEXT_POKE1);
13382- local_flush_tlb();
13383- sync_core();
13384- /* Could also do a CLFLUSH here to speed up CPU recovery; but
13385- that causes hangs on some VIA CPUs. */
13386+ text_poke_early(addr, opcode, len);
13387 for (i = 0; i < len; i++)
13388- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
13389- local_irq_restore(flags);
13390+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
13391 return addr;
13392 }
13393
13394diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
13395index f98d84c..e402a69 100644
13396--- a/arch/x86/kernel/apic/apic.c
13397+++ b/arch/x86/kernel/apic/apic.c
13398@@ -174,7 +174,7 @@ int first_system_vector = 0xfe;
13399 /*
13400 * Debug level, exported for io_apic.c
13401 */
13402-unsigned int apic_verbosity;
13403+int apic_verbosity;
13404
13405 int pic_mode;
13406
13407@@ -1853,7 +1853,7 @@ void smp_error_interrupt(struct pt_regs *regs)
13408 apic_write(APIC_ESR, 0);
13409 v1 = apic_read(APIC_ESR);
13410 ack_APIC_irq();
13411- atomic_inc(&irq_err_count);
13412+ atomic_inc_unchecked(&irq_err_count);
13413
13414 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
13415 smp_processor_id(), v0 , v1);
13416diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
13417index 6d939d7..0697fcc 100644
13418--- a/arch/x86/kernel/apic/io_apic.c
13419+++ b/arch/x86/kernel/apic/io_apic.c
13420@@ -1096,7 +1096,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
13421 }
13422 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
13423
13424-void lock_vector_lock(void)
13425+void lock_vector_lock(void) __acquires(vector_lock)
13426 {
13427 /* Used to the online set of cpus does not change
13428 * during assign_irq_vector.
13429@@ -1104,7 +1104,7 @@ void lock_vector_lock(void)
13430 raw_spin_lock(&vector_lock);
13431 }
13432
13433-void unlock_vector_lock(void)
13434+void unlock_vector_lock(void) __releases(vector_lock)
13435 {
13436 raw_spin_unlock(&vector_lock);
13437 }
13438@@ -2510,7 +2510,7 @@ static void ack_apic_edge(struct irq_data *data)
13439 ack_APIC_irq();
13440 }
13441
13442-atomic_t irq_mis_count;
13443+atomic_unchecked_t irq_mis_count;
13444
13445 static void ack_apic_level(struct irq_data *data)
13446 {
13447@@ -2576,7 +2576,7 @@ static void ack_apic_level(struct irq_data *data)
13448 * at the cpu.
13449 */
13450 if (!(v & (1 << (i & 0x1f)))) {
13451- atomic_inc(&irq_mis_count);
13452+ atomic_inc_unchecked(&irq_mis_count);
13453
13454 eoi_ioapic_irq(irq, cfg);
13455 }
13456diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
13457index a46bd38..6b906d7 100644
13458--- a/arch/x86/kernel/apm_32.c
13459+++ b/arch/x86/kernel/apm_32.c
13460@@ -411,7 +411,7 @@ static DEFINE_MUTEX(apm_mutex);
13461 * This is for buggy BIOS's that refer to (real mode) segment 0x40
13462 * even though they are called in protected mode.
13463 */
13464-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
13465+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
13466 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
13467
13468 static const char driver_version[] = "1.16ac"; /* no spaces */
13469@@ -589,7 +589,10 @@ static long __apm_bios_call(void *_call)
13470 BUG_ON(cpu != 0);
13471 gdt = get_cpu_gdt_table(cpu);
13472 save_desc_40 = gdt[0x40 / 8];
13473+
13474+ pax_open_kernel();
13475 gdt[0x40 / 8] = bad_bios_desc;
13476+ pax_close_kernel();
13477
13478 apm_irq_save(flags);
13479 APM_DO_SAVE_SEGS;
13480@@ -598,7 +601,11 @@ static long __apm_bios_call(void *_call)
13481 &call->esi);
13482 APM_DO_RESTORE_SEGS;
13483 apm_irq_restore(flags);
13484+
13485+ pax_open_kernel();
13486 gdt[0x40 / 8] = save_desc_40;
13487+ pax_close_kernel();
13488+
13489 put_cpu();
13490
13491 return call->eax & 0xff;
13492@@ -665,7 +672,10 @@ static long __apm_bios_call_simple(void *_call)
13493 BUG_ON(cpu != 0);
13494 gdt = get_cpu_gdt_table(cpu);
13495 save_desc_40 = gdt[0x40 / 8];
13496+
13497+ pax_open_kernel();
13498 gdt[0x40 / 8] = bad_bios_desc;
13499+ pax_close_kernel();
13500
13501 apm_irq_save(flags);
13502 APM_DO_SAVE_SEGS;
13503@@ -673,7 +683,11 @@ static long __apm_bios_call_simple(void *_call)
13504 &call->eax);
13505 APM_DO_RESTORE_SEGS;
13506 apm_irq_restore(flags);
13507+
13508+ pax_open_kernel();
13509 gdt[0x40 / 8] = save_desc_40;
13510+ pax_close_kernel();
13511+
13512 put_cpu();
13513 return error;
13514 }
13515@@ -2347,12 +2361,15 @@ static int __init apm_init(void)
13516 * code to that CPU.
13517 */
13518 gdt = get_cpu_gdt_table(0);
13519+
13520+ pax_open_kernel();
13521 set_desc_base(&gdt[APM_CS >> 3],
13522 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
13523 set_desc_base(&gdt[APM_CS_16 >> 3],
13524 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
13525 set_desc_base(&gdt[APM_DS >> 3],
13526 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
13527+ pax_close_kernel();
13528
13529 proc_create("apm", 0, NULL, &apm_file_ops);
13530
13531diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
13532index 4f13faf..87db5d2 100644
13533--- a/arch/x86/kernel/asm-offsets.c
13534+++ b/arch/x86/kernel/asm-offsets.c
13535@@ -33,6 +33,8 @@ void common(void) {
13536 OFFSET(TI_status, thread_info, status);
13537 OFFSET(TI_addr_limit, thread_info, addr_limit);
13538 OFFSET(TI_preempt_count, thread_info, preempt_count);
13539+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
13540+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
13541
13542 BLANK();
13543 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
13544@@ -53,8 +55,26 @@ void common(void) {
13545 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
13546 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
13547 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
13548+
13549+#ifdef CONFIG_PAX_KERNEXEC
13550+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
13551 #endif
13552
13553+#ifdef CONFIG_PAX_MEMORY_UDEREF
13554+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
13555+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
13556+#ifdef CONFIG_X86_64
13557+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
13558+#endif
13559+#endif
13560+
13561+#endif
13562+
13563+ BLANK();
13564+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
13565+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
13566+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
13567+
13568 #ifdef CONFIG_XEN
13569 BLANK();
13570 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
13571diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
13572index e72a119..6e2955d 100644
13573--- a/arch/x86/kernel/asm-offsets_64.c
13574+++ b/arch/x86/kernel/asm-offsets_64.c
13575@@ -69,6 +69,7 @@ int main(void)
13576 BLANK();
13577 #undef ENTRY
13578
13579+ DEFINE(TSS_size, sizeof(struct tss_struct));
13580 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
13581 BLANK();
13582
13583diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
13584index 25f24dc..4094a7f 100644
13585--- a/arch/x86/kernel/cpu/Makefile
13586+++ b/arch/x86/kernel/cpu/Makefile
13587@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
13588 CFLAGS_REMOVE_perf_event.o = -pg
13589 endif
13590
13591-# Make sure load_percpu_segment has no stackprotector
13592-nostackp := $(call cc-option, -fno-stack-protector)
13593-CFLAGS_common.o := $(nostackp)
13594-
13595 obj-y := intel_cacheinfo.o scattered.o topology.o
13596 obj-y += proc.o capflags.o powerflags.o common.o
13597 obj-y += vmware.o hypervisor.o sched.o mshyperv.o
13598diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
13599index 0bab2b1..d0a1bf8 100644
13600--- a/arch/x86/kernel/cpu/amd.c
13601+++ b/arch/x86/kernel/cpu/amd.c
13602@@ -664,7 +664,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
13603 unsigned int size)
13604 {
13605 /* AMD errata T13 (order #21922) */
13606- if ((c->x86 == 6)) {
13607+ if (c->x86 == 6) {
13608 /* Duron Rev A0 */
13609 if (c->x86_model == 3 && c->x86_mask == 0)
13610 size = 64;
13611diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
13612index aa003b1..47ea638 100644
13613--- a/arch/x86/kernel/cpu/common.c
13614+++ b/arch/x86/kernel/cpu/common.c
13615@@ -84,60 +84,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
13616
13617 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
13618
13619-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
13620-#ifdef CONFIG_X86_64
13621- /*
13622- * We need valid kernel segments for data and code in long mode too
13623- * IRET will check the segment types kkeil 2000/10/28
13624- * Also sysret mandates a special GDT layout
13625- *
13626- * TLS descriptors are currently at a different place compared to i386.
13627- * Hopefully nobody expects them at a fixed place (Wine?)
13628- */
13629- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
13630- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
13631- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
13632- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
13633- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
13634- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
13635-#else
13636- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
13637- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13638- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
13639- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
13640- /*
13641- * Segments used for calling PnP BIOS have byte granularity.
13642- * They code segments and data segments have fixed 64k limits,
13643- * the transfer segment sizes are set at run time.
13644- */
13645- /* 32-bit code */
13646- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13647- /* 16-bit code */
13648- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13649- /* 16-bit data */
13650- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
13651- /* 16-bit data */
13652- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
13653- /* 16-bit data */
13654- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
13655- /*
13656- * The APM segments have byte granularity and their bases
13657- * are set at run time. All have 64k limits.
13658- */
13659- /* 32-bit code */
13660- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13661- /* 16-bit code */
13662- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13663- /* data */
13664- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
13665-
13666- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13667- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13668- GDT_STACK_CANARY_INIT
13669-#endif
13670-} };
13671-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
13672-
13673 static int __init x86_xsave_setup(char *s)
13674 {
13675 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
13676@@ -372,7 +318,7 @@ void switch_to_new_gdt(int cpu)
13677 {
13678 struct desc_ptr gdt_descr;
13679
13680- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
13681+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
13682 gdt_descr.size = GDT_SIZE - 1;
13683 load_gdt(&gdt_descr);
13684 /* Reload the per-cpu base */
13685@@ -844,6 +790,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
13686 /* Filter out anything that depends on CPUID levels we don't have */
13687 filter_cpuid_features(c, true);
13688
13689+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
13690+ setup_clear_cpu_cap(X86_FEATURE_SEP);
13691+#endif
13692+
13693 /* If the model name is still unset, do table lookup. */
13694 if (!c->x86_model_id[0]) {
13695 const char *p;
13696@@ -1024,6 +974,9 @@ static __init int setup_disablecpuid(char *arg)
13697 }
13698 __setup("clearcpuid=", setup_disablecpuid);
13699
13700+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
13701+EXPORT_PER_CPU_SYMBOL(current_tinfo);
13702+
13703 #ifdef CONFIG_X86_64
13704 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
13705
13706@@ -1039,7 +992,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
13707 EXPORT_PER_CPU_SYMBOL(current_task);
13708
13709 DEFINE_PER_CPU(unsigned long, kernel_stack) =
13710- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
13711+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
13712 EXPORT_PER_CPU_SYMBOL(kernel_stack);
13713
13714 DEFINE_PER_CPU(char *, irq_stack_ptr) =
13715@@ -1104,7 +1057,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
13716 {
13717 memset(regs, 0, sizeof(struct pt_regs));
13718 regs->fs = __KERNEL_PERCPU;
13719- regs->gs = __KERNEL_STACK_CANARY;
13720+ savesegment(gs, regs->gs);
13721
13722 return regs;
13723 }
13724@@ -1159,7 +1112,7 @@ void __cpuinit cpu_init(void)
13725 int i;
13726
13727 cpu = stack_smp_processor_id();
13728- t = &per_cpu(init_tss, cpu);
13729+ t = init_tss + cpu;
13730 oist = &per_cpu(orig_ist, cpu);
13731
13732 #ifdef CONFIG_NUMA
13733@@ -1185,7 +1138,7 @@ void __cpuinit cpu_init(void)
13734 switch_to_new_gdt(cpu);
13735 loadsegment(fs, 0);
13736
13737- load_idt((const struct desc_ptr *)&idt_descr);
13738+ load_idt(&idt_descr);
13739
13740 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
13741 syscall_init();
13742@@ -1194,7 +1147,6 @@ void __cpuinit cpu_init(void)
13743 wrmsrl(MSR_KERNEL_GS_BASE, 0);
13744 barrier();
13745
13746- x86_configure_nx();
13747 if (cpu != 0)
13748 enable_x2apic();
13749
13750@@ -1248,7 +1200,7 @@ void __cpuinit cpu_init(void)
13751 {
13752 int cpu = smp_processor_id();
13753 struct task_struct *curr = current;
13754- struct tss_struct *t = &per_cpu(init_tss, cpu);
13755+ struct tss_struct *t = init_tss + cpu;
13756 struct thread_struct *thread = &curr->thread;
13757
13758 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
13759diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
13760index 5231312..a78a987 100644
13761--- a/arch/x86/kernel/cpu/intel.c
13762+++ b/arch/x86/kernel/cpu/intel.c
13763@@ -174,7 +174,7 @@ static void __cpuinit trap_init_f00f_bug(void)
13764 * Update the IDT descriptor and reload the IDT so that
13765 * it uses the read-only mapped virtual address.
13766 */
13767- idt_descr.address = fix_to_virt(FIX_F00F_IDT);
13768+ idt_descr.address = (struct desc_struct *)fix_to_virt(FIX_F00F_IDT);
13769 load_idt(&idt_descr);
13770 }
13771 #endif
13772diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13773index 319882e..993534e 100644
13774--- a/arch/x86/kernel/cpu/mcheck/mce-inject.c
13775+++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13776@@ -173,6 +173,8 @@ static void raise_mce(struct mce *m)
13777
13778 /* Error injection interface */
13779 static ssize_t mce_write(struct file *filp, const char __user *ubuf,
13780+ size_t usize, loff_t *off) __size_overflow(3);
13781+static ssize_t mce_write(struct file *filp, const char __user *ubuf,
13782 size_t usize, loff_t *off)
13783 {
13784 struct mce m;
13785diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
13786index 2af127d..8ff7ac0 100644
13787--- a/arch/x86/kernel/cpu/mcheck/mce.c
13788+++ b/arch/x86/kernel/cpu/mcheck/mce.c
13789@@ -42,6 +42,7 @@
13790 #include <asm/processor.h>
13791 #include <asm/mce.h>
13792 #include <asm/msr.h>
13793+#include <asm/local.h>
13794
13795 #include "mce-internal.h"
13796
13797@@ -202,7 +203,7 @@ static void print_mce(struct mce *m)
13798 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
13799 m->cs, m->ip);
13800
13801- if (m->cs == __KERNEL_CS)
13802+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
13803 print_symbol("{%s}", m->ip);
13804 pr_cont("\n");
13805 }
13806@@ -235,10 +236,10 @@ static void print_mce(struct mce *m)
13807
13808 #define PANIC_TIMEOUT 5 /* 5 seconds */
13809
13810-static atomic_t mce_paniced;
13811+static atomic_unchecked_t mce_paniced;
13812
13813 static int fake_panic;
13814-static atomic_t mce_fake_paniced;
13815+static atomic_unchecked_t mce_fake_paniced;
13816
13817 /* Panic in progress. Enable interrupts and wait for final IPI */
13818 static void wait_for_panic(void)
13819@@ -262,7 +263,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
13820 /*
13821 * Make sure only one CPU runs in machine check panic
13822 */
13823- if (atomic_inc_return(&mce_paniced) > 1)
13824+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
13825 wait_for_panic();
13826 barrier();
13827
13828@@ -270,7 +271,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
13829 console_verbose();
13830 } else {
13831 /* Don't log too much for fake panic */
13832- if (atomic_inc_return(&mce_fake_paniced) > 1)
13833+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
13834 return;
13835 }
13836 /* First print corrected ones that are still unlogged */
13837@@ -610,7 +611,7 @@ static int mce_timed_out(u64 *t)
13838 * might have been modified by someone else.
13839 */
13840 rmb();
13841- if (atomic_read(&mce_paniced))
13842+ if (atomic_read_unchecked(&mce_paniced))
13843 wait_for_panic();
13844 if (!monarch_timeout)
13845 goto out;
13846@@ -1398,7 +1399,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
13847 }
13848
13849 /* Call the installed machine check handler for this CPU setup. */
13850-void (*machine_check_vector)(struct pt_regs *, long error_code) =
13851+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
13852 unexpected_machine_check;
13853
13854 /*
13855@@ -1421,7 +1422,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
13856 return;
13857 }
13858
13859+ pax_open_kernel();
13860 machine_check_vector = do_machine_check;
13861+ pax_close_kernel();
13862
13863 __mcheck_cpu_init_generic();
13864 __mcheck_cpu_init_vendor(c);
13865@@ -1435,7 +1438,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
13866 */
13867
13868 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
13869-static int mce_chrdev_open_count; /* #times opened */
13870+static local_t mce_chrdev_open_count; /* #times opened */
13871 static int mce_chrdev_open_exclu; /* already open exclusive? */
13872
13873 static int mce_chrdev_open(struct inode *inode, struct file *file)
13874@@ -1443,7 +1446,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
13875 spin_lock(&mce_chrdev_state_lock);
13876
13877 if (mce_chrdev_open_exclu ||
13878- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
13879+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
13880 spin_unlock(&mce_chrdev_state_lock);
13881
13882 return -EBUSY;
13883@@ -1451,7 +1454,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
13884
13885 if (file->f_flags & O_EXCL)
13886 mce_chrdev_open_exclu = 1;
13887- mce_chrdev_open_count++;
13888+ local_inc(&mce_chrdev_open_count);
13889
13890 spin_unlock(&mce_chrdev_state_lock);
13891
13892@@ -1462,7 +1465,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
13893 {
13894 spin_lock(&mce_chrdev_state_lock);
13895
13896- mce_chrdev_open_count--;
13897+ local_dec(&mce_chrdev_open_count);
13898 mce_chrdev_open_exclu = 0;
13899
13900 spin_unlock(&mce_chrdev_state_lock);
13901@@ -2171,7 +2174,7 @@ struct dentry *mce_get_debugfs_dir(void)
13902 static void mce_reset(void)
13903 {
13904 cpu_missing = 0;
13905- atomic_set(&mce_fake_paniced, 0);
13906+ atomic_set_unchecked(&mce_fake_paniced, 0);
13907 atomic_set(&mce_executing, 0);
13908 atomic_set(&mce_callin, 0);
13909 atomic_set(&global_nwo, 0);
13910diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
13911index 5c0e653..0882b0a 100644
13912--- a/arch/x86/kernel/cpu/mcheck/p5.c
13913+++ b/arch/x86/kernel/cpu/mcheck/p5.c
13914@@ -12,6 +12,7 @@
13915 #include <asm/system.h>
13916 #include <asm/mce.h>
13917 #include <asm/msr.h>
13918+#include <asm/pgtable.h>
13919
13920 /* By default disabled */
13921 int mce_p5_enabled __read_mostly;
13922@@ -50,7 +51,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
13923 if (!cpu_has(c, X86_FEATURE_MCE))
13924 return;
13925
13926+ pax_open_kernel();
13927 machine_check_vector = pentium_machine_check;
13928+ pax_close_kernel();
13929 /* Make sure the vector pointer is visible before we enable MCEs: */
13930 wmb();
13931
13932diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
13933index 54060f5..c1a7577 100644
13934--- a/arch/x86/kernel/cpu/mcheck/winchip.c
13935+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
13936@@ -11,6 +11,7 @@
13937 #include <asm/system.h>
13938 #include <asm/mce.h>
13939 #include <asm/msr.h>
13940+#include <asm/pgtable.h>
13941
13942 /* Machine check handler for WinChip C6: */
13943 static void winchip_machine_check(struct pt_regs *regs, long error_code)
13944@@ -24,7 +25,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
13945 {
13946 u32 lo, hi;
13947
13948+ pax_open_kernel();
13949 machine_check_vector = winchip_machine_check;
13950+ pax_close_kernel();
13951 /* Make sure the vector pointer is visible before we enable MCEs: */
13952 wmb();
13953
13954diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
13955index 7928963..1b16001 100644
13956--- a/arch/x86/kernel/cpu/mtrr/if.c
13957+++ b/arch/x86/kernel/cpu/mtrr/if.c
13958@@ -91,6 +91,8 @@ mtrr_file_del(unsigned long base, unsigned long size,
13959 * "base=%Lx size=%Lx type=%s" or "disable=%d"
13960 */
13961 static ssize_t
13962+mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos) __size_overflow(3);
13963+static ssize_t
13964 mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos)
13965 {
13966 int i, err;
13967diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
13968index 6b96110..0da73eb 100644
13969--- a/arch/x86/kernel/cpu/mtrr/main.c
13970+++ b/arch/x86/kernel/cpu/mtrr/main.c
13971@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
13972 u64 size_or_mask, size_and_mask;
13973 static bool mtrr_aps_delayed_init;
13974
13975-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
13976+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
13977
13978 const struct mtrr_ops *mtrr_if;
13979
13980diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
13981index df5e41f..816c719 100644
13982--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
13983+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
13984@@ -25,7 +25,7 @@ struct mtrr_ops {
13985 int (*validate_add_page)(unsigned long base, unsigned long size,
13986 unsigned int type);
13987 int (*have_wrcomb)(void);
13988-};
13989+} __do_const;
13990
13991 extern int generic_get_free_region(unsigned long base, unsigned long size,
13992 int replace_reg);
13993diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
13994index 2bda212..78cc605 100644
13995--- a/arch/x86/kernel/cpu/perf_event.c
13996+++ b/arch/x86/kernel/cpu/perf_event.c
13997@@ -1529,7 +1529,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
13998 break;
13999
14000 perf_callchain_store(entry, frame.return_address);
14001- fp = frame.next_frame;
14002+ fp = (const void __force_user *)frame.next_frame;
14003 }
14004 }
14005
14006diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
14007index 13ad899..f642b9a 100644
14008--- a/arch/x86/kernel/crash.c
14009+++ b/arch/x86/kernel/crash.c
14010@@ -36,10 +36,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
14011 {
14012 #ifdef CONFIG_X86_32
14013 struct pt_regs fixed_regs;
14014-#endif
14015
14016-#ifdef CONFIG_X86_32
14017- if (!user_mode_vm(regs)) {
14018+ if (!user_mode(regs)) {
14019 crash_fixup_ss_esp(&fixed_regs, regs);
14020 regs = &fixed_regs;
14021 }
14022diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
14023index 37250fe..bf2ec74 100644
14024--- a/arch/x86/kernel/doublefault_32.c
14025+++ b/arch/x86/kernel/doublefault_32.c
14026@@ -11,7 +11,7 @@
14027
14028 #define DOUBLEFAULT_STACKSIZE (1024)
14029 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
14030-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
14031+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
14032
14033 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
14034
14035@@ -21,7 +21,7 @@ static void doublefault_fn(void)
14036 unsigned long gdt, tss;
14037
14038 store_gdt(&gdt_desc);
14039- gdt = gdt_desc.address;
14040+ gdt = (unsigned long)gdt_desc.address;
14041
14042 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
14043
14044@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
14045 /* 0x2 bit is always set */
14046 .flags = X86_EFLAGS_SF | 0x2,
14047 .sp = STACK_START,
14048- .es = __USER_DS,
14049+ .es = __KERNEL_DS,
14050 .cs = __KERNEL_CS,
14051 .ss = __KERNEL_DS,
14052- .ds = __USER_DS,
14053+ .ds = __KERNEL_DS,
14054 .fs = __KERNEL_PERCPU,
14055
14056 .__cr3 = __pa_nodebug(swapper_pg_dir),
14057diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
14058index 1aae78f..aab3a3d 100644
14059--- a/arch/x86/kernel/dumpstack.c
14060+++ b/arch/x86/kernel/dumpstack.c
14061@@ -2,6 +2,9 @@
14062 * Copyright (C) 1991, 1992 Linus Torvalds
14063 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
14064 */
14065+#ifdef CONFIG_GRKERNSEC_HIDESYM
14066+#define __INCLUDED_BY_HIDESYM 1
14067+#endif
14068 #include <linux/kallsyms.h>
14069 #include <linux/kprobes.h>
14070 #include <linux/uaccess.h>
14071@@ -35,9 +38,8 @@ void printk_address(unsigned long address, int reliable)
14072 static void
14073 print_ftrace_graph_addr(unsigned long addr, void *data,
14074 const struct stacktrace_ops *ops,
14075- struct thread_info *tinfo, int *graph)
14076+ struct task_struct *task, int *graph)
14077 {
14078- struct task_struct *task = tinfo->task;
14079 unsigned long ret_addr;
14080 int index = task->curr_ret_stack;
14081
14082@@ -58,7 +60,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14083 static inline void
14084 print_ftrace_graph_addr(unsigned long addr, void *data,
14085 const struct stacktrace_ops *ops,
14086- struct thread_info *tinfo, int *graph)
14087+ struct task_struct *task, int *graph)
14088 { }
14089 #endif
14090
14091@@ -69,10 +71,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14092 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
14093 */
14094
14095-static inline int valid_stack_ptr(struct thread_info *tinfo,
14096- void *p, unsigned int size, void *end)
14097+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
14098 {
14099- void *t = tinfo;
14100 if (end) {
14101 if (p < end && p >= (end-THREAD_SIZE))
14102 return 1;
14103@@ -83,14 +83,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
14104 }
14105
14106 unsigned long
14107-print_context_stack(struct thread_info *tinfo,
14108+print_context_stack(struct task_struct *task, void *stack_start,
14109 unsigned long *stack, unsigned long bp,
14110 const struct stacktrace_ops *ops, void *data,
14111 unsigned long *end, int *graph)
14112 {
14113 struct stack_frame *frame = (struct stack_frame *)bp;
14114
14115- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
14116+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
14117 unsigned long addr;
14118
14119 addr = *stack;
14120@@ -102,7 +102,7 @@ print_context_stack(struct thread_info *tinfo,
14121 } else {
14122 ops->address(data, addr, 0);
14123 }
14124- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14125+ print_ftrace_graph_addr(addr, data, ops, task, graph);
14126 }
14127 stack++;
14128 }
14129@@ -111,7 +111,7 @@ print_context_stack(struct thread_info *tinfo,
14130 EXPORT_SYMBOL_GPL(print_context_stack);
14131
14132 unsigned long
14133-print_context_stack_bp(struct thread_info *tinfo,
14134+print_context_stack_bp(struct task_struct *task, void *stack_start,
14135 unsigned long *stack, unsigned long bp,
14136 const struct stacktrace_ops *ops, void *data,
14137 unsigned long *end, int *graph)
14138@@ -119,7 +119,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14139 struct stack_frame *frame = (struct stack_frame *)bp;
14140 unsigned long *ret_addr = &frame->return_address;
14141
14142- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
14143+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
14144 unsigned long addr = *ret_addr;
14145
14146 if (!__kernel_text_address(addr))
14147@@ -128,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14148 ops->address(data, addr, 1);
14149 frame = frame->next_frame;
14150 ret_addr = &frame->return_address;
14151- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14152+ print_ftrace_graph_addr(addr, data, ops, task, graph);
14153 }
14154
14155 return (unsigned long)frame;
14156@@ -186,7 +186,7 @@ void dump_stack(void)
14157
14158 bp = stack_frame(current, NULL);
14159 printk("Pid: %d, comm: %.20s %s %s %.*s\n",
14160- current->pid, current->comm, print_tainted(),
14161+ task_pid_nr(current), current->comm, print_tainted(),
14162 init_utsname()->release,
14163 (int)strcspn(init_utsname()->version, " "),
14164 init_utsname()->version);
14165@@ -222,6 +222,8 @@ unsigned __kprobes long oops_begin(void)
14166 }
14167 EXPORT_SYMBOL_GPL(oops_begin);
14168
14169+extern void gr_handle_kernel_exploit(void);
14170+
14171 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14172 {
14173 if (regs && kexec_should_crash(current))
14174@@ -243,7 +245,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14175 panic("Fatal exception in interrupt");
14176 if (panic_on_oops)
14177 panic("Fatal exception");
14178- do_exit(signr);
14179+
14180+ gr_handle_kernel_exploit();
14181+
14182+ do_group_exit(signr);
14183 }
14184
14185 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14186@@ -269,7 +274,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14187
14188 show_registers(regs);
14189 #ifdef CONFIG_X86_32
14190- if (user_mode_vm(regs)) {
14191+ if (user_mode(regs)) {
14192 sp = regs->sp;
14193 ss = regs->ss & 0xffff;
14194 } else {
14195@@ -297,7 +302,7 @@ void die(const char *str, struct pt_regs *regs, long err)
14196 unsigned long flags = oops_begin();
14197 int sig = SIGSEGV;
14198
14199- if (!user_mode_vm(regs))
14200+ if (!user_mode(regs))
14201 report_bug(regs->ip, regs);
14202
14203 if (__die(str, regs, err))
14204diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
14205index c99f9ed..2a15d80 100644
14206--- a/arch/x86/kernel/dumpstack_32.c
14207+++ b/arch/x86/kernel/dumpstack_32.c
14208@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14209 bp = stack_frame(task, regs);
14210
14211 for (;;) {
14212- struct thread_info *context;
14213+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14214
14215- context = (struct thread_info *)
14216- ((unsigned long)stack & (~(THREAD_SIZE - 1)));
14217- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
14218+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14219
14220- stack = (unsigned long *)context->previous_esp;
14221- if (!stack)
14222+ if (stack_start == task_stack_page(task))
14223 break;
14224+ stack = *(unsigned long **)stack_start;
14225 if (ops->stack(data, "IRQ") < 0)
14226 break;
14227 touch_nmi_watchdog();
14228@@ -96,21 +94,22 @@ void show_registers(struct pt_regs *regs)
14229 * When in-kernel, we also print out the stack and code at the
14230 * time of the fault..
14231 */
14232- if (!user_mode_vm(regs)) {
14233+ if (!user_mode(regs)) {
14234 unsigned int code_prologue = code_bytes * 43 / 64;
14235 unsigned int code_len = code_bytes;
14236 unsigned char c;
14237 u8 *ip;
14238+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
14239
14240 printk(KERN_EMERG "Stack:\n");
14241 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
14242
14243 printk(KERN_EMERG "Code: ");
14244
14245- ip = (u8 *)regs->ip - code_prologue;
14246+ ip = (u8 *)regs->ip - code_prologue + cs_base;
14247 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
14248 /* try starting at IP */
14249- ip = (u8 *)regs->ip;
14250+ ip = (u8 *)regs->ip + cs_base;
14251 code_len = code_len - code_prologue + 1;
14252 }
14253 for (i = 0; i < code_len; i++, ip++) {
14254@@ -119,7 +118,7 @@ void show_registers(struct pt_regs *regs)
14255 printk(KERN_CONT " Bad EIP value.");
14256 break;
14257 }
14258- if (ip == (u8 *)regs->ip)
14259+ if (ip == (u8 *)regs->ip + cs_base)
14260 printk(KERN_CONT "<%02x> ", c);
14261 else
14262 printk(KERN_CONT "%02x ", c);
14263@@ -132,6 +131,7 @@ int is_valid_bugaddr(unsigned long ip)
14264 {
14265 unsigned short ud2;
14266
14267+ ip = ktla_ktva(ip);
14268 if (ip < PAGE_OFFSET)
14269 return 0;
14270 if (probe_kernel_address((unsigned short *)ip, ud2))
14271@@ -139,3 +139,15 @@ int is_valid_bugaddr(unsigned long ip)
14272
14273 return ud2 == 0x0b0f;
14274 }
14275+
14276+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14277+void pax_check_alloca(unsigned long size)
14278+{
14279+ unsigned long sp = (unsigned long)&sp, stack_left;
14280+
14281+ /* all kernel stacks are of the same size */
14282+ stack_left = sp & (THREAD_SIZE - 1);
14283+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14284+}
14285+EXPORT_SYMBOL(pax_check_alloca);
14286+#endif
14287diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
14288index 6d728d9..279514e 100644
14289--- a/arch/x86/kernel/dumpstack_64.c
14290+++ b/arch/x86/kernel/dumpstack_64.c
14291@@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14292 unsigned long *irq_stack_end =
14293 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
14294 unsigned used = 0;
14295- struct thread_info *tinfo;
14296 int graph = 0;
14297 unsigned long dummy;
14298+ void *stack_start;
14299
14300 if (!task)
14301 task = current;
14302@@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14303 * current stack address. If the stacks consist of nested
14304 * exceptions
14305 */
14306- tinfo = task_thread_info(task);
14307 for (;;) {
14308 char *id;
14309 unsigned long *estack_end;
14310+
14311 estack_end = in_exception_stack(cpu, (unsigned long)stack,
14312 &used, &id);
14313
14314@@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14315 if (ops->stack(data, id) < 0)
14316 break;
14317
14318- bp = ops->walk_stack(tinfo, stack, bp, ops,
14319+ bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
14320 data, estack_end, &graph);
14321 ops->stack(data, "<EOE>");
14322 /*
14323@@ -172,7 +172,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14324 if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
14325 if (ops->stack(data, "IRQ") < 0)
14326 break;
14327- bp = ops->walk_stack(tinfo, stack, bp,
14328+ bp = ops->walk_stack(task, irq_stack, stack, bp,
14329 ops, data, irq_stack_end, &graph);
14330 /*
14331 * We link to the next stack (which would be
14332@@ -191,7 +191,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14333 /*
14334 * This handles the process stack:
14335 */
14336- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
14337+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14338+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14339 put_cpu();
14340 }
14341 EXPORT_SYMBOL(dump_trace);
14342@@ -305,3 +306,50 @@ int is_valid_bugaddr(unsigned long ip)
14343
14344 return ud2 == 0x0b0f;
14345 }
14346+
14347+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14348+void pax_check_alloca(unsigned long size)
14349+{
14350+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
14351+ unsigned cpu, used;
14352+ char *id;
14353+
14354+ /* check the process stack first */
14355+ stack_start = (unsigned long)task_stack_page(current);
14356+ stack_end = stack_start + THREAD_SIZE;
14357+ if (likely(stack_start <= sp && sp < stack_end)) {
14358+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
14359+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14360+ return;
14361+ }
14362+
14363+ cpu = get_cpu();
14364+
14365+ /* check the irq stacks */
14366+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
14367+ stack_start = stack_end - IRQ_STACK_SIZE;
14368+ if (stack_start <= sp && sp < stack_end) {
14369+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
14370+ put_cpu();
14371+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14372+ return;
14373+ }
14374+
14375+ /* check the exception stacks */
14376+ used = 0;
14377+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
14378+ stack_start = stack_end - EXCEPTION_STKSZ;
14379+ if (stack_end && stack_start <= sp && sp < stack_end) {
14380+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
14381+ put_cpu();
14382+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14383+ return;
14384+ }
14385+
14386+ put_cpu();
14387+
14388+ /* unknown stack */
14389+ BUG();
14390+}
14391+EXPORT_SYMBOL(pax_check_alloca);
14392+#endif
14393diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
14394index cd28a35..c72ed9a 100644
14395--- a/arch/x86/kernel/early_printk.c
14396+++ b/arch/x86/kernel/early_printk.c
14397@@ -7,6 +7,7 @@
14398 #include <linux/pci_regs.h>
14399 #include <linux/pci_ids.h>
14400 #include <linux/errno.h>
14401+#include <linux/sched.h>
14402 #include <asm/io.h>
14403 #include <asm/processor.h>
14404 #include <asm/fcntl.h>
14405diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
14406index f3f6f53..0841b66 100644
14407--- a/arch/x86/kernel/entry_32.S
14408+++ b/arch/x86/kernel/entry_32.S
14409@@ -186,13 +186,146 @@
14410 /*CFI_REL_OFFSET gs, PT_GS*/
14411 .endm
14412 .macro SET_KERNEL_GS reg
14413+
14414+#ifdef CONFIG_CC_STACKPROTECTOR
14415 movl $(__KERNEL_STACK_CANARY), \reg
14416+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
14417+ movl $(__USER_DS), \reg
14418+#else
14419+ xorl \reg, \reg
14420+#endif
14421+
14422 movl \reg, %gs
14423 .endm
14424
14425 #endif /* CONFIG_X86_32_LAZY_GS */
14426
14427-.macro SAVE_ALL
14428+.macro pax_enter_kernel
14429+#ifdef CONFIG_PAX_KERNEXEC
14430+ call pax_enter_kernel
14431+#endif
14432+.endm
14433+
14434+.macro pax_exit_kernel
14435+#ifdef CONFIG_PAX_KERNEXEC
14436+ call pax_exit_kernel
14437+#endif
14438+.endm
14439+
14440+#ifdef CONFIG_PAX_KERNEXEC
14441+ENTRY(pax_enter_kernel)
14442+#ifdef CONFIG_PARAVIRT
14443+ pushl %eax
14444+ pushl %ecx
14445+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
14446+ mov %eax, %esi
14447+#else
14448+ mov %cr0, %esi
14449+#endif
14450+ bts $16, %esi
14451+ jnc 1f
14452+ mov %cs, %esi
14453+ cmp $__KERNEL_CS, %esi
14454+ jz 3f
14455+ ljmp $__KERNEL_CS, $3f
14456+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
14457+2:
14458+#ifdef CONFIG_PARAVIRT
14459+ mov %esi, %eax
14460+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
14461+#else
14462+ mov %esi, %cr0
14463+#endif
14464+3:
14465+#ifdef CONFIG_PARAVIRT
14466+ popl %ecx
14467+ popl %eax
14468+#endif
14469+ ret
14470+ENDPROC(pax_enter_kernel)
14471+
14472+ENTRY(pax_exit_kernel)
14473+#ifdef CONFIG_PARAVIRT
14474+ pushl %eax
14475+ pushl %ecx
14476+#endif
14477+ mov %cs, %esi
14478+ cmp $__KERNEXEC_KERNEL_CS, %esi
14479+ jnz 2f
14480+#ifdef CONFIG_PARAVIRT
14481+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
14482+ mov %eax, %esi
14483+#else
14484+ mov %cr0, %esi
14485+#endif
14486+ btr $16, %esi
14487+ ljmp $__KERNEL_CS, $1f
14488+1:
14489+#ifdef CONFIG_PARAVIRT
14490+ mov %esi, %eax
14491+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
14492+#else
14493+ mov %esi, %cr0
14494+#endif
14495+2:
14496+#ifdef CONFIG_PARAVIRT
14497+ popl %ecx
14498+ popl %eax
14499+#endif
14500+ ret
14501+ENDPROC(pax_exit_kernel)
14502+#endif
14503+
14504+.macro pax_erase_kstack
14505+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14506+ call pax_erase_kstack
14507+#endif
14508+.endm
14509+
14510+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14511+/*
14512+ * ebp: thread_info
14513+ * ecx, edx: can be clobbered
14514+ */
14515+ENTRY(pax_erase_kstack)
14516+ pushl %edi
14517+ pushl %eax
14518+
14519+ mov TI_lowest_stack(%ebp), %edi
14520+ mov $-0xBEEF, %eax
14521+ std
14522+
14523+1: mov %edi, %ecx
14524+ and $THREAD_SIZE_asm - 1, %ecx
14525+ shr $2, %ecx
14526+ repne scasl
14527+ jecxz 2f
14528+
14529+ cmp $2*16, %ecx
14530+ jc 2f
14531+
14532+ mov $2*16, %ecx
14533+ repe scasl
14534+ jecxz 2f
14535+ jne 1b
14536+
14537+2: cld
14538+ mov %esp, %ecx
14539+ sub %edi, %ecx
14540+ shr $2, %ecx
14541+ rep stosl
14542+
14543+ mov TI_task_thread_sp0(%ebp), %edi
14544+ sub $128, %edi
14545+ mov %edi, TI_lowest_stack(%ebp)
14546+
14547+ popl %eax
14548+ popl %edi
14549+ ret
14550+ENDPROC(pax_erase_kstack)
14551+#endif
14552+
14553+.macro __SAVE_ALL _DS
14554 cld
14555 PUSH_GS
14556 pushl_cfi %fs
14557@@ -215,7 +348,7 @@
14558 CFI_REL_OFFSET ecx, 0
14559 pushl_cfi %ebx
14560 CFI_REL_OFFSET ebx, 0
14561- movl $(__USER_DS), %edx
14562+ movl $\_DS, %edx
14563 movl %edx, %ds
14564 movl %edx, %es
14565 movl $(__KERNEL_PERCPU), %edx
14566@@ -223,6 +356,15 @@
14567 SET_KERNEL_GS %edx
14568 .endm
14569
14570+.macro SAVE_ALL
14571+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
14572+ __SAVE_ALL __KERNEL_DS
14573+ pax_enter_kernel
14574+#else
14575+ __SAVE_ALL __USER_DS
14576+#endif
14577+.endm
14578+
14579 .macro RESTORE_INT_REGS
14580 popl_cfi %ebx
14581 CFI_RESTORE ebx
14582@@ -308,7 +450,7 @@ ENTRY(ret_from_fork)
14583 popfl_cfi
14584 jmp syscall_exit
14585 CFI_ENDPROC
14586-END(ret_from_fork)
14587+ENDPROC(ret_from_fork)
14588
14589 /*
14590 * Interrupt exit functions should be protected against kprobes
14591@@ -333,7 +475,15 @@ check_userspace:
14592 movb PT_CS(%esp), %al
14593 andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
14594 cmpl $USER_RPL, %eax
14595+
14596+#ifdef CONFIG_PAX_KERNEXEC
14597+ jae resume_userspace
14598+
14599+ PAX_EXIT_KERNEL
14600+ jmp resume_kernel
14601+#else
14602 jb resume_kernel # not returning to v8086 or userspace
14603+#endif
14604
14605 ENTRY(resume_userspace)
14606 LOCKDEP_SYS_EXIT
14607@@ -345,8 +495,8 @@ ENTRY(resume_userspace)
14608 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
14609 # int/exception return?
14610 jne work_pending
14611- jmp restore_all
14612-END(ret_from_exception)
14613+ jmp restore_all_pax
14614+ENDPROC(ret_from_exception)
14615
14616 #ifdef CONFIG_PREEMPT
14617 ENTRY(resume_kernel)
14618@@ -361,7 +511,7 @@ need_resched:
14619 jz restore_all
14620 call preempt_schedule_irq
14621 jmp need_resched
14622-END(resume_kernel)
14623+ENDPROC(resume_kernel)
14624 #endif
14625 CFI_ENDPROC
14626 /*
14627@@ -395,23 +545,34 @@ sysenter_past_esp:
14628 /*CFI_REL_OFFSET cs, 0*/
14629 /*
14630 * Push current_thread_info()->sysenter_return to the stack.
14631- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
14632- * pushed above; +8 corresponds to copy_thread's esp0 setting.
14633 */
14634- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
14635+ pushl_cfi $0
14636 CFI_REL_OFFSET eip, 0
14637
14638 pushl_cfi %eax
14639 SAVE_ALL
14640+ GET_THREAD_INFO(%ebp)
14641+ movl TI_sysenter_return(%ebp),%ebp
14642+ movl %ebp,PT_EIP(%esp)
14643 ENABLE_INTERRUPTS(CLBR_NONE)
14644
14645 /*
14646 * Load the potential sixth argument from user stack.
14647 * Careful about security.
14648 */
14649+ movl PT_OLDESP(%esp),%ebp
14650+
14651+#ifdef CONFIG_PAX_MEMORY_UDEREF
14652+ mov PT_OLDSS(%esp),%ds
14653+1: movl %ds:(%ebp),%ebp
14654+ push %ss
14655+ pop %ds
14656+#else
14657 cmpl $__PAGE_OFFSET-3,%ebp
14658 jae syscall_fault
14659 1: movl (%ebp),%ebp
14660+#endif
14661+
14662 movl %ebp,PT_EBP(%esp)
14663 .section __ex_table,"a"
14664 .align 4
14665@@ -434,12 +595,24 @@ sysenter_do_call:
14666 testl $_TIF_ALLWORK_MASK, %ecx
14667 jne sysexit_audit
14668 sysenter_exit:
14669+
14670+#ifdef CONFIG_PAX_RANDKSTACK
14671+ pushl_cfi %eax
14672+ movl %esp, %eax
14673+ call pax_randomize_kstack
14674+ popl_cfi %eax
14675+#endif
14676+
14677+ pax_erase_kstack
14678+
14679 /* if something modifies registers it must also disable sysexit */
14680 movl PT_EIP(%esp), %edx
14681 movl PT_OLDESP(%esp), %ecx
14682 xorl %ebp,%ebp
14683 TRACE_IRQS_ON
14684 1: mov PT_FS(%esp), %fs
14685+2: mov PT_DS(%esp), %ds
14686+3: mov PT_ES(%esp), %es
14687 PTGS_TO_GS
14688 ENABLE_INTERRUPTS_SYSEXIT
14689
14690@@ -456,6 +629,9 @@ sysenter_audit:
14691 movl %eax,%edx /* 2nd arg: syscall number */
14692 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
14693 call audit_syscall_entry
14694+
14695+ pax_erase_kstack
14696+
14697 pushl_cfi %ebx
14698 movl PT_EAX(%esp),%eax /* reload syscall number */
14699 jmp sysenter_do_call
14700@@ -482,11 +658,17 @@ sysexit_audit:
14701
14702 CFI_ENDPROC
14703 .pushsection .fixup,"ax"
14704-2: movl $0,PT_FS(%esp)
14705+4: movl $0,PT_FS(%esp)
14706+ jmp 1b
14707+5: movl $0,PT_DS(%esp)
14708+ jmp 1b
14709+6: movl $0,PT_ES(%esp)
14710 jmp 1b
14711 .section __ex_table,"a"
14712 .align 4
14713- .long 1b,2b
14714+ .long 1b,4b
14715+ .long 2b,5b
14716+ .long 3b,6b
14717 .popsection
14718 PTGS_TO_GS_EX
14719 ENDPROC(ia32_sysenter_target)
14720@@ -519,6 +701,15 @@ syscall_exit:
14721 testl $_TIF_ALLWORK_MASK, %ecx # current->work
14722 jne syscall_exit_work
14723
14724+restore_all_pax:
14725+
14726+#ifdef CONFIG_PAX_RANDKSTACK
14727+ movl %esp, %eax
14728+ call pax_randomize_kstack
14729+#endif
14730+
14731+ pax_erase_kstack
14732+
14733 restore_all:
14734 TRACE_IRQS_IRET
14735 restore_all_notrace:
14736@@ -578,14 +769,34 @@ ldt_ss:
14737 * compensating for the offset by changing to the ESPFIX segment with
14738 * a base address that matches for the difference.
14739 */
14740-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
14741+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
14742 mov %esp, %edx /* load kernel esp */
14743 mov PT_OLDESP(%esp), %eax /* load userspace esp */
14744 mov %dx, %ax /* eax: new kernel esp */
14745 sub %eax, %edx /* offset (low word is 0) */
14746+#ifdef CONFIG_SMP
14747+ movl PER_CPU_VAR(cpu_number), %ebx
14748+ shll $PAGE_SHIFT_asm, %ebx
14749+ addl $cpu_gdt_table, %ebx
14750+#else
14751+ movl $cpu_gdt_table, %ebx
14752+#endif
14753 shr $16, %edx
14754- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
14755- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
14756+
14757+#ifdef CONFIG_PAX_KERNEXEC
14758+ mov %cr0, %esi
14759+ btr $16, %esi
14760+ mov %esi, %cr0
14761+#endif
14762+
14763+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
14764+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
14765+
14766+#ifdef CONFIG_PAX_KERNEXEC
14767+ bts $16, %esi
14768+ mov %esi, %cr0
14769+#endif
14770+
14771 pushl_cfi $__ESPFIX_SS
14772 pushl_cfi %eax /* new kernel esp */
14773 /* Disable interrupts, but do not irqtrace this section: we
14774@@ -614,34 +825,28 @@ work_resched:
14775 movl TI_flags(%ebp), %ecx
14776 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
14777 # than syscall tracing?
14778- jz restore_all
14779+ jz restore_all_pax
14780 testb $_TIF_NEED_RESCHED, %cl
14781 jnz work_resched
14782
14783 work_notifysig: # deal with pending signals and
14784 # notify-resume requests
14785+ movl %esp, %eax
14786 #ifdef CONFIG_VM86
14787 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
14788- movl %esp, %eax
14789- jne work_notifysig_v86 # returning to kernel-space or
14790+ jz 1f # returning to kernel-space or
14791 # vm86-space
14792- xorl %edx, %edx
14793- call do_notify_resume
14794- jmp resume_userspace_sig
14795
14796- ALIGN
14797-work_notifysig_v86:
14798 pushl_cfi %ecx # save ti_flags for do_notify_resume
14799 call save_v86_state # %eax contains pt_regs pointer
14800 popl_cfi %ecx
14801 movl %eax, %esp
14802-#else
14803- movl %esp, %eax
14804+1:
14805 #endif
14806 xorl %edx, %edx
14807 call do_notify_resume
14808 jmp resume_userspace_sig
14809-END(work_pending)
14810+ENDPROC(work_pending)
14811
14812 # perform syscall exit tracing
14813 ALIGN
14814@@ -649,11 +854,14 @@ syscall_trace_entry:
14815 movl $-ENOSYS,PT_EAX(%esp)
14816 movl %esp, %eax
14817 call syscall_trace_enter
14818+
14819+ pax_erase_kstack
14820+
14821 /* What it returned is what we'll actually use. */
14822 cmpl $(nr_syscalls), %eax
14823 jnae syscall_call
14824 jmp syscall_exit
14825-END(syscall_trace_entry)
14826+ENDPROC(syscall_trace_entry)
14827
14828 # perform syscall exit tracing
14829 ALIGN
14830@@ -666,20 +874,24 @@ syscall_exit_work:
14831 movl %esp, %eax
14832 call syscall_trace_leave
14833 jmp resume_userspace
14834-END(syscall_exit_work)
14835+ENDPROC(syscall_exit_work)
14836 CFI_ENDPROC
14837
14838 RING0_INT_FRAME # can't unwind into user space anyway
14839 syscall_fault:
14840+#ifdef CONFIG_PAX_MEMORY_UDEREF
14841+ push %ss
14842+ pop %ds
14843+#endif
14844 GET_THREAD_INFO(%ebp)
14845 movl $-EFAULT,PT_EAX(%esp)
14846 jmp resume_userspace
14847-END(syscall_fault)
14848+ENDPROC(syscall_fault)
14849
14850 syscall_badsys:
14851 movl $-ENOSYS,PT_EAX(%esp)
14852 jmp resume_userspace
14853-END(syscall_badsys)
14854+ENDPROC(syscall_badsys)
14855 CFI_ENDPROC
14856 /*
14857 * End of kprobes section
14858@@ -753,6 +965,36 @@ ptregs_clone:
14859 CFI_ENDPROC
14860 ENDPROC(ptregs_clone)
14861
14862+ ALIGN;
14863+ENTRY(kernel_execve)
14864+ CFI_STARTPROC
14865+ pushl_cfi %ebp
14866+ sub $PT_OLDSS+4,%esp
14867+ pushl_cfi %edi
14868+ pushl_cfi %ecx
14869+ pushl_cfi %eax
14870+ lea 3*4(%esp),%edi
14871+ mov $PT_OLDSS/4+1,%ecx
14872+ xorl %eax,%eax
14873+ rep stosl
14874+ popl_cfi %eax
14875+ popl_cfi %ecx
14876+ popl_cfi %edi
14877+ movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
14878+ pushl_cfi %esp
14879+ call sys_execve
14880+ add $4,%esp
14881+ CFI_ADJUST_CFA_OFFSET -4
14882+ GET_THREAD_INFO(%ebp)
14883+ test %eax,%eax
14884+ jz syscall_exit
14885+ add $PT_OLDSS+4,%esp
14886+ CFI_ADJUST_CFA_OFFSET -PT_OLDSS-4
14887+ popl_cfi %ebp
14888+ ret
14889+ CFI_ENDPROC
14890+ENDPROC(kernel_execve)
14891+
14892 .macro FIXUP_ESPFIX_STACK
14893 /*
14894 * Switch back for ESPFIX stack to the normal zerobased stack
14895@@ -762,8 +1004,15 @@ ENDPROC(ptregs_clone)
14896 * normal stack and adjusts ESP with the matching offset.
14897 */
14898 /* fixup the stack */
14899- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
14900- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
14901+#ifdef CONFIG_SMP
14902+ movl PER_CPU_VAR(cpu_number), %ebx
14903+ shll $PAGE_SHIFT_asm, %ebx
14904+ addl $cpu_gdt_table, %ebx
14905+#else
14906+ movl $cpu_gdt_table, %ebx
14907+#endif
14908+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
14909+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
14910 shl $16, %eax
14911 addl %esp, %eax /* the adjusted stack pointer */
14912 pushl_cfi $__KERNEL_DS
14913@@ -816,7 +1065,7 @@ vector=vector+1
14914 .endr
14915 2: jmp common_interrupt
14916 .endr
14917-END(irq_entries_start)
14918+ENDPROC(irq_entries_start)
14919
14920 .previous
14921 END(interrupt)
14922@@ -864,7 +1113,7 @@ ENTRY(coprocessor_error)
14923 pushl_cfi $do_coprocessor_error
14924 jmp error_code
14925 CFI_ENDPROC
14926-END(coprocessor_error)
14927+ENDPROC(coprocessor_error)
14928
14929 ENTRY(simd_coprocessor_error)
14930 RING0_INT_FRAME
14931@@ -885,7 +1134,7 @@ ENTRY(simd_coprocessor_error)
14932 #endif
14933 jmp error_code
14934 CFI_ENDPROC
14935-END(simd_coprocessor_error)
14936+ENDPROC(simd_coprocessor_error)
14937
14938 ENTRY(device_not_available)
14939 RING0_INT_FRAME
14940@@ -893,7 +1142,7 @@ ENTRY(device_not_available)
14941 pushl_cfi $do_device_not_available
14942 jmp error_code
14943 CFI_ENDPROC
14944-END(device_not_available)
14945+ENDPROC(device_not_available)
14946
14947 #ifdef CONFIG_PARAVIRT
14948 ENTRY(native_iret)
14949@@ -902,12 +1151,12 @@ ENTRY(native_iret)
14950 .align 4
14951 .long native_iret, iret_exc
14952 .previous
14953-END(native_iret)
14954+ENDPROC(native_iret)
14955
14956 ENTRY(native_irq_enable_sysexit)
14957 sti
14958 sysexit
14959-END(native_irq_enable_sysexit)
14960+ENDPROC(native_irq_enable_sysexit)
14961 #endif
14962
14963 ENTRY(overflow)
14964@@ -916,7 +1165,7 @@ ENTRY(overflow)
14965 pushl_cfi $do_overflow
14966 jmp error_code
14967 CFI_ENDPROC
14968-END(overflow)
14969+ENDPROC(overflow)
14970
14971 ENTRY(bounds)
14972 RING0_INT_FRAME
14973@@ -924,7 +1173,7 @@ ENTRY(bounds)
14974 pushl_cfi $do_bounds
14975 jmp error_code
14976 CFI_ENDPROC
14977-END(bounds)
14978+ENDPROC(bounds)
14979
14980 ENTRY(invalid_op)
14981 RING0_INT_FRAME
14982@@ -932,7 +1181,7 @@ ENTRY(invalid_op)
14983 pushl_cfi $do_invalid_op
14984 jmp error_code
14985 CFI_ENDPROC
14986-END(invalid_op)
14987+ENDPROC(invalid_op)
14988
14989 ENTRY(coprocessor_segment_overrun)
14990 RING0_INT_FRAME
14991@@ -940,35 +1189,35 @@ ENTRY(coprocessor_segment_overrun)
14992 pushl_cfi $do_coprocessor_segment_overrun
14993 jmp error_code
14994 CFI_ENDPROC
14995-END(coprocessor_segment_overrun)
14996+ENDPROC(coprocessor_segment_overrun)
14997
14998 ENTRY(invalid_TSS)
14999 RING0_EC_FRAME
15000 pushl_cfi $do_invalid_TSS
15001 jmp error_code
15002 CFI_ENDPROC
15003-END(invalid_TSS)
15004+ENDPROC(invalid_TSS)
15005
15006 ENTRY(segment_not_present)
15007 RING0_EC_FRAME
15008 pushl_cfi $do_segment_not_present
15009 jmp error_code
15010 CFI_ENDPROC
15011-END(segment_not_present)
15012+ENDPROC(segment_not_present)
15013
15014 ENTRY(stack_segment)
15015 RING0_EC_FRAME
15016 pushl_cfi $do_stack_segment
15017 jmp error_code
15018 CFI_ENDPROC
15019-END(stack_segment)
15020+ENDPROC(stack_segment)
15021
15022 ENTRY(alignment_check)
15023 RING0_EC_FRAME
15024 pushl_cfi $do_alignment_check
15025 jmp error_code
15026 CFI_ENDPROC
15027-END(alignment_check)
15028+ENDPROC(alignment_check)
15029
15030 ENTRY(divide_error)
15031 RING0_INT_FRAME
15032@@ -976,7 +1225,7 @@ ENTRY(divide_error)
15033 pushl_cfi $do_divide_error
15034 jmp error_code
15035 CFI_ENDPROC
15036-END(divide_error)
15037+ENDPROC(divide_error)
15038
15039 #ifdef CONFIG_X86_MCE
15040 ENTRY(machine_check)
15041@@ -985,7 +1234,7 @@ ENTRY(machine_check)
15042 pushl_cfi machine_check_vector
15043 jmp error_code
15044 CFI_ENDPROC
15045-END(machine_check)
15046+ENDPROC(machine_check)
15047 #endif
15048
15049 ENTRY(spurious_interrupt_bug)
15050@@ -994,7 +1243,7 @@ ENTRY(spurious_interrupt_bug)
15051 pushl_cfi $do_spurious_interrupt_bug
15052 jmp error_code
15053 CFI_ENDPROC
15054-END(spurious_interrupt_bug)
15055+ENDPROC(spurious_interrupt_bug)
15056 /*
15057 * End of kprobes section
15058 */
15059@@ -1109,7 +1358,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector, XEN_HVM_EVTCHN_CALLBACK,
15060
15061 ENTRY(mcount)
15062 ret
15063-END(mcount)
15064+ENDPROC(mcount)
15065
15066 ENTRY(ftrace_caller)
15067 cmpl $0, function_trace_stop
15068@@ -1138,7 +1387,7 @@ ftrace_graph_call:
15069 .globl ftrace_stub
15070 ftrace_stub:
15071 ret
15072-END(ftrace_caller)
15073+ENDPROC(ftrace_caller)
15074
15075 #else /* ! CONFIG_DYNAMIC_FTRACE */
15076
15077@@ -1174,7 +1423,7 @@ trace:
15078 popl %ecx
15079 popl %eax
15080 jmp ftrace_stub
15081-END(mcount)
15082+ENDPROC(mcount)
15083 #endif /* CONFIG_DYNAMIC_FTRACE */
15084 #endif /* CONFIG_FUNCTION_TRACER */
15085
15086@@ -1195,7 +1444,7 @@ ENTRY(ftrace_graph_caller)
15087 popl %ecx
15088 popl %eax
15089 ret
15090-END(ftrace_graph_caller)
15091+ENDPROC(ftrace_graph_caller)
15092
15093 .globl return_to_handler
15094 return_to_handler:
15095@@ -1209,7 +1458,6 @@ return_to_handler:
15096 jmp *%ecx
15097 #endif
15098
15099-.section .rodata,"a"
15100 #include "syscall_table_32.S"
15101
15102 syscall_table_size=(.-sys_call_table)
15103@@ -1255,15 +1503,18 @@ error_code:
15104 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
15105 REG_TO_PTGS %ecx
15106 SET_KERNEL_GS %ecx
15107- movl $(__USER_DS), %ecx
15108+ movl $(__KERNEL_DS), %ecx
15109 movl %ecx, %ds
15110 movl %ecx, %es
15111+
15112+ pax_enter_kernel
15113+
15114 TRACE_IRQS_OFF
15115 movl %esp,%eax # pt_regs pointer
15116 call *%edi
15117 jmp ret_from_exception
15118 CFI_ENDPROC
15119-END(page_fault)
15120+ENDPROC(page_fault)
15121
15122 /*
15123 * Debug traps and NMI can happen at the one SYSENTER instruction
15124@@ -1305,7 +1556,7 @@ debug_stack_correct:
15125 call do_debug
15126 jmp ret_from_exception
15127 CFI_ENDPROC
15128-END(debug)
15129+ENDPROC(debug)
15130
15131 /*
15132 * NMI is doubly nasty. It can happen _while_ we're handling
15133@@ -1342,6 +1593,9 @@ nmi_stack_correct:
15134 xorl %edx,%edx # zero error code
15135 movl %esp,%eax # pt_regs pointer
15136 call do_nmi
15137+
15138+ pax_exit_kernel
15139+
15140 jmp restore_all_notrace
15141 CFI_ENDPROC
15142
15143@@ -1378,12 +1632,15 @@ nmi_espfix_stack:
15144 FIXUP_ESPFIX_STACK # %eax == %esp
15145 xorl %edx,%edx # zero error code
15146 call do_nmi
15147+
15148+ pax_exit_kernel
15149+
15150 RESTORE_REGS
15151 lss 12+4(%esp), %esp # back to espfix stack
15152 CFI_ADJUST_CFA_OFFSET -24
15153 jmp irq_return
15154 CFI_ENDPROC
15155-END(nmi)
15156+ENDPROC(nmi)
15157
15158 ENTRY(int3)
15159 RING0_INT_FRAME
15160@@ -1395,14 +1652,14 @@ ENTRY(int3)
15161 call do_int3
15162 jmp ret_from_exception
15163 CFI_ENDPROC
15164-END(int3)
15165+ENDPROC(int3)
15166
15167 ENTRY(general_protection)
15168 RING0_EC_FRAME
15169 pushl_cfi $do_general_protection
15170 jmp error_code
15171 CFI_ENDPROC
15172-END(general_protection)
15173+ENDPROC(general_protection)
15174
15175 #ifdef CONFIG_KVM_GUEST
15176 ENTRY(async_page_fault)
15177@@ -1410,7 +1667,7 @@ ENTRY(async_page_fault)
15178 pushl_cfi $do_async_page_fault
15179 jmp error_code
15180 CFI_ENDPROC
15181-END(async_page_fault)
15182+ENDPROC(async_page_fault)
15183 #endif
15184
15185 /*
15186diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
15187index faf8d5e..4f16a68 100644
15188--- a/arch/x86/kernel/entry_64.S
15189+++ b/arch/x86/kernel/entry_64.S
15190@@ -55,6 +55,8 @@
15191 #include <asm/paravirt.h>
15192 #include <asm/ftrace.h>
15193 #include <asm/percpu.h>
15194+#include <asm/pgtable.h>
15195+#include <asm/alternative-asm.h>
15196
15197 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
15198 #include <linux/elf-em.h>
15199@@ -68,8 +70,9 @@
15200 #ifdef CONFIG_FUNCTION_TRACER
15201 #ifdef CONFIG_DYNAMIC_FTRACE
15202 ENTRY(mcount)
15203+ pax_force_retaddr
15204 retq
15205-END(mcount)
15206+ENDPROC(mcount)
15207
15208 ENTRY(ftrace_caller)
15209 cmpl $0, function_trace_stop
15210@@ -92,8 +95,9 @@ GLOBAL(ftrace_graph_call)
15211 #endif
15212
15213 GLOBAL(ftrace_stub)
15214+ pax_force_retaddr
15215 retq
15216-END(ftrace_caller)
15217+ENDPROC(ftrace_caller)
15218
15219 #else /* ! CONFIG_DYNAMIC_FTRACE */
15220 ENTRY(mcount)
15221@@ -112,6 +116,7 @@ ENTRY(mcount)
15222 #endif
15223
15224 GLOBAL(ftrace_stub)
15225+ pax_force_retaddr
15226 retq
15227
15228 trace:
15229@@ -121,12 +126,13 @@ trace:
15230 movq 8(%rbp), %rsi
15231 subq $MCOUNT_INSN_SIZE, %rdi
15232
15233+ pax_force_fptr ftrace_trace_function
15234 call *ftrace_trace_function
15235
15236 MCOUNT_RESTORE_FRAME
15237
15238 jmp ftrace_stub
15239-END(mcount)
15240+ENDPROC(mcount)
15241 #endif /* CONFIG_DYNAMIC_FTRACE */
15242 #endif /* CONFIG_FUNCTION_TRACER */
15243
15244@@ -146,8 +152,9 @@ ENTRY(ftrace_graph_caller)
15245
15246 MCOUNT_RESTORE_FRAME
15247
15248+ pax_force_retaddr
15249 retq
15250-END(ftrace_graph_caller)
15251+ENDPROC(ftrace_graph_caller)
15252
15253 GLOBAL(return_to_handler)
15254 subq $24, %rsp
15255@@ -163,6 +170,7 @@ GLOBAL(return_to_handler)
15256 movq 8(%rsp), %rdx
15257 movq (%rsp), %rax
15258 addq $24, %rsp
15259+ pax_force_fptr %rdi
15260 jmp *%rdi
15261 #endif
15262
15263@@ -178,6 +186,282 @@ ENTRY(native_usergs_sysret64)
15264 ENDPROC(native_usergs_sysret64)
15265 #endif /* CONFIG_PARAVIRT */
15266
15267+ .macro ljmpq sel, off
15268+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
15269+ .byte 0x48; ljmp *1234f(%rip)
15270+ .pushsection .rodata
15271+ .align 16
15272+ 1234: .quad \off; .word \sel
15273+ .popsection
15274+#else
15275+ pushq $\sel
15276+ pushq $\off
15277+ lretq
15278+#endif
15279+ .endm
15280+
15281+ .macro pax_enter_kernel
15282+ pax_set_fptr_mask
15283+#ifdef CONFIG_PAX_KERNEXEC
15284+ call pax_enter_kernel
15285+#endif
15286+ .endm
15287+
15288+ .macro pax_exit_kernel
15289+#ifdef CONFIG_PAX_KERNEXEC
15290+ call pax_exit_kernel
15291+#endif
15292+ .endm
15293+
15294+#ifdef CONFIG_PAX_KERNEXEC
15295+ENTRY(pax_enter_kernel)
15296+ pushq %rdi
15297+
15298+#ifdef CONFIG_PARAVIRT
15299+ PV_SAVE_REGS(CLBR_RDI)
15300+#endif
15301+
15302+ GET_CR0_INTO_RDI
15303+ bts $16,%rdi
15304+ jnc 3f
15305+ mov %cs,%edi
15306+ cmp $__KERNEL_CS,%edi
15307+ jnz 2f
15308+1:
15309+
15310+#ifdef CONFIG_PARAVIRT
15311+ PV_RESTORE_REGS(CLBR_RDI)
15312+#endif
15313+
15314+ popq %rdi
15315+ pax_force_retaddr
15316+ retq
15317+
15318+2: ljmpq __KERNEL_CS,1f
15319+3: ljmpq __KERNEXEC_KERNEL_CS,4f
15320+4: SET_RDI_INTO_CR0
15321+ jmp 1b
15322+ENDPROC(pax_enter_kernel)
15323+
15324+ENTRY(pax_exit_kernel)
15325+ pushq %rdi
15326+
15327+#ifdef CONFIG_PARAVIRT
15328+ PV_SAVE_REGS(CLBR_RDI)
15329+#endif
15330+
15331+ mov %cs,%rdi
15332+ cmp $__KERNEXEC_KERNEL_CS,%edi
15333+ jz 2f
15334+1:
15335+
15336+#ifdef CONFIG_PARAVIRT
15337+ PV_RESTORE_REGS(CLBR_RDI);
15338+#endif
15339+
15340+ popq %rdi
15341+ pax_force_retaddr
15342+ retq
15343+
15344+2: GET_CR0_INTO_RDI
15345+ btr $16,%rdi
15346+ ljmpq __KERNEL_CS,3f
15347+3: SET_RDI_INTO_CR0
15348+ jmp 1b
15349+#ifdef CONFIG_PARAVIRT
15350+ PV_RESTORE_REGS(CLBR_RDI);
15351+#endif
15352+
15353+ popq %rdi
15354+ pax_force_retaddr
15355+ retq
15356+ENDPROC(pax_exit_kernel)
15357+#endif
15358+
15359+ .macro pax_enter_kernel_user
15360+ pax_set_fptr_mask
15361+#ifdef CONFIG_PAX_MEMORY_UDEREF
15362+ call pax_enter_kernel_user
15363+#endif
15364+ .endm
15365+
15366+ .macro pax_exit_kernel_user
15367+#ifdef CONFIG_PAX_MEMORY_UDEREF
15368+ call pax_exit_kernel_user
15369+#endif
15370+#ifdef CONFIG_PAX_RANDKSTACK
15371+ pushq %rax
15372+ call pax_randomize_kstack
15373+ popq %rax
15374+#endif
15375+ .endm
15376+
15377+#ifdef CONFIG_PAX_MEMORY_UDEREF
15378+ENTRY(pax_enter_kernel_user)
15379+ pushq %rdi
15380+ pushq %rbx
15381+
15382+#ifdef CONFIG_PARAVIRT
15383+ PV_SAVE_REGS(CLBR_RDI)
15384+#endif
15385+
15386+ GET_CR3_INTO_RDI
15387+ mov %rdi,%rbx
15388+ add $__START_KERNEL_map,%rbx
15389+ sub phys_base(%rip),%rbx
15390+
15391+#ifdef CONFIG_PARAVIRT
15392+ pushq %rdi
15393+ cmpl $0, pv_info+PARAVIRT_enabled
15394+ jz 1f
15395+ i = 0
15396+ .rept USER_PGD_PTRS
15397+ mov i*8(%rbx),%rsi
15398+ mov $0,%sil
15399+ lea i*8(%rbx),%rdi
15400+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15401+ i = i + 1
15402+ .endr
15403+ jmp 2f
15404+1:
15405+#endif
15406+
15407+ i = 0
15408+ .rept USER_PGD_PTRS
15409+ movb $0,i*8(%rbx)
15410+ i = i + 1
15411+ .endr
15412+
15413+#ifdef CONFIG_PARAVIRT
15414+2: popq %rdi
15415+#endif
15416+ SET_RDI_INTO_CR3
15417+
15418+#ifdef CONFIG_PAX_KERNEXEC
15419+ GET_CR0_INTO_RDI
15420+ bts $16,%rdi
15421+ SET_RDI_INTO_CR0
15422+#endif
15423+
15424+#ifdef CONFIG_PARAVIRT
15425+ PV_RESTORE_REGS(CLBR_RDI)
15426+#endif
15427+
15428+ popq %rbx
15429+ popq %rdi
15430+ pax_force_retaddr
15431+ retq
15432+ENDPROC(pax_enter_kernel_user)
15433+
15434+ENTRY(pax_exit_kernel_user)
15435+ push %rdi
15436+
15437+#ifdef CONFIG_PARAVIRT
15438+ pushq %rbx
15439+ PV_SAVE_REGS(CLBR_RDI)
15440+#endif
15441+
15442+#ifdef CONFIG_PAX_KERNEXEC
15443+ GET_CR0_INTO_RDI
15444+ btr $16,%rdi
15445+ SET_RDI_INTO_CR0
15446+#endif
15447+
15448+ GET_CR3_INTO_RDI
15449+ add $__START_KERNEL_map,%rdi
15450+ sub phys_base(%rip),%rdi
15451+
15452+#ifdef CONFIG_PARAVIRT
15453+ cmpl $0, pv_info+PARAVIRT_enabled
15454+ jz 1f
15455+ mov %rdi,%rbx
15456+ i = 0
15457+ .rept USER_PGD_PTRS
15458+ mov i*8(%rbx),%rsi
15459+ mov $0x67,%sil
15460+ lea i*8(%rbx),%rdi
15461+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15462+ i = i + 1
15463+ .endr
15464+ jmp 2f
15465+1:
15466+#endif
15467+
15468+ i = 0
15469+ .rept USER_PGD_PTRS
15470+ movb $0x67,i*8(%rdi)
15471+ i = i + 1
15472+ .endr
15473+
15474+#ifdef CONFIG_PARAVIRT
15475+2: PV_RESTORE_REGS(CLBR_RDI)
15476+ popq %rbx
15477+#endif
15478+
15479+ popq %rdi
15480+ pax_force_retaddr
15481+ retq
15482+ENDPROC(pax_exit_kernel_user)
15483+#endif
15484+
15485+.macro pax_erase_kstack
15486+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15487+ call pax_erase_kstack
15488+#endif
15489+.endm
15490+
15491+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15492+/*
15493+ * r11: thread_info
15494+ * rcx, rdx: can be clobbered
15495+ */
15496+ENTRY(pax_erase_kstack)
15497+ pushq %rdi
15498+ pushq %rax
15499+ pushq %r11
15500+
15501+ GET_THREAD_INFO(%r11)
15502+ mov TI_lowest_stack(%r11), %rdi
15503+ mov $-0xBEEF, %rax
15504+ std
15505+
15506+1: mov %edi, %ecx
15507+ and $THREAD_SIZE_asm - 1, %ecx
15508+ shr $3, %ecx
15509+ repne scasq
15510+ jecxz 2f
15511+
15512+ cmp $2*8, %ecx
15513+ jc 2f
15514+
15515+ mov $2*8, %ecx
15516+ repe scasq
15517+ jecxz 2f
15518+ jne 1b
15519+
15520+2: cld
15521+ mov %esp, %ecx
15522+ sub %edi, %ecx
15523+
15524+ cmp $THREAD_SIZE_asm, %rcx
15525+ jb 3f
15526+ ud2
15527+3:
15528+
15529+ shr $3, %ecx
15530+ rep stosq
15531+
15532+ mov TI_task_thread_sp0(%r11), %rdi
15533+ sub $256, %rdi
15534+ mov %rdi, TI_lowest_stack(%r11)
15535+
15536+ popq %r11
15537+ popq %rax
15538+ popq %rdi
15539+ pax_force_retaddr
15540+ ret
15541+ENDPROC(pax_erase_kstack)
15542+#endif
15543
15544 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
15545 #ifdef CONFIG_TRACE_IRQFLAGS
15546@@ -231,8 +515,8 @@ ENDPROC(native_usergs_sysret64)
15547 .endm
15548
15549 .macro UNFAKE_STACK_FRAME
15550- addq $8*6, %rsp
15551- CFI_ADJUST_CFA_OFFSET -(6*8)
15552+ addq $8*6 + ARG_SKIP, %rsp
15553+ CFI_ADJUST_CFA_OFFSET -(6*8 + ARG_SKIP)
15554 .endm
15555
15556 /*
15557@@ -319,7 +603,7 @@ ENDPROC(native_usergs_sysret64)
15558 movq %rsp, %rsi
15559
15560 leaq -RBP(%rsp),%rdi /* arg1 for handler */
15561- testl $3, CS(%rdi)
15562+ testb $3, CS(%rdi)
15563 je 1f
15564 SWAPGS
15565 /*
15566@@ -355,9 +639,10 @@ ENTRY(save_rest)
15567 movq_cfi r15, R15+16
15568 movq %r11, 8(%rsp) /* return address */
15569 FIXUP_TOP_OF_STACK %r11, 16
15570+ pax_force_retaddr
15571 ret
15572 CFI_ENDPROC
15573-END(save_rest)
15574+ENDPROC(save_rest)
15575
15576 /* save complete stack frame */
15577 .pushsection .kprobes.text, "ax"
15578@@ -386,9 +671,10 @@ ENTRY(save_paranoid)
15579 js 1f /* negative -> in kernel */
15580 SWAPGS
15581 xorl %ebx,%ebx
15582-1: ret
15583+1: pax_force_retaddr_bts
15584+ ret
15585 CFI_ENDPROC
15586-END(save_paranoid)
15587+ENDPROC(save_paranoid)
15588 .popsection
15589
15590 /*
15591@@ -410,7 +696,7 @@ ENTRY(ret_from_fork)
15592
15593 RESTORE_REST
15594
15595- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
15596+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
15597 je int_ret_from_sys_call
15598
15599 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
15600@@ -420,7 +706,7 @@ ENTRY(ret_from_fork)
15601 jmp ret_from_sys_call # go to the SYSRET fastpath
15602
15603 CFI_ENDPROC
15604-END(ret_from_fork)
15605+ENDPROC(ret_from_fork)
15606
15607 /*
15608 * System call entry. Up to 6 arguments in registers are supported.
15609@@ -456,7 +742,7 @@ END(ret_from_fork)
15610 ENTRY(system_call)
15611 CFI_STARTPROC simple
15612 CFI_SIGNAL_FRAME
15613- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
15614+ CFI_DEF_CFA rsp,0
15615 CFI_REGISTER rip,rcx
15616 /*CFI_REGISTER rflags,r11*/
15617 SWAPGS_UNSAFE_STACK
15618@@ -469,12 +755,13 @@ ENTRY(system_call_after_swapgs)
15619
15620 movq %rsp,PER_CPU_VAR(old_rsp)
15621 movq PER_CPU_VAR(kernel_stack),%rsp
15622+ SAVE_ARGS 8*6,0
15623+ pax_enter_kernel_user
15624 /*
15625 * No need to follow this irqs off/on section - it's straight
15626 * and short:
15627 */
15628 ENABLE_INTERRUPTS(CLBR_NONE)
15629- SAVE_ARGS 8,0
15630 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
15631 movq %rcx,RIP-ARGOFFSET(%rsp)
15632 CFI_REL_OFFSET rip,RIP-ARGOFFSET
15633@@ -484,7 +771,7 @@ ENTRY(system_call_after_swapgs)
15634 system_call_fastpath:
15635 cmpq $__NR_syscall_max,%rax
15636 ja badsys
15637- movq %r10,%rcx
15638+ movq R10-ARGOFFSET(%rsp),%rcx
15639 call *sys_call_table(,%rax,8) # XXX: rip relative
15640 movq %rax,RAX-ARGOFFSET(%rsp)
15641 /*
15642@@ -503,6 +790,8 @@ sysret_check:
15643 andl %edi,%edx
15644 jnz sysret_careful
15645 CFI_REMEMBER_STATE
15646+ pax_exit_kernel_user
15647+ pax_erase_kstack
15648 /*
15649 * sysretq will re-enable interrupts:
15650 */
15651@@ -554,14 +843,18 @@ badsys:
15652 * jump back to the normal fast path.
15653 */
15654 auditsys:
15655- movq %r10,%r9 /* 6th arg: 4th syscall arg */
15656+ movq R10-ARGOFFSET(%rsp),%r9 /* 6th arg: 4th syscall arg */
15657 movq %rdx,%r8 /* 5th arg: 3rd syscall arg */
15658 movq %rsi,%rcx /* 4th arg: 2nd syscall arg */
15659 movq %rdi,%rdx /* 3rd arg: 1st syscall arg */
15660 movq %rax,%rsi /* 2nd arg: syscall number */
15661 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
15662 call audit_syscall_entry
15663+
15664+ pax_erase_kstack
15665+
15666 LOAD_ARGS 0 /* reload call-clobbered registers */
15667+ pax_set_fptr_mask
15668 jmp system_call_fastpath
15669
15670 /*
15671@@ -591,16 +884,20 @@ tracesys:
15672 FIXUP_TOP_OF_STACK %rdi
15673 movq %rsp,%rdi
15674 call syscall_trace_enter
15675+
15676+ pax_erase_kstack
15677+
15678 /*
15679 * Reload arg registers from stack in case ptrace changed them.
15680 * We don't reload %rax because syscall_trace_enter() returned
15681 * the value it wants us to use in the table lookup.
15682 */
15683 LOAD_ARGS ARGOFFSET, 1
15684+ pax_set_fptr_mask
15685 RESTORE_REST
15686 cmpq $__NR_syscall_max,%rax
15687 ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
15688- movq %r10,%rcx /* fixup for C */
15689+ movq R10-ARGOFFSET(%rsp),%rcx /* fixup for C */
15690 call *sys_call_table(,%rax,8)
15691 movq %rax,RAX-ARGOFFSET(%rsp)
15692 /* Use IRET because user could have changed frame */
15693@@ -612,7 +909,7 @@ tracesys:
15694 GLOBAL(int_ret_from_sys_call)
15695 DISABLE_INTERRUPTS(CLBR_NONE)
15696 TRACE_IRQS_OFF
15697- testl $3,CS-ARGOFFSET(%rsp)
15698+ testb $3,CS-ARGOFFSET(%rsp)
15699 je retint_restore_args
15700 movl $_TIF_ALLWORK_MASK,%edi
15701 /* edi: mask to check */
15702@@ -623,6 +920,7 @@ GLOBAL(int_with_check)
15703 andl %edi,%edx
15704 jnz int_careful
15705 andl $~TS_COMPAT,TI_status(%rcx)
15706+ pax_erase_kstack
15707 jmp retint_swapgs
15708
15709 /* Either reschedule or signal or syscall exit tracking needed. */
15710@@ -669,7 +967,7 @@ int_restore_rest:
15711 TRACE_IRQS_OFF
15712 jmp int_with_check
15713 CFI_ENDPROC
15714-END(system_call)
15715+ENDPROC(system_call)
15716
15717 /*
15718 * Certain special system calls that need to save a complete full stack frame.
15719@@ -685,7 +983,7 @@ ENTRY(\label)
15720 call \func
15721 jmp ptregscall_common
15722 CFI_ENDPROC
15723-END(\label)
15724+ENDPROC(\label)
15725 .endm
15726
15727 PTREGSCALL stub_clone, sys_clone, %r8
15728@@ -703,9 +1001,10 @@ ENTRY(ptregscall_common)
15729 movq_cfi_restore R12+8, r12
15730 movq_cfi_restore RBP+8, rbp
15731 movq_cfi_restore RBX+8, rbx
15732+ pax_force_retaddr
15733 ret $REST_SKIP /* pop extended registers */
15734 CFI_ENDPROC
15735-END(ptregscall_common)
15736+ENDPROC(ptregscall_common)
15737
15738 ENTRY(stub_execve)
15739 CFI_STARTPROC
15740@@ -720,7 +1019,7 @@ ENTRY(stub_execve)
15741 RESTORE_REST
15742 jmp int_ret_from_sys_call
15743 CFI_ENDPROC
15744-END(stub_execve)
15745+ENDPROC(stub_execve)
15746
15747 /*
15748 * sigreturn is special because it needs to restore all registers on return.
15749@@ -738,7 +1037,7 @@ ENTRY(stub_rt_sigreturn)
15750 RESTORE_REST
15751 jmp int_ret_from_sys_call
15752 CFI_ENDPROC
15753-END(stub_rt_sigreturn)
15754+ENDPROC(stub_rt_sigreturn)
15755
15756 /*
15757 * Build the entry stubs and pointer table with some assembler magic.
15758@@ -773,7 +1072,7 @@ vector=vector+1
15759 2: jmp common_interrupt
15760 .endr
15761 CFI_ENDPROC
15762-END(irq_entries_start)
15763+ENDPROC(irq_entries_start)
15764
15765 .previous
15766 END(interrupt)
15767@@ -793,6 +1092,16 @@ END(interrupt)
15768 subq $ORIG_RAX-RBP, %rsp
15769 CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
15770 SAVE_ARGS_IRQ
15771+#ifdef CONFIG_PAX_MEMORY_UDEREF
15772+ testb $3, CS(%rdi)
15773+ jnz 1f
15774+ pax_enter_kernel
15775+ jmp 2f
15776+1: pax_enter_kernel_user
15777+2:
15778+#else
15779+ pax_enter_kernel
15780+#endif
15781 call \func
15782 .endm
15783
15784@@ -824,7 +1133,7 @@ ret_from_intr:
15785
15786 exit_intr:
15787 GET_THREAD_INFO(%rcx)
15788- testl $3,CS-ARGOFFSET(%rsp)
15789+ testb $3,CS-ARGOFFSET(%rsp)
15790 je retint_kernel
15791
15792 /* Interrupt came from user space */
15793@@ -846,12 +1155,15 @@ retint_swapgs: /* return to user-space */
15794 * The iretq could re-enable interrupts:
15795 */
15796 DISABLE_INTERRUPTS(CLBR_ANY)
15797+ pax_exit_kernel_user
15798 TRACE_IRQS_IRETQ
15799 SWAPGS
15800 jmp restore_args
15801
15802 retint_restore_args: /* return to kernel space */
15803 DISABLE_INTERRUPTS(CLBR_ANY)
15804+ pax_exit_kernel
15805+ pax_force_retaddr RIP-ARGOFFSET
15806 /*
15807 * The iretq could re-enable interrupts:
15808 */
15809@@ -940,7 +1252,7 @@ ENTRY(retint_kernel)
15810 #endif
15811
15812 CFI_ENDPROC
15813-END(common_interrupt)
15814+ENDPROC(common_interrupt)
15815 /*
15816 * End of kprobes section
15817 */
15818@@ -956,7 +1268,7 @@ ENTRY(\sym)
15819 interrupt \do_sym
15820 jmp ret_from_intr
15821 CFI_ENDPROC
15822-END(\sym)
15823+ENDPROC(\sym)
15824 .endm
15825
15826 #ifdef CONFIG_SMP
15827@@ -1021,12 +1333,22 @@ ENTRY(\sym)
15828 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15829 call error_entry
15830 DEFAULT_FRAME 0
15831+#ifdef CONFIG_PAX_MEMORY_UDEREF
15832+ testb $3, CS(%rsp)
15833+ jnz 1f
15834+ pax_enter_kernel
15835+ jmp 2f
15836+1: pax_enter_kernel_user
15837+2:
15838+#else
15839+ pax_enter_kernel
15840+#endif
15841 movq %rsp,%rdi /* pt_regs pointer */
15842 xorl %esi,%esi /* no error code */
15843 call \do_sym
15844 jmp error_exit /* %ebx: no swapgs flag */
15845 CFI_ENDPROC
15846-END(\sym)
15847+ENDPROC(\sym)
15848 .endm
15849
15850 .macro paranoidzeroentry sym do_sym
15851@@ -1038,15 +1360,25 @@ ENTRY(\sym)
15852 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15853 call save_paranoid
15854 TRACE_IRQS_OFF
15855+#ifdef CONFIG_PAX_MEMORY_UDEREF
15856+ testb $3, CS(%rsp)
15857+ jnz 1f
15858+ pax_enter_kernel
15859+ jmp 2f
15860+1: pax_enter_kernel_user
15861+2:
15862+#else
15863+ pax_enter_kernel
15864+#endif
15865 movq %rsp,%rdi /* pt_regs pointer */
15866 xorl %esi,%esi /* no error code */
15867 call \do_sym
15868 jmp paranoid_exit /* %ebx: no swapgs flag */
15869 CFI_ENDPROC
15870-END(\sym)
15871+ENDPROC(\sym)
15872 .endm
15873
15874-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
15875+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r12)
15876 .macro paranoidzeroentry_ist sym do_sym ist
15877 ENTRY(\sym)
15878 INTR_FRAME
15879@@ -1056,14 +1388,30 @@ ENTRY(\sym)
15880 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15881 call save_paranoid
15882 TRACE_IRQS_OFF
15883+#ifdef CONFIG_PAX_MEMORY_UDEREF
15884+ testb $3, CS(%rsp)
15885+ jnz 1f
15886+ pax_enter_kernel
15887+ jmp 2f
15888+1: pax_enter_kernel_user
15889+2:
15890+#else
15891+ pax_enter_kernel
15892+#endif
15893 movq %rsp,%rdi /* pt_regs pointer */
15894 xorl %esi,%esi /* no error code */
15895+#ifdef CONFIG_SMP
15896+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r12d
15897+ lea init_tss(%r12), %r12
15898+#else
15899+ lea init_tss(%rip), %r12
15900+#endif
15901 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
15902 call \do_sym
15903 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
15904 jmp paranoid_exit /* %ebx: no swapgs flag */
15905 CFI_ENDPROC
15906-END(\sym)
15907+ENDPROC(\sym)
15908 .endm
15909
15910 .macro errorentry sym do_sym
15911@@ -1074,13 +1422,23 @@ ENTRY(\sym)
15912 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15913 call error_entry
15914 DEFAULT_FRAME 0
15915+#ifdef CONFIG_PAX_MEMORY_UDEREF
15916+ testb $3, CS(%rsp)
15917+ jnz 1f
15918+ pax_enter_kernel
15919+ jmp 2f
15920+1: pax_enter_kernel_user
15921+2:
15922+#else
15923+ pax_enter_kernel
15924+#endif
15925 movq %rsp,%rdi /* pt_regs pointer */
15926 movq ORIG_RAX(%rsp),%rsi /* get error code */
15927 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
15928 call \do_sym
15929 jmp error_exit /* %ebx: no swapgs flag */
15930 CFI_ENDPROC
15931-END(\sym)
15932+ENDPROC(\sym)
15933 .endm
15934
15935 /* error code is on the stack already */
15936@@ -1093,13 +1451,23 @@ ENTRY(\sym)
15937 call save_paranoid
15938 DEFAULT_FRAME 0
15939 TRACE_IRQS_OFF
15940+#ifdef CONFIG_PAX_MEMORY_UDEREF
15941+ testb $3, CS(%rsp)
15942+ jnz 1f
15943+ pax_enter_kernel
15944+ jmp 2f
15945+1: pax_enter_kernel_user
15946+2:
15947+#else
15948+ pax_enter_kernel
15949+#endif
15950 movq %rsp,%rdi /* pt_regs pointer */
15951 movq ORIG_RAX(%rsp),%rsi /* get error code */
15952 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
15953 call \do_sym
15954 jmp paranoid_exit /* %ebx: no swapgs flag */
15955 CFI_ENDPROC
15956-END(\sym)
15957+ENDPROC(\sym)
15958 .endm
15959
15960 zeroentry divide_error do_divide_error
15961@@ -1129,9 +1497,10 @@ gs_change:
15962 2: mfence /* workaround */
15963 SWAPGS
15964 popfq_cfi
15965+ pax_force_retaddr
15966 ret
15967 CFI_ENDPROC
15968-END(native_load_gs_index)
15969+ENDPROC(native_load_gs_index)
15970
15971 .section __ex_table,"a"
15972 .align 8
15973@@ -1153,13 +1522,14 @@ ENTRY(kernel_thread_helper)
15974 * Here we are in the child and the registers are set as they were
15975 * at kernel_thread() invocation in the parent.
15976 */
15977+ pax_force_fptr %rsi
15978 call *%rsi
15979 # exit
15980 mov %eax, %edi
15981 call do_exit
15982 ud2 # padding for call trace
15983 CFI_ENDPROC
15984-END(kernel_thread_helper)
15985+ENDPROC(kernel_thread_helper)
15986
15987 /*
15988 * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
15989@@ -1186,11 +1556,11 @@ ENTRY(kernel_execve)
15990 RESTORE_REST
15991 testq %rax,%rax
15992 je int_ret_from_sys_call
15993- RESTORE_ARGS
15994 UNFAKE_STACK_FRAME
15995+ pax_force_retaddr
15996 ret
15997 CFI_ENDPROC
15998-END(kernel_execve)
15999+ENDPROC(kernel_execve)
16000
16001 /* Call softirq on interrupt stack. Interrupts are off. */
16002 ENTRY(call_softirq)
16003@@ -1208,9 +1578,10 @@ ENTRY(call_softirq)
16004 CFI_DEF_CFA_REGISTER rsp
16005 CFI_ADJUST_CFA_OFFSET -8
16006 decl PER_CPU_VAR(irq_count)
16007+ pax_force_retaddr
16008 ret
16009 CFI_ENDPROC
16010-END(call_softirq)
16011+ENDPROC(call_softirq)
16012
16013 #ifdef CONFIG_XEN
16014 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
16015@@ -1248,7 +1619,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
16016 decl PER_CPU_VAR(irq_count)
16017 jmp error_exit
16018 CFI_ENDPROC
16019-END(xen_do_hypervisor_callback)
16020+ENDPROC(xen_do_hypervisor_callback)
16021
16022 /*
16023 * Hypervisor uses this for application faults while it executes.
16024@@ -1307,7 +1678,7 @@ ENTRY(xen_failsafe_callback)
16025 SAVE_ALL
16026 jmp error_exit
16027 CFI_ENDPROC
16028-END(xen_failsafe_callback)
16029+ENDPROC(xen_failsafe_callback)
16030
16031 apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
16032 xen_hvm_callback_vector xen_evtchn_do_upcall
16033@@ -1356,16 +1727,31 @@ ENTRY(paranoid_exit)
16034 TRACE_IRQS_OFF
16035 testl %ebx,%ebx /* swapgs needed? */
16036 jnz paranoid_restore
16037- testl $3,CS(%rsp)
16038+ testb $3,CS(%rsp)
16039 jnz paranoid_userspace
16040+#ifdef CONFIG_PAX_MEMORY_UDEREF
16041+ pax_exit_kernel
16042+ TRACE_IRQS_IRETQ 0
16043+ SWAPGS_UNSAFE_STACK
16044+ RESTORE_ALL 8
16045+ pax_force_retaddr_bts
16046+ jmp irq_return
16047+#endif
16048 paranoid_swapgs:
16049+#ifdef CONFIG_PAX_MEMORY_UDEREF
16050+ pax_exit_kernel_user
16051+#else
16052+ pax_exit_kernel
16053+#endif
16054 TRACE_IRQS_IRETQ 0
16055 SWAPGS_UNSAFE_STACK
16056 RESTORE_ALL 8
16057 jmp irq_return
16058 paranoid_restore:
16059+ pax_exit_kernel
16060 TRACE_IRQS_IRETQ 0
16061 RESTORE_ALL 8
16062+ pax_force_retaddr_bts
16063 jmp irq_return
16064 paranoid_userspace:
16065 GET_THREAD_INFO(%rcx)
16066@@ -1394,7 +1780,7 @@ paranoid_schedule:
16067 TRACE_IRQS_OFF
16068 jmp paranoid_userspace
16069 CFI_ENDPROC
16070-END(paranoid_exit)
16071+ENDPROC(paranoid_exit)
16072
16073 /*
16074 * Exception entry point. This expects an error code/orig_rax on the stack.
16075@@ -1421,12 +1807,13 @@ ENTRY(error_entry)
16076 movq_cfi r14, R14+8
16077 movq_cfi r15, R15+8
16078 xorl %ebx,%ebx
16079- testl $3,CS+8(%rsp)
16080+ testb $3,CS+8(%rsp)
16081 je error_kernelspace
16082 error_swapgs:
16083 SWAPGS
16084 error_sti:
16085 TRACE_IRQS_OFF
16086+ pax_force_retaddr_bts
16087 ret
16088
16089 /*
16090@@ -1453,7 +1840,7 @@ bstep_iret:
16091 movq %rcx,RIP+8(%rsp)
16092 jmp error_swapgs
16093 CFI_ENDPROC
16094-END(error_entry)
16095+ENDPROC(error_entry)
16096
16097
16098 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
16099@@ -1473,7 +1860,7 @@ ENTRY(error_exit)
16100 jnz retint_careful
16101 jmp retint_swapgs
16102 CFI_ENDPROC
16103-END(error_exit)
16104+ENDPROC(error_exit)
16105
16106
16107 /* runs on exception stack */
16108@@ -1485,6 +1872,16 @@ ENTRY(nmi)
16109 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16110 call save_paranoid
16111 DEFAULT_FRAME 0
16112+#ifdef CONFIG_PAX_MEMORY_UDEREF
16113+ testb $3, CS(%rsp)
16114+ jnz 1f
16115+ pax_enter_kernel
16116+ jmp 2f
16117+1: pax_enter_kernel_user
16118+2:
16119+#else
16120+ pax_enter_kernel
16121+#endif
16122 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
16123 movq %rsp,%rdi
16124 movq $-1,%rsi
16125@@ -1495,12 +1892,28 @@ ENTRY(nmi)
16126 DISABLE_INTERRUPTS(CLBR_NONE)
16127 testl %ebx,%ebx /* swapgs needed? */
16128 jnz nmi_restore
16129- testl $3,CS(%rsp)
16130+ testb $3,CS(%rsp)
16131 jnz nmi_userspace
16132+#ifdef CONFIG_PAX_MEMORY_UDEREF
16133+ pax_exit_kernel
16134+ SWAPGS_UNSAFE_STACK
16135+ RESTORE_ALL 8
16136+ pax_force_retaddr_bts
16137+ jmp irq_return
16138+#endif
16139 nmi_swapgs:
16140+#ifdef CONFIG_PAX_MEMORY_UDEREF
16141+ pax_exit_kernel_user
16142+#else
16143+ pax_exit_kernel
16144+#endif
16145 SWAPGS_UNSAFE_STACK
16146+ RESTORE_ALL 8
16147+ jmp irq_return
16148 nmi_restore:
16149+ pax_exit_kernel
16150 RESTORE_ALL 8
16151+ pax_force_retaddr_bts
16152 jmp irq_return
16153 nmi_userspace:
16154 GET_THREAD_INFO(%rcx)
16155@@ -1529,14 +1942,14 @@ nmi_schedule:
16156 jmp paranoid_exit
16157 CFI_ENDPROC
16158 #endif
16159-END(nmi)
16160+ENDPROC(nmi)
16161
16162 ENTRY(ignore_sysret)
16163 CFI_STARTPROC
16164 mov $-ENOSYS,%eax
16165 sysret
16166 CFI_ENDPROC
16167-END(ignore_sysret)
16168+ENDPROC(ignore_sysret)
16169
16170 /*
16171 * End of kprobes section
16172diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
16173index c9a281f..ce2f317 100644
16174--- a/arch/x86/kernel/ftrace.c
16175+++ b/arch/x86/kernel/ftrace.c
16176@@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the IP to write to */
16177 static const void *mod_code_newcode; /* holds the text to write to the IP */
16178
16179 static unsigned nmi_wait_count;
16180-static atomic_t nmi_update_count = ATOMIC_INIT(0);
16181+static atomic_unchecked_t nmi_update_count = ATOMIC_INIT(0);
16182
16183 int ftrace_arch_read_dyn_info(char *buf, int size)
16184 {
16185@@ -134,7 +134,7 @@ int ftrace_arch_read_dyn_info(char *buf, int size)
16186
16187 r = snprintf(buf, size, "%u %u",
16188 nmi_wait_count,
16189- atomic_read(&nmi_update_count));
16190+ atomic_read_unchecked(&nmi_update_count));
16191 return r;
16192 }
16193
16194@@ -177,8 +177,10 @@ void ftrace_nmi_enter(void)
16195
16196 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
16197 smp_rmb();
16198+ pax_open_kernel();
16199 ftrace_mod_code();
16200- atomic_inc(&nmi_update_count);
16201+ pax_close_kernel();
16202+ atomic_inc_unchecked(&nmi_update_count);
16203 }
16204 /* Must have previous changes seen before executions */
16205 smp_mb();
16206@@ -271,6 +273,8 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
16207 {
16208 unsigned char replaced[MCOUNT_INSN_SIZE];
16209
16210+ ip = ktla_ktva(ip);
16211+
16212 /*
16213 * Note: Due to modules and __init, code can
16214 * disappear and change, we need to protect against faulting
16215@@ -327,7 +331,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
16216 unsigned char old[MCOUNT_INSN_SIZE], *new;
16217 int ret;
16218
16219- memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
16220+ memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
16221 new = ftrace_call_replace(ip, (unsigned long)func);
16222 ret = ftrace_modify_code(ip, old, new);
16223
16224@@ -353,6 +357,8 @@ static int ftrace_mod_jmp(unsigned long ip,
16225 {
16226 unsigned char code[MCOUNT_INSN_SIZE];
16227
16228+ ip = ktla_ktva(ip);
16229+
16230 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
16231 return -EFAULT;
16232
16233diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
16234index 3bb0850..55a56f4 100644
16235--- a/arch/x86/kernel/head32.c
16236+++ b/arch/x86/kernel/head32.c
16237@@ -19,6 +19,7 @@
16238 #include <asm/io_apic.h>
16239 #include <asm/bios_ebda.h>
16240 #include <asm/tlbflush.h>
16241+#include <asm/boot.h>
16242
16243 static void __init i386_default_early_setup(void)
16244 {
16245@@ -33,7 +34,7 @@ void __init i386_start_kernel(void)
16246 {
16247 memblock_init();
16248
16249- memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
16250+ memblock_x86_reserve_range(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
16251
16252 #ifdef CONFIG_BLK_DEV_INITRD
16253 /* Reserve INITRD */
16254diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
16255index ce0be7c..c41476e 100644
16256--- a/arch/x86/kernel/head_32.S
16257+++ b/arch/x86/kernel/head_32.S
16258@@ -25,6 +25,12 @@
16259 /* Physical address */
16260 #define pa(X) ((X) - __PAGE_OFFSET)
16261
16262+#ifdef CONFIG_PAX_KERNEXEC
16263+#define ta(X) (X)
16264+#else
16265+#define ta(X) ((X) - __PAGE_OFFSET)
16266+#endif
16267+
16268 /*
16269 * References to members of the new_cpu_data structure.
16270 */
16271@@ -54,11 +60,7 @@
16272 * and small than max_low_pfn, otherwise will waste some page table entries
16273 */
16274
16275-#if PTRS_PER_PMD > 1
16276-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
16277-#else
16278-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
16279-#endif
16280+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
16281
16282 /* Number of possible pages in the lowmem region */
16283 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
16284@@ -77,6 +79,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
16285 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16286
16287 /*
16288+ * Real beginning of normal "text" segment
16289+ */
16290+ENTRY(stext)
16291+ENTRY(_stext)
16292+
16293+/*
16294 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
16295 * %esi points to the real-mode code as a 32-bit pointer.
16296 * CS and DS must be 4 GB flat segments, but we don't depend on
16297@@ -84,6 +92,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16298 * can.
16299 */
16300 __HEAD
16301+
16302+#ifdef CONFIG_PAX_KERNEXEC
16303+ jmp startup_32
16304+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
16305+.fill PAGE_SIZE-5,1,0xcc
16306+#endif
16307+
16308 ENTRY(startup_32)
16309 movl pa(stack_start),%ecx
16310
16311@@ -105,6 +120,57 @@ ENTRY(startup_32)
16312 2:
16313 leal -__PAGE_OFFSET(%ecx),%esp
16314
16315+#ifdef CONFIG_SMP
16316+ movl $pa(cpu_gdt_table),%edi
16317+ movl $__per_cpu_load,%eax
16318+ movw %ax,__KERNEL_PERCPU + 2(%edi)
16319+ rorl $16,%eax
16320+ movb %al,__KERNEL_PERCPU + 4(%edi)
16321+ movb %ah,__KERNEL_PERCPU + 7(%edi)
16322+ movl $__per_cpu_end - 1,%eax
16323+ subl $__per_cpu_start,%eax
16324+ movw %ax,__KERNEL_PERCPU + 0(%edi)
16325+#endif
16326+
16327+#ifdef CONFIG_PAX_MEMORY_UDEREF
16328+ movl $NR_CPUS,%ecx
16329+ movl $pa(cpu_gdt_table),%edi
16330+1:
16331+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
16332+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
16333+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
16334+ addl $PAGE_SIZE_asm,%edi
16335+ loop 1b
16336+#endif
16337+
16338+#ifdef CONFIG_PAX_KERNEXEC
16339+ movl $pa(boot_gdt),%edi
16340+ movl $__LOAD_PHYSICAL_ADDR,%eax
16341+ movw %ax,__BOOT_CS + 2(%edi)
16342+ rorl $16,%eax
16343+ movb %al,__BOOT_CS + 4(%edi)
16344+ movb %ah,__BOOT_CS + 7(%edi)
16345+ rorl $16,%eax
16346+
16347+ ljmp $(__BOOT_CS),$1f
16348+1:
16349+
16350+ movl $NR_CPUS,%ecx
16351+ movl $pa(cpu_gdt_table),%edi
16352+ addl $__PAGE_OFFSET,%eax
16353+1:
16354+ movw %ax,__KERNEL_CS + 2(%edi)
16355+ movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi)
16356+ rorl $16,%eax
16357+ movb %al,__KERNEL_CS + 4(%edi)
16358+ movb %al,__KERNEXEC_KERNEL_CS + 4(%edi)
16359+ movb %ah,__KERNEL_CS + 7(%edi)
16360+ movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi)
16361+ rorl $16,%eax
16362+ addl $PAGE_SIZE_asm,%edi
16363+ loop 1b
16364+#endif
16365+
16366 /*
16367 * Clear BSS first so that there are no surprises...
16368 */
16369@@ -195,8 +261,11 @@ ENTRY(startup_32)
16370 movl %eax, pa(max_pfn_mapped)
16371
16372 /* Do early initialization of the fixmap area */
16373- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
16374- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
16375+#ifdef CONFIG_COMPAT_VDSO
16376+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
16377+#else
16378+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
16379+#endif
16380 #else /* Not PAE */
16381
16382 page_pde_offset = (__PAGE_OFFSET >> 20);
16383@@ -226,8 +295,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
16384 movl %eax, pa(max_pfn_mapped)
16385
16386 /* Do early initialization of the fixmap area */
16387- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
16388- movl %eax,pa(initial_page_table+0xffc)
16389+#ifdef CONFIG_COMPAT_VDSO
16390+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
16391+#else
16392+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
16393+#endif
16394 #endif
16395
16396 #ifdef CONFIG_PARAVIRT
16397@@ -241,9 +313,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
16398 cmpl $num_subarch_entries, %eax
16399 jae bad_subarch
16400
16401- movl pa(subarch_entries)(,%eax,4), %eax
16402- subl $__PAGE_OFFSET, %eax
16403- jmp *%eax
16404+ jmp *pa(subarch_entries)(,%eax,4)
16405
16406 bad_subarch:
16407 WEAK(lguest_entry)
16408@@ -255,10 +325,10 @@ WEAK(xen_entry)
16409 __INITDATA
16410
16411 subarch_entries:
16412- .long default_entry /* normal x86/PC */
16413- .long lguest_entry /* lguest hypervisor */
16414- .long xen_entry /* Xen hypervisor */
16415- .long default_entry /* Moorestown MID */
16416+ .long ta(default_entry) /* normal x86/PC */
16417+ .long ta(lguest_entry) /* lguest hypervisor */
16418+ .long ta(xen_entry) /* Xen hypervisor */
16419+ .long ta(default_entry) /* Moorestown MID */
16420 num_subarch_entries = (. - subarch_entries) / 4
16421 .previous
16422 #else
16423@@ -312,6 +382,7 @@ default_entry:
16424 orl %edx,%eax
16425 movl %eax,%cr4
16426
16427+#ifdef CONFIG_X86_PAE
16428 testb $X86_CR4_PAE, %al # check if PAE is enabled
16429 jz 6f
16430
16431@@ -340,6 +411,9 @@ default_entry:
16432 /* Make changes effective */
16433 wrmsr
16434
16435+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
16436+#endif
16437+
16438 6:
16439
16440 /*
16441@@ -443,7 +517,7 @@ is386: movl $2,%ecx # set MP
16442 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
16443 movl %eax,%ss # after changing gdt.
16444
16445- movl $(__USER_DS),%eax # DS/ES contains default USER segment
16446+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
16447 movl %eax,%ds
16448 movl %eax,%es
16449
16450@@ -457,15 +531,22 @@ is386: movl $2,%ecx # set MP
16451 */
16452 cmpb $0,ready
16453 jne 1f
16454- movl $gdt_page,%eax
16455+ movl $cpu_gdt_table,%eax
16456 movl $stack_canary,%ecx
16457+#ifdef CONFIG_SMP
16458+ addl $__per_cpu_load,%ecx
16459+#endif
16460 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
16461 shrl $16, %ecx
16462 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
16463 movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax)
16464 1:
16465-#endif
16466 movl $(__KERNEL_STACK_CANARY),%eax
16467+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
16468+ movl $(__USER_DS),%eax
16469+#else
16470+ xorl %eax,%eax
16471+#endif
16472 movl %eax,%gs
16473
16474 xorl %eax,%eax # Clear LDT
16475@@ -558,22 +639,22 @@ early_page_fault:
16476 jmp early_fault
16477
16478 early_fault:
16479- cld
16480 #ifdef CONFIG_PRINTK
16481+ cmpl $1,%ss:early_recursion_flag
16482+ je hlt_loop
16483+ incl %ss:early_recursion_flag
16484+ cld
16485 pusha
16486 movl $(__KERNEL_DS),%eax
16487 movl %eax,%ds
16488 movl %eax,%es
16489- cmpl $2,early_recursion_flag
16490- je hlt_loop
16491- incl early_recursion_flag
16492 movl %cr2,%eax
16493 pushl %eax
16494 pushl %edx /* trapno */
16495 pushl $fault_msg
16496 call printk
16497+; call dump_stack
16498 #endif
16499- call dump_stack
16500 hlt_loop:
16501 hlt
16502 jmp hlt_loop
16503@@ -581,8 +662,11 @@ hlt_loop:
16504 /* This is the default interrupt "handler" :-) */
16505 ALIGN
16506 ignore_int:
16507- cld
16508 #ifdef CONFIG_PRINTK
16509+ cmpl $2,%ss:early_recursion_flag
16510+ je hlt_loop
16511+ incl %ss:early_recursion_flag
16512+ cld
16513 pushl %eax
16514 pushl %ecx
16515 pushl %edx
16516@@ -591,9 +675,6 @@ ignore_int:
16517 movl $(__KERNEL_DS),%eax
16518 movl %eax,%ds
16519 movl %eax,%es
16520- cmpl $2,early_recursion_flag
16521- je hlt_loop
16522- incl early_recursion_flag
16523 pushl 16(%esp)
16524 pushl 24(%esp)
16525 pushl 32(%esp)
16526@@ -622,29 +703,43 @@ ENTRY(initial_code)
16527 /*
16528 * BSS section
16529 */
16530-__PAGE_ALIGNED_BSS
16531- .align PAGE_SIZE
16532 #ifdef CONFIG_X86_PAE
16533+.section .initial_pg_pmd,"a",@progbits
16534 initial_pg_pmd:
16535 .fill 1024*KPMDS,4,0
16536 #else
16537+.section .initial_page_table,"a",@progbits
16538 ENTRY(initial_page_table)
16539 .fill 1024,4,0
16540 #endif
16541+.section .initial_pg_fixmap,"a",@progbits
16542 initial_pg_fixmap:
16543 .fill 1024,4,0
16544+.section .empty_zero_page,"a",@progbits
16545 ENTRY(empty_zero_page)
16546 .fill 4096,1,0
16547+.section .swapper_pg_dir,"a",@progbits
16548 ENTRY(swapper_pg_dir)
16549+#ifdef CONFIG_X86_PAE
16550+ .fill 4,8,0
16551+#else
16552 .fill 1024,4,0
16553+#endif
16554+
16555+/*
16556+ * The IDT has to be page-aligned to simplify the Pentium
16557+ * F0 0F bug workaround.. We have a special link segment
16558+ * for this.
16559+ */
16560+.section .idt,"a",@progbits
16561+ENTRY(idt_table)
16562+ .fill 256,8,0
16563
16564 /*
16565 * This starts the data section.
16566 */
16567 #ifdef CONFIG_X86_PAE
16568-__PAGE_ALIGNED_DATA
16569- /* Page-aligned for the benefit of paravirt? */
16570- .align PAGE_SIZE
16571+.section .initial_page_table,"a",@progbits
16572 ENTRY(initial_page_table)
16573 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
16574 # if KPMDS == 3
16575@@ -663,18 +758,27 @@ ENTRY(initial_page_table)
16576 # error "Kernel PMDs should be 1, 2 or 3"
16577 # endif
16578 .align PAGE_SIZE /* needs to be page-sized too */
16579+
16580+#ifdef CONFIG_PAX_PER_CPU_PGD
16581+ENTRY(cpu_pgd)
16582+ .rept NR_CPUS
16583+ .fill 4,8,0
16584+ .endr
16585+#endif
16586+
16587 #endif
16588
16589 .data
16590 .balign 4
16591 ENTRY(stack_start)
16592- .long init_thread_union+THREAD_SIZE
16593+ .long init_thread_union+THREAD_SIZE-8
16594
16595+ready: .byte 0
16596+
16597+.section .rodata,"a",@progbits
16598 early_recursion_flag:
16599 .long 0
16600
16601-ready: .byte 0
16602-
16603 int_msg:
16604 .asciz "Unknown interrupt or fault at: %p %p %p\n"
16605
16606@@ -707,7 +811,7 @@ fault_msg:
16607 .word 0 # 32 bit align gdt_desc.address
16608 boot_gdt_descr:
16609 .word __BOOT_DS+7
16610- .long boot_gdt - __PAGE_OFFSET
16611+ .long pa(boot_gdt)
16612
16613 .word 0 # 32-bit align idt_desc.address
16614 idt_descr:
16615@@ -718,7 +822,7 @@ idt_descr:
16616 .word 0 # 32 bit align gdt_desc.address
16617 ENTRY(early_gdt_descr)
16618 .word GDT_ENTRIES*8-1
16619- .long gdt_page /* Overwritten for secondary CPUs */
16620+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
16621
16622 /*
16623 * The boot_gdt must mirror the equivalent in setup.S and is
16624@@ -727,5 +831,65 @@ ENTRY(early_gdt_descr)
16625 .align L1_CACHE_BYTES
16626 ENTRY(boot_gdt)
16627 .fill GDT_ENTRY_BOOT_CS,8,0
16628- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
16629- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
16630+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
16631+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
16632+
16633+ .align PAGE_SIZE_asm
16634+ENTRY(cpu_gdt_table)
16635+ .rept NR_CPUS
16636+ .quad 0x0000000000000000 /* NULL descriptor */
16637+ .quad 0x0000000000000000 /* 0x0b reserved */
16638+ .quad 0x0000000000000000 /* 0x13 reserved */
16639+ .quad 0x0000000000000000 /* 0x1b reserved */
16640+
16641+#ifdef CONFIG_PAX_KERNEXEC
16642+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
16643+#else
16644+ .quad 0x0000000000000000 /* 0x20 unused */
16645+#endif
16646+
16647+ .quad 0x0000000000000000 /* 0x28 unused */
16648+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
16649+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
16650+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
16651+ .quad 0x0000000000000000 /* 0x4b reserved */
16652+ .quad 0x0000000000000000 /* 0x53 reserved */
16653+ .quad 0x0000000000000000 /* 0x5b reserved */
16654+
16655+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
16656+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
16657+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
16658+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
16659+
16660+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
16661+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
16662+
16663+ /*
16664+ * Segments used for calling PnP BIOS have byte granularity.
16665+ * The code segments and data segments have fixed 64k limits,
16666+ * the transfer segment sizes are set at run time.
16667+ */
16668+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
16669+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
16670+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
16671+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
16672+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
16673+
16674+ /*
16675+ * The APM segments have byte granularity and their bases
16676+ * are set at run time. All have 64k limits.
16677+ */
16678+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
16679+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
16680+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
16681+
16682+ .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
16683+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
16684+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
16685+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
16686+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
16687+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
16688+
16689+ /* Be sure this is zeroed to avoid false validations in Xen */
16690+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
16691+ .endr
16692diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
16693index e11e394..9aebc5d 100644
16694--- a/arch/x86/kernel/head_64.S
16695+++ b/arch/x86/kernel/head_64.S
16696@@ -19,6 +19,8 @@
16697 #include <asm/cache.h>
16698 #include <asm/processor-flags.h>
16699 #include <asm/percpu.h>
16700+#include <asm/cpufeature.h>
16701+#include <asm/alternative-asm.h>
16702
16703 #ifdef CONFIG_PARAVIRT
16704 #include <asm/asm-offsets.h>
16705@@ -38,6 +40,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
16706 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
16707 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
16708 L3_START_KERNEL = pud_index(__START_KERNEL_map)
16709+L4_VMALLOC_START = pgd_index(VMALLOC_START)
16710+L3_VMALLOC_START = pud_index(VMALLOC_START)
16711+L4_VMALLOC_END = pgd_index(VMALLOC_END)
16712+L3_VMALLOC_END = pud_index(VMALLOC_END)
16713+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
16714+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
16715
16716 .text
16717 __HEAD
16718@@ -85,35 +93,23 @@ startup_64:
16719 */
16720 addq %rbp, init_level4_pgt + 0(%rip)
16721 addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
16722+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
16723+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
16724+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
16725 addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
16726
16727 addq %rbp, level3_ident_pgt + 0(%rip)
16728+#ifndef CONFIG_XEN
16729+ addq %rbp, level3_ident_pgt + 8(%rip)
16730+#endif
16731
16732- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
16733- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
16734+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
16735+
16736+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
16737+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
16738
16739 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
16740-
16741- /* Add an Identity mapping if I am above 1G */
16742- leaq _text(%rip), %rdi
16743- andq $PMD_PAGE_MASK, %rdi
16744-
16745- movq %rdi, %rax
16746- shrq $PUD_SHIFT, %rax
16747- andq $(PTRS_PER_PUD - 1), %rax
16748- jz ident_complete
16749-
16750- leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
16751- leaq level3_ident_pgt(%rip), %rbx
16752- movq %rdx, 0(%rbx, %rax, 8)
16753-
16754- movq %rdi, %rax
16755- shrq $PMD_SHIFT, %rax
16756- andq $(PTRS_PER_PMD - 1), %rax
16757- leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx
16758- leaq level2_spare_pgt(%rip), %rbx
16759- movq %rdx, 0(%rbx, %rax, 8)
16760-ident_complete:
16761+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
16762
16763 /*
16764 * Fixup the kernel text+data virtual addresses. Note that
16765@@ -160,8 +156,8 @@ ENTRY(secondary_startup_64)
16766 * after the boot processor executes this code.
16767 */
16768
16769- /* Enable PAE mode and PGE */
16770- movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
16771+ /* Enable PAE mode and PSE/PGE */
16772+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
16773 movq %rax, %cr4
16774
16775 /* Setup early boot stage 4 level pagetables. */
16776@@ -183,9 +179,17 @@ ENTRY(secondary_startup_64)
16777 movl $MSR_EFER, %ecx
16778 rdmsr
16779 btsl $_EFER_SCE, %eax /* Enable System Call */
16780- btl $20,%edi /* No Execute supported? */
16781+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
16782 jnc 1f
16783 btsl $_EFER_NX, %eax
16784+ leaq init_level4_pgt(%rip), %rdi
16785+#ifndef CONFIG_EFI
16786+ btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
16787+#endif
16788+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
16789+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
16790+ btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
16791+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
16792 1: wrmsr /* Make changes effective */
16793
16794 /* Setup cr0 */
16795@@ -247,6 +251,7 @@ ENTRY(secondary_startup_64)
16796 * jump. In addition we need to ensure %cs is set so we make this
16797 * a far return.
16798 */
16799+ pax_set_fptr_mask
16800 movq initial_code(%rip),%rax
16801 pushq $0 # fake return address to stop unwinder
16802 pushq $__KERNEL_CS # set correct cs
16803@@ -269,7 +274,7 @@ ENTRY(secondary_startup_64)
16804 bad_address:
16805 jmp bad_address
16806
16807- .section ".init.text","ax"
16808+ __INIT
16809 #ifdef CONFIG_EARLY_PRINTK
16810 .globl early_idt_handlers
16811 early_idt_handlers:
16812@@ -314,18 +319,23 @@ ENTRY(early_idt_handler)
16813 #endif /* EARLY_PRINTK */
16814 1: hlt
16815 jmp 1b
16816+ .previous
16817
16818 #ifdef CONFIG_EARLY_PRINTK
16819+ __INITDATA
16820 early_recursion_flag:
16821 .long 0
16822+ .previous
16823
16824+ .section .rodata,"a",@progbits
16825 early_idt_msg:
16826 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
16827 early_idt_ripmsg:
16828 .asciz "RIP %s\n"
16829+ .previous
16830 #endif /* CONFIG_EARLY_PRINTK */
16831- .previous
16832
16833+ .section .rodata,"a",@progbits
16834 #define NEXT_PAGE(name) \
16835 .balign PAGE_SIZE; \
16836 ENTRY(name)
16837@@ -338,7 +348,6 @@ ENTRY(name)
16838 i = i + 1 ; \
16839 .endr
16840
16841- .data
16842 /*
16843 * This default setting generates an ident mapping at address 0x100000
16844 * and a mapping for the kernel that precisely maps virtual address
16845@@ -349,13 +358,41 @@ NEXT_PAGE(init_level4_pgt)
16846 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
16847 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
16848 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
16849+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
16850+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
16851+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
16852+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
16853+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
16854+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
16855 .org init_level4_pgt + L4_START_KERNEL*8, 0
16856 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
16857 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
16858
16859+#ifdef CONFIG_PAX_PER_CPU_PGD
16860+NEXT_PAGE(cpu_pgd)
16861+ .rept NR_CPUS
16862+ .fill 512,8,0
16863+ .endr
16864+#endif
16865+
16866 NEXT_PAGE(level3_ident_pgt)
16867 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
16868+#ifdef CONFIG_XEN
16869 .fill 511,8,0
16870+#else
16871+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
16872+ .fill 510,8,0
16873+#endif
16874+
16875+NEXT_PAGE(level3_vmalloc_start_pgt)
16876+ .fill 512,8,0
16877+
16878+NEXT_PAGE(level3_vmalloc_end_pgt)
16879+ .fill 512,8,0
16880+
16881+NEXT_PAGE(level3_vmemmap_pgt)
16882+ .fill L3_VMEMMAP_START,8,0
16883+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
16884
16885 NEXT_PAGE(level3_kernel_pgt)
16886 .fill L3_START_KERNEL,8,0
16887@@ -363,20 +400,23 @@ NEXT_PAGE(level3_kernel_pgt)
16888 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
16889 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
16890
16891+NEXT_PAGE(level2_vmemmap_pgt)
16892+ .fill 512,8,0
16893+
16894 NEXT_PAGE(level2_fixmap_pgt)
16895- .fill 506,8,0
16896- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
16897- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
16898- .fill 5,8,0
16899+ .fill 507,8,0
16900+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
16901+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
16902+ .fill 4,8,0
16903
16904-NEXT_PAGE(level1_fixmap_pgt)
16905+NEXT_PAGE(level1_vsyscall_pgt)
16906 .fill 512,8,0
16907
16908-NEXT_PAGE(level2_ident_pgt)
16909- /* Since I easily can, map the first 1G.
16910+ /* Since I easily can, map the first 2G.
16911 * Don't set NX because code runs from these pages.
16912 */
16913- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
16914+NEXT_PAGE(level2_ident_pgt)
16915+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
16916
16917 NEXT_PAGE(level2_kernel_pgt)
16918 /*
16919@@ -389,33 +429,55 @@ NEXT_PAGE(level2_kernel_pgt)
16920 * If you want to increase this then increase MODULES_VADDR
16921 * too.)
16922 */
16923- PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
16924- KERNEL_IMAGE_SIZE/PMD_SIZE)
16925-
16926-NEXT_PAGE(level2_spare_pgt)
16927- .fill 512, 8, 0
16928+ PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)
16929
16930 #undef PMDS
16931 #undef NEXT_PAGE
16932
16933- .data
16934+ .align PAGE_SIZE
16935+ENTRY(cpu_gdt_table)
16936+ .rept NR_CPUS
16937+ .quad 0x0000000000000000 /* NULL descriptor */
16938+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
16939+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
16940+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
16941+ .quad 0x00cffb000000ffff /* __USER32_CS */
16942+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
16943+ .quad 0x00affb000000ffff /* __USER_CS */
16944+
16945+#ifdef CONFIG_PAX_KERNEXEC
16946+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
16947+#else
16948+ .quad 0x0 /* unused */
16949+#endif
16950+
16951+ .quad 0,0 /* TSS */
16952+ .quad 0,0 /* LDT */
16953+ .quad 0,0,0 /* three TLS descriptors */
16954+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
16955+ /* asm/segment.h:GDT_ENTRIES must match this */
16956+
16957+ /* zero the remaining page */
16958+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
16959+ .endr
16960+
16961 .align 16
16962 .globl early_gdt_descr
16963 early_gdt_descr:
16964 .word GDT_ENTRIES*8-1
16965 early_gdt_descr_base:
16966- .quad INIT_PER_CPU_VAR(gdt_page)
16967+ .quad cpu_gdt_table
16968
16969 ENTRY(phys_base)
16970 /* This must match the first entry in level2_kernel_pgt */
16971 .quad 0x0000000000000000
16972
16973 #include "../../x86/xen/xen-head.S"
16974-
16975- .section .bss, "aw", @nobits
16976+
16977+ .section .rodata,"a",@progbits
16978 .align L1_CACHE_BYTES
16979 ENTRY(idt_table)
16980- .skip IDT_ENTRIES * 16
16981+ .fill 512,8,0
16982
16983 __PAGE_ALIGNED_BSS
16984 .align PAGE_SIZE
16985diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
16986index 9c3bd4a..e1d9b35 100644
16987--- a/arch/x86/kernel/i386_ksyms_32.c
16988+++ b/arch/x86/kernel/i386_ksyms_32.c
16989@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
16990 EXPORT_SYMBOL(cmpxchg8b_emu);
16991 #endif
16992
16993+EXPORT_SYMBOL_GPL(cpu_gdt_table);
16994+
16995 /* Networking helper routines. */
16996 EXPORT_SYMBOL(csum_partial_copy_generic);
16997+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
16998+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
16999
17000 EXPORT_SYMBOL(__get_user_1);
17001 EXPORT_SYMBOL(__get_user_2);
17002@@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr);
17003
17004 EXPORT_SYMBOL(csum_partial);
17005 EXPORT_SYMBOL(empty_zero_page);
17006+
17007+#ifdef CONFIG_PAX_KERNEXEC
17008+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
17009+#endif
17010diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
17011index 739d859..d1d6be7 100644
17012--- a/arch/x86/kernel/i387.c
17013+++ b/arch/x86/kernel/i387.c
17014@@ -188,6 +188,9 @@ int xfpregs_active(struct task_struct *target, const struct user_regset *regset)
17015
17016 int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
17017 unsigned int pos, unsigned int count,
17018+ void *kbuf, void __user *ubuf) __size_overflow(4);
17019+int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
17020+ unsigned int pos, unsigned int count,
17021 void *kbuf, void __user *ubuf)
17022 {
17023 int ret;
17024@@ -207,6 +210,9 @@ int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
17025
17026 int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17027 unsigned int pos, unsigned int count,
17028+ const void *kbuf, const void __user *ubuf) __size_overflow(4);
17029+int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17030+ unsigned int pos, unsigned int count,
17031 const void *kbuf, const void __user *ubuf)
17032 {
17033 int ret;
17034@@ -240,6 +246,9 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17035
17036 int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17037 unsigned int pos, unsigned int count,
17038+ void *kbuf, void __user *ubuf) __size_overflow(4);
17039+int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17040+ unsigned int pos, unsigned int count,
17041 void *kbuf, void __user *ubuf)
17042 {
17043 int ret;
17044@@ -269,6 +278,9 @@ int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17045
17046 int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
17047 unsigned int pos, unsigned int count,
17048+ const void *kbuf, const void __user *ubuf) __size_overflow(4);
17049+int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
17050+ unsigned int pos, unsigned int count,
17051 const void *kbuf, const void __user *ubuf)
17052 {
17053 int ret;
17054@@ -439,6 +451,9 @@ static void convert_to_fxsr(struct task_struct *tsk,
17055
17056 int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17057 unsigned int pos, unsigned int count,
17058+ void *kbuf, void __user *ubuf) __size_overflow(3,4);
17059+int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17060+ unsigned int pos, unsigned int count,
17061 void *kbuf, void __user *ubuf)
17062 {
17063 struct user_i387_ia32_struct env;
17064@@ -471,6 +486,9 @@ int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17065
17066 int fpregs_set(struct task_struct *target, const struct user_regset *regset,
17067 unsigned int pos, unsigned int count,
17068+ const void *kbuf, const void __user *ubuf) __size_overflow(3,4);
17069+int fpregs_set(struct task_struct *target, const struct user_regset *regset,
17070+ unsigned int pos, unsigned int count,
17071 const void *kbuf, const void __user *ubuf)
17072 {
17073 struct user_i387_ia32_struct env;
17074@@ -619,6 +637,8 @@ static inline int restore_i387_fsave(struct _fpstate_ia32 __user *buf)
17075 }
17076
17077 static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf,
17078+ unsigned int size) __size_overflow(2);
17079+static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf,
17080 unsigned int size)
17081 {
17082 struct task_struct *tsk = current;
17083diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
17084index 6104852..6114160 100644
17085--- a/arch/x86/kernel/i8259.c
17086+++ b/arch/x86/kernel/i8259.c
17087@@ -210,7 +210,7 @@ spurious_8259A_irq:
17088 "spurious 8259A interrupt: IRQ%d.\n", irq);
17089 spurious_irq_mask |= irqmask;
17090 }
17091- atomic_inc(&irq_err_count);
17092+ atomic_inc_unchecked(&irq_err_count);
17093 /*
17094 * Theoretically we do not have to handle this IRQ,
17095 * but in Linux this does not cause problems and is
17096diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
17097index 43e9ccf..44ccf6f 100644
17098--- a/arch/x86/kernel/init_task.c
17099+++ b/arch/x86/kernel/init_task.c
17100@@ -20,8 +20,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
17101 * way process stacks are handled. This is done by having a special
17102 * "init_task" linker map entry..
17103 */
17104-union thread_union init_thread_union __init_task_data =
17105- { INIT_THREAD_INFO(init_task) };
17106+union thread_union init_thread_union __init_task_data;
17107
17108 /*
17109 * Initial task structure.
17110@@ -38,5 +37,5 @@ EXPORT_SYMBOL(init_task);
17111 * section. Since TSS's are completely CPU-local, we want them
17112 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
17113 */
17114-DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
17115-
17116+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
17117+EXPORT_SYMBOL(init_tss);
17118diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
17119index 8c96897..be66bfa 100644
17120--- a/arch/x86/kernel/ioport.c
17121+++ b/arch/x86/kernel/ioport.c
17122@@ -6,6 +6,7 @@
17123 #include <linux/sched.h>
17124 #include <linux/kernel.h>
17125 #include <linux/capability.h>
17126+#include <linux/security.h>
17127 #include <linux/errno.h>
17128 #include <linux/types.h>
17129 #include <linux/ioport.h>
17130@@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17131
17132 if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
17133 return -EINVAL;
17134+#ifdef CONFIG_GRKERNSEC_IO
17135+ if (turn_on && grsec_disable_privio) {
17136+ gr_handle_ioperm();
17137+ return -EPERM;
17138+ }
17139+#endif
17140 if (turn_on && !capable(CAP_SYS_RAWIO))
17141 return -EPERM;
17142
17143@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17144 * because the ->io_bitmap_max value must match the bitmap
17145 * contents:
17146 */
17147- tss = &per_cpu(init_tss, get_cpu());
17148+ tss = init_tss + get_cpu();
17149
17150 if (turn_on)
17151 bitmap_clear(t->io_bitmap_ptr, from, num);
17152@@ -102,6 +109,12 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
17153 return -EINVAL;
17154 /* Trying to gain more privileges? */
17155 if (level > old) {
17156+#ifdef CONFIG_GRKERNSEC_IO
17157+ if (grsec_disable_privio) {
17158+ gr_handle_iopl();
17159+ return -EPERM;
17160+ }
17161+#endif
17162 if (!capable(CAP_SYS_RAWIO))
17163 return -EPERM;
17164 }
17165diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
17166index 429e0c9..17b3ece 100644
17167--- a/arch/x86/kernel/irq.c
17168+++ b/arch/x86/kernel/irq.c
17169@@ -18,7 +18,7 @@
17170 #include <asm/mce.h>
17171 #include <asm/hw_irq.h>
17172
17173-atomic_t irq_err_count;
17174+atomic_unchecked_t irq_err_count;
17175
17176 /* Function pointer for generic interrupt vector handling */
17177 void (*x86_platform_ipi_callback)(void) = NULL;
17178@@ -117,9 +117,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
17179 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
17180 seq_printf(p, " Machine check polls\n");
17181 #endif
17182- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
17183+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
17184 #if defined(CONFIG_X86_IO_APIC)
17185- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
17186+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
17187 #endif
17188 return 0;
17189 }
17190@@ -159,10 +159,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
17191
17192 u64 arch_irq_stat(void)
17193 {
17194- u64 sum = atomic_read(&irq_err_count);
17195+ u64 sum = atomic_read_unchecked(&irq_err_count);
17196
17197 #ifdef CONFIG_X86_IO_APIC
17198- sum += atomic_read(&irq_mis_count);
17199+ sum += atomic_read_unchecked(&irq_mis_count);
17200 #endif
17201 return sum;
17202 }
17203diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
17204index 7209070..cbcd71a 100644
17205--- a/arch/x86/kernel/irq_32.c
17206+++ b/arch/x86/kernel/irq_32.c
17207@@ -36,7 +36,7 @@ static int check_stack_overflow(void)
17208 __asm__ __volatile__("andl %%esp,%0" :
17209 "=r" (sp) : "0" (THREAD_SIZE - 1));
17210
17211- return sp < (sizeof(struct thread_info) + STACK_WARN);
17212+ return sp < STACK_WARN;
17213 }
17214
17215 static void print_stack_overflow(void)
17216@@ -54,8 +54,8 @@ static inline void print_stack_overflow(void) { }
17217 * per-CPU IRQ handling contexts (thread information and stack)
17218 */
17219 union irq_ctx {
17220- struct thread_info tinfo;
17221- u32 stack[THREAD_SIZE/sizeof(u32)];
17222+ unsigned long previous_esp;
17223+ u32 stack[THREAD_SIZE/sizeof(u32)];
17224 } __attribute__((aligned(THREAD_SIZE)));
17225
17226 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
17227@@ -75,10 +75,9 @@ static void call_on_stack(void *func, void *stack)
17228 static inline int
17229 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17230 {
17231- union irq_ctx *curctx, *irqctx;
17232+ union irq_ctx *irqctx;
17233 u32 *isp, arg1, arg2;
17234
17235- curctx = (union irq_ctx *) current_thread_info();
17236 irqctx = __this_cpu_read(hardirq_ctx);
17237
17238 /*
17239@@ -87,21 +86,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17240 * handler) we can't do that and just have to keep using the
17241 * current stack (which is the irq stack already after all)
17242 */
17243- if (unlikely(curctx == irqctx))
17244+ if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
17245 return 0;
17246
17247 /* build the stack frame on the IRQ stack */
17248- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17249- irqctx->tinfo.task = curctx->tinfo.task;
17250- irqctx->tinfo.previous_esp = current_stack_pointer;
17251+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17252+ irqctx->previous_esp = current_stack_pointer;
17253
17254- /*
17255- * Copy the softirq bits in preempt_count so that the
17256- * softirq checks work in the hardirq context.
17257- */
17258- irqctx->tinfo.preempt_count =
17259- (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
17260- (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
17261+#ifdef CONFIG_PAX_MEMORY_UDEREF
17262+ __set_fs(MAKE_MM_SEG(0));
17263+#endif
17264
17265 if (unlikely(overflow))
17266 call_on_stack(print_stack_overflow, isp);
17267@@ -113,6 +107,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17268 : "0" (irq), "1" (desc), "2" (isp),
17269 "D" (desc->handle_irq)
17270 : "memory", "cc", "ecx");
17271+
17272+#ifdef CONFIG_PAX_MEMORY_UDEREF
17273+ __set_fs(current_thread_info()->addr_limit);
17274+#endif
17275+
17276 return 1;
17277 }
17278
17279@@ -121,29 +120,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17280 */
17281 void __cpuinit irq_ctx_init(int cpu)
17282 {
17283- union irq_ctx *irqctx;
17284-
17285 if (per_cpu(hardirq_ctx, cpu))
17286 return;
17287
17288- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17289- THREAD_FLAGS,
17290- THREAD_ORDER));
17291- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17292- irqctx->tinfo.cpu = cpu;
17293- irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
17294- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17295-
17296- per_cpu(hardirq_ctx, cpu) = irqctx;
17297-
17298- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17299- THREAD_FLAGS,
17300- THREAD_ORDER));
17301- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17302- irqctx->tinfo.cpu = cpu;
17303- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17304-
17305- per_cpu(softirq_ctx, cpu) = irqctx;
17306+ per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
17307+ per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
17308
17309 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
17310 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
17311@@ -152,7 +133,6 @@ void __cpuinit irq_ctx_init(int cpu)
17312 asmlinkage void do_softirq(void)
17313 {
17314 unsigned long flags;
17315- struct thread_info *curctx;
17316 union irq_ctx *irqctx;
17317 u32 *isp;
17318
17319@@ -162,15 +142,22 @@ asmlinkage void do_softirq(void)
17320 local_irq_save(flags);
17321
17322 if (local_softirq_pending()) {
17323- curctx = current_thread_info();
17324 irqctx = __this_cpu_read(softirq_ctx);
17325- irqctx->tinfo.task = curctx->task;
17326- irqctx->tinfo.previous_esp = current_stack_pointer;
17327+ irqctx->previous_esp = current_stack_pointer;
17328
17329 /* build the stack frame on the softirq stack */
17330- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17331+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17332+
17333+#ifdef CONFIG_PAX_MEMORY_UDEREF
17334+ __set_fs(MAKE_MM_SEG(0));
17335+#endif
17336
17337 call_on_stack(__do_softirq, isp);
17338+
17339+#ifdef CONFIG_PAX_MEMORY_UDEREF
17340+ __set_fs(current_thread_info()->addr_limit);
17341+#endif
17342+
17343 /*
17344 * Shouldn't happen, we returned above if in_interrupt():
17345 */
17346diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
17347index 69bca46..0bac999 100644
17348--- a/arch/x86/kernel/irq_64.c
17349+++ b/arch/x86/kernel/irq_64.c
17350@@ -38,7 +38,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
17351 #ifdef CONFIG_DEBUG_STACKOVERFLOW
17352 u64 curbase = (u64)task_stack_page(current);
17353
17354- if (user_mode_vm(regs))
17355+ if (user_mode(regs))
17356 return;
17357
17358 WARN_ONCE(regs->sp >= curbase &&
17359diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
17360index faba577..93b9e71 100644
17361--- a/arch/x86/kernel/kgdb.c
17362+++ b/arch/x86/kernel/kgdb.c
17363@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
17364 #ifdef CONFIG_X86_32
17365 switch (regno) {
17366 case GDB_SS:
17367- if (!user_mode_vm(regs))
17368+ if (!user_mode(regs))
17369 *(unsigned long *)mem = __KERNEL_DS;
17370 break;
17371 case GDB_SP:
17372- if (!user_mode_vm(regs))
17373+ if (!user_mode(regs))
17374 *(unsigned long *)mem = kernel_stack_pointer(regs);
17375 break;
17376 case GDB_GS:
17377@@ -473,12 +473,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
17378 case 'k':
17379 /* clear the trace bit */
17380 linux_regs->flags &= ~X86_EFLAGS_TF;
17381- atomic_set(&kgdb_cpu_doing_single_step, -1);
17382+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
17383
17384 /* set the trace bit if we're stepping */
17385 if (remcomInBuffer[0] == 's') {
17386 linux_regs->flags |= X86_EFLAGS_TF;
17387- atomic_set(&kgdb_cpu_doing_single_step,
17388+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
17389 raw_smp_processor_id());
17390 }
17391
17392@@ -543,7 +543,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
17393
17394 switch (cmd) {
17395 case DIE_DEBUG:
17396- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
17397+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
17398 if (user_mode(regs))
17399 return single_step_cont(regs, args);
17400 break;
17401diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
17402index 7da647d..56fe348 100644
17403--- a/arch/x86/kernel/kprobes.c
17404+++ b/arch/x86/kernel/kprobes.c
17405@@ -118,8 +118,11 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
17406 } __attribute__((packed)) *insn;
17407
17408 insn = (struct __arch_relative_insn *)from;
17409+
17410+ pax_open_kernel();
17411 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
17412 insn->op = op;
17413+ pax_close_kernel();
17414 }
17415
17416 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
17417@@ -156,7 +159,7 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes)
17418 kprobe_opcode_t opcode;
17419 kprobe_opcode_t *orig_opcodes = opcodes;
17420
17421- if (search_exception_tables((unsigned long)opcodes))
17422+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
17423 return 0; /* Page fault may occur on this address. */
17424
17425 retry:
17426@@ -317,7 +320,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
17427 }
17428 }
17429 insn_get_length(&insn);
17430+ pax_open_kernel();
17431 memcpy(dest, insn.kaddr, insn.length);
17432+ pax_close_kernel();
17433
17434 #ifdef CONFIG_X86_64
17435 if (insn_rip_relative(&insn)) {
17436@@ -341,7 +346,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
17437 (u8 *) dest;
17438 BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */
17439 disp = (u8 *) dest + insn_offset_displacement(&insn);
17440+ pax_open_kernel();
17441 *(s32 *) disp = (s32) newdisp;
17442+ pax_close_kernel();
17443 }
17444 #endif
17445 return insn.length;
17446@@ -355,12 +362,12 @@ static void __kprobes arch_copy_kprobe(struct kprobe *p)
17447 */
17448 __copy_instruction(p->ainsn.insn, p->addr, 0);
17449
17450- if (can_boost(p->addr))
17451+ if (can_boost(ktla_ktva(p->addr)))
17452 p->ainsn.boostable = 0;
17453 else
17454 p->ainsn.boostable = -1;
17455
17456- p->opcode = *p->addr;
17457+ p->opcode = *(ktla_ktva(p->addr));
17458 }
17459
17460 int __kprobes arch_prepare_kprobe(struct kprobe *p)
17461@@ -477,7 +484,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
17462 * nor set current_kprobe, because it doesn't use single
17463 * stepping.
17464 */
17465- regs->ip = (unsigned long)p->ainsn.insn;
17466+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17467 preempt_enable_no_resched();
17468 return;
17469 }
17470@@ -496,7 +503,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
17471 if (p->opcode == BREAKPOINT_INSTRUCTION)
17472 regs->ip = (unsigned long)p->addr;
17473 else
17474- regs->ip = (unsigned long)p->ainsn.insn;
17475+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17476 }
17477
17478 /*
17479@@ -575,7 +582,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
17480 setup_singlestep(p, regs, kcb, 0);
17481 return 1;
17482 }
17483- } else if (*addr != BREAKPOINT_INSTRUCTION) {
17484+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
17485 /*
17486 * The breakpoint instruction was removed right
17487 * after we hit it. Another cpu has removed
17488@@ -683,6 +690,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
17489 " movq %rax, 152(%rsp)\n"
17490 RESTORE_REGS_STRING
17491 " popfq\n"
17492+#ifdef KERNEXEC_PLUGIN
17493+ " btsq $63,(%rsp)\n"
17494+#endif
17495 #else
17496 " pushf\n"
17497 SAVE_REGS_STRING
17498@@ -820,7 +830,7 @@ static void __kprobes resume_execution(struct kprobe *p,
17499 struct pt_regs *regs, struct kprobe_ctlblk *kcb)
17500 {
17501 unsigned long *tos = stack_addr(regs);
17502- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
17503+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
17504 unsigned long orig_ip = (unsigned long)p->addr;
17505 kprobe_opcode_t *insn = p->ainsn.insn;
17506
17507@@ -1002,7 +1012,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
17508 struct die_args *args = data;
17509 int ret = NOTIFY_DONE;
17510
17511- if (args->regs && user_mode_vm(args->regs))
17512+ if (args->regs && user_mode(args->regs))
17513 return ret;
17514
17515 switch (val) {
17516@@ -1384,7 +1394,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17517 * Verify if the address gap is in 2GB range, because this uses
17518 * a relative jump.
17519 */
17520- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
17521+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
17522 if (abs(rel) > 0x7fffffff)
17523 return -ERANGE;
17524
17525@@ -1405,11 +1415,11 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17526 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
17527
17528 /* Set probe function call */
17529- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
17530+ synthesize_relcall(buf + TMPL_CALL_IDX, ktla_ktva(optimized_callback));
17531
17532 /* Set returning jmp instruction at the tail of out-of-line buffer */
17533 synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
17534- (u8 *)op->kp.addr + op->optinsn.size);
17535+ (u8 *)ktla_ktva(op->kp.addr) + op->optinsn.size);
17536
17537 flush_icache_range((unsigned long) buf,
17538 (unsigned long) buf + TMPL_END_IDX +
17539@@ -1431,7 +1441,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
17540 ((long)op->kp.addr + RELATIVEJUMP_SIZE));
17541
17542 /* Backup instructions which will be replaced by jump address */
17543- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
17544+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
17545 RELATIVE_ADDR_SIZE);
17546
17547 insn_buf[0] = RELATIVEJUMP_OPCODE;
17548diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
17549index a9c2116..a52d4fc 100644
17550--- a/arch/x86/kernel/kvm.c
17551+++ b/arch/x86/kernel/kvm.c
17552@@ -437,6 +437,7 @@ static void __init paravirt_ops_setup(void)
17553 pv_mmu_ops.set_pud = kvm_set_pud;
17554 #if PAGETABLE_LEVELS == 4
17555 pv_mmu_ops.set_pgd = kvm_set_pgd;
17556+ pv_mmu_ops.set_pgd_batched = kvm_set_pgd;
17557 #endif
17558 #endif
17559 pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
17560diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
17561index ea69726..8b497c9 100644
17562--- a/arch/x86/kernel/ldt.c
17563+++ b/arch/x86/kernel/ldt.c
17564@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
17565 if (reload) {
17566 #ifdef CONFIG_SMP
17567 preempt_disable();
17568- load_LDT(pc);
17569+ load_LDT_nolock(pc);
17570 if (!cpumask_equal(mm_cpumask(current->mm),
17571 cpumask_of(smp_processor_id())))
17572 smp_call_function(flush_ldt, current->mm, 1);
17573 preempt_enable();
17574 #else
17575- load_LDT(pc);
17576+ load_LDT_nolock(pc);
17577 #endif
17578 }
17579 if (oldsize) {
17580@@ -95,7 +95,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
17581 return err;
17582
17583 for (i = 0; i < old->size; i++)
17584- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
17585+ write_ldt_entry(new->ldt, i, old->ldt + i);
17586 return 0;
17587 }
17588
17589@@ -116,6 +116,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
17590 retval = copy_ldt(&mm->context, &old_mm->context);
17591 mutex_unlock(&old_mm->context.lock);
17592 }
17593+
17594+ if (tsk == current) {
17595+ mm->context.vdso = 0;
17596+
17597+#ifdef CONFIG_X86_32
17598+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17599+ mm->context.user_cs_base = 0UL;
17600+ mm->context.user_cs_limit = ~0UL;
17601+
17602+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17603+ cpus_clear(mm->context.cpu_user_cs_mask);
17604+#endif
17605+
17606+#endif
17607+#endif
17608+
17609+ }
17610+
17611 return retval;
17612 }
17613
17614@@ -141,6 +159,7 @@ void destroy_context(struct mm_struct *mm)
17615 }
17616 }
17617
17618+static int read_ldt(void __user *ptr, unsigned long bytecount) __size_overflow(2);
17619 static int read_ldt(void __user *ptr, unsigned long bytecount)
17620 {
17621 int err;
17622@@ -230,6 +249,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
17623 }
17624 }
17625
17626+#ifdef CONFIG_PAX_SEGMEXEC
17627+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
17628+ error = -EINVAL;
17629+ goto out_unlock;
17630+ }
17631+#endif
17632+
17633 fill_ldt(&ldt, &ldt_info);
17634 if (oldmode)
17635 ldt.avl = 0;
17636diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
17637index a3fa43b..8966f4c 100644
17638--- a/arch/x86/kernel/machine_kexec_32.c
17639+++ b/arch/x86/kernel/machine_kexec_32.c
17640@@ -27,7 +27,7 @@
17641 #include <asm/cacheflush.h>
17642 #include <asm/debugreg.h>
17643
17644-static void set_idt(void *newidt, __u16 limit)
17645+static void set_idt(struct desc_struct *newidt, __u16 limit)
17646 {
17647 struct desc_ptr curidt;
17648
17649@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit)
17650 }
17651
17652
17653-static void set_gdt(void *newgdt, __u16 limit)
17654+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
17655 {
17656 struct desc_ptr curgdt;
17657
17658@@ -217,7 +217,7 @@ void machine_kexec(struct kimage *image)
17659 }
17660
17661 control_page = page_address(image->control_code_page);
17662- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
17663+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
17664
17665 relocate_kernel_ptr = control_page;
17666 page_list[PA_CONTROL_PAGE] = __pa(control_page);
17667diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
17668index 3ca42d0..79d24cd 100644
17669--- a/arch/x86/kernel/microcode_intel.c
17670+++ b/arch/x86/kernel/microcode_intel.c
17671@@ -434,15 +434,16 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
17672 return ret;
17673 }
17674
17675+static int get_ucode_user(void *to, const void *from, size_t n) __size_overflow(3);
17676 static int get_ucode_user(void *to, const void *from, size_t n)
17677 {
17678- return copy_from_user(to, from, n);
17679+ return copy_from_user(to, (const void __force_user *)from, n);
17680 }
17681
17682 static enum ucode_state
17683 request_microcode_user(int cpu, const void __user *buf, size_t size)
17684 {
17685- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
17686+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
17687 }
17688
17689 static void microcode_fini_cpu(int cpu)
17690diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
17691index 925179f..267ac7a 100644
17692--- a/arch/x86/kernel/module.c
17693+++ b/arch/x86/kernel/module.c
17694@@ -36,15 +36,60 @@
17695 #define DEBUGP(fmt...)
17696 #endif
17697
17698-void *module_alloc(unsigned long size)
17699+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
17700 {
17701- if (PAGE_ALIGN(size) > MODULES_LEN)
17702+ if (size == 0 || PAGE_ALIGN(size) > MODULES_LEN)
17703 return NULL;
17704 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
17705- GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
17706+ GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
17707 -1, __builtin_return_address(0));
17708 }
17709
17710+void *module_alloc(unsigned long size)
17711+{
17712+
17713+#ifdef CONFIG_PAX_KERNEXEC
17714+ return __module_alloc(size, PAGE_KERNEL);
17715+#else
17716+ return __module_alloc(size, PAGE_KERNEL_EXEC);
17717+#endif
17718+
17719+}
17720+
17721+#ifdef CONFIG_PAX_KERNEXEC
17722+#ifdef CONFIG_X86_32
17723+void *module_alloc_exec(unsigned long size)
17724+{
17725+ struct vm_struct *area;
17726+
17727+ if (size == 0)
17728+ return NULL;
17729+
17730+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
17731+ return area ? area->addr : NULL;
17732+}
17733+EXPORT_SYMBOL(module_alloc_exec);
17734+
17735+void module_free_exec(struct module *mod, void *module_region)
17736+{
17737+ vunmap(module_region);
17738+}
17739+EXPORT_SYMBOL(module_free_exec);
17740+#else
17741+void module_free_exec(struct module *mod, void *module_region)
17742+{
17743+ module_free(mod, module_region);
17744+}
17745+EXPORT_SYMBOL(module_free_exec);
17746+
17747+void *module_alloc_exec(unsigned long size)
17748+{
17749+ return __module_alloc(size, PAGE_KERNEL_RX);
17750+}
17751+EXPORT_SYMBOL(module_alloc_exec);
17752+#endif
17753+#endif
17754+
17755 #ifdef CONFIG_X86_32
17756 int apply_relocate(Elf32_Shdr *sechdrs,
17757 const char *strtab,
17758@@ -55,14 +100,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
17759 unsigned int i;
17760 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
17761 Elf32_Sym *sym;
17762- uint32_t *location;
17763+ uint32_t *plocation, location;
17764
17765 DEBUGP("Applying relocate section %u to %u\n", relsec,
17766 sechdrs[relsec].sh_info);
17767 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
17768 /* This is where to make the change */
17769- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
17770- + rel[i].r_offset;
17771+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
17772+ location = (uint32_t)plocation;
17773+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
17774+ plocation = ktla_ktva((void *)plocation);
17775 /* This is the symbol it is referring to. Note that all
17776 undefined symbols have been resolved. */
17777 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
17778@@ -71,11 +118,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
17779 switch (ELF32_R_TYPE(rel[i].r_info)) {
17780 case R_386_32:
17781 /* We add the value into the location given */
17782- *location += sym->st_value;
17783+ pax_open_kernel();
17784+ *plocation += sym->st_value;
17785+ pax_close_kernel();
17786 break;
17787 case R_386_PC32:
17788 /* Add the value, subtract its postition */
17789- *location += sym->st_value - (uint32_t)location;
17790+ pax_open_kernel();
17791+ *plocation += sym->st_value - location;
17792+ pax_close_kernel();
17793 break;
17794 default:
17795 printk(KERN_ERR "module %s: Unknown relocation: %u\n",
17796@@ -120,21 +171,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
17797 case R_X86_64_NONE:
17798 break;
17799 case R_X86_64_64:
17800+ pax_open_kernel();
17801 *(u64 *)loc = val;
17802+ pax_close_kernel();
17803 break;
17804 case R_X86_64_32:
17805+ pax_open_kernel();
17806 *(u32 *)loc = val;
17807+ pax_close_kernel();
17808 if (val != *(u32 *)loc)
17809 goto overflow;
17810 break;
17811 case R_X86_64_32S:
17812+ pax_open_kernel();
17813 *(s32 *)loc = val;
17814+ pax_close_kernel();
17815 if ((s64)val != *(s32 *)loc)
17816 goto overflow;
17817 break;
17818 case R_X86_64_PC32:
17819 val -= (u64)loc;
17820+ pax_open_kernel();
17821 *(u32 *)loc = val;
17822+ pax_close_kernel();
17823+
17824 #if 0
17825 if ((s64)val != *(s32 *)loc)
17826 goto overflow;
17827diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
17828index e88f37b..1353db6 100644
17829--- a/arch/x86/kernel/nmi.c
17830+++ b/arch/x86/kernel/nmi.c
17831@@ -408,6 +408,17 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
17832 dotraplinkage notrace __kprobes void
17833 do_nmi(struct pt_regs *regs, long error_code)
17834 {
17835+
17836+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
17837+ if (!user_mode(regs)) {
17838+ unsigned long cs = regs->cs & 0xFFFF;
17839+ unsigned long ip = ktva_ktla(regs->ip);
17840+
17841+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
17842+ regs->ip = ip;
17843+ }
17844+#endif
17845+
17846 nmi_enter();
17847
17848 inc_irq_stat(__nmi_count);
17849diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
17850index 676b8c7..870ba04 100644
17851--- a/arch/x86/kernel/paravirt-spinlocks.c
17852+++ b/arch/x86/kernel/paravirt-spinlocks.c
17853@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
17854 arch_spin_lock(lock);
17855 }
17856
17857-struct pv_lock_ops pv_lock_ops = {
17858+struct pv_lock_ops pv_lock_ops __read_only = {
17859 #ifdef CONFIG_SMP
17860 .spin_is_locked = __ticket_spin_is_locked,
17861 .spin_is_contended = __ticket_spin_is_contended,
17862diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
17863index d90272e..6bb013b 100644
17864--- a/arch/x86/kernel/paravirt.c
17865+++ b/arch/x86/kernel/paravirt.c
17866@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
17867 {
17868 return x;
17869 }
17870+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
17871+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
17872+#endif
17873
17874 void __init default_banner(void)
17875 {
17876@@ -145,15 +148,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
17877 if (opfunc == NULL)
17878 /* If there's no function, patch it with a ud2a (BUG) */
17879 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
17880- else if (opfunc == _paravirt_nop)
17881+ else if (opfunc == (void *)_paravirt_nop)
17882 /* If the operation is a nop, then nop the callsite */
17883 ret = paravirt_patch_nop();
17884
17885 /* identity functions just return their single argument */
17886- else if (opfunc == _paravirt_ident_32)
17887+ else if (opfunc == (void *)_paravirt_ident_32)
17888 ret = paravirt_patch_ident_32(insnbuf, len);
17889- else if (opfunc == _paravirt_ident_64)
17890+ else if (opfunc == (void *)_paravirt_ident_64)
17891 ret = paravirt_patch_ident_64(insnbuf, len);
17892+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
17893+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
17894+ ret = paravirt_patch_ident_64(insnbuf, len);
17895+#endif
17896
17897 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
17898 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
17899@@ -178,7 +185,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
17900 if (insn_len > len || start == NULL)
17901 insn_len = len;
17902 else
17903- memcpy(insnbuf, start, insn_len);
17904+ memcpy(insnbuf, ktla_ktva(start), insn_len);
17905
17906 return insn_len;
17907 }
17908@@ -302,7 +309,7 @@ void arch_flush_lazy_mmu_mode(void)
17909 preempt_enable();
17910 }
17911
17912-struct pv_info pv_info = {
17913+struct pv_info pv_info __read_only = {
17914 .name = "bare hardware",
17915 .paravirt_enabled = 0,
17916 .kernel_rpl = 0,
17917@@ -313,16 +320,16 @@ struct pv_info pv_info = {
17918 #endif
17919 };
17920
17921-struct pv_init_ops pv_init_ops = {
17922+struct pv_init_ops pv_init_ops __read_only = {
17923 .patch = native_patch,
17924 };
17925
17926-struct pv_time_ops pv_time_ops = {
17927+struct pv_time_ops pv_time_ops __read_only = {
17928 .sched_clock = native_sched_clock,
17929 .steal_clock = native_steal_clock,
17930 };
17931
17932-struct pv_irq_ops pv_irq_ops = {
17933+struct pv_irq_ops pv_irq_ops __read_only = {
17934 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
17935 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
17936 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
17937@@ -334,7 +341,7 @@ struct pv_irq_ops pv_irq_ops = {
17938 #endif
17939 };
17940
17941-struct pv_cpu_ops pv_cpu_ops = {
17942+struct pv_cpu_ops pv_cpu_ops __read_only = {
17943 .cpuid = native_cpuid,
17944 .get_debugreg = native_get_debugreg,
17945 .set_debugreg = native_set_debugreg,
17946@@ -395,21 +402,26 @@ struct pv_cpu_ops pv_cpu_ops = {
17947 .end_context_switch = paravirt_nop,
17948 };
17949
17950-struct pv_apic_ops pv_apic_ops = {
17951+struct pv_apic_ops pv_apic_ops __read_only = {
17952 #ifdef CONFIG_X86_LOCAL_APIC
17953 .startup_ipi_hook = paravirt_nop,
17954 #endif
17955 };
17956
17957-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
17958+#ifdef CONFIG_X86_32
17959+#ifdef CONFIG_X86_PAE
17960+/* 64-bit pagetable entries */
17961+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
17962+#else
17963 /* 32-bit pagetable entries */
17964 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
17965+#endif
17966 #else
17967 /* 64-bit pagetable entries */
17968 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
17969 #endif
17970
17971-struct pv_mmu_ops pv_mmu_ops = {
17972+struct pv_mmu_ops pv_mmu_ops __read_only = {
17973
17974 .read_cr2 = native_read_cr2,
17975 .write_cr2 = native_write_cr2,
17976@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
17977 .make_pud = PTE_IDENT,
17978
17979 .set_pgd = native_set_pgd,
17980+ .set_pgd_batched = native_set_pgd_batched,
17981 #endif
17982 #endif /* PAGETABLE_LEVELS >= 3 */
17983
17984@@ -478,6 +491,12 @@ struct pv_mmu_ops pv_mmu_ops = {
17985 },
17986
17987 .set_fixmap = native_set_fixmap,
17988+
17989+#ifdef CONFIG_PAX_KERNEXEC
17990+ .pax_open_kernel = native_pax_open_kernel,
17991+ .pax_close_kernel = native_pax_close_kernel,
17992+#endif
17993+
17994 };
17995
17996 EXPORT_SYMBOL_GPL(pv_time_ops);
17997diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
17998index 35ccf75..7a15747 100644
17999--- a/arch/x86/kernel/pci-iommu_table.c
18000+++ b/arch/x86/kernel/pci-iommu_table.c
18001@@ -2,7 +2,7 @@
18002 #include <asm/iommu_table.h>
18003 #include <linux/string.h>
18004 #include <linux/kallsyms.h>
18005-
18006+#include <linux/sched.h>
18007
18008 #define DEBUG 1
18009
18010diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
18011index ee5d4fb..426649b 100644
18012--- a/arch/x86/kernel/process.c
18013+++ b/arch/x86/kernel/process.c
18014@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_struct *tsk)
18015
18016 void free_thread_info(struct thread_info *ti)
18017 {
18018- free_thread_xstate(ti->task);
18019 free_pages((unsigned long)ti, THREAD_ORDER);
18020 }
18021
18022+static struct kmem_cache *task_struct_cachep;
18023+
18024 void arch_task_cache_init(void)
18025 {
18026- task_xstate_cachep =
18027- kmem_cache_create("task_xstate", xstate_size,
18028+ /* create a slab on which task_structs can be allocated */
18029+ task_struct_cachep =
18030+ kmem_cache_create("task_struct", sizeof(struct task_struct),
18031+ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);
18032+
18033+ task_xstate_cachep =
18034+ kmem_cache_create("task_xstate", xstate_size,
18035 __alignof__(union thread_xstate),
18036- SLAB_PANIC | SLAB_NOTRACK, NULL);
18037+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
18038+}
18039+
18040+struct task_struct *alloc_task_struct_node(int node)
18041+{
18042+ return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node);
18043+}
18044+
18045+void free_task_struct(struct task_struct *task)
18046+{
18047+ free_thread_xstate(task);
18048+ kmem_cache_free(task_struct_cachep, task);
18049 }
18050
18051 /*
18052@@ -70,7 +87,7 @@ void exit_thread(void)
18053 unsigned long *bp = t->io_bitmap_ptr;
18054
18055 if (bp) {
18056- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
18057+ struct tss_struct *tss = init_tss + get_cpu();
18058
18059 t->io_bitmap_ptr = NULL;
18060 clear_thread_flag(TIF_IO_BITMAP);
18061@@ -106,7 +123,7 @@ void show_regs_common(void)
18062
18063 printk(KERN_CONT "\n");
18064 printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
18065- current->pid, current->comm, print_tainted(),
18066+ task_pid_nr(current), current->comm, print_tainted(),
18067 init_utsname()->release,
18068 (int)strcspn(init_utsname()->version, " "),
18069 init_utsname()->version);
18070@@ -120,6 +137,9 @@ void flush_thread(void)
18071 {
18072 struct task_struct *tsk = current;
18073
18074+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
18075+ loadsegment(gs, 0);
18076+#endif
18077 flush_ptrace_hw_breakpoint(tsk);
18078 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
18079 /*
18080@@ -282,10 +302,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
18081 regs.di = (unsigned long) arg;
18082
18083 #ifdef CONFIG_X86_32
18084- regs.ds = __USER_DS;
18085- regs.es = __USER_DS;
18086+ regs.ds = __KERNEL_DS;
18087+ regs.es = __KERNEL_DS;
18088 regs.fs = __KERNEL_PERCPU;
18089- regs.gs = __KERNEL_STACK_CANARY;
18090+ savesegment(gs, regs.gs);
18091 #else
18092 regs.ss = __KERNEL_DS;
18093 #endif
18094@@ -411,7 +431,7 @@ bool set_pm_idle_to_default(void)
18095
18096 return ret;
18097 }
18098-void stop_this_cpu(void *dummy)
18099+__noreturn void stop_this_cpu(void *dummy)
18100 {
18101 local_irq_disable();
18102 /*
18103@@ -653,16 +673,37 @@ static int __init idle_setup(char *str)
18104 }
18105 early_param("idle", idle_setup);
18106
18107-unsigned long arch_align_stack(unsigned long sp)
18108+#ifdef CONFIG_PAX_RANDKSTACK
18109+void pax_randomize_kstack(struct pt_regs *regs)
18110 {
18111- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
18112- sp -= get_random_int() % 8192;
18113- return sp & ~0xf;
18114-}
18115+ struct thread_struct *thread = &current->thread;
18116+ unsigned long time;
18117
18118-unsigned long arch_randomize_brk(struct mm_struct *mm)
18119-{
18120- unsigned long range_end = mm->brk + 0x02000000;
18121- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
18122-}
18123+ if (!randomize_va_space)
18124+ return;
18125+
18126+ if (v8086_mode(regs))
18127+ return;
18128
18129+ rdtscl(time);
18130+
18131+ /* P4 seems to return a 0 LSB, ignore it */
18132+#ifdef CONFIG_MPENTIUM4
18133+ time &= 0x3EUL;
18134+ time <<= 2;
18135+#elif defined(CONFIG_X86_64)
18136+ time &= 0xFUL;
18137+ time <<= 4;
18138+#else
18139+ time &= 0x1FUL;
18140+ time <<= 3;
18141+#endif
18142+
18143+ thread->sp0 ^= time;
18144+ load_sp0(init_tss + smp_processor_id(), thread);
18145+
18146+#ifdef CONFIG_X86_64
18147+ percpu_write(kernel_stack, thread->sp0);
18148+#endif
18149+}
18150+#endif
18151diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
18152index 8598296..bfadef0 100644
18153--- a/arch/x86/kernel/process_32.c
18154+++ b/arch/x86/kernel/process_32.c
18155@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
18156 unsigned long thread_saved_pc(struct task_struct *tsk)
18157 {
18158 return ((unsigned long *)tsk->thread.sp)[3];
18159+//XXX return tsk->thread.eip;
18160 }
18161
18162 #ifndef CONFIG_SMP
18163@@ -130,15 +131,14 @@ void __show_regs(struct pt_regs *regs, int all)
18164 unsigned long sp;
18165 unsigned short ss, gs;
18166
18167- if (user_mode_vm(regs)) {
18168+ if (user_mode(regs)) {
18169 sp = regs->sp;
18170 ss = regs->ss & 0xffff;
18171- gs = get_user_gs(regs);
18172 } else {
18173 sp = kernel_stack_pointer(regs);
18174 savesegment(ss, ss);
18175- savesegment(gs, gs);
18176 }
18177+ gs = get_user_gs(regs);
18178
18179 show_regs_common();
18180
18181@@ -200,13 +200,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18182 struct task_struct *tsk;
18183 int err;
18184
18185- childregs = task_pt_regs(p);
18186+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
18187 *childregs = *regs;
18188 childregs->ax = 0;
18189 childregs->sp = sp;
18190
18191 p->thread.sp = (unsigned long) childregs;
18192 p->thread.sp0 = (unsigned long) (childregs+1);
18193+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18194
18195 p->thread.ip = (unsigned long) ret_from_fork;
18196
18197@@ -296,7 +297,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18198 struct thread_struct *prev = &prev_p->thread,
18199 *next = &next_p->thread;
18200 int cpu = smp_processor_id();
18201- struct tss_struct *tss = &per_cpu(init_tss, cpu);
18202+ struct tss_struct *tss = init_tss + cpu;
18203 fpu_switch_t fpu;
18204
18205 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
18206@@ -320,6 +321,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18207 */
18208 lazy_save_gs(prev->gs);
18209
18210+#ifdef CONFIG_PAX_MEMORY_UDEREF
18211+ __set_fs(task_thread_info(next_p)->addr_limit);
18212+#endif
18213+
18214 /*
18215 * Load the per-thread Thread-Local Storage descriptor.
18216 */
18217@@ -350,6 +355,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18218 */
18219 arch_end_context_switch(next_p);
18220
18221+ percpu_write(current_task, next_p);
18222+ percpu_write(current_tinfo, &next_p->tinfo);
18223+
18224 /*
18225 * Restore %gs if needed (which is common)
18226 */
18227@@ -358,8 +366,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18228
18229 switch_fpu_finish(next_p, fpu);
18230
18231- percpu_write(current_task, next_p);
18232-
18233 return prev_p;
18234 }
18235
18236@@ -389,4 +395,3 @@ unsigned long get_wchan(struct task_struct *p)
18237 } while (count++ < 16);
18238 return 0;
18239 }
18240-
18241diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
18242index 6a364a6..b147d11 100644
18243--- a/arch/x86/kernel/process_64.c
18244+++ b/arch/x86/kernel/process_64.c
18245@@ -89,7 +89,7 @@ static void __exit_idle(void)
18246 void exit_idle(void)
18247 {
18248 /* idle loop has pid 0 */
18249- if (current->pid)
18250+ if (task_pid_nr(current))
18251 return;
18252 __exit_idle();
18253 }
18254@@ -264,8 +264,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18255 struct pt_regs *childregs;
18256 struct task_struct *me = current;
18257
18258- childregs = ((struct pt_regs *)
18259- (THREAD_SIZE + task_stack_page(p))) - 1;
18260+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
18261 *childregs = *regs;
18262
18263 childregs->ax = 0;
18264@@ -277,6 +276,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18265 p->thread.sp = (unsigned long) childregs;
18266 p->thread.sp0 = (unsigned long) (childregs+1);
18267 p->thread.usersp = me->thread.usersp;
18268+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18269
18270 set_tsk_thread_flag(p, TIF_FORK);
18271
18272@@ -379,7 +379,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18273 struct thread_struct *prev = &prev_p->thread;
18274 struct thread_struct *next = &next_p->thread;
18275 int cpu = smp_processor_id();
18276- struct tss_struct *tss = &per_cpu(init_tss, cpu);
18277+ struct tss_struct *tss = init_tss + cpu;
18278 unsigned fsindex, gsindex;
18279 fpu_switch_t fpu;
18280
18281@@ -461,10 +461,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18282 prev->usersp = percpu_read(old_rsp);
18283 percpu_write(old_rsp, next->usersp);
18284 percpu_write(current_task, next_p);
18285+ percpu_write(current_tinfo, &next_p->tinfo);
18286
18287- percpu_write(kernel_stack,
18288- (unsigned long)task_stack_page(next_p) +
18289- THREAD_SIZE - KERNEL_STACK_OFFSET);
18290+ percpu_write(kernel_stack, next->sp0);
18291
18292 /*
18293 * Now maybe reload the debug registers and handle I/O bitmaps
18294@@ -519,12 +518,11 @@ unsigned long get_wchan(struct task_struct *p)
18295 if (!p || p == current || p->state == TASK_RUNNING)
18296 return 0;
18297 stack = (unsigned long)task_stack_page(p);
18298- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
18299+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
18300 return 0;
18301 fp = *(u64 *)(p->thread.sp);
18302 do {
18303- if (fp < (unsigned long)stack ||
18304- fp >= (unsigned long)stack+THREAD_SIZE)
18305+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
18306 return 0;
18307 ip = *(u64 *)(fp+8);
18308 if (!in_sched_functions(ip))
18309diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
18310index 8252879..f367ec9 100644
18311--- a/arch/x86/kernel/ptrace.c
18312+++ b/arch/x86/kernel/ptrace.c
18313@@ -791,6 +791,10 @@ static int ioperm_active(struct task_struct *target,
18314 static int ioperm_get(struct task_struct *target,
18315 const struct user_regset *regset,
18316 unsigned int pos, unsigned int count,
18317+ void *kbuf, void __user *ubuf) __size_overflow(3,4);
18318+static int ioperm_get(struct task_struct *target,
18319+ const struct user_regset *regset,
18320+ unsigned int pos, unsigned int count,
18321 void *kbuf, void __user *ubuf)
18322 {
18323 if (!target->thread.io_bitmap_ptr)
18324@@ -822,7 +826,7 @@ long arch_ptrace(struct task_struct *child, long request,
18325 unsigned long addr, unsigned long data)
18326 {
18327 int ret;
18328- unsigned long __user *datap = (unsigned long __user *)data;
18329+ unsigned long __user *datap = (__force unsigned long __user *)data;
18330
18331 switch (request) {
18332 /* read the word at location addr in the USER area. */
18333@@ -907,14 +911,14 @@ long arch_ptrace(struct task_struct *child, long request,
18334 if ((int) addr < 0)
18335 return -EIO;
18336 ret = do_get_thread_area(child, addr,
18337- (struct user_desc __user *)data);
18338+ (__force struct user_desc __user *) data);
18339 break;
18340
18341 case PTRACE_SET_THREAD_AREA:
18342 if ((int) addr < 0)
18343 return -EIO;
18344 ret = do_set_thread_area(child, addr,
18345- (struct user_desc __user *)data, 0);
18346+ (__force struct user_desc __user *) data, 0);
18347 break;
18348 #endif
18349
18350@@ -1331,7 +1335,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
18351 memset(info, 0, sizeof(*info));
18352 info->si_signo = SIGTRAP;
18353 info->si_code = si_code;
18354- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
18355+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
18356 }
18357
18358 void user_single_step_siginfo(struct task_struct *tsk,
18359diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
18360index 42eb330..139955c 100644
18361--- a/arch/x86/kernel/pvclock.c
18362+++ b/arch/x86/kernel/pvclock.c
18363@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
18364 return pv_tsc_khz;
18365 }
18366
18367-static atomic64_t last_value = ATOMIC64_INIT(0);
18368+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
18369
18370 void pvclock_resume(void)
18371 {
18372- atomic64_set(&last_value, 0);
18373+ atomic64_set_unchecked(&last_value, 0);
18374 }
18375
18376 cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18377@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18378 * updating at the same time, and one of them could be slightly behind,
18379 * making the assumption that last_value always go forward fail to hold.
18380 */
18381- last = atomic64_read(&last_value);
18382+ last = atomic64_read_unchecked(&last_value);
18383 do {
18384 if (ret < last)
18385 return last;
18386- last = atomic64_cmpxchg(&last_value, last, ret);
18387+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
18388 } while (unlikely(last != ret));
18389
18390 return ret;
18391diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
18392index 37a458b..e63d183 100644
18393--- a/arch/x86/kernel/reboot.c
18394+++ b/arch/x86/kernel/reboot.c
18395@@ -35,7 +35,7 @@ void (*pm_power_off)(void);
18396 EXPORT_SYMBOL(pm_power_off);
18397
18398 static const struct desc_ptr no_idt = {};
18399-static int reboot_mode;
18400+static unsigned short reboot_mode;
18401 enum reboot_type reboot_type = BOOT_ACPI;
18402 int reboot_force;
18403
18404@@ -324,13 +324,17 @@ core_initcall(reboot_init);
18405 extern const unsigned char machine_real_restart_asm[];
18406 extern const u64 machine_real_restart_gdt[3];
18407
18408-void machine_real_restart(unsigned int type)
18409+__noreturn void machine_real_restart(unsigned int type)
18410 {
18411 void *restart_va;
18412 unsigned long restart_pa;
18413- void (*restart_lowmem)(unsigned int);
18414+ void (* __noreturn restart_lowmem)(unsigned int);
18415 u64 *lowmem_gdt;
18416
18417+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18418+ struct desc_struct *gdt;
18419+#endif
18420+
18421 local_irq_disable();
18422
18423 /* Write zero to CMOS register number 0x0f, which the BIOS POST
18424@@ -356,14 +360,14 @@ void machine_real_restart(unsigned int type)
18425 boot)". This seems like a fairly standard thing that gets set by
18426 REBOOT.COM programs, and the previous reset routine did this
18427 too. */
18428- *((unsigned short *)0x472) = reboot_mode;
18429+ *(unsigned short *)(__va(0x472)) = reboot_mode;
18430
18431 /* Patch the GDT in the low memory trampoline */
18432 lowmem_gdt = TRAMPOLINE_SYM(machine_real_restart_gdt);
18433
18434 restart_va = TRAMPOLINE_SYM(machine_real_restart_asm);
18435 restart_pa = virt_to_phys(restart_va);
18436- restart_lowmem = (void (*)(unsigned int))restart_pa;
18437+ restart_lowmem = (void *)restart_pa;
18438
18439 /* GDT[0]: GDT self-pointer */
18440 lowmem_gdt[0] =
18441@@ -374,7 +378,33 @@ void machine_real_restart(unsigned int type)
18442 GDT_ENTRY(0x009b, restart_pa, 0xffff);
18443
18444 /* Jump to the identity-mapped low memory code */
18445+
18446+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18447+ gdt = get_cpu_gdt_table(smp_processor_id());
18448+ pax_open_kernel();
18449+#ifdef CONFIG_PAX_MEMORY_UDEREF
18450+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
18451+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
18452+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
18453+#endif
18454+#ifdef CONFIG_PAX_KERNEXEC
18455+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
18456+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
18457+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
18458+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
18459+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
18460+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
18461+#endif
18462+ pax_close_kernel();
18463+#endif
18464+
18465+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18466+ asm volatile("push %0; push %1; lret\n" : : "i" (__KERNEL_CS), "rm" (restart_lowmem), "a" (type));
18467+ unreachable();
18468+#else
18469 restart_lowmem(type);
18470+#endif
18471+
18472 }
18473 #ifdef CONFIG_APM_MODULE
18474 EXPORT_SYMBOL(machine_real_restart);
18475@@ -540,7 +570,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
18476 * try to force a triple fault and then cycle between hitting the keyboard
18477 * controller and doing that
18478 */
18479-static void native_machine_emergency_restart(void)
18480+__noreturn static void native_machine_emergency_restart(void)
18481 {
18482 int i;
18483 int attempt = 0;
18484@@ -664,13 +694,13 @@ void native_machine_shutdown(void)
18485 #endif
18486 }
18487
18488-static void __machine_emergency_restart(int emergency)
18489+static __noreturn void __machine_emergency_restart(int emergency)
18490 {
18491 reboot_emergency = emergency;
18492 machine_ops.emergency_restart();
18493 }
18494
18495-static void native_machine_restart(char *__unused)
18496+static __noreturn void native_machine_restart(char *__unused)
18497 {
18498 printk("machine restart\n");
18499
18500@@ -679,7 +709,7 @@ static void native_machine_restart(char *__unused)
18501 __machine_emergency_restart(0);
18502 }
18503
18504-static void native_machine_halt(void)
18505+static __noreturn void native_machine_halt(void)
18506 {
18507 /* stop other cpus and apics */
18508 machine_shutdown();
18509@@ -690,7 +720,7 @@ static void native_machine_halt(void)
18510 stop_this_cpu(NULL);
18511 }
18512
18513-static void native_machine_power_off(void)
18514+__noreturn static void native_machine_power_off(void)
18515 {
18516 if (pm_power_off) {
18517 if (!reboot_force)
18518@@ -699,6 +729,7 @@ static void native_machine_power_off(void)
18519 }
18520 /* a fallback in case there is no PM info available */
18521 tboot_shutdown(TB_SHUTDOWN_HALT);
18522+ unreachable();
18523 }
18524
18525 struct machine_ops machine_ops = {
18526diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
18527index 7a6f3b3..bed145d7 100644
18528--- a/arch/x86/kernel/relocate_kernel_64.S
18529+++ b/arch/x86/kernel/relocate_kernel_64.S
18530@@ -11,6 +11,7 @@
18531 #include <asm/kexec.h>
18532 #include <asm/processor-flags.h>
18533 #include <asm/pgtable_types.h>
18534+#include <asm/alternative-asm.h>
18535
18536 /*
18537 * Must be relocatable PIC code callable as a C function
18538@@ -160,13 +161,14 @@ identity_mapped:
18539 xorq %rbp, %rbp
18540 xorq %r8, %r8
18541 xorq %r9, %r9
18542- xorq %r10, %r9
18543+ xorq %r10, %r10
18544 xorq %r11, %r11
18545 xorq %r12, %r12
18546 xorq %r13, %r13
18547 xorq %r14, %r14
18548 xorq %r15, %r15
18549
18550+ pax_force_retaddr 0, 1
18551 ret
18552
18553 1:
18554diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
18555index cf0ef98..e3f780b 100644
18556--- a/arch/x86/kernel/setup.c
18557+++ b/arch/x86/kernel/setup.c
18558@@ -447,7 +447,7 @@ static void __init parse_setup_data(void)
18559
18560 switch (data->type) {
18561 case SETUP_E820_EXT:
18562- parse_e820_ext(data);
18563+ parse_e820_ext((struct setup_data __force_kernel *)data);
18564 break;
18565 case SETUP_DTB:
18566 add_dtb(pa_data);
18567@@ -650,7 +650,7 @@ static void __init trim_bios_range(void)
18568 * area (640->1Mb) as ram even though it is not.
18569 * take them out.
18570 */
18571- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
18572+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
18573 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
18574 }
18575
18576@@ -773,14 +773,14 @@ void __init setup_arch(char **cmdline_p)
18577
18578 if (!boot_params.hdr.root_flags)
18579 root_mountflags &= ~MS_RDONLY;
18580- init_mm.start_code = (unsigned long) _text;
18581- init_mm.end_code = (unsigned long) _etext;
18582+ init_mm.start_code = ktla_ktva((unsigned long) _text);
18583+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
18584 init_mm.end_data = (unsigned long) _edata;
18585 init_mm.brk = _brk_end;
18586
18587- code_resource.start = virt_to_phys(_text);
18588- code_resource.end = virt_to_phys(_etext)-1;
18589- data_resource.start = virt_to_phys(_etext);
18590+ code_resource.start = virt_to_phys(ktla_ktva(_text));
18591+ code_resource.end = virt_to_phys(ktla_ktva(_etext))-1;
18592+ data_resource.start = virt_to_phys(_sdata);
18593 data_resource.end = virt_to_phys(_edata)-1;
18594 bss_resource.start = virt_to_phys(&__bss_start);
18595 bss_resource.end = virt_to_phys(&__bss_stop)-1;
18596diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
18597index 71f4727..217419b 100644
18598--- a/arch/x86/kernel/setup_percpu.c
18599+++ b/arch/x86/kernel/setup_percpu.c
18600@@ -21,19 +21,17 @@
18601 #include <asm/cpu.h>
18602 #include <asm/stackprotector.h>
18603
18604-DEFINE_PER_CPU(int, cpu_number);
18605+#ifdef CONFIG_SMP
18606+DEFINE_PER_CPU(unsigned int, cpu_number);
18607 EXPORT_PER_CPU_SYMBOL(cpu_number);
18608+#endif
18609
18610-#ifdef CONFIG_X86_64
18611 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
18612-#else
18613-#define BOOT_PERCPU_OFFSET 0
18614-#endif
18615
18616 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
18617 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
18618
18619-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
18620+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
18621 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
18622 };
18623 EXPORT_SYMBOL(__per_cpu_offset);
18624@@ -96,6 +94,8 @@ static bool __init pcpu_need_numa(void)
18625 * Pointer to the allocated area on success, NULL on failure.
18626 */
18627 static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18628+ unsigned long align) __size_overflow(2);
18629+static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18630 unsigned long align)
18631 {
18632 const unsigned long goal = __pa(MAX_DMA_ADDRESS);
18633@@ -124,6 +124,8 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18634 /*
18635 * Helpers for first chunk memory allocation
18636 */
18637+static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align) __size_overflow(2);
18638+
18639 static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align)
18640 {
18641 return pcpu_alloc_bootmem(cpu, size, align);
18642@@ -155,10 +157,10 @@ static inline void setup_percpu_segment(int cpu)
18643 {
18644 #ifdef CONFIG_X86_32
18645 struct desc_struct gdt;
18646+ unsigned long base = per_cpu_offset(cpu);
18647
18648- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
18649- 0x2 | DESCTYPE_S, 0x8);
18650- gdt.s = 1;
18651+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
18652+ 0x83 | DESCTYPE_S, 0xC);
18653 write_gdt_entry(get_cpu_gdt_table(cpu),
18654 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
18655 #endif
18656@@ -207,6 +209,11 @@ void __init setup_per_cpu_areas(void)
18657 /* alrighty, percpu areas up and running */
18658 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
18659 for_each_possible_cpu(cpu) {
18660+#ifdef CONFIG_CC_STACKPROTECTOR
18661+#ifdef CONFIG_X86_32
18662+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
18663+#endif
18664+#endif
18665 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
18666 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
18667 per_cpu(cpu_number, cpu) = cpu;
18668@@ -247,6 +254,12 @@ void __init setup_per_cpu_areas(void)
18669 */
18670 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
18671 #endif
18672+#ifdef CONFIG_CC_STACKPROTECTOR
18673+#ifdef CONFIG_X86_32
18674+ if (!cpu)
18675+ per_cpu(stack_canary.canary, cpu) = canary;
18676+#endif
18677+#endif
18678 /*
18679 * Up to this point, the boot CPU has been using .init.data
18680 * area. Reload any changed state for the boot CPU.
18681diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
18682index 54ddaeb2..22c3bdc 100644
18683--- a/arch/x86/kernel/signal.c
18684+++ b/arch/x86/kernel/signal.c
18685@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsigned long sp)
18686 * Align the stack pointer according to the i386 ABI,
18687 * i.e. so that on function entry ((sp + 4) & 15) == 0.
18688 */
18689- sp = ((sp + 4) & -16ul) - 4;
18690+ sp = ((sp - 12) & -16ul) - 4;
18691 #else /* !CONFIG_X86_32 */
18692 sp = round_down(sp, 16) - 8;
18693 #endif
18694@@ -249,11 +249,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
18695 * Return an always-bogus address instead so we will die with SIGSEGV.
18696 */
18697 if (onsigstack && !likely(on_sig_stack(sp)))
18698- return (void __user *)-1L;
18699+ return (__force void __user *)-1L;
18700
18701 /* save i387 state */
18702 if (used_math() && save_i387_xstate(*fpstate) < 0)
18703- return (void __user *)-1L;
18704+ return (__force void __user *)-1L;
18705
18706 return (void __user *)sp;
18707 }
18708@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
18709 }
18710
18711 if (current->mm->context.vdso)
18712- restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
18713+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
18714 else
18715- restorer = &frame->retcode;
18716+ restorer = (void __user *)&frame->retcode;
18717 if (ka->sa.sa_flags & SA_RESTORER)
18718 restorer = ka->sa.sa_restorer;
18719
18720@@ -324,7 +324,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
18721 * reasons and because gdb uses it as a signature to notice
18722 * signal handler stack frames.
18723 */
18724- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
18725+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
18726
18727 if (err)
18728 return -EFAULT;
18729@@ -378,7 +378,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
18730 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
18731
18732 /* Set up to return from userspace. */
18733- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
18734+ if (current->mm->context.vdso)
18735+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
18736+ else
18737+ restorer = (void __user *)&frame->retcode;
18738 if (ka->sa.sa_flags & SA_RESTORER)
18739 restorer = ka->sa.sa_restorer;
18740 put_user_ex(restorer, &frame->pretcode);
18741@@ -390,7 +393,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
18742 * reasons and because gdb uses it as a signature to notice
18743 * signal handler stack frames.
18744 */
18745- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
18746+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
18747 } put_user_catch(err);
18748
18749 if (err)
18750@@ -769,7 +772,7 @@ static void do_signal(struct pt_regs *regs)
18751 * X86_32: vm86 regs switched out by assembly code before reaching
18752 * here, so testing against kernel CS suffices.
18753 */
18754- if (!user_mode(regs))
18755+ if (!user_mode_novm(regs))
18756 return;
18757
18758 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
18759diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
18760index 9f548cb..caf76f7 100644
18761--- a/arch/x86/kernel/smpboot.c
18762+++ b/arch/x86/kernel/smpboot.c
18763@@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
18764 set_idle_for_cpu(cpu, c_idle.idle);
18765 do_rest:
18766 per_cpu(current_task, cpu) = c_idle.idle;
18767+ per_cpu(current_tinfo, cpu) = &c_idle.idle->tinfo;
18768 #ifdef CONFIG_X86_32
18769 /* Stack for startup_32 can be just as for start_secondary onwards */
18770 irq_ctx_init(cpu);
18771 #else
18772 clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
18773 initial_gs = per_cpu_offset(cpu);
18774- per_cpu(kernel_stack, cpu) =
18775- (unsigned long)task_stack_page(c_idle.idle) -
18776- KERNEL_STACK_OFFSET + THREAD_SIZE;
18777+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
18778 #endif
18779+
18780+ pax_open_kernel();
18781 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
18782+ pax_close_kernel();
18783+
18784 initial_code = (unsigned long)start_secondary;
18785 stack_start = c_idle.idle->thread.sp;
18786
18787@@ -861,6 +864,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
18788
18789 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
18790
18791+#ifdef CONFIG_PAX_PER_CPU_PGD
18792+ clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
18793+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
18794+ KERNEL_PGD_PTRS);
18795+#endif
18796+
18797 err = do_boot_cpu(apicid, cpu);
18798 if (err) {
18799 pr_debug("do_boot_cpu failed %d\n", err);
18800diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
18801index c346d11..d43b163 100644
18802--- a/arch/x86/kernel/step.c
18803+++ b/arch/x86/kernel/step.c
18804@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
18805 struct desc_struct *desc;
18806 unsigned long base;
18807
18808- seg &= ~7UL;
18809+ seg >>= 3;
18810
18811 mutex_lock(&child->mm->context.lock);
18812- if (unlikely((seg >> 3) >= child->mm->context.size))
18813+ if (unlikely(seg >= child->mm->context.size))
18814 addr = -1L; /* bogus selector, access would fault */
18815 else {
18816 desc = child->mm->context.ldt + seg;
18817@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
18818 addr += base;
18819 }
18820 mutex_unlock(&child->mm->context.lock);
18821- }
18822+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
18823+ addr = ktla_ktva(addr);
18824
18825 return addr;
18826 }
18827@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
18828 unsigned char opcode[15];
18829 unsigned long addr = convert_ip_to_linear(child, regs);
18830
18831+ if (addr == -EINVAL)
18832+ return 0;
18833+
18834 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
18835 for (i = 0; i < copied; i++) {
18836 switch (opcode[i]) {
18837diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
18838index 0b0cb5f..db6b9ed 100644
18839--- a/arch/x86/kernel/sys_i386_32.c
18840+++ b/arch/x86/kernel/sys_i386_32.c
18841@@ -24,17 +24,224 @@
18842
18843 #include <asm/syscalls.h>
18844
18845-/*
18846- * Do a system call from kernel instead of calling sys_execve so we
18847- * end up with proper pt_regs.
18848- */
18849-int kernel_execve(const char *filename,
18850- const char *const argv[],
18851- const char *const envp[])
18852+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
18853 {
18854- long __res;
18855- asm volatile ("int $0x80"
18856- : "=a" (__res)
18857- : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
18858- return __res;
18859+ unsigned long pax_task_size = TASK_SIZE;
18860+
18861+#ifdef CONFIG_PAX_SEGMEXEC
18862+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
18863+ pax_task_size = SEGMEXEC_TASK_SIZE;
18864+#endif
18865+
18866+ if (len > pax_task_size || addr > pax_task_size - len)
18867+ return -EINVAL;
18868+
18869+ return 0;
18870+}
18871+
18872+unsigned long
18873+arch_get_unmapped_area(struct file *filp, unsigned long addr,
18874+ unsigned long len, unsigned long pgoff, unsigned long flags)
18875+{
18876+ struct mm_struct *mm = current->mm;
18877+ struct vm_area_struct *vma;
18878+ unsigned long start_addr, pax_task_size = TASK_SIZE;
18879+
18880+#ifdef CONFIG_PAX_SEGMEXEC
18881+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
18882+ pax_task_size = SEGMEXEC_TASK_SIZE;
18883+#endif
18884+
18885+ pax_task_size -= PAGE_SIZE;
18886+
18887+ if (len > pax_task_size)
18888+ return -ENOMEM;
18889+
18890+ if (flags & MAP_FIXED)
18891+ return addr;
18892+
18893+#ifdef CONFIG_PAX_RANDMMAP
18894+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
18895+#endif
18896+
18897+ if (addr) {
18898+ addr = PAGE_ALIGN(addr);
18899+ if (pax_task_size - len >= addr) {
18900+ vma = find_vma(mm, addr);
18901+ if (check_heap_stack_gap(vma, addr, len))
18902+ return addr;
18903+ }
18904+ }
18905+ if (len > mm->cached_hole_size) {
18906+ start_addr = addr = mm->free_area_cache;
18907+ } else {
18908+ start_addr = addr = mm->mmap_base;
18909+ mm->cached_hole_size = 0;
18910+ }
18911+
18912+#ifdef CONFIG_PAX_PAGEEXEC
18913+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
18914+ start_addr = 0x00110000UL;
18915+
18916+#ifdef CONFIG_PAX_RANDMMAP
18917+ if (mm->pax_flags & MF_PAX_RANDMMAP)
18918+ start_addr += mm->delta_mmap & 0x03FFF000UL;
18919+#endif
18920+
18921+ if (mm->start_brk <= start_addr && start_addr < mm->mmap_base)
18922+ start_addr = addr = mm->mmap_base;
18923+ else
18924+ addr = start_addr;
18925+ }
18926+#endif
18927+
18928+full_search:
18929+ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
18930+ /* At this point: (!vma || addr < vma->vm_end). */
18931+ if (pax_task_size - len < addr) {
18932+ /*
18933+ * Start a new search - just in case we missed
18934+ * some holes.
18935+ */
18936+ if (start_addr != mm->mmap_base) {
18937+ start_addr = addr = mm->mmap_base;
18938+ mm->cached_hole_size = 0;
18939+ goto full_search;
18940+ }
18941+ return -ENOMEM;
18942+ }
18943+ if (check_heap_stack_gap(vma, addr, len))
18944+ break;
18945+ if (addr + mm->cached_hole_size < vma->vm_start)
18946+ mm->cached_hole_size = vma->vm_start - addr;
18947+ addr = vma->vm_end;
18948+ if (mm->start_brk <= addr && addr < mm->mmap_base) {
18949+ start_addr = addr = mm->mmap_base;
18950+ mm->cached_hole_size = 0;
18951+ goto full_search;
18952+ }
18953+ }
18954+
18955+ /*
18956+ * Remember the place where we stopped the search:
18957+ */
18958+ mm->free_area_cache = addr + len;
18959+ return addr;
18960+}
18961+
18962+unsigned long
18963+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
18964+ const unsigned long len, const unsigned long pgoff,
18965+ const unsigned long flags)
18966+{
18967+ struct vm_area_struct *vma;
18968+ struct mm_struct *mm = current->mm;
18969+ unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
18970+
18971+#ifdef CONFIG_PAX_SEGMEXEC
18972+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
18973+ pax_task_size = SEGMEXEC_TASK_SIZE;
18974+#endif
18975+
18976+ pax_task_size -= PAGE_SIZE;
18977+
18978+ /* requested length too big for entire address space */
18979+ if (len > pax_task_size)
18980+ return -ENOMEM;
18981+
18982+ if (flags & MAP_FIXED)
18983+ return addr;
18984+
18985+#ifdef CONFIG_PAX_PAGEEXEC
18986+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
18987+ goto bottomup;
18988+#endif
18989+
18990+#ifdef CONFIG_PAX_RANDMMAP
18991+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
18992+#endif
18993+
18994+ /* requesting a specific address */
18995+ if (addr) {
18996+ addr = PAGE_ALIGN(addr);
18997+ if (pax_task_size - len >= addr) {
18998+ vma = find_vma(mm, addr);
18999+ if (check_heap_stack_gap(vma, addr, len))
19000+ return addr;
19001+ }
19002+ }
19003+
19004+ /* check if free_area_cache is useful for us */
19005+ if (len <= mm->cached_hole_size) {
19006+ mm->cached_hole_size = 0;
19007+ mm->free_area_cache = mm->mmap_base;
19008+ }
19009+
19010+ /* either no address requested or can't fit in requested address hole */
19011+ addr = mm->free_area_cache;
19012+
19013+ /* make sure it can fit in the remaining address space */
19014+ if (addr > len) {
19015+ vma = find_vma(mm, addr-len);
19016+ if (check_heap_stack_gap(vma, addr - len, len))
19017+ /* remember the address as a hint for next time */
19018+ return (mm->free_area_cache = addr-len);
19019+ }
19020+
19021+ if (mm->mmap_base < len)
19022+ goto bottomup;
19023+
19024+ addr = mm->mmap_base-len;
19025+
19026+ do {
19027+ /*
19028+ * Lookup failure means no vma is above this address,
19029+ * else if new region fits below vma->vm_start,
19030+ * return with success:
19031+ */
19032+ vma = find_vma(mm, addr);
19033+ if (check_heap_stack_gap(vma, addr, len))
19034+ /* remember the address as a hint for next time */
19035+ return (mm->free_area_cache = addr);
19036+
19037+ /* remember the largest hole we saw so far */
19038+ if (addr + mm->cached_hole_size < vma->vm_start)
19039+ mm->cached_hole_size = vma->vm_start - addr;
19040+
19041+ /* try just below the current vma->vm_start */
19042+ addr = skip_heap_stack_gap(vma, len);
19043+ } while (!IS_ERR_VALUE(addr));
19044+
19045+bottomup:
19046+ /*
19047+ * A failed mmap() very likely causes application failure,
19048+ * so fall back to the bottom-up function here. This scenario
19049+ * can happen with large stack limits and large mmap()
19050+ * allocations.
19051+ */
19052+
19053+#ifdef CONFIG_PAX_SEGMEXEC
19054+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
19055+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
19056+ else
19057+#endif
19058+
19059+ mm->mmap_base = TASK_UNMAPPED_BASE;
19060+
19061+#ifdef CONFIG_PAX_RANDMMAP
19062+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19063+ mm->mmap_base += mm->delta_mmap;
19064+#endif
19065+
19066+ mm->free_area_cache = mm->mmap_base;
19067+ mm->cached_hole_size = ~0UL;
19068+ addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19069+ /*
19070+ * Restore the topdown base:
19071+ */
19072+ mm->mmap_base = base;
19073+ mm->free_area_cache = base;
19074+ mm->cached_hole_size = ~0UL;
19075+
19076+ return addr;
19077 }
19078diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
19079index 0514890..3dbebce 100644
19080--- a/arch/x86/kernel/sys_x86_64.c
19081+++ b/arch/x86/kernel/sys_x86_64.c
19082@@ -95,8 +95,8 @@ out:
19083 return error;
19084 }
19085
19086-static void find_start_end(unsigned long flags, unsigned long *begin,
19087- unsigned long *end)
19088+static void find_start_end(struct mm_struct *mm, unsigned long flags,
19089+ unsigned long *begin, unsigned long *end)
19090 {
19091 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
19092 unsigned long new_begin;
19093@@ -115,7 +115,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
19094 *begin = new_begin;
19095 }
19096 } else {
19097- *begin = TASK_UNMAPPED_BASE;
19098+ *begin = mm->mmap_base;
19099 *end = TASK_SIZE;
19100 }
19101 }
19102@@ -132,16 +132,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
19103 if (flags & MAP_FIXED)
19104 return addr;
19105
19106- find_start_end(flags, &begin, &end);
19107+ find_start_end(mm, flags, &begin, &end);
19108
19109 if (len > end)
19110 return -ENOMEM;
19111
19112+#ifdef CONFIG_PAX_RANDMMAP
19113+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19114+#endif
19115+
19116 if (addr) {
19117 addr = PAGE_ALIGN(addr);
19118 vma = find_vma(mm, addr);
19119- if (end - len >= addr &&
19120- (!vma || addr + len <= vma->vm_start))
19121+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
19122 return addr;
19123 }
19124 if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
19125@@ -172,7 +175,7 @@ full_search:
19126 }
19127 return -ENOMEM;
19128 }
19129- if (!vma || addr + len <= vma->vm_start) {
19130+ if (check_heap_stack_gap(vma, addr, len)) {
19131 /*
19132 * Remember the place where we stopped the search:
19133 */
19134@@ -195,7 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19135 {
19136 struct vm_area_struct *vma;
19137 struct mm_struct *mm = current->mm;
19138- unsigned long addr = addr0;
19139+ unsigned long base = mm->mmap_base, addr = addr0;
19140
19141 /* requested length too big for entire address space */
19142 if (len > TASK_SIZE)
19143@@ -208,13 +211,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19144 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
19145 goto bottomup;
19146
19147+#ifdef CONFIG_PAX_RANDMMAP
19148+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19149+#endif
19150+
19151 /* requesting a specific address */
19152 if (addr) {
19153 addr = PAGE_ALIGN(addr);
19154- vma = find_vma(mm, addr);
19155- if (TASK_SIZE - len >= addr &&
19156- (!vma || addr + len <= vma->vm_start))
19157- return addr;
19158+ if (TASK_SIZE - len >= addr) {
19159+ vma = find_vma(mm, addr);
19160+ if (check_heap_stack_gap(vma, addr, len))
19161+ return addr;
19162+ }
19163 }
19164
19165 /* check if free_area_cache is useful for us */
19166@@ -232,7 +240,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19167 ALIGN_TOPDOWN);
19168
19169 vma = find_vma(mm, tmp_addr);
19170- if (!vma || tmp_addr + len <= vma->vm_start)
19171+ if (check_heap_stack_gap(vma, tmp_addr, len))
19172 /* remember the address as a hint for next time */
19173 return mm->free_area_cache = tmp_addr;
19174 }
19175@@ -251,7 +259,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19176 * return with success:
19177 */
19178 vma = find_vma(mm, addr);
19179- if (!vma || addr+len <= vma->vm_start)
19180+ if (check_heap_stack_gap(vma, addr, len))
19181 /* remember the address as a hint for next time */
19182 return mm->free_area_cache = addr;
19183
19184@@ -260,8 +268,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19185 mm->cached_hole_size = vma->vm_start - addr;
19186
19187 /* try just below the current vma->vm_start */
19188- addr = vma->vm_start-len;
19189- } while (len < vma->vm_start);
19190+ addr = skip_heap_stack_gap(vma, len);
19191+ } while (!IS_ERR_VALUE(addr));
19192
19193 bottomup:
19194 /*
19195@@ -270,13 +278,21 @@ bottomup:
19196 * can happen with large stack limits and large mmap()
19197 * allocations.
19198 */
19199+ mm->mmap_base = TASK_UNMAPPED_BASE;
19200+
19201+#ifdef CONFIG_PAX_RANDMMAP
19202+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19203+ mm->mmap_base += mm->delta_mmap;
19204+#endif
19205+
19206+ mm->free_area_cache = mm->mmap_base;
19207 mm->cached_hole_size = ~0UL;
19208- mm->free_area_cache = TASK_UNMAPPED_BASE;
19209 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19210 /*
19211 * Restore the topdown base:
19212 */
19213- mm->free_area_cache = mm->mmap_base;
19214+ mm->mmap_base = base;
19215+ mm->free_area_cache = base;
19216 mm->cached_hole_size = ~0UL;
19217
19218 return addr;
19219diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
19220index 9a0e312..e6f66f2 100644
19221--- a/arch/x86/kernel/syscall_table_32.S
19222+++ b/arch/x86/kernel/syscall_table_32.S
19223@@ -1,3 +1,4 @@
19224+.section .rodata,"a",@progbits
19225 ENTRY(sys_call_table)
19226 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
19227 .long sys_exit
19228diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
19229index e2410e2..4fe3fbc 100644
19230--- a/arch/x86/kernel/tboot.c
19231+++ b/arch/x86/kernel/tboot.c
19232@@ -219,7 +219,7 @@ static int tboot_setup_sleep(void)
19233
19234 void tboot_shutdown(u32 shutdown_type)
19235 {
19236- void (*shutdown)(void);
19237+ void (* __noreturn shutdown)(void);
19238
19239 if (!tboot_enabled())
19240 return;
19241@@ -241,7 +241,7 @@ void tboot_shutdown(u32 shutdown_type)
19242
19243 switch_to_tboot_pt();
19244
19245- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
19246+ shutdown = (void *)tboot->shutdown_entry;
19247 shutdown();
19248
19249 /* should not reach here */
19250@@ -298,7 +298,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
19251 tboot_shutdown(acpi_shutdown_map[sleep_state]);
19252 }
19253
19254-static atomic_t ap_wfs_count;
19255+static atomic_unchecked_t ap_wfs_count;
19256
19257 static int tboot_wait_for_aps(int num_aps)
19258 {
19259@@ -322,9 +322,9 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
19260 {
19261 switch (action) {
19262 case CPU_DYING:
19263- atomic_inc(&ap_wfs_count);
19264+ atomic_inc_unchecked(&ap_wfs_count);
19265 if (num_online_cpus() == 1)
19266- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
19267+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
19268 return NOTIFY_BAD;
19269 break;
19270 }
19271@@ -343,7 +343,7 @@ static __init int tboot_late_init(void)
19272
19273 tboot_create_trampoline();
19274
19275- atomic_set(&ap_wfs_count, 0);
19276+ atomic_set_unchecked(&ap_wfs_count, 0);
19277 register_hotcpu_notifier(&tboot_cpu_notifier);
19278 return 0;
19279 }
19280diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
19281index dd5fbf4..b7f2232 100644
19282--- a/arch/x86/kernel/time.c
19283+++ b/arch/x86/kernel/time.c
19284@@ -31,9 +31,9 @@ unsigned long profile_pc(struct pt_regs *regs)
19285 {
19286 unsigned long pc = instruction_pointer(regs);
19287
19288- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
19289+ if (!user_mode(regs) && in_lock_functions(pc)) {
19290 #ifdef CONFIG_FRAME_POINTER
19291- return *(unsigned long *)(regs->bp + sizeof(long));
19292+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
19293 #else
19294 unsigned long *sp =
19295 (unsigned long *)kernel_stack_pointer(regs);
19296@@ -42,11 +42,17 @@ unsigned long profile_pc(struct pt_regs *regs)
19297 * or above a saved flags. Eflags has bits 22-31 zero,
19298 * kernel addresses don't.
19299 */
19300+
19301+#ifdef CONFIG_PAX_KERNEXEC
19302+ return ktla_ktva(sp[0]);
19303+#else
19304 if (sp[0] >> 22)
19305 return sp[0];
19306 if (sp[1] >> 22)
19307 return sp[1];
19308 #endif
19309+
19310+#endif
19311 }
19312 return pc;
19313 }
19314diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
19315index 6bb7b85..dd853e1 100644
19316--- a/arch/x86/kernel/tls.c
19317+++ b/arch/x86/kernel/tls.c
19318@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
19319 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
19320 return -EINVAL;
19321
19322+#ifdef CONFIG_PAX_SEGMEXEC
19323+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
19324+ return -EINVAL;
19325+#endif
19326+
19327 set_tls_desc(p, idx, &info, 1);
19328
19329 return 0;
19330diff --git a/arch/x86/kernel/tls.h b/arch/x86/kernel/tls.h
19331index 2f083a2..7d3fecc 100644
19332--- a/arch/x86/kernel/tls.h
19333+++ b/arch/x86/kernel/tls.h
19334@@ -16,6 +16,6 @@
19335
19336 extern user_regset_active_fn regset_tls_active;
19337 extern user_regset_get_fn regset_tls_get;
19338-extern user_regset_set_fn regset_tls_set;
19339+extern user_regset_set_fn regset_tls_set __size_overflow(4);
19340
19341 #endif /* _ARCH_X86_KERNEL_TLS_H */
19342diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S
19343index 451c0a7..e57f551 100644
19344--- a/arch/x86/kernel/trampoline_32.S
19345+++ b/arch/x86/kernel/trampoline_32.S
19346@@ -32,6 +32,12 @@
19347 #include <asm/segment.h>
19348 #include <asm/page_types.h>
19349
19350+#ifdef CONFIG_PAX_KERNEXEC
19351+#define ta(X) (X)
19352+#else
19353+#define ta(X) ((X) - __PAGE_OFFSET)
19354+#endif
19355+
19356 #ifdef CONFIG_SMP
19357
19358 .section ".x86_trampoline","a"
19359@@ -62,7 +68,7 @@ r_base = .
19360 inc %ax # protected mode (PE) bit
19361 lmsw %ax # into protected mode
19362 # flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S
19363- ljmpl $__BOOT_CS, $(startup_32_smp-__PAGE_OFFSET)
19364+ ljmpl $__BOOT_CS, $ta(startup_32_smp)
19365
19366 # These need to be in the same 64K segment as the above;
19367 # hence we don't use the boot_gdt_descr defined in head.S
19368diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
19369index 09ff517..df19fbff 100644
19370--- a/arch/x86/kernel/trampoline_64.S
19371+++ b/arch/x86/kernel/trampoline_64.S
19372@@ -90,7 +90,7 @@ startup_32:
19373 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
19374 movl %eax, %ds
19375
19376- movl $X86_CR4_PAE, %eax
19377+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
19378 movl %eax, %cr4 # Enable PAE mode
19379
19380 # Setup trampoline 4 level pagetables
19381@@ -138,7 +138,7 @@ tidt:
19382 # so the kernel can live anywhere
19383 .balign 4
19384 tgdt:
19385- .short tgdt_end - tgdt # gdt limit
19386+ .short tgdt_end - tgdt - 1 # gdt limit
19387 .long tgdt - r_base
19388 .short 0
19389 .quad 0x00cf9b000000ffff # __KERNEL32_CS
19390diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
19391index 31d9d0f..e244dd9 100644
19392--- a/arch/x86/kernel/traps.c
19393+++ b/arch/x86/kernel/traps.c
19394@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
19395
19396 /* Do we ignore FPU interrupts ? */
19397 char ignore_fpu_irq;
19398-
19399-/*
19400- * The IDT has to be page-aligned to simplify the Pentium
19401- * F0 0F bug workaround.
19402- */
19403-gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
19404 #endif
19405
19406 DECLARE_BITMAP(used_vectors, NR_VECTORS);
19407@@ -108,13 +102,13 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
19408 }
19409
19410 static void __kprobes
19411-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
19412+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
19413 long error_code, siginfo_t *info)
19414 {
19415 struct task_struct *tsk = current;
19416
19417 #ifdef CONFIG_X86_32
19418- if (regs->flags & X86_VM_MASK) {
19419+ if (v8086_mode(regs)) {
19420 /*
19421 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
19422 * On nmi (interrupt 2), do_trap should not be called.
19423@@ -125,7 +119,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
19424 }
19425 #endif
19426
19427- if (!user_mode(regs))
19428+ if (!user_mode_novm(regs))
19429 goto kernel_trap;
19430
19431 #ifdef CONFIG_X86_32
19432@@ -148,7 +142,7 @@ trap_signal:
19433 printk_ratelimit()) {
19434 printk(KERN_INFO
19435 "%s[%d] trap %s ip:%lx sp:%lx error:%lx",
19436- tsk->comm, tsk->pid, str,
19437+ tsk->comm, task_pid_nr(tsk), str,
19438 regs->ip, regs->sp, error_code);
19439 print_vma_addr(" in ", regs->ip);
19440 printk("\n");
19441@@ -165,8 +159,20 @@ kernel_trap:
19442 if (!fixup_exception(regs)) {
19443 tsk->thread.error_code = error_code;
19444 tsk->thread.trap_no = trapnr;
19445+
19446+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19447+ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
19448+ str = "PAX: suspicious stack segment fault";
19449+#endif
19450+
19451 die(str, regs, error_code);
19452 }
19453+
19454+#ifdef CONFIG_PAX_REFCOUNT
19455+ if (trapnr == 4)
19456+ pax_report_refcount_overflow(regs);
19457+#endif
19458+
19459 return;
19460
19461 #ifdef CONFIG_X86_32
19462@@ -255,14 +261,30 @@ do_general_protection(struct pt_regs *regs, long error_code)
19463 conditional_sti(regs);
19464
19465 #ifdef CONFIG_X86_32
19466- if (regs->flags & X86_VM_MASK)
19467+ if (v8086_mode(regs))
19468 goto gp_in_vm86;
19469 #endif
19470
19471 tsk = current;
19472- if (!user_mode(regs))
19473+ if (!user_mode_novm(regs))
19474 goto gp_in_kernel;
19475
19476+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
19477+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
19478+ struct mm_struct *mm = tsk->mm;
19479+ unsigned long limit;
19480+
19481+ down_write(&mm->mmap_sem);
19482+ limit = mm->context.user_cs_limit;
19483+ if (limit < TASK_SIZE) {
19484+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
19485+ up_write(&mm->mmap_sem);
19486+ return;
19487+ }
19488+ up_write(&mm->mmap_sem);
19489+ }
19490+#endif
19491+
19492 tsk->thread.error_code = error_code;
19493 tsk->thread.trap_no = 13;
19494
19495@@ -295,6 +317,13 @@ gp_in_kernel:
19496 if (notify_die(DIE_GPF, "general protection fault", regs,
19497 error_code, 13, SIGSEGV) == NOTIFY_STOP)
19498 return;
19499+
19500+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19501+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
19502+ die("PAX: suspicious general protection fault", regs, error_code);
19503+ else
19504+#endif
19505+
19506 die("general protection fault", regs, error_code);
19507 }
19508
19509@@ -414,7 +443,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
19510 /* It's safe to allow irq's after DR6 has been saved */
19511 preempt_conditional_sti(regs);
19512
19513- if (regs->flags & X86_VM_MASK) {
19514+ if (v8086_mode(regs)) {
19515 handle_vm86_trap((struct kernel_vm86_regs *) regs,
19516 error_code, 1);
19517 preempt_conditional_cli(regs);
19518@@ -428,7 +457,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
19519 * We already checked v86 mode above, so we can check for kernel mode
19520 * by just checking the CPL of CS.
19521 */
19522- if ((dr6 & DR_STEP) && !user_mode(regs)) {
19523+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
19524 tsk->thread.debugreg6 &= ~DR_STEP;
19525 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
19526 regs->flags &= ~X86_EFLAGS_TF;
19527@@ -457,7 +486,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
19528 return;
19529 conditional_sti(regs);
19530
19531- if (!user_mode_vm(regs))
19532+ if (!user_mode(regs))
19533 {
19534 if (!fixup_exception(regs)) {
19535 task->thread.error_code = error_code;
19536@@ -569,8 +598,8 @@ asmlinkage void __attribute__((weak)) smp_threshold_interrupt(void)
19537 void __math_state_restore(struct task_struct *tsk)
19538 {
19539 /* We need a safe address that is cheap to find and that is already
19540- in L1. We've just brought in "tsk->thread.has_fpu", so use that */
19541-#define safe_address (tsk->thread.has_fpu)
19542+ in L1. */
19543+#define safe_address (init_tss[smp_processor_id()].x86_tss.sp0)
19544
19545 /* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception
19546 is pending. Clear the x87 state here by setting it to fixed
19547diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
19548index b9242ba..50c5edd 100644
19549--- a/arch/x86/kernel/verify_cpu.S
19550+++ b/arch/x86/kernel/verify_cpu.S
19551@@ -20,6 +20,7 @@
19552 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
19553 * arch/x86/kernel/trampoline_64.S: secondary processor verification
19554 * arch/x86/kernel/head_32.S: processor startup
19555+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
19556 *
19557 * verify_cpu, returns the status of longmode and SSE in register %eax.
19558 * 0: Success 1: Failure
19559diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
19560index 863f875..4307295 100644
19561--- a/arch/x86/kernel/vm86_32.c
19562+++ b/arch/x86/kernel/vm86_32.c
19563@@ -41,6 +41,7 @@
19564 #include <linux/ptrace.h>
19565 #include <linux/audit.h>
19566 #include <linux/stddef.h>
19567+#include <linux/grsecurity.h>
19568
19569 #include <asm/uaccess.h>
19570 #include <asm/io.h>
19571@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
19572 do_exit(SIGSEGV);
19573 }
19574
19575- tss = &per_cpu(init_tss, get_cpu());
19576+ tss = init_tss + get_cpu();
19577 current->thread.sp0 = current->thread.saved_sp0;
19578 current->thread.sysenter_cs = __KERNEL_CS;
19579 load_sp0(tss, &current->thread);
19580@@ -208,6 +209,13 @@ int sys_vm86old(struct vm86_struct __user *v86, struct pt_regs *regs)
19581 struct task_struct *tsk;
19582 int tmp, ret = -EPERM;
19583
19584+#ifdef CONFIG_GRKERNSEC_VM86
19585+ if (!capable(CAP_SYS_RAWIO)) {
19586+ gr_handle_vm86();
19587+ goto out;
19588+ }
19589+#endif
19590+
19591 tsk = current;
19592 if (tsk->thread.saved_sp0)
19593 goto out;
19594@@ -238,6 +246,14 @@ int sys_vm86(unsigned long cmd, unsigned long arg, struct pt_regs *regs)
19595 int tmp, ret;
19596 struct vm86plus_struct __user *v86;
19597
19598+#ifdef CONFIG_GRKERNSEC_VM86
19599+ if (!capable(CAP_SYS_RAWIO)) {
19600+ gr_handle_vm86();
19601+ ret = -EPERM;
19602+ goto out;
19603+ }
19604+#endif
19605+
19606 tsk = current;
19607 switch (cmd) {
19608 case VM86_REQUEST_IRQ:
19609@@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
19610 tsk->thread.saved_fs = info->regs32->fs;
19611 tsk->thread.saved_gs = get_user_gs(info->regs32);
19612
19613- tss = &per_cpu(init_tss, get_cpu());
19614+ tss = init_tss + get_cpu();
19615 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
19616 if (cpu_has_sep)
19617 tsk->thread.sysenter_cs = 0;
19618@@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
19619 goto cannot_handle;
19620 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
19621 goto cannot_handle;
19622- intr_ptr = (unsigned long __user *) (i << 2);
19623+ intr_ptr = (__force unsigned long __user *) (i << 2);
19624 if (get_user(segoffs, intr_ptr))
19625 goto cannot_handle;
19626 if ((segoffs >> 16) == BIOSSEG)
19627diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
19628index 0f703f1..9e15f64 100644
19629--- a/arch/x86/kernel/vmlinux.lds.S
19630+++ b/arch/x86/kernel/vmlinux.lds.S
19631@@ -26,6 +26,13 @@
19632 #include <asm/page_types.h>
19633 #include <asm/cache.h>
19634 #include <asm/boot.h>
19635+#include <asm/segment.h>
19636+
19637+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19638+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
19639+#else
19640+#define __KERNEL_TEXT_OFFSET 0
19641+#endif
19642
19643 #undef i386 /* in case the preprocessor is a 32bit one */
19644
19645@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
19646
19647 PHDRS {
19648 text PT_LOAD FLAGS(5); /* R_E */
19649+#ifdef CONFIG_X86_32
19650+ module PT_LOAD FLAGS(5); /* R_E */
19651+#endif
19652+#ifdef CONFIG_XEN
19653+ rodata PT_LOAD FLAGS(5); /* R_E */
19654+#else
19655+ rodata PT_LOAD FLAGS(4); /* R__ */
19656+#endif
19657 data PT_LOAD FLAGS(6); /* RW_ */
19658-#ifdef CONFIG_X86_64
19659+ init.begin PT_LOAD FLAGS(6); /* RW_ */
19660 #ifdef CONFIG_SMP
19661 percpu PT_LOAD FLAGS(6); /* RW_ */
19662 #endif
19663+ text.init PT_LOAD FLAGS(5); /* R_E */
19664+ text.exit PT_LOAD FLAGS(5); /* R_E */
19665 init PT_LOAD FLAGS(7); /* RWE */
19666-#endif
19667 note PT_NOTE FLAGS(0); /* ___ */
19668 }
19669
19670 SECTIONS
19671 {
19672 #ifdef CONFIG_X86_32
19673- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
19674- phys_startup_32 = startup_32 - LOAD_OFFSET;
19675+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
19676 #else
19677- . = __START_KERNEL;
19678- phys_startup_64 = startup_64 - LOAD_OFFSET;
19679+ . = __START_KERNEL;
19680 #endif
19681
19682 /* Text and read-only data */
19683- .text : AT(ADDR(.text) - LOAD_OFFSET) {
19684- _text = .;
19685+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
19686 /* bootstrapping code */
19687+#ifdef CONFIG_X86_32
19688+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19689+#else
19690+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19691+#endif
19692+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19693+ _text = .;
19694 HEAD_TEXT
19695 #ifdef CONFIG_X86_32
19696 . = ALIGN(PAGE_SIZE);
19697@@ -108,13 +128,47 @@ SECTIONS
19698 IRQENTRY_TEXT
19699 *(.fixup)
19700 *(.gnu.warning)
19701- /* End of text section */
19702- _etext = .;
19703 } :text = 0x9090
19704
19705- NOTES :text :note
19706+ . += __KERNEL_TEXT_OFFSET;
19707
19708- EXCEPTION_TABLE(16) :text = 0x9090
19709+#ifdef CONFIG_X86_32
19710+ . = ALIGN(PAGE_SIZE);
19711+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
19712+
19713+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
19714+ MODULES_EXEC_VADDR = .;
19715+ BYTE(0)
19716+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
19717+ . = ALIGN(HPAGE_SIZE);
19718+ MODULES_EXEC_END = . - 1;
19719+#endif
19720+
19721+ } :module
19722+#endif
19723+
19724+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
19725+ /* End of text section */
19726+ _etext = . - __KERNEL_TEXT_OFFSET;
19727+ }
19728+
19729+#ifdef CONFIG_X86_32
19730+ . = ALIGN(PAGE_SIZE);
19731+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
19732+ *(.idt)
19733+ . = ALIGN(PAGE_SIZE);
19734+ *(.empty_zero_page)
19735+ *(.initial_pg_fixmap)
19736+ *(.initial_pg_pmd)
19737+ *(.initial_page_table)
19738+ *(.swapper_pg_dir)
19739+ } :rodata
19740+#endif
19741+
19742+ . = ALIGN(PAGE_SIZE);
19743+ NOTES :rodata :note
19744+
19745+ EXCEPTION_TABLE(16) :rodata
19746
19747 #if defined(CONFIG_DEBUG_RODATA)
19748 /* .text should occupy whole number of pages */
19749@@ -126,16 +180,20 @@ SECTIONS
19750
19751 /* Data */
19752 .data : AT(ADDR(.data) - LOAD_OFFSET) {
19753+
19754+#ifdef CONFIG_PAX_KERNEXEC
19755+ . = ALIGN(HPAGE_SIZE);
19756+#else
19757+ . = ALIGN(PAGE_SIZE);
19758+#endif
19759+
19760 /* Start of data section */
19761 _sdata = .;
19762
19763 /* init_task */
19764 INIT_TASK_DATA(THREAD_SIZE)
19765
19766-#ifdef CONFIG_X86_32
19767- /* 32 bit has nosave before _edata */
19768 NOSAVE_DATA
19769-#endif
19770
19771 PAGE_ALIGNED_DATA(PAGE_SIZE)
19772
19773@@ -176,12 +234,19 @@ SECTIONS
19774 #endif /* CONFIG_X86_64 */
19775
19776 /* Init code and data - will be freed after init */
19777- . = ALIGN(PAGE_SIZE);
19778 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
19779+ BYTE(0)
19780+
19781+#ifdef CONFIG_PAX_KERNEXEC
19782+ . = ALIGN(HPAGE_SIZE);
19783+#else
19784+ . = ALIGN(PAGE_SIZE);
19785+#endif
19786+
19787 __init_begin = .; /* paired with __init_end */
19788- }
19789+ } :init.begin
19790
19791-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
19792+#ifdef CONFIG_SMP
19793 /*
19794 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
19795 * output PHDR, so the next output section - .init.text - should
19796@@ -190,12 +255,27 @@ SECTIONS
19797 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
19798 #endif
19799
19800- INIT_TEXT_SECTION(PAGE_SIZE)
19801-#ifdef CONFIG_X86_64
19802- :init
19803-#endif
19804+ . = ALIGN(PAGE_SIZE);
19805+ init_begin = .;
19806+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
19807+ VMLINUX_SYMBOL(_sinittext) = .;
19808+ INIT_TEXT
19809+ VMLINUX_SYMBOL(_einittext) = .;
19810+ . = ALIGN(PAGE_SIZE);
19811+ } :text.init
19812
19813- INIT_DATA_SECTION(16)
19814+ /*
19815+ * .exit.text is discard at runtime, not link time, to deal with
19816+ * references from .altinstructions and .eh_frame
19817+ */
19818+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
19819+ EXIT_TEXT
19820+ . = ALIGN(16);
19821+ } :text.exit
19822+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
19823+
19824+ . = ALIGN(PAGE_SIZE);
19825+ INIT_DATA_SECTION(16) :init
19826
19827 /*
19828 * Code and data for a variety of lowlevel trampolines, to be
19829@@ -269,19 +349,12 @@ SECTIONS
19830 }
19831
19832 . = ALIGN(8);
19833- /*
19834- * .exit.text is discard at runtime, not link time, to deal with
19835- * references from .altinstructions and .eh_frame
19836- */
19837- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
19838- EXIT_TEXT
19839- }
19840
19841 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
19842 EXIT_DATA
19843 }
19844
19845-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
19846+#ifndef CONFIG_SMP
19847 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
19848 #endif
19849
19850@@ -300,16 +373,10 @@ SECTIONS
19851 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
19852 __smp_locks = .;
19853 *(.smp_locks)
19854- . = ALIGN(PAGE_SIZE);
19855 __smp_locks_end = .;
19856+ . = ALIGN(PAGE_SIZE);
19857 }
19858
19859-#ifdef CONFIG_X86_64
19860- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
19861- NOSAVE_DATA
19862- }
19863-#endif
19864-
19865 /* BSS */
19866 . = ALIGN(PAGE_SIZE);
19867 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
19868@@ -325,6 +392,7 @@ SECTIONS
19869 __brk_base = .;
19870 . += 64 * 1024; /* 64k alignment slop space */
19871 *(.brk_reservation) /* areas brk users have reserved */
19872+ . = ALIGN(HPAGE_SIZE);
19873 __brk_limit = .;
19874 }
19875
19876@@ -351,13 +419,12 @@ SECTIONS
19877 * for the boot processor.
19878 */
19879 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
19880-INIT_PER_CPU(gdt_page);
19881 INIT_PER_CPU(irq_stack_union);
19882
19883 /*
19884 * Build-time check on the image size:
19885 */
19886-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
19887+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
19888 "kernel image bigger than KERNEL_IMAGE_SIZE");
19889
19890 #ifdef CONFIG_SMP
19891diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
19892index e4d4a22..47ee71f 100644
19893--- a/arch/x86/kernel/vsyscall_64.c
19894+++ b/arch/x86/kernel/vsyscall_64.c
19895@@ -57,15 +57,13 @@ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
19896 .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
19897 };
19898
19899-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = NATIVE;
19900+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
19901
19902 static int __init vsyscall_setup(char *str)
19903 {
19904 if (str) {
19905 if (!strcmp("emulate", str))
19906 vsyscall_mode = EMULATE;
19907- else if (!strcmp("native", str))
19908- vsyscall_mode = NATIVE;
19909 else if (!strcmp("none", str))
19910 vsyscall_mode = NONE;
19911 else
19912@@ -178,7 +176,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
19913
19914 tsk = current;
19915 if (seccomp_mode(&tsk->seccomp))
19916- do_exit(SIGKILL);
19917+ do_group_exit(SIGKILL);
19918
19919 switch (vsyscall_nr) {
19920 case 0:
19921@@ -220,8 +218,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
19922 return true;
19923
19924 sigsegv:
19925- force_sig(SIGSEGV, current);
19926- return true;
19927+ do_group_exit(SIGKILL);
19928 }
19929
19930 /*
19931@@ -274,10 +271,7 @@ void __init map_vsyscall(void)
19932 extern char __vvar_page;
19933 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
19934
19935- __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
19936- vsyscall_mode == NATIVE
19937- ? PAGE_KERNEL_VSYSCALL
19938- : PAGE_KERNEL_VVAR);
19939+ __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
19940 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
19941 (unsigned long)VSYSCALL_START);
19942
19943diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
19944index 9796c2f..f686fbf 100644
19945--- a/arch/x86/kernel/x8664_ksyms_64.c
19946+++ b/arch/x86/kernel/x8664_ksyms_64.c
19947@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
19948 EXPORT_SYMBOL(copy_user_generic_string);
19949 EXPORT_SYMBOL(copy_user_generic_unrolled);
19950 EXPORT_SYMBOL(__copy_user_nocache);
19951-EXPORT_SYMBOL(_copy_from_user);
19952-EXPORT_SYMBOL(_copy_to_user);
19953
19954 EXPORT_SYMBOL(copy_page);
19955 EXPORT_SYMBOL(clear_page);
19956diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
19957index 7110911..e8cdee5 100644
19958--- a/arch/x86/kernel/xsave.c
19959+++ b/arch/x86/kernel/xsave.c
19960@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
19961 fx_sw_user->xstate_size > fx_sw_user->extended_size)
19962 return -EINVAL;
19963
19964- err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
19965+ err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
19966 fx_sw_user->extended_size -
19967 FP_XSTATE_MAGIC2_SIZE));
19968 if (err)
19969@@ -266,7 +266,7 @@ fx_only:
19970 * the other extended state.
19971 */
19972 xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
19973- return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
19974+ return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
19975 }
19976
19977 /*
19978@@ -295,7 +295,7 @@ int restore_i387_xstate(void __user *buf)
19979 if (use_xsave())
19980 err = restore_user_xstate(buf);
19981 else
19982- err = fxrstor_checking((__force struct i387_fxsave_struct *)
19983+ err = fxrstor_checking((struct i387_fxsave_struct __force_kernel *)
19984 buf);
19985 if (unlikely(err)) {
19986 /*
19987diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
19988index f1e3be18..588efc8 100644
19989--- a/arch/x86/kvm/emulate.c
19990+++ b/arch/x86/kvm/emulate.c
19991@@ -249,6 +249,7 @@ struct gprefix {
19992
19993 #define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype) \
19994 do { \
19995+ unsigned long _tmp; \
19996 __asm__ __volatile__ ( \
19997 _PRE_EFLAGS("0", "4", "2") \
19998 _op _suffix " %"_x"3,%1; " \
19999@@ -263,8 +264,6 @@ struct gprefix {
20000 /* Raw emulation: instruction has two explicit operands. */
20001 #define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy) \
20002 do { \
20003- unsigned long _tmp; \
20004- \
20005 switch ((ctxt)->dst.bytes) { \
20006 case 2: \
20007 ____emulate_2op(ctxt,_op,_wx,_wy,"w",u16); \
20008@@ -280,7 +279,6 @@ struct gprefix {
20009
20010 #define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
20011 do { \
20012- unsigned long _tmp; \
20013 switch ((ctxt)->dst.bytes) { \
20014 case 1: \
20015 ____emulate_2op(ctxt,_op,_bx,_by,"b",u8); \
20016diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
20017index 54abb40..a192606 100644
20018--- a/arch/x86/kvm/lapic.c
20019+++ b/arch/x86/kvm/lapic.c
20020@@ -53,7 +53,7 @@
20021 #define APIC_BUS_CYCLE_NS 1
20022
20023 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
20024-#define apic_debug(fmt, arg...)
20025+#define apic_debug(fmt, arg...) do {} while (0)
20026
20027 #define APIC_LVT_NUM 6
20028 /* 14 is the version for Xeon and Pentium 8.4.8*/
20029diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
20030index f1b36cf..af8a124 100644
20031--- a/arch/x86/kvm/mmu.c
20032+++ b/arch/x86/kvm/mmu.c
20033@@ -3555,7 +3555,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
20034
20035 pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
20036
20037- invlpg_counter = atomic_read(&vcpu->kvm->arch.invlpg_counter);
20038+ invlpg_counter = atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter);
20039
20040 /*
20041 * Assume that the pte write on a page table of the same type
20042@@ -3587,7 +3587,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
20043 }
20044
20045 spin_lock(&vcpu->kvm->mmu_lock);
20046- if (atomic_read(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
20047+ if (atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
20048 gentry = 0;
20049 kvm_mmu_free_some_pages(vcpu);
20050 ++vcpu->kvm->stat.mmu_pte_write;
20051diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
20052index 9299410..ade2f9b 100644
20053--- a/arch/x86/kvm/paging_tmpl.h
20054+++ b/arch/x86/kvm/paging_tmpl.h
20055@@ -197,7 +197,7 @@ retry_walk:
20056 if (unlikely(kvm_is_error_hva(host_addr)))
20057 goto error;
20058
20059- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
20060+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
20061 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
20062 goto error;
20063
20064@@ -705,7 +705,7 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva)
20065 if (need_flush)
20066 kvm_flush_remote_tlbs(vcpu->kvm);
20067
20068- atomic_inc(&vcpu->kvm->arch.invlpg_counter);
20069+ atomic_inc_unchecked(&vcpu->kvm->arch.invlpg_counter);
20070
20071 spin_unlock(&vcpu->kvm->mmu_lock);
20072
20073diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
20074index 94a4672..1700ed1 100644
20075--- a/arch/x86/kvm/svm.c
20076+++ b/arch/x86/kvm/svm.c
20077@@ -3037,6 +3037,7 @@ static int svm_set_vm_cr(struct kvm_vcpu *vcpu, u64 data)
20078 return 0;
20079 }
20080
20081+static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data) __size_overflow(3);
20082 static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data)
20083 {
20084 struct vcpu_svm *svm = to_svm(vcpu);
20085@@ -3405,7 +3406,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
20086 int cpu = raw_smp_processor_id();
20087
20088 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
20089+
20090+ pax_open_kernel();
20091 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
20092+ pax_close_kernel();
20093+
20094 load_TR_desc();
20095 }
20096
20097@@ -3783,6 +3788,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
20098 #endif
20099 #endif
20100
20101+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20102+ __set_fs(current_thread_info()->addr_limit);
20103+#endif
20104+
20105 reload_tss(vcpu);
20106
20107 local_irq_disable();
20108diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
20109index 4ea7678..c715f2f 100644
20110--- a/arch/x86/kvm/vmx.c
20111+++ b/arch/x86/kvm/vmx.c
20112@@ -1305,7 +1305,11 @@ static void reload_tss(void)
20113 struct desc_struct *descs;
20114
20115 descs = (void *)gdt->address;
20116+
20117+ pax_open_kernel();
20118 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
20119+ pax_close_kernel();
20120+
20121 load_TR_desc();
20122 }
20123
20124@@ -2163,6 +2167,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
20125 * Returns 0 on success, non-0 otherwise.
20126 * Assumes vcpu_load() was already called.
20127 */
20128+static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) __size_overflow(3);
20129 static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)
20130 {
20131 struct vcpu_vmx *vmx = to_vmx(vcpu);
20132@@ -2633,8 +2638,11 @@ static __init int hardware_setup(void)
20133 if (!cpu_has_vmx_flexpriority())
20134 flexpriority_enabled = 0;
20135
20136- if (!cpu_has_vmx_tpr_shadow())
20137- kvm_x86_ops->update_cr8_intercept = NULL;
20138+ if (!cpu_has_vmx_tpr_shadow()) {
20139+ pax_open_kernel();
20140+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
20141+ pax_close_kernel();
20142+ }
20143
20144 if (enable_ept && !cpu_has_vmx_ept_2m_page())
20145 kvm_disable_largepages();
20146@@ -3648,7 +3656,7 @@ static void vmx_set_constant_host_state(void)
20147 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
20148
20149 asm("mov $.Lkvm_vmx_return, %0" : "=r"(tmpl));
20150- vmcs_writel(HOST_RIP, tmpl); /* 22.2.5 */
20151+ vmcs_writel(HOST_RIP, ktla_ktva(tmpl)); /* 22.2.5 */
20152
20153 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
20154 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
20155@@ -6169,6 +6177,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20156 "jmp .Lkvm_vmx_return \n\t"
20157 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
20158 ".Lkvm_vmx_return: "
20159+
20160+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20161+ "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
20162+ ".Lkvm_vmx_return2: "
20163+#endif
20164+
20165 /* Save guest registers, load host registers, keep flags */
20166 "mov %0, %c[wordsize](%%"R"sp) \n\t"
20167 "pop %0 \n\t"
20168@@ -6217,6 +6231,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20169 #endif
20170 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
20171 [wordsize]"i"(sizeof(ulong))
20172+
20173+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20174+ ,[cs]"i"(__KERNEL_CS)
20175+#endif
20176+
20177 : "cc", "memory"
20178 , R"ax", R"bx", R"di", R"si"
20179 #ifdef CONFIG_X86_64
20180@@ -6245,7 +6264,16 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20181 }
20182 }
20183
20184- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
20185+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
20186+
20187+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20188+ loadsegment(fs, __KERNEL_PERCPU);
20189+#endif
20190+
20191+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20192+ __set_fs(current_thread_info()->addr_limit);
20193+#endif
20194+
20195 vmx->loaded_vmcs->launched = 1;
20196
20197 vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
20198diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
20199index 4c938da..6cd8090 100644
20200--- a/arch/x86/kvm/x86.c
20201+++ b/arch/x86/kvm/x86.c
20202@@ -907,6 +907,7 @@ static int do_set_msr(struct kvm_vcpu *vcpu, unsigned index, u64 *data)
20203 return kvm_set_msr(vcpu, index, *data);
20204 }
20205
20206+static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) __size_overflow(2);
20207 static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock)
20208 {
20209 int version;
20210@@ -1345,8 +1346,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
20211 {
20212 struct kvm *kvm = vcpu->kvm;
20213 int lm = is_long_mode(vcpu);
20214- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20215- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20216+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20217+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20218 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
20219 : kvm->arch.xen_hvm_config.blob_size_32;
20220 u32 page_num = data & ~PAGE_MASK;
20221@@ -2165,6 +2166,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
20222 if (n < msr_list.nmsrs)
20223 goto out;
20224 r = -EFAULT;
20225+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
20226+ goto out;
20227 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
20228 num_msrs_to_save * sizeof(u32)))
20229 goto out;
20230@@ -2340,15 +2343,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
20231 struct kvm_cpuid2 *cpuid,
20232 struct kvm_cpuid_entry2 __user *entries)
20233 {
20234- int r;
20235+ int r, i;
20236
20237 r = -E2BIG;
20238 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
20239 goto out;
20240 r = -EFAULT;
20241- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
20242- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20243+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20244 goto out;
20245+ for (i = 0; i < cpuid->nent; ++i) {
20246+ struct kvm_cpuid_entry2 cpuid_entry;
20247+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
20248+ goto out;
20249+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
20250+ }
20251 vcpu->arch.cpuid_nent = cpuid->nent;
20252 kvm_apic_set_version(vcpu);
20253 kvm_x86_ops->cpuid_update(vcpu);
20254@@ -2363,15 +2371,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
20255 struct kvm_cpuid2 *cpuid,
20256 struct kvm_cpuid_entry2 __user *entries)
20257 {
20258- int r;
20259+ int r, i;
20260
20261 r = -E2BIG;
20262 if (cpuid->nent < vcpu->arch.cpuid_nent)
20263 goto out;
20264 r = -EFAULT;
20265- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
20266- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20267+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20268 goto out;
20269+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
20270+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
20271+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
20272+ goto out;
20273+ }
20274 return 0;
20275
20276 out:
20277@@ -2746,7 +2758,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
20278 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
20279 struct kvm_interrupt *irq)
20280 {
20281- if (irq->irq < 0 || irq->irq >= 256)
20282+ if (irq->irq >= 256)
20283 return -EINVAL;
20284 if (irqchip_in_kernel(vcpu->kvm))
20285 return -ENXIO;
20286@@ -3949,6 +3961,9 @@ gpa_t kvm_mmu_gva_to_gpa_system(struct kvm_vcpu *vcpu, gva_t gva,
20287
20288 static int kvm_read_guest_virt_helper(gva_t addr, void *val, unsigned int bytes,
20289 struct kvm_vcpu *vcpu, u32 access,
20290+ struct x86_exception *exception) __size_overflow(1,3);
20291+static int kvm_read_guest_virt_helper(gva_t addr, void *val, unsigned int bytes,
20292+ struct kvm_vcpu *vcpu, u32 access,
20293 struct x86_exception *exception)
20294 {
20295 void *data = val;
20296@@ -3980,6 +3995,9 @@ out:
20297 /* used for instruction fetching */
20298 static int kvm_fetch_guest_virt(struct x86_emulate_ctxt *ctxt,
20299 gva_t addr, void *val, unsigned int bytes,
20300+ struct x86_exception *exception) __size_overflow(2,4);
20301+static int kvm_fetch_guest_virt(struct x86_emulate_ctxt *ctxt,
20302+ gva_t addr, void *val, unsigned int bytes,
20303 struct x86_exception *exception)
20304 {
20305 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20306@@ -4004,6 +4022,9 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_virt);
20307
20308 static int kvm_read_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20309 gva_t addr, void *val, unsigned int bytes,
20310+ struct x86_exception *exception) __size_overflow(2,4);
20311+static int kvm_read_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20312+ gva_t addr, void *val, unsigned int bytes,
20313 struct x86_exception *exception)
20314 {
20315 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20316@@ -4117,12 +4138,16 @@ static int read_prepare(struct kvm_vcpu *vcpu, void *val, int bytes)
20317 }
20318
20319 static int read_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20320+ void *val, int bytes) __size_overflow(2);
20321+static int read_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20322 void *val, int bytes)
20323 {
20324 return !kvm_read_guest(vcpu->kvm, gpa, val, bytes);
20325 }
20326
20327 static int write_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20328+ void *val, int bytes) __size_overflow(2);
20329+static int write_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20330 void *val, int bytes)
20331 {
20332 return emulator_write_phys(vcpu, gpa, val, bytes);
20333@@ -4273,6 +4298,12 @@ static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
20334 const void *old,
20335 const void *new,
20336 unsigned int bytes,
20337+ struct x86_exception *exception) __size_overflow(5);
20338+static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
20339+ unsigned long addr,
20340+ const void *old,
20341+ const void *new,
20342+ unsigned int bytes,
20343 struct x86_exception *exception)
20344 {
20345 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20346@@ -5162,7 +5193,7 @@ static void kvm_set_mmio_spte_mask(void)
20347 kvm_mmu_set_mmio_spte_mask(mask);
20348 }
20349
20350-int kvm_arch_init(void *opaque)
20351+int kvm_arch_init(const void *opaque)
20352 {
20353 int r;
20354 struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
20355diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
20356index d36fe23..a4b189f 100644
20357--- a/arch/x86/kvm/x86.h
20358+++ b/arch/x86/kvm/x86.h
20359@@ -119,10 +119,10 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, u64 data);
20360
20361 int kvm_read_guest_virt(struct x86_emulate_ctxt *ctxt,
20362 gva_t addr, void *val, unsigned int bytes,
20363- struct x86_exception *exception);
20364+ struct x86_exception *exception) __size_overflow(2,4);
20365
20366 int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20367 gva_t addr, void *val, unsigned int bytes,
20368- struct x86_exception *exception);
20369+ struct x86_exception *exception) __size_overflow(2,4);
20370
20371 #endif
20372diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
20373index cf4603b..7cdde38 100644
20374--- a/arch/x86/lguest/boot.c
20375+++ b/arch/x86/lguest/boot.c
20376@@ -1195,9 +1195,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
20377 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
20378 * Launcher to reboot us.
20379 */
20380-static void lguest_restart(char *reason)
20381+static __noreturn void lguest_restart(char *reason)
20382 {
20383 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
20384+ BUG();
20385 }
20386
20387 /*G:050
20388diff --git a/arch/x86/lib/atomic64_32.c b/arch/x86/lib/atomic64_32.c
20389index 042f682..c92afb6 100644
20390--- a/arch/x86/lib/atomic64_32.c
20391+++ b/arch/x86/lib/atomic64_32.c
20392@@ -8,18 +8,30 @@
20393
20394 long long atomic64_read_cx8(long long, const atomic64_t *v);
20395 EXPORT_SYMBOL(atomic64_read_cx8);
20396+long long atomic64_read_unchecked_cx8(long long, const atomic64_unchecked_t *v);
20397+EXPORT_SYMBOL(atomic64_read_unchecked_cx8);
20398 long long atomic64_set_cx8(long long, const atomic64_t *v);
20399 EXPORT_SYMBOL(atomic64_set_cx8);
20400+long long atomic64_set_unchecked_cx8(long long, const atomic64_unchecked_t *v);
20401+EXPORT_SYMBOL(atomic64_set_unchecked_cx8);
20402 long long atomic64_xchg_cx8(long long, unsigned high);
20403 EXPORT_SYMBOL(atomic64_xchg_cx8);
20404 long long atomic64_add_return_cx8(long long a, atomic64_t *v);
20405 EXPORT_SYMBOL(atomic64_add_return_cx8);
20406+long long atomic64_add_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20407+EXPORT_SYMBOL(atomic64_add_return_unchecked_cx8);
20408 long long atomic64_sub_return_cx8(long long a, atomic64_t *v);
20409 EXPORT_SYMBOL(atomic64_sub_return_cx8);
20410+long long atomic64_sub_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20411+EXPORT_SYMBOL(atomic64_sub_return_unchecked_cx8);
20412 long long atomic64_inc_return_cx8(long long a, atomic64_t *v);
20413 EXPORT_SYMBOL(atomic64_inc_return_cx8);
20414+long long atomic64_inc_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20415+EXPORT_SYMBOL(atomic64_inc_return_unchecked_cx8);
20416 long long atomic64_dec_return_cx8(long long a, atomic64_t *v);
20417 EXPORT_SYMBOL(atomic64_dec_return_cx8);
20418+long long atomic64_dec_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20419+EXPORT_SYMBOL(atomic64_dec_return_unchecked_cx8);
20420 long long atomic64_dec_if_positive_cx8(atomic64_t *v);
20421 EXPORT_SYMBOL(atomic64_dec_if_positive_cx8);
20422 int atomic64_inc_not_zero_cx8(atomic64_t *v);
20423@@ -30,26 +42,46 @@ EXPORT_SYMBOL(atomic64_add_unless_cx8);
20424 #ifndef CONFIG_X86_CMPXCHG64
20425 long long atomic64_read_386(long long, const atomic64_t *v);
20426 EXPORT_SYMBOL(atomic64_read_386);
20427+long long atomic64_read_unchecked_386(long long, const atomic64_unchecked_t *v);
20428+EXPORT_SYMBOL(atomic64_read_unchecked_386);
20429 long long atomic64_set_386(long long, const atomic64_t *v);
20430 EXPORT_SYMBOL(atomic64_set_386);
20431+long long atomic64_set_unchecked_386(long long, const atomic64_unchecked_t *v);
20432+EXPORT_SYMBOL(atomic64_set_unchecked_386);
20433 long long atomic64_xchg_386(long long, unsigned high);
20434 EXPORT_SYMBOL(atomic64_xchg_386);
20435 long long atomic64_add_return_386(long long a, atomic64_t *v);
20436 EXPORT_SYMBOL(atomic64_add_return_386);
20437+long long atomic64_add_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20438+EXPORT_SYMBOL(atomic64_add_return_unchecked_386);
20439 long long atomic64_sub_return_386(long long a, atomic64_t *v);
20440 EXPORT_SYMBOL(atomic64_sub_return_386);
20441+long long atomic64_sub_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20442+EXPORT_SYMBOL(atomic64_sub_return_unchecked_386);
20443 long long atomic64_inc_return_386(long long a, atomic64_t *v);
20444 EXPORT_SYMBOL(atomic64_inc_return_386);
20445+long long atomic64_inc_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20446+EXPORT_SYMBOL(atomic64_inc_return_unchecked_386);
20447 long long atomic64_dec_return_386(long long a, atomic64_t *v);
20448 EXPORT_SYMBOL(atomic64_dec_return_386);
20449+long long atomic64_dec_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20450+EXPORT_SYMBOL(atomic64_dec_return_unchecked_386);
20451 long long atomic64_add_386(long long a, atomic64_t *v);
20452 EXPORT_SYMBOL(atomic64_add_386);
20453+long long atomic64_add_unchecked_386(long long a, atomic64_unchecked_t *v);
20454+EXPORT_SYMBOL(atomic64_add_unchecked_386);
20455 long long atomic64_sub_386(long long a, atomic64_t *v);
20456 EXPORT_SYMBOL(atomic64_sub_386);
20457+long long atomic64_sub_unchecked_386(long long a, atomic64_unchecked_t *v);
20458+EXPORT_SYMBOL(atomic64_sub_unchecked_386);
20459 long long atomic64_inc_386(long long a, atomic64_t *v);
20460 EXPORT_SYMBOL(atomic64_inc_386);
20461+long long atomic64_inc_unchecked_386(long long a, atomic64_unchecked_t *v);
20462+EXPORT_SYMBOL(atomic64_inc_unchecked_386);
20463 long long atomic64_dec_386(long long a, atomic64_t *v);
20464 EXPORT_SYMBOL(atomic64_dec_386);
20465+long long atomic64_dec_unchecked_386(long long a, atomic64_unchecked_t *v);
20466+EXPORT_SYMBOL(atomic64_dec_unchecked_386);
20467 long long atomic64_dec_if_positive_386(atomic64_t *v);
20468 EXPORT_SYMBOL(atomic64_dec_if_positive_386);
20469 int atomic64_inc_not_zero_386(atomic64_t *v);
20470diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
20471index e8e7e0d..56fd1b0 100644
20472--- a/arch/x86/lib/atomic64_386_32.S
20473+++ b/arch/x86/lib/atomic64_386_32.S
20474@@ -48,6 +48,10 @@ BEGIN(read)
20475 movl (v), %eax
20476 movl 4(v), %edx
20477 RET_ENDP
20478+BEGIN(read_unchecked)
20479+ movl (v), %eax
20480+ movl 4(v), %edx
20481+RET_ENDP
20482 #undef v
20483
20484 #define v %esi
20485@@ -55,6 +59,10 @@ BEGIN(set)
20486 movl %ebx, (v)
20487 movl %ecx, 4(v)
20488 RET_ENDP
20489+BEGIN(set_unchecked)
20490+ movl %ebx, (v)
20491+ movl %ecx, 4(v)
20492+RET_ENDP
20493 #undef v
20494
20495 #define v %esi
20496@@ -70,6 +78,20 @@ RET_ENDP
20497 BEGIN(add)
20498 addl %eax, (v)
20499 adcl %edx, 4(v)
20500+
20501+#ifdef CONFIG_PAX_REFCOUNT
20502+ jno 0f
20503+ subl %eax, (v)
20504+ sbbl %edx, 4(v)
20505+ int $4
20506+0:
20507+ _ASM_EXTABLE(0b, 0b)
20508+#endif
20509+
20510+RET_ENDP
20511+BEGIN(add_unchecked)
20512+ addl %eax, (v)
20513+ adcl %edx, 4(v)
20514 RET_ENDP
20515 #undef v
20516
20517@@ -77,6 +99,24 @@ RET_ENDP
20518 BEGIN(add_return)
20519 addl (v), %eax
20520 adcl 4(v), %edx
20521+
20522+#ifdef CONFIG_PAX_REFCOUNT
20523+ into
20524+1234:
20525+ _ASM_EXTABLE(1234b, 2f)
20526+#endif
20527+
20528+ movl %eax, (v)
20529+ movl %edx, 4(v)
20530+
20531+#ifdef CONFIG_PAX_REFCOUNT
20532+2:
20533+#endif
20534+
20535+RET_ENDP
20536+BEGIN(add_return_unchecked)
20537+ addl (v), %eax
20538+ adcl 4(v), %edx
20539 movl %eax, (v)
20540 movl %edx, 4(v)
20541 RET_ENDP
20542@@ -86,6 +126,20 @@ RET_ENDP
20543 BEGIN(sub)
20544 subl %eax, (v)
20545 sbbl %edx, 4(v)
20546+
20547+#ifdef CONFIG_PAX_REFCOUNT
20548+ jno 0f
20549+ addl %eax, (v)
20550+ adcl %edx, 4(v)
20551+ int $4
20552+0:
20553+ _ASM_EXTABLE(0b, 0b)
20554+#endif
20555+
20556+RET_ENDP
20557+BEGIN(sub_unchecked)
20558+ subl %eax, (v)
20559+ sbbl %edx, 4(v)
20560 RET_ENDP
20561 #undef v
20562
20563@@ -96,6 +150,27 @@ BEGIN(sub_return)
20564 sbbl $0, %edx
20565 addl (v), %eax
20566 adcl 4(v), %edx
20567+
20568+#ifdef CONFIG_PAX_REFCOUNT
20569+ into
20570+1234:
20571+ _ASM_EXTABLE(1234b, 2f)
20572+#endif
20573+
20574+ movl %eax, (v)
20575+ movl %edx, 4(v)
20576+
20577+#ifdef CONFIG_PAX_REFCOUNT
20578+2:
20579+#endif
20580+
20581+RET_ENDP
20582+BEGIN(sub_return_unchecked)
20583+ negl %edx
20584+ negl %eax
20585+ sbbl $0, %edx
20586+ addl (v), %eax
20587+ adcl 4(v), %edx
20588 movl %eax, (v)
20589 movl %edx, 4(v)
20590 RET_ENDP
20591@@ -105,6 +180,20 @@ RET_ENDP
20592 BEGIN(inc)
20593 addl $1, (v)
20594 adcl $0, 4(v)
20595+
20596+#ifdef CONFIG_PAX_REFCOUNT
20597+ jno 0f
20598+ subl $1, (v)
20599+ sbbl $0, 4(v)
20600+ int $4
20601+0:
20602+ _ASM_EXTABLE(0b, 0b)
20603+#endif
20604+
20605+RET_ENDP
20606+BEGIN(inc_unchecked)
20607+ addl $1, (v)
20608+ adcl $0, 4(v)
20609 RET_ENDP
20610 #undef v
20611
20612@@ -114,6 +203,26 @@ BEGIN(inc_return)
20613 movl 4(v), %edx
20614 addl $1, %eax
20615 adcl $0, %edx
20616+
20617+#ifdef CONFIG_PAX_REFCOUNT
20618+ into
20619+1234:
20620+ _ASM_EXTABLE(1234b, 2f)
20621+#endif
20622+
20623+ movl %eax, (v)
20624+ movl %edx, 4(v)
20625+
20626+#ifdef CONFIG_PAX_REFCOUNT
20627+2:
20628+#endif
20629+
20630+RET_ENDP
20631+BEGIN(inc_return_unchecked)
20632+ movl (v), %eax
20633+ movl 4(v), %edx
20634+ addl $1, %eax
20635+ adcl $0, %edx
20636 movl %eax, (v)
20637 movl %edx, 4(v)
20638 RET_ENDP
20639@@ -123,6 +232,20 @@ RET_ENDP
20640 BEGIN(dec)
20641 subl $1, (v)
20642 sbbl $0, 4(v)
20643+
20644+#ifdef CONFIG_PAX_REFCOUNT
20645+ jno 0f
20646+ addl $1, (v)
20647+ adcl $0, 4(v)
20648+ int $4
20649+0:
20650+ _ASM_EXTABLE(0b, 0b)
20651+#endif
20652+
20653+RET_ENDP
20654+BEGIN(dec_unchecked)
20655+ subl $1, (v)
20656+ sbbl $0, 4(v)
20657 RET_ENDP
20658 #undef v
20659
20660@@ -132,6 +255,26 @@ BEGIN(dec_return)
20661 movl 4(v), %edx
20662 subl $1, %eax
20663 sbbl $0, %edx
20664+
20665+#ifdef CONFIG_PAX_REFCOUNT
20666+ into
20667+1234:
20668+ _ASM_EXTABLE(1234b, 2f)
20669+#endif
20670+
20671+ movl %eax, (v)
20672+ movl %edx, 4(v)
20673+
20674+#ifdef CONFIG_PAX_REFCOUNT
20675+2:
20676+#endif
20677+
20678+RET_ENDP
20679+BEGIN(dec_return_unchecked)
20680+ movl (v), %eax
20681+ movl 4(v), %edx
20682+ subl $1, %eax
20683+ sbbl $0, %edx
20684 movl %eax, (v)
20685 movl %edx, 4(v)
20686 RET_ENDP
20687@@ -143,6 +286,13 @@ BEGIN(add_unless)
20688 adcl %edx, %edi
20689 addl (v), %eax
20690 adcl 4(v), %edx
20691+
20692+#ifdef CONFIG_PAX_REFCOUNT
20693+ into
20694+1234:
20695+ _ASM_EXTABLE(1234b, 2f)
20696+#endif
20697+
20698 cmpl %eax, %esi
20699 je 3f
20700 1:
20701@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
20702 1:
20703 addl $1, %eax
20704 adcl $0, %edx
20705+
20706+#ifdef CONFIG_PAX_REFCOUNT
20707+ into
20708+1234:
20709+ _ASM_EXTABLE(1234b, 2f)
20710+#endif
20711+
20712 movl %eax, (v)
20713 movl %edx, 4(v)
20714 movl $1, %eax
20715@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
20716 movl 4(v), %edx
20717 subl $1, %eax
20718 sbbl $0, %edx
20719+
20720+#ifdef CONFIG_PAX_REFCOUNT
20721+ into
20722+1234:
20723+ _ASM_EXTABLE(1234b, 1f)
20724+#endif
20725+
20726 js 1f
20727 movl %eax, (v)
20728 movl %edx, 4(v)
20729diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
20730index 391a083..d658e9f 100644
20731--- a/arch/x86/lib/atomic64_cx8_32.S
20732+++ b/arch/x86/lib/atomic64_cx8_32.S
20733@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
20734 CFI_STARTPROC
20735
20736 read64 %ecx
20737+ pax_force_retaddr
20738 ret
20739 CFI_ENDPROC
20740 ENDPROC(atomic64_read_cx8)
20741
20742+ENTRY(atomic64_read_unchecked_cx8)
20743+ CFI_STARTPROC
20744+
20745+ read64 %ecx
20746+ pax_force_retaddr
20747+ ret
20748+ CFI_ENDPROC
20749+ENDPROC(atomic64_read_unchecked_cx8)
20750+
20751 ENTRY(atomic64_set_cx8)
20752 CFI_STARTPROC
20753
20754@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
20755 cmpxchg8b (%esi)
20756 jne 1b
20757
20758+ pax_force_retaddr
20759 ret
20760 CFI_ENDPROC
20761 ENDPROC(atomic64_set_cx8)
20762
20763+ENTRY(atomic64_set_unchecked_cx8)
20764+ CFI_STARTPROC
20765+
20766+1:
20767+/* we don't need LOCK_PREFIX since aligned 64-bit writes
20768+ * are atomic on 586 and newer */
20769+ cmpxchg8b (%esi)
20770+ jne 1b
20771+
20772+ pax_force_retaddr
20773+ ret
20774+ CFI_ENDPROC
20775+ENDPROC(atomic64_set_unchecked_cx8)
20776+
20777 ENTRY(atomic64_xchg_cx8)
20778 CFI_STARTPROC
20779
20780@@ -62,12 +87,13 @@ ENTRY(atomic64_xchg_cx8)
20781 cmpxchg8b (%esi)
20782 jne 1b
20783
20784+ pax_force_retaddr
20785 ret
20786 CFI_ENDPROC
20787 ENDPROC(atomic64_xchg_cx8)
20788
20789-.macro addsub_return func ins insc
20790-ENTRY(atomic64_\func\()_return_cx8)
20791+.macro addsub_return func ins insc unchecked=""
20792+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
20793 CFI_STARTPROC
20794 SAVE ebp
20795 SAVE ebx
20796@@ -84,27 +110,44 @@ ENTRY(atomic64_\func\()_return_cx8)
20797 movl %edx, %ecx
20798 \ins\()l %esi, %ebx
20799 \insc\()l %edi, %ecx
20800+
20801+.ifb \unchecked
20802+#ifdef CONFIG_PAX_REFCOUNT
20803+ into
20804+2:
20805+ _ASM_EXTABLE(2b, 3f)
20806+#endif
20807+.endif
20808+
20809 LOCK_PREFIX
20810 cmpxchg8b (%ebp)
20811 jne 1b
20812-
20813-10:
20814 movl %ebx, %eax
20815 movl %ecx, %edx
20816+
20817+.ifb \unchecked
20818+#ifdef CONFIG_PAX_REFCOUNT
20819+3:
20820+#endif
20821+.endif
20822+
20823 RESTORE edi
20824 RESTORE esi
20825 RESTORE ebx
20826 RESTORE ebp
20827+ pax_force_retaddr
20828 ret
20829 CFI_ENDPROC
20830-ENDPROC(atomic64_\func\()_return_cx8)
20831+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
20832 .endm
20833
20834 addsub_return add add adc
20835 addsub_return sub sub sbb
20836+addsub_return add add adc _unchecked
20837+addsub_return sub sub sbb _unchecked
20838
20839-.macro incdec_return func ins insc
20840-ENTRY(atomic64_\func\()_return_cx8)
20841+.macro incdec_return func ins insc unchecked
20842+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
20843 CFI_STARTPROC
20844 SAVE ebx
20845
20846@@ -114,21 +157,39 @@ ENTRY(atomic64_\func\()_return_cx8)
20847 movl %edx, %ecx
20848 \ins\()l $1, %ebx
20849 \insc\()l $0, %ecx
20850+
20851+.ifb \unchecked
20852+#ifdef CONFIG_PAX_REFCOUNT
20853+ into
20854+2:
20855+ _ASM_EXTABLE(2b, 3f)
20856+#endif
20857+.endif
20858+
20859 LOCK_PREFIX
20860 cmpxchg8b (%esi)
20861 jne 1b
20862
20863-10:
20864 movl %ebx, %eax
20865 movl %ecx, %edx
20866+
20867+.ifb \unchecked
20868+#ifdef CONFIG_PAX_REFCOUNT
20869+3:
20870+#endif
20871+.endif
20872+
20873 RESTORE ebx
20874+ pax_force_retaddr
20875 ret
20876 CFI_ENDPROC
20877-ENDPROC(atomic64_\func\()_return_cx8)
20878+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
20879 .endm
20880
20881 incdec_return inc add adc
20882 incdec_return dec sub sbb
20883+incdec_return inc add adc _unchecked
20884+incdec_return dec sub sbb _unchecked
20885
20886 ENTRY(atomic64_dec_if_positive_cx8)
20887 CFI_STARTPROC
20888@@ -140,6 +201,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
20889 movl %edx, %ecx
20890 subl $1, %ebx
20891 sbb $0, %ecx
20892+
20893+#ifdef CONFIG_PAX_REFCOUNT
20894+ into
20895+1234:
20896+ _ASM_EXTABLE(1234b, 2f)
20897+#endif
20898+
20899 js 2f
20900 LOCK_PREFIX
20901 cmpxchg8b (%esi)
20902@@ -149,6 +217,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
20903 movl %ebx, %eax
20904 movl %ecx, %edx
20905 RESTORE ebx
20906+ pax_force_retaddr
20907 ret
20908 CFI_ENDPROC
20909 ENDPROC(atomic64_dec_if_positive_cx8)
20910@@ -174,6 +243,13 @@ ENTRY(atomic64_add_unless_cx8)
20911 movl %edx, %ecx
20912 addl %esi, %ebx
20913 adcl %edi, %ecx
20914+
20915+#ifdef CONFIG_PAX_REFCOUNT
20916+ into
20917+1234:
20918+ _ASM_EXTABLE(1234b, 3f)
20919+#endif
20920+
20921 LOCK_PREFIX
20922 cmpxchg8b (%ebp)
20923 jne 1b
20924@@ -184,6 +260,7 @@ ENTRY(atomic64_add_unless_cx8)
20925 CFI_ADJUST_CFA_OFFSET -8
20926 RESTORE ebx
20927 RESTORE ebp
20928+ pax_force_retaddr
20929 ret
20930 4:
20931 cmpl %edx, 4(%esp)
20932@@ -206,6 +283,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
20933 movl %edx, %ecx
20934 addl $1, %ebx
20935 adcl $0, %ecx
20936+
20937+#ifdef CONFIG_PAX_REFCOUNT
20938+ into
20939+1234:
20940+ _ASM_EXTABLE(1234b, 3f)
20941+#endif
20942+
20943 LOCK_PREFIX
20944 cmpxchg8b (%esi)
20945 jne 1b
20946@@ -213,6 +297,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
20947 movl $1, %eax
20948 3:
20949 RESTORE ebx
20950+ pax_force_retaddr
20951 ret
20952 4:
20953 testl %edx, %edx
20954diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
20955index 78d16a5..fbcf666 100644
20956--- a/arch/x86/lib/checksum_32.S
20957+++ b/arch/x86/lib/checksum_32.S
20958@@ -28,7 +28,8 @@
20959 #include <linux/linkage.h>
20960 #include <asm/dwarf2.h>
20961 #include <asm/errno.h>
20962-
20963+#include <asm/segment.h>
20964+
20965 /*
20966 * computes a partial checksum, e.g. for TCP/UDP fragments
20967 */
20968@@ -296,9 +297,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
20969
20970 #define ARGBASE 16
20971 #define FP 12
20972-
20973-ENTRY(csum_partial_copy_generic)
20974+
20975+ENTRY(csum_partial_copy_generic_to_user)
20976 CFI_STARTPROC
20977+
20978+#ifdef CONFIG_PAX_MEMORY_UDEREF
20979+ pushl_cfi %gs
20980+ popl_cfi %es
20981+ jmp csum_partial_copy_generic
20982+#endif
20983+
20984+ENTRY(csum_partial_copy_generic_from_user)
20985+
20986+#ifdef CONFIG_PAX_MEMORY_UDEREF
20987+ pushl_cfi %gs
20988+ popl_cfi %ds
20989+#endif
20990+
20991+ENTRY(csum_partial_copy_generic)
20992 subl $4,%esp
20993 CFI_ADJUST_CFA_OFFSET 4
20994 pushl_cfi %edi
20995@@ -320,7 +336,7 @@ ENTRY(csum_partial_copy_generic)
20996 jmp 4f
20997 SRC(1: movw (%esi), %bx )
20998 addl $2, %esi
20999-DST( movw %bx, (%edi) )
21000+DST( movw %bx, %es:(%edi) )
21001 addl $2, %edi
21002 addw %bx, %ax
21003 adcl $0, %eax
21004@@ -332,30 +348,30 @@ DST( movw %bx, (%edi) )
21005 SRC(1: movl (%esi), %ebx )
21006 SRC( movl 4(%esi), %edx )
21007 adcl %ebx, %eax
21008-DST( movl %ebx, (%edi) )
21009+DST( movl %ebx, %es:(%edi) )
21010 adcl %edx, %eax
21011-DST( movl %edx, 4(%edi) )
21012+DST( movl %edx, %es:4(%edi) )
21013
21014 SRC( movl 8(%esi), %ebx )
21015 SRC( movl 12(%esi), %edx )
21016 adcl %ebx, %eax
21017-DST( movl %ebx, 8(%edi) )
21018+DST( movl %ebx, %es:8(%edi) )
21019 adcl %edx, %eax
21020-DST( movl %edx, 12(%edi) )
21021+DST( movl %edx, %es:12(%edi) )
21022
21023 SRC( movl 16(%esi), %ebx )
21024 SRC( movl 20(%esi), %edx )
21025 adcl %ebx, %eax
21026-DST( movl %ebx, 16(%edi) )
21027+DST( movl %ebx, %es:16(%edi) )
21028 adcl %edx, %eax
21029-DST( movl %edx, 20(%edi) )
21030+DST( movl %edx, %es:20(%edi) )
21031
21032 SRC( movl 24(%esi), %ebx )
21033 SRC( movl 28(%esi), %edx )
21034 adcl %ebx, %eax
21035-DST( movl %ebx, 24(%edi) )
21036+DST( movl %ebx, %es:24(%edi) )
21037 adcl %edx, %eax
21038-DST( movl %edx, 28(%edi) )
21039+DST( movl %edx, %es:28(%edi) )
21040
21041 lea 32(%esi), %esi
21042 lea 32(%edi), %edi
21043@@ -369,7 +385,7 @@ DST( movl %edx, 28(%edi) )
21044 shrl $2, %edx # This clears CF
21045 SRC(3: movl (%esi), %ebx )
21046 adcl %ebx, %eax
21047-DST( movl %ebx, (%edi) )
21048+DST( movl %ebx, %es:(%edi) )
21049 lea 4(%esi), %esi
21050 lea 4(%edi), %edi
21051 dec %edx
21052@@ -381,12 +397,12 @@ DST( movl %ebx, (%edi) )
21053 jb 5f
21054 SRC( movw (%esi), %cx )
21055 leal 2(%esi), %esi
21056-DST( movw %cx, (%edi) )
21057+DST( movw %cx, %es:(%edi) )
21058 leal 2(%edi), %edi
21059 je 6f
21060 shll $16,%ecx
21061 SRC(5: movb (%esi), %cl )
21062-DST( movb %cl, (%edi) )
21063+DST( movb %cl, %es:(%edi) )
21064 6: addl %ecx, %eax
21065 adcl $0, %eax
21066 7:
21067@@ -397,7 +413,7 @@ DST( movb %cl, (%edi) )
21068
21069 6001:
21070 movl ARGBASE+20(%esp), %ebx # src_err_ptr
21071- movl $-EFAULT, (%ebx)
21072+ movl $-EFAULT, %ss:(%ebx)
21073
21074 # zero the complete destination - computing the rest
21075 # is too much work
21076@@ -410,11 +426,15 @@ DST( movb %cl, (%edi) )
21077
21078 6002:
21079 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21080- movl $-EFAULT,(%ebx)
21081+ movl $-EFAULT,%ss:(%ebx)
21082 jmp 5000b
21083
21084 .previous
21085
21086+ pushl_cfi %ss
21087+ popl_cfi %ds
21088+ pushl_cfi %ss
21089+ popl_cfi %es
21090 popl_cfi %ebx
21091 CFI_RESTORE ebx
21092 popl_cfi %esi
21093@@ -424,26 +444,43 @@ DST( movb %cl, (%edi) )
21094 popl_cfi %ecx # equivalent to addl $4,%esp
21095 ret
21096 CFI_ENDPROC
21097-ENDPROC(csum_partial_copy_generic)
21098+ENDPROC(csum_partial_copy_generic_to_user)
21099
21100 #else
21101
21102 /* Version for PentiumII/PPro */
21103
21104 #define ROUND1(x) \
21105+ nop; nop; nop; \
21106 SRC(movl x(%esi), %ebx ) ; \
21107 addl %ebx, %eax ; \
21108- DST(movl %ebx, x(%edi) ) ;
21109+ DST(movl %ebx, %es:x(%edi)) ;
21110
21111 #define ROUND(x) \
21112+ nop; nop; nop; \
21113 SRC(movl x(%esi), %ebx ) ; \
21114 adcl %ebx, %eax ; \
21115- DST(movl %ebx, x(%edi) ) ;
21116+ DST(movl %ebx, %es:x(%edi)) ;
21117
21118 #define ARGBASE 12
21119-
21120-ENTRY(csum_partial_copy_generic)
21121+
21122+ENTRY(csum_partial_copy_generic_to_user)
21123 CFI_STARTPROC
21124+
21125+#ifdef CONFIG_PAX_MEMORY_UDEREF
21126+ pushl_cfi %gs
21127+ popl_cfi %es
21128+ jmp csum_partial_copy_generic
21129+#endif
21130+
21131+ENTRY(csum_partial_copy_generic_from_user)
21132+
21133+#ifdef CONFIG_PAX_MEMORY_UDEREF
21134+ pushl_cfi %gs
21135+ popl_cfi %ds
21136+#endif
21137+
21138+ENTRY(csum_partial_copy_generic)
21139 pushl_cfi %ebx
21140 CFI_REL_OFFSET ebx, 0
21141 pushl_cfi %edi
21142@@ -464,7 +501,7 @@ ENTRY(csum_partial_copy_generic)
21143 subl %ebx, %edi
21144 lea -1(%esi),%edx
21145 andl $-32,%edx
21146- lea 3f(%ebx,%ebx), %ebx
21147+ lea 3f(%ebx,%ebx,2), %ebx
21148 testl %esi, %esi
21149 jmp *%ebx
21150 1: addl $64,%esi
21151@@ -485,19 +522,19 @@ ENTRY(csum_partial_copy_generic)
21152 jb 5f
21153 SRC( movw (%esi), %dx )
21154 leal 2(%esi), %esi
21155-DST( movw %dx, (%edi) )
21156+DST( movw %dx, %es:(%edi) )
21157 leal 2(%edi), %edi
21158 je 6f
21159 shll $16,%edx
21160 5:
21161 SRC( movb (%esi), %dl )
21162-DST( movb %dl, (%edi) )
21163+DST( movb %dl, %es:(%edi) )
21164 6: addl %edx, %eax
21165 adcl $0, %eax
21166 7:
21167 .section .fixup, "ax"
21168 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
21169- movl $-EFAULT, (%ebx)
21170+ movl $-EFAULT, %ss:(%ebx)
21171 # zero the complete destination (computing the rest is too much work)
21172 movl ARGBASE+8(%esp),%edi # dst
21173 movl ARGBASE+12(%esp),%ecx # len
21174@@ -505,10 +542,17 @@ DST( movb %dl, (%edi) )
21175 rep; stosb
21176 jmp 7b
21177 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21178- movl $-EFAULT, (%ebx)
21179+ movl $-EFAULT, %ss:(%ebx)
21180 jmp 7b
21181 .previous
21182
21183+#ifdef CONFIG_PAX_MEMORY_UDEREF
21184+ pushl_cfi %ss
21185+ popl_cfi %ds
21186+ pushl_cfi %ss
21187+ popl_cfi %es
21188+#endif
21189+
21190 popl_cfi %esi
21191 CFI_RESTORE esi
21192 popl_cfi %edi
21193@@ -517,7 +561,7 @@ DST( movb %dl, (%edi) )
21194 CFI_RESTORE ebx
21195 ret
21196 CFI_ENDPROC
21197-ENDPROC(csum_partial_copy_generic)
21198+ENDPROC(csum_partial_copy_generic_to_user)
21199
21200 #undef ROUND
21201 #undef ROUND1
21202diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
21203index f2145cf..cea889d 100644
21204--- a/arch/x86/lib/clear_page_64.S
21205+++ b/arch/x86/lib/clear_page_64.S
21206@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
21207 movl $4096/8,%ecx
21208 xorl %eax,%eax
21209 rep stosq
21210+ pax_force_retaddr
21211 ret
21212 CFI_ENDPROC
21213 ENDPROC(clear_page_c)
21214@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
21215 movl $4096,%ecx
21216 xorl %eax,%eax
21217 rep stosb
21218+ pax_force_retaddr
21219 ret
21220 CFI_ENDPROC
21221 ENDPROC(clear_page_c_e)
21222@@ -43,6 +45,7 @@ ENTRY(clear_page)
21223 leaq 64(%rdi),%rdi
21224 jnz .Lloop
21225 nop
21226+ pax_force_retaddr
21227 ret
21228 CFI_ENDPROC
21229 .Lclear_page_end:
21230@@ -58,7 +61,7 @@ ENDPROC(clear_page)
21231
21232 #include <asm/cpufeature.h>
21233
21234- .section .altinstr_replacement,"ax"
21235+ .section .altinstr_replacement,"a"
21236 1: .byte 0xeb /* jmp <disp8> */
21237 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
21238 2: .byte 0xeb /* jmp <disp8> */
21239diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
21240index 1e572c5..2a162cd 100644
21241--- a/arch/x86/lib/cmpxchg16b_emu.S
21242+++ b/arch/x86/lib/cmpxchg16b_emu.S
21243@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
21244
21245 popf
21246 mov $1, %al
21247+ pax_force_retaddr
21248 ret
21249
21250 not_same:
21251 popf
21252 xor %al,%al
21253+ pax_force_retaddr
21254 ret
21255
21256 CFI_ENDPROC
21257diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
21258index 01c805b..dccb07f 100644
21259--- a/arch/x86/lib/copy_page_64.S
21260+++ b/arch/x86/lib/copy_page_64.S
21261@@ -9,6 +9,7 @@ copy_page_c:
21262 CFI_STARTPROC
21263 movl $4096/8,%ecx
21264 rep movsq
21265+ pax_force_retaddr
21266 ret
21267 CFI_ENDPROC
21268 ENDPROC(copy_page_c)
21269@@ -39,7 +40,7 @@ ENTRY(copy_page)
21270 movq 16 (%rsi), %rdx
21271 movq 24 (%rsi), %r8
21272 movq 32 (%rsi), %r9
21273- movq 40 (%rsi), %r10
21274+ movq 40 (%rsi), %r13
21275 movq 48 (%rsi), %r11
21276 movq 56 (%rsi), %r12
21277
21278@@ -50,7 +51,7 @@ ENTRY(copy_page)
21279 movq %rdx, 16 (%rdi)
21280 movq %r8, 24 (%rdi)
21281 movq %r9, 32 (%rdi)
21282- movq %r10, 40 (%rdi)
21283+ movq %r13, 40 (%rdi)
21284 movq %r11, 48 (%rdi)
21285 movq %r12, 56 (%rdi)
21286
21287@@ -69,7 +70,7 @@ ENTRY(copy_page)
21288 movq 16 (%rsi), %rdx
21289 movq 24 (%rsi), %r8
21290 movq 32 (%rsi), %r9
21291- movq 40 (%rsi), %r10
21292+ movq 40 (%rsi), %r13
21293 movq 48 (%rsi), %r11
21294 movq 56 (%rsi), %r12
21295
21296@@ -78,7 +79,7 @@ ENTRY(copy_page)
21297 movq %rdx, 16 (%rdi)
21298 movq %r8, 24 (%rdi)
21299 movq %r9, 32 (%rdi)
21300- movq %r10, 40 (%rdi)
21301+ movq %r13, 40 (%rdi)
21302 movq %r11, 48 (%rdi)
21303 movq %r12, 56 (%rdi)
21304
21305@@ -95,6 +96,7 @@ ENTRY(copy_page)
21306 CFI_RESTORE r13
21307 addq $3*8,%rsp
21308 CFI_ADJUST_CFA_OFFSET -3*8
21309+ pax_force_retaddr
21310 ret
21311 .Lcopy_page_end:
21312 CFI_ENDPROC
21313@@ -105,7 +107,7 @@ ENDPROC(copy_page)
21314
21315 #include <asm/cpufeature.h>
21316
21317- .section .altinstr_replacement,"ax"
21318+ .section .altinstr_replacement,"a"
21319 1: .byte 0xeb /* jmp <disp8> */
21320 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
21321 2:
21322diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
21323index 0248402..821c786 100644
21324--- a/arch/x86/lib/copy_user_64.S
21325+++ b/arch/x86/lib/copy_user_64.S
21326@@ -16,6 +16,7 @@
21327 #include <asm/thread_info.h>
21328 #include <asm/cpufeature.h>
21329 #include <asm/alternative-asm.h>
21330+#include <asm/pgtable.h>
21331
21332 /*
21333 * By placing feature2 after feature1 in altinstructions section, we logically
21334@@ -29,7 +30,7 @@
21335 .byte 0xe9 /* 32bit jump */
21336 .long \orig-1f /* by default jump to orig */
21337 1:
21338- .section .altinstr_replacement,"ax"
21339+ .section .altinstr_replacement,"a"
21340 2: .byte 0xe9 /* near jump with 32bit immediate */
21341 .long \alt1-1b /* offset */ /* or alternatively to alt1 */
21342 3: .byte 0xe9 /* near jump with 32bit immediate */
21343@@ -71,47 +72,20 @@
21344 #endif
21345 .endm
21346
21347-/* Standard copy_to_user with segment limit checking */
21348-ENTRY(_copy_to_user)
21349- CFI_STARTPROC
21350- GET_THREAD_INFO(%rax)
21351- movq %rdi,%rcx
21352- addq %rdx,%rcx
21353- jc bad_to_user
21354- cmpq TI_addr_limit(%rax),%rcx
21355- ja bad_to_user
21356- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21357- copy_user_generic_unrolled,copy_user_generic_string, \
21358- copy_user_enhanced_fast_string
21359- CFI_ENDPROC
21360-ENDPROC(_copy_to_user)
21361-
21362-/* Standard copy_from_user with segment limit checking */
21363-ENTRY(_copy_from_user)
21364- CFI_STARTPROC
21365- GET_THREAD_INFO(%rax)
21366- movq %rsi,%rcx
21367- addq %rdx,%rcx
21368- jc bad_from_user
21369- cmpq TI_addr_limit(%rax),%rcx
21370- ja bad_from_user
21371- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21372- copy_user_generic_unrolled,copy_user_generic_string, \
21373- copy_user_enhanced_fast_string
21374- CFI_ENDPROC
21375-ENDPROC(_copy_from_user)
21376-
21377 .section .fixup,"ax"
21378 /* must zero dest */
21379 ENTRY(bad_from_user)
21380 bad_from_user:
21381 CFI_STARTPROC
21382+ testl %edx,%edx
21383+ js bad_to_user
21384 movl %edx,%ecx
21385 xorl %eax,%eax
21386 rep
21387 stosb
21388 bad_to_user:
21389 movl %edx,%eax
21390+ pax_force_retaddr
21391 ret
21392 CFI_ENDPROC
21393 ENDPROC(bad_from_user)
21394@@ -141,19 +115,19 @@ ENTRY(copy_user_generic_unrolled)
21395 jz 17f
21396 1: movq (%rsi),%r8
21397 2: movq 1*8(%rsi),%r9
21398-3: movq 2*8(%rsi),%r10
21399+3: movq 2*8(%rsi),%rax
21400 4: movq 3*8(%rsi),%r11
21401 5: movq %r8,(%rdi)
21402 6: movq %r9,1*8(%rdi)
21403-7: movq %r10,2*8(%rdi)
21404+7: movq %rax,2*8(%rdi)
21405 8: movq %r11,3*8(%rdi)
21406 9: movq 4*8(%rsi),%r8
21407 10: movq 5*8(%rsi),%r9
21408-11: movq 6*8(%rsi),%r10
21409+11: movq 6*8(%rsi),%rax
21410 12: movq 7*8(%rsi),%r11
21411 13: movq %r8,4*8(%rdi)
21412 14: movq %r9,5*8(%rdi)
21413-15: movq %r10,6*8(%rdi)
21414+15: movq %rax,6*8(%rdi)
21415 16: movq %r11,7*8(%rdi)
21416 leaq 64(%rsi),%rsi
21417 leaq 64(%rdi),%rdi
21418@@ -179,6 +153,7 @@ ENTRY(copy_user_generic_unrolled)
21419 decl %ecx
21420 jnz 21b
21421 23: xor %eax,%eax
21422+ pax_force_retaddr
21423 ret
21424
21425 .section .fixup,"ax"
21426@@ -251,6 +226,7 @@ ENTRY(copy_user_generic_string)
21427 3: rep
21428 movsb
21429 4: xorl %eax,%eax
21430+ pax_force_retaddr
21431 ret
21432
21433 .section .fixup,"ax"
21434@@ -287,6 +263,7 @@ ENTRY(copy_user_enhanced_fast_string)
21435 1: rep
21436 movsb
21437 2: xorl %eax,%eax
21438+ pax_force_retaddr
21439 ret
21440
21441 .section .fixup,"ax"
21442diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
21443index cb0c112..e3a6895 100644
21444--- a/arch/x86/lib/copy_user_nocache_64.S
21445+++ b/arch/x86/lib/copy_user_nocache_64.S
21446@@ -8,12 +8,14 @@
21447
21448 #include <linux/linkage.h>
21449 #include <asm/dwarf2.h>
21450+#include <asm/alternative-asm.h>
21451
21452 #define FIX_ALIGNMENT 1
21453
21454 #include <asm/current.h>
21455 #include <asm/asm-offsets.h>
21456 #include <asm/thread_info.h>
21457+#include <asm/pgtable.h>
21458
21459 .macro ALIGN_DESTINATION
21460 #ifdef FIX_ALIGNMENT
21461@@ -50,6 +52,15 @@
21462 */
21463 ENTRY(__copy_user_nocache)
21464 CFI_STARTPROC
21465+
21466+#ifdef CONFIG_PAX_MEMORY_UDEREF
21467+ mov $PAX_USER_SHADOW_BASE,%rcx
21468+ cmp %rcx,%rsi
21469+ jae 1f
21470+ add %rcx,%rsi
21471+1:
21472+#endif
21473+
21474 cmpl $8,%edx
21475 jb 20f /* less then 8 bytes, go to byte copy loop */
21476 ALIGN_DESTINATION
21477@@ -59,19 +70,19 @@ ENTRY(__copy_user_nocache)
21478 jz 17f
21479 1: movq (%rsi),%r8
21480 2: movq 1*8(%rsi),%r9
21481-3: movq 2*8(%rsi),%r10
21482+3: movq 2*8(%rsi),%rax
21483 4: movq 3*8(%rsi),%r11
21484 5: movnti %r8,(%rdi)
21485 6: movnti %r9,1*8(%rdi)
21486-7: movnti %r10,2*8(%rdi)
21487+7: movnti %rax,2*8(%rdi)
21488 8: movnti %r11,3*8(%rdi)
21489 9: movq 4*8(%rsi),%r8
21490 10: movq 5*8(%rsi),%r9
21491-11: movq 6*8(%rsi),%r10
21492+11: movq 6*8(%rsi),%rax
21493 12: movq 7*8(%rsi),%r11
21494 13: movnti %r8,4*8(%rdi)
21495 14: movnti %r9,5*8(%rdi)
21496-15: movnti %r10,6*8(%rdi)
21497+15: movnti %rax,6*8(%rdi)
21498 16: movnti %r11,7*8(%rdi)
21499 leaq 64(%rsi),%rsi
21500 leaq 64(%rdi),%rdi
21501@@ -98,6 +109,7 @@ ENTRY(__copy_user_nocache)
21502 jnz 21b
21503 23: xorl %eax,%eax
21504 sfence
21505+ pax_force_retaddr
21506 ret
21507
21508 .section .fixup,"ax"
21509diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
21510index fb903b7..c92b7f7 100644
21511--- a/arch/x86/lib/csum-copy_64.S
21512+++ b/arch/x86/lib/csum-copy_64.S
21513@@ -8,6 +8,7 @@
21514 #include <linux/linkage.h>
21515 #include <asm/dwarf2.h>
21516 #include <asm/errno.h>
21517+#include <asm/alternative-asm.h>
21518
21519 /*
21520 * Checksum copy with exception handling.
21521@@ -228,6 +229,7 @@ ENTRY(csum_partial_copy_generic)
21522 CFI_RESTORE rbp
21523 addq $7*8, %rsp
21524 CFI_ADJUST_CFA_OFFSET -7*8
21525+ pax_force_retaddr 0, 1
21526 ret
21527 CFI_RESTORE_STATE
21528
21529diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
21530index 459b58a..9570bc7 100644
21531--- a/arch/x86/lib/csum-wrappers_64.c
21532+++ b/arch/x86/lib/csum-wrappers_64.c
21533@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
21534 len -= 2;
21535 }
21536 }
21537- isum = csum_partial_copy_generic((__force const void *)src,
21538+
21539+#ifdef CONFIG_PAX_MEMORY_UDEREF
21540+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
21541+ src += PAX_USER_SHADOW_BASE;
21542+#endif
21543+
21544+ isum = csum_partial_copy_generic((const void __force_kernel *)src,
21545 dst, len, isum, errp, NULL);
21546 if (unlikely(*errp))
21547 goto out_err;
21548@@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
21549 }
21550
21551 *errp = 0;
21552- return csum_partial_copy_generic(src, (void __force *)dst,
21553+
21554+#ifdef CONFIG_PAX_MEMORY_UDEREF
21555+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
21556+ dst += PAX_USER_SHADOW_BASE;
21557+#endif
21558+
21559+ return csum_partial_copy_generic(src, (void __force_kernel *)dst,
21560 len, isum, NULL, errp);
21561 }
21562 EXPORT_SYMBOL(csum_partial_copy_to_user);
21563diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c
21564index fc45ba8..e395693 100644
21565--- a/arch/x86/lib/delay.c
21566+++ b/arch/x86/lib/delay.c
21567@@ -48,9 +48,9 @@ static void delay_loop(unsigned long loops)
21568 }
21569
21570 /* TSC based delay: */
21571-static void delay_tsc(unsigned long loops)
21572+static void delay_tsc(unsigned long __loops)
21573 {
21574- unsigned long bclock, now;
21575+ u32 bclock, now, loops = __loops;
21576 int cpu;
21577
21578 preempt_disable();
21579diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
21580index 51f1504..ddac4c1 100644
21581--- a/arch/x86/lib/getuser.S
21582+++ b/arch/x86/lib/getuser.S
21583@@ -33,15 +33,38 @@
21584 #include <asm/asm-offsets.h>
21585 #include <asm/thread_info.h>
21586 #include <asm/asm.h>
21587+#include <asm/segment.h>
21588+#include <asm/pgtable.h>
21589+#include <asm/alternative-asm.h>
21590+
21591+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
21592+#define __copyuser_seg gs;
21593+#else
21594+#define __copyuser_seg
21595+#endif
21596
21597 .text
21598 ENTRY(__get_user_1)
21599 CFI_STARTPROC
21600+
21601+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21602 GET_THREAD_INFO(%_ASM_DX)
21603 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21604 jae bad_get_user
21605-1: movzb (%_ASM_AX),%edx
21606+
21607+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21608+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21609+ cmp %_ASM_DX,%_ASM_AX
21610+ jae 1234f
21611+ add %_ASM_DX,%_ASM_AX
21612+1234:
21613+#endif
21614+
21615+#endif
21616+
21617+1: __copyuser_seg movzb (%_ASM_AX),%edx
21618 xor %eax,%eax
21619+ pax_force_retaddr
21620 ret
21621 CFI_ENDPROC
21622 ENDPROC(__get_user_1)
21623@@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
21624 ENTRY(__get_user_2)
21625 CFI_STARTPROC
21626 add $1,%_ASM_AX
21627+
21628+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21629 jc bad_get_user
21630 GET_THREAD_INFO(%_ASM_DX)
21631 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21632 jae bad_get_user
21633-2: movzwl -1(%_ASM_AX),%edx
21634+
21635+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21636+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21637+ cmp %_ASM_DX,%_ASM_AX
21638+ jae 1234f
21639+ add %_ASM_DX,%_ASM_AX
21640+1234:
21641+#endif
21642+
21643+#endif
21644+
21645+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
21646 xor %eax,%eax
21647+ pax_force_retaddr
21648 ret
21649 CFI_ENDPROC
21650 ENDPROC(__get_user_2)
21651@@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
21652 ENTRY(__get_user_4)
21653 CFI_STARTPROC
21654 add $3,%_ASM_AX
21655+
21656+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21657 jc bad_get_user
21658 GET_THREAD_INFO(%_ASM_DX)
21659 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21660 jae bad_get_user
21661-3: mov -3(%_ASM_AX),%edx
21662+
21663+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21664+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21665+ cmp %_ASM_DX,%_ASM_AX
21666+ jae 1234f
21667+ add %_ASM_DX,%_ASM_AX
21668+1234:
21669+#endif
21670+
21671+#endif
21672+
21673+3: __copyuser_seg mov -3(%_ASM_AX),%edx
21674 xor %eax,%eax
21675+ pax_force_retaddr
21676 ret
21677 CFI_ENDPROC
21678 ENDPROC(__get_user_4)
21679@@ -80,8 +131,18 @@ ENTRY(__get_user_8)
21680 GET_THREAD_INFO(%_ASM_DX)
21681 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21682 jae bad_get_user
21683+
21684+#ifdef CONFIG_PAX_MEMORY_UDEREF
21685+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21686+ cmp %_ASM_DX,%_ASM_AX
21687+ jae 1234f
21688+ add %_ASM_DX,%_ASM_AX
21689+1234:
21690+#endif
21691+
21692 4: movq -7(%_ASM_AX),%_ASM_DX
21693 xor %eax,%eax
21694+ pax_force_retaddr
21695 ret
21696 CFI_ENDPROC
21697 ENDPROC(__get_user_8)
21698@@ -91,6 +152,7 @@ bad_get_user:
21699 CFI_STARTPROC
21700 xor %edx,%edx
21701 mov $(-EFAULT),%_ASM_AX
21702+ pax_force_retaddr
21703 ret
21704 CFI_ENDPROC
21705 END(bad_get_user)
21706diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
21707index 374562e..a75830b 100644
21708--- a/arch/x86/lib/insn.c
21709+++ b/arch/x86/lib/insn.c
21710@@ -21,6 +21,11 @@
21711 #include <linux/string.h>
21712 #include <asm/inat.h>
21713 #include <asm/insn.h>
21714+#ifdef __KERNEL__
21715+#include <asm/pgtable_types.h>
21716+#else
21717+#define ktla_ktva(addr) addr
21718+#endif
21719
21720 /* Verify next sizeof(t) bytes can be on the same instruction */
21721 #define validate_next(t, insn, n) \
21722@@ -49,8 +54,8 @@
21723 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
21724 {
21725 memset(insn, 0, sizeof(*insn));
21726- insn->kaddr = kaddr;
21727- insn->next_byte = kaddr;
21728+ insn->kaddr = ktla_ktva(kaddr);
21729+ insn->next_byte = ktla_ktva(kaddr);
21730 insn->x86_64 = x86_64 ? 1 : 0;
21731 insn->opnd_bytes = 4;
21732 if (x86_64)
21733diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
21734index 05a95e7..326f2fa 100644
21735--- a/arch/x86/lib/iomap_copy_64.S
21736+++ b/arch/x86/lib/iomap_copy_64.S
21737@@ -17,6 +17,7 @@
21738
21739 #include <linux/linkage.h>
21740 #include <asm/dwarf2.h>
21741+#include <asm/alternative-asm.h>
21742
21743 /*
21744 * override generic version in lib/iomap_copy.c
21745@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
21746 CFI_STARTPROC
21747 movl %edx,%ecx
21748 rep movsd
21749+ pax_force_retaddr
21750 ret
21751 CFI_ENDPROC
21752 ENDPROC(__iowrite32_copy)
21753diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
21754index efbf2a0..8893637 100644
21755--- a/arch/x86/lib/memcpy_64.S
21756+++ b/arch/x86/lib/memcpy_64.S
21757@@ -34,6 +34,7 @@
21758 rep movsq
21759 movl %edx, %ecx
21760 rep movsb
21761+ pax_force_retaddr
21762 ret
21763 .Lmemcpy_e:
21764 .previous
21765@@ -51,6 +52,7 @@
21766
21767 movl %edx, %ecx
21768 rep movsb
21769+ pax_force_retaddr
21770 ret
21771 .Lmemcpy_e_e:
21772 .previous
21773@@ -81,13 +83,13 @@ ENTRY(memcpy)
21774 */
21775 movq 0*8(%rsi), %r8
21776 movq 1*8(%rsi), %r9
21777- movq 2*8(%rsi), %r10
21778+ movq 2*8(%rsi), %rcx
21779 movq 3*8(%rsi), %r11
21780 leaq 4*8(%rsi), %rsi
21781
21782 movq %r8, 0*8(%rdi)
21783 movq %r9, 1*8(%rdi)
21784- movq %r10, 2*8(%rdi)
21785+ movq %rcx, 2*8(%rdi)
21786 movq %r11, 3*8(%rdi)
21787 leaq 4*8(%rdi), %rdi
21788 jae .Lcopy_forward_loop
21789@@ -110,12 +112,12 @@ ENTRY(memcpy)
21790 subq $0x20, %rdx
21791 movq -1*8(%rsi), %r8
21792 movq -2*8(%rsi), %r9
21793- movq -3*8(%rsi), %r10
21794+ movq -3*8(%rsi), %rcx
21795 movq -4*8(%rsi), %r11
21796 leaq -4*8(%rsi), %rsi
21797 movq %r8, -1*8(%rdi)
21798 movq %r9, -2*8(%rdi)
21799- movq %r10, -3*8(%rdi)
21800+ movq %rcx, -3*8(%rdi)
21801 movq %r11, -4*8(%rdi)
21802 leaq -4*8(%rdi), %rdi
21803 jae .Lcopy_backward_loop
21804@@ -135,12 +137,13 @@ ENTRY(memcpy)
21805 */
21806 movq 0*8(%rsi), %r8
21807 movq 1*8(%rsi), %r9
21808- movq -2*8(%rsi, %rdx), %r10
21809+ movq -2*8(%rsi, %rdx), %rcx
21810 movq -1*8(%rsi, %rdx), %r11
21811 movq %r8, 0*8(%rdi)
21812 movq %r9, 1*8(%rdi)
21813- movq %r10, -2*8(%rdi, %rdx)
21814+ movq %rcx, -2*8(%rdi, %rdx)
21815 movq %r11, -1*8(%rdi, %rdx)
21816+ pax_force_retaddr
21817 retq
21818 .p2align 4
21819 .Lless_16bytes:
21820@@ -153,6 +156,7 @@ ENTRY(memcpy)
21821 movq -1*8(%rsi, %rdx), %r9
21822 movq %r8, 0*8(%rdi)
21823 movq %r9, -1*8(%rdi, %rdx)
21824+ pax_force_retaddr
21825 retq
21826 .p2align 4
21827 .Lless_8bytes:
21828@@ -166,6 +170,7 @@ ENTRY(memcpy)
21829 movl -4(%rsi, %rdx), %r8d
21830 movl %ecx, (%rdi)
21831 movl %r8d, -4(%rdi, %rdx)
21832+ pax_force_retaddr
21833 retq
21834 .p2align 4
21835 .Lless_3bytes:
21836@@ -183,6 +188,7 @@ ENTRY(memcpy)
21837 jnz .Lloop_1
21838
21839 .Lend:
21840+ pax_force_retaddr
21841 retq
21842 CFI_ENDPROC
21843 ENDPROC(memcpy)
21844diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
21845index ee16461..c39c199 100644
21846--- a/arch/x86/lib/memmove_64.S
21847+++ b/arch/x86/lib/memmove_64.S
21848@@ -61,13 +61,13 @@ ENTRY(memmove)
21849 5:
21850 sub $0x20, %rdx
21851 movq 0*8(%rsi), %r11
21852- movq 1*8(%rsi), %r10
21853+ movq 1*8(%rsi), %rcx
21854 movq 2*8(%rsi), %r9
21855 movq 3*8(%rsi), %r8
21856 leaq 4*8(%rsi), %rsi
21857
21858 movq %r11, 0*8(%rdi)
21859- movq %r10, 1*8(%rdi)
21860+ movq %rcx, 1*8(%rdi)
21861 movq %r9, 2*8(%rdi)
21862 movq %r8, 3*8(%rdi)
21863 leaq 4*8(%rdi), %rdi
21864@@ -81,10 +81,10 @@ ENTRY(memmove)
21865 4:
21866 movq %rdx, %rcx
21867 movq -8(%rsi, %rdx), %r11
21868- lea -8(%rdi, %rdx), %r10
21869+ lea -8(%rdi, %rdx), %r9
21870 shrq $3, %rcx
21871 rep movsq
21872- movq %r11, (%r10)
21873+ movq %r11, (%r9)
21874 jmp 13f
21875 .Lmemmove_end_forward:
21876
21877@@ -95,14 +95,14 @@ ENTRY(memmove)
21878 7:
21879 movq %rdx, %rcx
21880 movq (%rsi), %r11
21881- movq %rdi, %r10
21882+ movq %rdi, %r9
21883 leaq -8(%rsi, %rdx), %rsi
21884 leaq -8(%rdi, %rdx), %rdi
21885 shrq $3, %rcx
21886 std
21887 rep movsq
21888 cld
21889- movq %r11, (%r10)
21890+ movq %r11, (%r9)
21891 jmp 13f
21892
21893 /*
21894@@ -127,13 +127,13 @@ ENTRY(memmove)
21895 8:
21896 subq $0x20, %rdx
21897 movq -1*8(%rsi), %r11
21898- movq -2*8(%rsi), %r10
21899+ movq -2*8(%rsi), %rcx
21900 movq -3*8(%rsi), %r9
21901 movq -4*8(%rsi), %r8
21902 leaq -4*8(%rsi), %rsi
21903
21904 movq %r11, -1*8(%rdi)
21905- movq %r10, -2*8(%rdi)
21906+ movq %rcx, -2*8(%rdi)
21907 movq %r9, -3*8(%rdi)
21908 movq %r8, -4*8(%rdi)
21909 leaq -4*8(%rdi), %rdi
21910@@ -151,11 +151,11 @@ ENTRY(memmove)
21911 * Move data from 16 bytes to 31 bytes.
21912 */
21913 movq 0*8(%rsi), %r11
21914- movq 1*8(%rsi), %r10
21915+ movq 1*8(%rsi), %rcx
21916 movq -2*8(%rsi, %rdx), %r9
21917 movq -1*8(%rsi, %rdx), %r8
21918 movq %r11, 0*8(%rdi)
21919- movq %r10, 1*8(%rdi)
21920+ movq %rcx, 1*8(%rdi)
21921 movq %r9, -2*8(%rdi, %rdx)
21922 movq %r8, -1*8(%rdi, %rdx)
21923 jmp 13f
21924@@ -167,9 +167,9 @@ ENTRY(memmove)
21925 * Move data from 8 bytes to 15 bytes.
21926 */
21927 movq 0*8(%rsi), %r11
21928- movq -1*8(%rsi, %rdx), %r10
21929+ movq -1*8(%rsi, %rdx), %r9
21930 movq %r11, 0*8(%rdi)
21931- movq %r10, -1*8(%rdi, %rdx)
21932+ movq %r9, -1*8(%rdi, %rdx)
21933 jmp 13f
21934 10:
21935 cmpq $4, %rdx
21936@@ -178,9 +178,9 @@ ENTRY(memmove)
21937 * Move data from 4 bytes to 7 bytes.
21938 */
21939 movl (%rsi), %r11d
21940- movl -4(%rsi, %rdx), %r10d
21941+ movl -4(%rsi, %rdx), %r9d
21942 movl %r11d, (%rdi)
21943- movl %r10d, -4(%rdi, %rdx)
21944+ movl %r9d, -4(%rdi, %rdx)
21945 jmp 13f
21946 11:
21947 cmp $2, %rdx
21948@@ -189,9 +189,9 @@ ENTRY(memmove)
21949 * Move data from 2 bytes to 3 bytes.
21950 */
21951 movw (%rsi), %r11w
21952- movw -2(%rsi, %rdx), %r10w
21953+ movw -2(%rsi, %rdx), %r9w
21954 movw %r11w, (%rdi)
21955- movw %r10w, -2(%rdi, %rdx)
21956+ movw %r9w, -2(%rdi, %rdx)
21957 jmp 13f
21958 12:
21959 cmp $1, %rdx
21960@@ -202,6 +202,7 @@ ENTRY(memmove)
21961 movb (%rsi), %r11b
21962 movb %r11b, (%rdi)
21963 13:
21964+ pax_force_retaddr
21965 retq
21966 CFI_ENDPROC
21967
21968@@ -210,6 +211,7 @@ ENTRY(memmove)
21969 /* Forward moving data. */
21970 movq %rdx, %rcx
21971 rep movsb
21972+ pax_force_retaddr
21973 retq
21974 .Lmemmove_end_forward_efs:
21975 .previous
21976diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
21977index 79bd454..dff325a 100644
21978--- a/arch/x86/lib/memset_64.S
21979+++ b/arch/x86/lib/memset_64.S
21980@@ -31,6 +31,7 @@
21981 movl %r8d,%ecx
21982 rep stosb
21983 movq %r9,%rax
21984+ pax_force_retaddr
21985 ret
21986 .Lmemset_e:
21987 .previous
21988@@ -53,6 +54,7 @@
21989 movl %edx,%ecx
21990 rep stosb
21991 movq %r9,%rax
21992+ pax_force_retaddr
21993 ret
21994 .Lmemset_e_e:
21995 .previous
21996@@ -60,13 +62,13 @@
21997 ENTRY(memset)
21998 ENTRY(__memset)
21999 CFI_STARTPROC
22000- movq %rdi,%r10
22001 movq %rdx,%r11
22002
22003 /* expand byte value */
22004 movzbl %sil,%ecx
22005 movabs $0x0101010101010101,%rax
22006 mul %rcx /* with rax, clobbers rdx */
22007+ movq %rdi,%rdx
22008
22009 /* align dst */
22010 movl %edi,%r9d
22011@@ -120,7 +122,8 @@ ENTRY(__memset)
22012 jnz .Lloop_1
22013
22014 .Lende:
22015- movq %r10,%rax
22016+ movq %rdx,%rax
22017+ pax_force_retaddr
22018 ret
22019
22020 CFI_RESTORE_STATE
22021diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
22022index c9f2d9b..e7fd2c0 100644
22023--- a/arch/x86/lib/mmx_32.c
22024+++ b/arch/x86/lib/mmx_32.c
22025@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22026 {
22027 void *p;
22028 int i;
22029+ unsigned long cr0;
22030
22031 if (unlikely(in_interrupt()))
22032 return __memcpy(to, from, len);
22033@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22034 kernel_fpu_begin();
22035
22036 __asm__ __volatile__ (
22037- "1: prefetch (%0)\n" /* This set is 28 bytes */
22038- " prefetch 64(%0)\n"
22039- " prefetch 128(%0)\n"
22040- " prefetch 192(%0)\n"
22041- " prefetch 256(%0)\n"
22042+ "1: prefetch (%1)\n" /* This set is 28 bytes */
22043+ " prefetch 64(%1)\n"
22044+ " prefetch 128(%1)\n"
22045+ " prefetch 192(%1)\n"
22046+ " prefetch 256(%1)\n"
22047 "2: \n"
22048 ".section .fixup, \"ax\"\n"
22049- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22050+ "3: \n"
22051+
22052+#ifdef CONFIG_PAX_KERNEXEC
22053+ " movl %%cr0, %0\n"
22054+ " movl %0, %%eax\n"
22055+ " andl $0xFFFEFFFF, %%eax\n"
22056+ " movl %%eax, %%cr0\n"
22057+#endif
22058+
22059+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22060+
22061+#ifdef CONFIG_PAX_KERNEXEC
22062+ " movl %0, %%cr0\n"
22063+#endif
22064+
22065 " jmp 2b\n"
22066 ".previous\n"
22067 _ASM_EXTABLE(1b, 3b)
22068- : : "r" (from));
22069+ : "=&r" (cr0) : "r" (from) : "ax");
22070
22071 for ( ; i > 5; i--) {
22072 __asm__ __volatile__ (
22073- "1: prefetch 320(%0)\n"
22074- "2: movq (%0), %%mm0\n"
22075- " movq 8(%0), %%mm1\n"
22076- " movq 16(%0), %%mm2\n"
22077- " movq 24(%0), %%mm3\n"
22078- " movq %%mm0, (%1)\n"
22079- " movq %%mm1, 8(%1)\n"
22080- " movq %%mm2, 16(%1)\n"
22081- " movq %%mm3, 24(%1)\n"
22082- " movq 32(%0), %%mm0\n"
22083- " movq 40(%0), %%mm1\n"
22084- " movq 48(%0), %%mm2\n"
22085- " movq 56(%0), %%mm3\n"
22086- " movq %%mm0, 32(%1)\n"
22087- " movq %%mm1, 40(%1)\n"
22088- " movq %%mm2, 48(%1)\n"
22089- " movq %%mm3, 56(%1)\n"
22090+ "1: prefetch 320(%1)\n"
22091+ "2: movq (%1), %%mm0\n"
22092+ " movq 8(%1), %%mm1\n"
22093+ " movq 16(%1), %%mm2\n"
22094+ " movq 24(%1), %%mm3\n"
22095+ " movq %%mm0, (%2)\n"
22096+ " movq %%mm1, 8(%2)\n"
22097+ " movq %%mm2, 16(%2)\n"
22098+ " movq %%mm3, 24(%2)\n"
22099+ " movq 32(%1), %%mm0\n"
22100+ " movq 40(%1), %%mm1\n"
22101+ " movq 48(%1), %%mm2\n"
22102+ " movq 56(%1), %%mm3\n"
22103+ " movq %%mm0, 32(%2)\n"
22104+ " movq %%mm1, 40(%2)\n"
22105+ " movq %%mm2, 48(%2)\n"
22106+ " movq %%mm3, 56(%2)\n"
22107 ".section .fixup, \"ax\"\n"
22108- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22109+ "3:\n"
22110+
22111+#ifdef CONFIG_PAX_KERNEXEC
22112+ " movl %%cr0, %0\n"
22113+ " movl %0, %%eax\n"
22114+ " andl $0xFFFEFFFF, %%eax\n"
22115+ " movl %%eax, %%cr0\n"
22116+#endif
22117+
22118+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22119+
22120+#ifdef CONFIG_PAX_KERNEXEC
22121+ " movl %0, %%cr0\n"
22122+#endif
22123+
22124 " jmp 2b\n"
22125 ".previous\n"
22126 _ASM_EXTABLE(1b, 3b)
22127- : : "r" (from), "r" (to) : "memory");
22128+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22129
22130 from += 64;
22131 to += 64;
22132@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
22133 static void fast_copy_page(void *to, void *from)
22134 {
22135 int i;
22136+ unsigned long cr0;
22137
22138 kernel_fpu_begin();
22139
22140@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
22141 * but that is for later. -AV
22142 */
22143 __asm__ __volatile__(
22144- "1: prefetch (%0)\n"
22145- " prefetch 64(%0)\n"
22146- " prefetch 128(%0)\n"
22147- " prefetch 192(%0)\n"
22148- " prefetch 256(%0)\n"
22149+ "1: prefetch (%1)\n"
22150+ " prefetch 64(%1)\n"
22151+ " prefetch 128(%1)\n"
22152+ " prefetch 192(%1)\n"
22153+ " prefetch 256(%1)\n"
22154 "2: \n"
22155 ".section .fixup, \"ax\"\n"
22156- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22157+ "3: \n"
22158+
22159+#ifdef CONFIG_PAX_KERNEXEC
22160+ " movl %%cr0, %0\n"
22161+ " movl %0, %%eax\n"
22162+ " andl $0xFFFEFFFF, %%eax\n"
22163+ " movl %%eax, %%cr0\n"
22164+#endif
22165+
22166+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22167+
22168+#ifdef CONFIG_PAX_KERNEXEC
22169+ " movl %0, %%cr0\n"
22170+#endif
22171+
22172 " jmp 2b\n"
22173 ".previous\n"
22174- _ASM_EXTABLE(1b, 3b) : : "r" (from));
22175+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22176
22177 for (i = 0; i < (4096-320)/64; i++) {
22178 __asm__ __volatile__ (
22179- "1: prefetch 320(%0)\n"
22180- "2: movq (%0), %%mm0\n"
22181- " movntq %%mm0, (%1)\n"
22182- " movq 8(%0), %%mm1\n"
22183- " movntq %%mm1, 8(%1)\n"
22184- " movq 16(%0), %%mm2\n"
22185- " movntq %%mm2, 16(%1)\n"
22186- " movq 24(%0), %%mm3\n"
22187- " movntq %%mm3, 24(%1)\n"
22188- " movq 32(%0), %%mm4\n"
22189- " movntq %%mm4, 32(%1)\n"
22190- " movq 40(%0), %%mm5\n"
22191- " movntq %%mm5, 40(%1)\n"
22192- " movq 48(%0), %%mm6\n"
22193- " movntq %%mm6, 48(%1)\n"
22194- " movq 56(%0), %%mm7\n"
22195- " movntq %%mm7, 56(%1)\n"
22196+ "1: prefetch 320(%1)\n"
22197+ "2: movq (%1), %%mm0\n"
22198+ " movntq %%mm0, (%2)\n"
22199+ " movq 8(%1), %%mm1\n"
22200+ " movntq %%mm1, 8(%2)\n"
22201+ " movq 16(%1), %%mm2\n"
22202+ " movntq %%mm2, 16(%2)\n"
22203+ " movq 24(%1), %%mm3\n"
22204+ " movntq %%mm3, 24(%2)\n"
22205+ " movq 32(%1), %%mm4\n"
22206+ " movntq %%mm4, 32(%2)\n"
22207+ " movq 40(%1), %%mm5\n"
22208+ " movntq %%mm5, 40(%2)\n"
22209+ " movq 48(%1), %%mm6\n"
22210+ " movntq %%mm6, 48(%2)\n"
22211+ " movq 56(%1), %%mm7\n"
22212+ " movntq %%mm7, 56(%2)\n"
22213 ".section .fixup, \"ax\"\n"
22214- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22215+ "3:\n"
22216+
22217+#ifdef CONFIG_PAX_KERNEXEC
22218+ " movl %%cr0, %0\n"
22219+ " movl %0, %%eax\n"
22220+ " andl $0xFFFEFFFF, %%eax\n"
22221+ " movl %%eax, %%cr0\n"
22222+#endif
22223+
22224+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22225+
22226+#ifdef CONFIG_PAX_KERNEXEC
22227+ " movl %0, %%cr0\n"
22228+#endif
22229+
22230 " jmp 2b\n"
22231 ".previous\n"
22232- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
22233+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22234
22235 from += 64;
22236 to += 64;
22237@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
22238 static void fast_copy_page(void *to, void *from)
22239 {
22240 int i;
22241+ unsigned long cr0;
22242
22243 kernel_fpu_begin();
22244
22245 __asm__ __volatile__ (
22246- "1: prefetch (%0)\n"
22247- " prefetch 64(%0)\n"
22248- " prefetch 128(%0)\n"
22249- " prefetch 192(%0)\n"
22250- " prefetch 256(%0)\n"
22251+ "1: prefetch (%1)\n"
22252+ " prefetch 64(%1)\n"
22253+ " prefetch 128(%1)\n"
22254+ " prefetch 192(%1)\n"
22255+ " prefetch 256(%1)\n"
22256 "2: \n"
22257 ".section .fixup, \"ax\"\n"
22258- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22259+ "3: \n"
22260+
22261+#ifdef CONFIG_PAX_KERNEXEC
22262+ " movl %%cr0, %0\n"
22263+ " movl %0, %%eax\n"
22264+ " andl $0xFFFEFFFF, %%eax\n"
22265+ " movl %%eax, %%cr0\n"
22266+#endif
22267+
22268+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22269+
22270+#ifdef CONFIG_PAX_KERNEXEC
22271+ " movl %0, %%cr0\n"
22272+#endif
22273+
22274 " jmp 2b\n"
22275 ".previous\n"
22276- _ASM_EXTABLE(1b, 3b) : : "r" (from));
22277+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22278
22279 for (i = 0; i < 4096/64; i++) {
22280 __asm__ __volatile__ (
22281- "1: prefetch 320(%0)\n"
22282- "2: movq (%0), %%mm0\n"
22283- " movq 8(%0), %%mm1\n"
22284- " movq 16(%0), %%mm2\n"
22285- " movq 24(%0), %%mm3\n"
22286- " movq %%mm0, (%1)\n"
22287- " movq %%mm1, 8(%1)\n"
22288- " movq %%mm2, 16(%1)\n"
22289- " movq %%mm3, 24(%1)\n"
22290- " movq 32(%0), %%mm0\n"
22291- " movq 40(%0), %%mm1\n"
22292- " movq 48(%0), %%mm2\n"
22293- " movq 56(%0), %%mm3\n"
22294- " movq %%mm0, 32(%1)\n"
22295- " movq %%mm1, 40(%1)\n"
22296- " movq %%mm2, 48(%1)\n"
22297- " movq %%mm3, 56(%1)\n"
22298+ "1: prefetch 320(%1)\n"
22299+ "2: movq (%1), %%mm0\n"
22300+ " movq 8(%1), %%mm1\n"
22301+ " movq 16(%1), %%mm2\n"
22302+ " movq 24(%1), %%mm3\n"
22303+ " movq %%mm0, (%2)\n"
22304+ " movq %%mm1, 8(%2)\n"
22305+ " movq %%mm2, 16(%2)\n"
22306+ " movq %%mm3, 24(%2)\n"
22307+ " movq 32(%1), %%mm0\n"
22308+ " movq 40(%1), %%mm1\n"
22309+ " movq 48(%1), %%mm2\n"
22310+ " movq 56(%1), %%mm3\n"
22311+ " movq %%mm0, 32(%2)\n"
22312+ " movq %%mm1, 40(%2)\n"
22313+ " movq %%mm2, 48(%2)\n"
22314+ " movq %%mm3, 56(%2)\n"
22315 ".section .fixup, \"ax\"\n"
22316- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22317+ "3:\n"
22318+
22319+#ifdef CONFIG_PAX_KERNEXEC
22320+ " movl %%cr0, %0\n"
22321+ " movl %0, %%eax\n"
22322+ " andl $0xFFFEFFFF, %%eax\n"
22323+ " movl %%eax, %%cr0\n"
22324+#endif
22325+
22326+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22327+
22328+#ifdef CONFIG_PAX_KERNEXEC
22329+ " movl %0, %%cr0\n"
22330+#endif
22331+
22332 " jmp 2b\n"
22333 ".previous\n"
22334 _ASM_EXTABLE(1b, 3b)
22335- : : "r" (from), "r" (to) : "memory");
22336+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22337
22338 from += 64;
22339 to += 64;
22340diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
22341index 69fa106..adda88b 100644
22342--- a/arch/x86/lib/msr-reg.S
22343+++ b/arch/x86/lib/msr-reg.S
22344@@ -3,6 +3,7 @@
22345 #include <asm/dwarf2.h>
22346 #include <asm/asm.h>
22347 #include <asm/msr.h>
22348+#include <asm/alternative-asm.h>
22349
22350 #ifdef CONFIG_X86_64
22351 /*
22352@@ -16,7 +17,7 @@ ENTRY(native_\op\()_safe_regs)
22353 CFI_STARTPROC
22354 pushq_cfi %rbx
22355 pushq_cfi %rbp
22356- movq %rdi, %r10 /* Save pointer */
22357+ movq %rdi, %r9 /* Save pointer */
22358 xorl %r11d, %r11d /* Return value */
22359 movl (%rdi), %eax
22360 movl 4(%rdi), %ecx
22361@@ -27,16 +28,17 @@ ENTRY(native_\op\()_safe_regs)
22362 movl 28(%rdi), %edi
22363 CFI_REMEMBER_STATE
22364 1: \op
22365-2: movl %eax, (%r10)
22366+2: movl %eax, (%r9)
22367 movl %r11d, %eax /* Return value */
22368- movl %ecx, 4(%r10)
22369- movl %edx, 8(%r10)
22370- movl %ebx, 12(%r10)
22371- movl %ebp, 20(%r10)
22372- movl %esi, 24(%r10)
22373- movl %edi, 28(%r10)
22374+ movl %ecx, 4(%r9)
22375+ movl %edx, 8(%r9)
22376+ movl %ebx, 12(%r9)
22377+ movl %ebp, 20(%r9)
22378+ movl %esi, 24(%r9)
22379+ movl %edi, 28(%r9)
22380 popq_cfi %rbp
22381 popq_cfi %rbx
22382+ pax_force_retaddr
22383 ret
22384 3:
22385 CFI_RESTORE_STATE
22386diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
22387index 36b0d15..d381858 100644
22388--- a/arch/x86/lib/putuser.S
22389+++ b/arch/x86/lib/putuser.S
22390@@ -15,7 +15,9 @@
22391 #include <asm/thread_info.h>
22392 #include <asm/errno.h>
22393 #include <asm/asm.h>
22394-
22395+#include <asm/segment.h>
22396+#include <asm/pgtable.h>
22397+#include <asm/alternative-asm.h>
22398
22399 /*
22400 * __put_user_X
22401@@ -29,52 +31,119 @@
22402 * as they get called from within inline assembly.
22403 */
22404
22405-#define ENTER CFI_STARTPROC ; \
22406- GET_THREAD_INFO(%_ASM_BX)
22407-#define EXIT ret ; \
22408+#define ENTER CFI_STARTPROC
22409+#define EXIT pax_force_retaddr; ret ; \
22410 CFI_ENDPROC
22411
22412+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22413+#define _DEST %_ASM_CX,%_ASM_BX
22414+#else
22415+#define _DEST %_ASM_CX
22416+#endif
22417+
22418+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
22419+#define __copyuser_seg gs;
22420+#else
22421+#define __copyuser_seg
22422+#endif
22423+
22424 .text
22425 ENTRY(__put_user_1)
22426 ENTER
22427+
22428+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22429+ GET_THREAD_INFO(%_ASM_BX)
22430 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
22431 jae bad_put_user
22432-1: movb %al,(%_ASM_CX)
22433+
22434+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22435+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22436+ cmp %_ASM_BX,%_ASM_CX
22437+ jb 1234f
22438+ xor %ebx,%ebx
22439+1234:
22440+#endif
22441+
22442+#endif
22443+
22444+1: __copyuser_seg movb %al,(_DEST)
22445 xor %eax,%eax
22446 EXIT
22447 ENDPROC(__put_user_1)
22448
22449 ENTRY(__put_user_2)
22450 ENTER
22451+
22452+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22453+ GET_THREAD_INFO(%_ASM_BX)
22454 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22455 sub $1,%_ASM_BX
22456 cmp %_ASM_BX,%_ASM_CX
22457 jae bad_put_user
22458-2: movw %ax,(%_ASM_CX)
22459+
22460+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22461+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22462+ cmp %_ASM_BX,%_ASM_CX
22463+ jb 1234f
22464+ xor %ebx,%ebx
22465+1234:
22466+#endif
22467+
22468+#endif
22469+
22470+2: __copyuser_seg movw %ax,(_DEST)
22471 xor %eax,%eax
22472 EXIT
22473 ENDPROC(__put_user_2)
22474
22475 ENTRY(__put_user_4)
22476 ENTER
22477+
22478+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22479+ GET_THREAD_INFO(%_ASM_BX)
22480 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22481 sub $3,%_ASM_BX
22482 cmp %_ASM_BX,%_ASM_CX
22483 jae bad_put_user
22484-3: movl %eax,(%_ASM_CX)
22485+
22486+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22487+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22488+ cmp %_ASM_BX,%_ASM_CX
22489+ jb 1234f
22490+ xor %ebx,%ebx
22491+1234:
22492+#endif
22493+
22494+#endif
22495+
22496+3: __copyuser_seg movl %eax,(_DEST)
22497 xor %eax,%eax
22498 EXIT
22499 ENDPROC(__put_user_4)
22500
22501 ENTRY(__put_user_8)
22502 ENTER
22503+
22504+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22505+ GET_THREAD_INFO(%_ASM_BX)
22506 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22507 sub $7,%_ASM_BX
22508 cmp %_ASM_BX,%_ASM_CX
22509 jae bad_put_user
22510-4: mov %_ASM_AX,(%_ASM_CX)
22511+
22512+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22513+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22514+ cmp %_ASM_BX,%_ASM_CX
22515+ jb 1234f
22516+ xor %ebx,%ebx
22517+1234:
22518+#endif
22519+
22520+#endif
22521+
22522+4: __copyuser_seg mov %_ASM_AX,(_DEST)
22523 #ifdef CONFIG_X86_32
22524-5: movl %edx,4(%_ASM_CX)
22525+5: __copyuser_seg movl %edx,4(_DEST)
22526 #endif
22527 xor %eax,%eax
22528 EXIT
22529diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
22530index 1cad221..de671ee 100644
22531--- a/arch/x86/lib/rwlock.S
22532+++ b/arch/x86/lib/rwlock.S
22533@@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
22534 FRAME
22535 0: LOCK_PREFIX
22536 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22537+
22538+#ifdef CONFIG_PAX_REFCOUNT
22539+ jno 1234f
22540+ LOCK_PREFIX
22541+ WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22542+ int $4
22543+1234:
22544+ _ASM_EXTABLE(1234b, 1234b)
22545+#endif
22546+
22547 1: rep; nop
22548 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
22549 jne 1b
22550 LOCK_PREFIX
22551 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22552+
22553+#ifdef CONFIG_PAX_REFCOUNT
22554+ jno 1234f
22555+ LOCK_PREFIX
22556+ WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22557+ int $4
22558+1234:
22559+ _ASM_EXTABLE(1234b, 1234b)
22560+#endif
22561+
22562 jnz 0b
22563 ENDFRAME
22564+ pax_force_retaddr
22565 ret
22566 CFI_ENDPROC
22567 END(__write_lock_failed)
22568@@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
22569 FRAME
22570 0: LOCK_PREFIX
22571 READ_LOCK_SIZE(inc) (%__lock_ptr)
22572+
22573+#ifdef CONFIG_PAX_REFCOUNT
22574+ jno 1234f
22575+ LOCK_PREFIX
22576+ READ_LOCK_SIZE(dec) (%__lock_ptr)
22577+ int $4
22578+1234:
22579+ _ASM_EXTABLE(1234b, 1234b)
22580+#endif
22581+
22582 1: rep; nop
22583 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
22584 js 1b
22585 LOCK_PREFIX
22586 READ_LOCK_SIZE(dec) (%__lock_ptr)
22587+
22588+#ifdef CONFIG_PAX_REFCOUNT
22589+ jno 1234f
22590+ LOCK_PREFIX
22591+ READ_LOCK_SIZE(inc) (%__lock_ptr)
22592+ int $4
22593+1234:
22594+ _ASM_EXTABLE(1234b, 1234b)
22595+#endif
22596+
22597 js 0b
22598 ENDFRAME
22599+ pax_force_retaddr
22600 ret
22601 CFI_ENDPROC
22602 END(__read_lock_failed)
22603diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
22604index 5dff5f0..cadebf4 100644
22605--- a/arch/x86/lib/rwsem.S
22606+++ b/arch/x86/lib/rwsem.S
22607@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
22608 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22609 CFI_RESTORE __ASM_REG(dx)
22610 restore_common_regs
22611+ pax_force_retaddr
22612 ret
22613 CFI_ENDPROC
22614 ENDPROC(call_rwsem_down_read_failed)
22615@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
22616 movq %rax,%rdi
22617 call rwsem_down_write_failed
22618 restore_common_regs
22619+ pax_force_retaddr
22620 ret
22621 CFI_ENDPROC
22622 ENDPROC(call_rwsem_down_write_failed)
22623@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
22624 movq %rax,%rdi
22625 call rwsem_wake
22626 restore_common_regs
22627-1: ret
22628+1: pax_force_retaddr
22629+ ret
22630 CFI_ENDPROC
22631 ENDPROC(call_rwsem_wake)
22632
22633@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
22634 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22635 CFI_RESTORE __ASM_REG(dx)
22636 restore_common_regs
22637+ pax_force_retaddr
22638 ret
22639 CFI_ENDPROC
22640 ENDPROC(call_rwsem_downgrade_wake)
22641diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
22642index a63efd6..ccecad8 100644
22643--- a/arch/x86/lib/thunk_64.S
22644+++ b/arch/x86/lib/thunk_64.S
22645@@ -8,6 +8,7 @@
22646 #include <linux/linkage.h>
22647 #include <asm/dwarf2.h>
22648 #include <asm/calling.h>
22649+#include <asm/alternative-asm.h>
22650
22651 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
22652 .macro THUNK name, func, put_ret_addr_in_rdi=0
22653@@ -41,5 +42,6 @@
22654 SAVE_ARGS
22655 restore:
22656 RESTORE_ARGS
22657+ pax_force_retaddr
22658 ret
22659 CFI_ENDPROC
22660diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
22661index e218d5d..1e01930 100644
22662--- a/arch/x86/lib/usercopy_32.c
22663+++ b/arch/x86/lib/usercopy_32.c
22664@@ -43,7 +43,7 @@ do { \
22665 __asm__ __volatile__( \
22666 " testl %1,%1\n" \
22667 " jz 2f\n" \
22668- "0: lodsb\n" \
22669+ "0: "__copyuser_seg"lodsb\n" \
22670 " stosb\n" \
22671 " testb %%al,%%al\n" \
22672 " jz 1f\n" \
22673@@ -83,7 +83,7 @@ do { \
22674 * and returns @count.
22675 */
22676 long
22677-__strncpy_from_user(char *dst, const char __user *src, long count)
22678+__strncpy_from_user(char *dst, const char __user *src, unsigned long count)
22679 {
22680 long res;
22681 __do_strncpy_from_user(dst, src, count, res);
22682@@ -110,7 +110,7 @@ EXPORT_SYMBOL(__strncpy_from_user);
22683 * and returns @count.
22684 */
22685 long
22686-strncpy_from_user(char *dst, const char __user *src, long count)
22687+strncpy_from_user(char *dst, const char __user *src, unsigned long count)
22688 {
22689 long res = -EFAULT;
22690 if (access_ok(VERIFY_READ, src, 1))
22691@@ -128,10 +128,12 @@ do { \
22692 int __d0; \
22693 might_fault(); \
22694 __asm__ __volatile__( \
22695+ __COPYUSER_SET_ES \
22696 "0: rep; stosl\n" \
22697 " movl %2,%0\n" \
22698 "1: rep; stosb\n" \
22699 "2:\n" \
22700+ __COPYUSER_RESTORE_ES \
22701 ".section .fixup,\"ax\"\n" \
22702 "3: lea 0(%2,%0,4),%0\n" \
22703 " jmp 2b\n" \
22704@@ -192,7 +194,7 @@ EXPORT_SYMBOL(__clear_user);
22705 * On exception, returns 0.
22706 * If the string is too long, returns a value greater than @n.
22707 */
22708-long strnlen_user(const char __user *s, long n)
22709+long strnlen_user(const char __user *s, unsigned long n)
22710 {
22711 unsigned long mask = -__addr_ok(s);
22712 unsigned long res, tmp;
22713@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, long n)
22714 might_fault();
22715
22716 __asm__ __volatile__(
22717+ __COPYUSER_SET_ES
22718 " testl %0, %0\n"
22719 " jz 3f\n"
22720 " andl %0,%%ecx\n"
22721@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, long n)
22722 " subl %%ecx,%0\n"
22723 " addl %0,%%eax\n"
22724 "1:\n"
22725+ __COPYUSER_RESTORE_ES
22726 ".section .fixup,\"ax\"\n"
22727 "2: xorl %%eax,%%eax\n"
22728 " jmp 1b\n"
22729@@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user);
22730
22731 #ifdef CONFIG_X86_INTEL_USERCOPY
22732 static unsigned long
22733-__copy_user_intel(void __user *to, const void *from, unsigned long size)
22734+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
22735 {
22736 int d0, d1;
22737 __asm__ __volatile__(
22738@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22739 " .align 2,0x90\n"
22740 "3: movl 0(%4), %%eax\n"
22741 "4: movl 4(%4), %%edx\n"
22742- "5: movl %%eax, 0(%3)\n"
22743- "6: movl %%edx, 4(%3)\n"
22744+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
22745+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
22746 "7: movl 8(%4), %%eax\n"
22747 "8: movl 12(%4),%%edx\n"
22748- "9: movl %%eax, 8(%3)\n"
22749- "10: movl %%edx, 12(%3)\n"
22750+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
22751+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
22752 "11: movl 16(%4), %%eax\n"
22753 "12: movl 20(%4), %%edx\n"
22754- "13: movl %%eax, 16(%3)\n"
22755- "14: movl %%edx, 20(%3)\n"
22756+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
22757+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
22758 "15: movl 24(%4), %%eax\n"
22759 "16: movl 28(%4), %%edx\n"
22760- "17: movl %%eax, 24(%3)\n"
22761- "18: movl %%edx, 28(%3)\n"
22762+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
22763+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
22764 "19: movl 32(%4), %%eax\n"
22765 "20: movl 36(%4), %%edx\n"
22766- "21: movl %%eax, 32(%3)\n"
22767- "22: movl %%edx, 36(%3)\n"
22768+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
22769+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
22770 "23: movl 40(%4), %%eax\n"
22771 "24: movl 44(%4), %%edx\n"
22772- "25: movl %%eax, 40(%3)\n"
22773- "26: movl %%edx, 44(%3)\n"
22774+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
22775+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
22776 "27: movl 48(%4), %%eax\n"
22777 "28: movl 52(%4), %%edx\n"
22778- "29: movl %%eax, 48(%3)\n"
22779- "30: movl %%edx, 52(%3)\n"
22780+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
22781+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
22782 "31: movl 56(%4), %%eax\n"
22783 "32: movl 60(%4), %%edx\n"
22784- "33: movl %%eax, 56(%3)\n"
22785- "34: movl %%edx, 60(%3)\n"
22786+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
22787+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
22788 " addl $-64, %0\n"
22789 " addl $64, %4\n"
22790 " addl $64, %3\n"
22791@@ -278,10 +282,12 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22792 " shrl $2, %0\n"
22793 " andl $3, %%eax\n"
22794 " cld\n"
22795+ __COPYUSER_SET_ES
22796 "99: rep; movsl\n"
22797 "36: movl %%eax, %0\n"
22798 "37: rep; movsb\n"
22799 "100:\n"
22800+ __COPYUSER_RESTORE_ES
22801 ".section .fixup,\"ax\"\n"
22802 "101: lea 0(%%eax,%0,4),%0\n"
22803 " jmp 100b\n"
22804@@ -334,46 +340,155 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22805 }
22806
22807 static unsigned long
22808+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
22809+{
22810+ int d0, d1;
22811+ __asm__ __volatile__(
22812+ " .align 2,0x90\n"
22813+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
22814+ " cmpl $67, %0\n"
22815+ " jbe 3f\n"
22816+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
22817+ " .align 2,0x90\n"
22818+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
22819+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
22820+ "5: movl %%eax, 0(%3)\n"
22821+ "6: movl %%edx, 4(%3)\n"
22822+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
22823+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
22824+ "9: movl %%eax, 8(%3)\n"
22825+ "10: movl %%edx, 12(%3)\n"
22826+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
22827+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
22828+ "13: movl %%eax, 16(%3)\n"
22829+ "14: movl %%edx, 20(%3)\n"
22830+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
22831+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
22832+ "17: movl %%eax, 24(%3)\n"
22833+ "18: movl %%edx, 28(%3)\n"
22834+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
22835+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
22836+ "21: movl %%eax, 32(%3)\n"
22837+ "22: movl %%edx, 36(%3)\n"
22838+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
22839+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
22840+ "25: movl %%eax, 40(%3)\n"
22841+ "26: movl %%edx, 44(%3)\n"
22842+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
22843+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
22844+ "29: movl %%eax, 48(%3)\n"
22845+ "30: movl %%edx, 52(%3)\n"
22846+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
22847+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
22848+ "33: movl %%eax, 56(%3)\n"
22849+ "34: movl %%edx, 60(%3)\n"
22850+ " addl $-64, %0\n"
22851+ " addl $64, %4\n"
22852+ " addl $64, %3\n"
22853+ " cmpl $63, %0\n"
22854+ " ja 1b\n"
22855+ "35: movl %0, %%eax\n"
22856+ " shrl $2, %0\n"
22857+ " andl $3, %%eax\n"
22858+ " cld\n"
22859+ "99: rep; "__copyuser_seg" movsl\n"
22860+ "36: movl %%eax, %0\n"
22861+ "37: rep; "__copyuser_seg" movsb\n"
22862+ "100:\n"
22863+ ".section .fixup,\"ax\"\n"
22864+ "101: lea 0(%%eax,%0,4),%0\n"
22865+ " jmp 100b\n"
22866+ ".previous\n"
22867+ ".section __ex_table,\"a\"\n"
22868+ " .align 4\n"
22869+ " .long 1b,100b\n"
22870+ " .long 2b,100b\n"
22871+ " .long 3b,100b\n"
22872+ " .long 4b,100b\n"
22873+ " .long 5b,100b\n"
22874+ " .long 6b,100b\n"
22875+ " .long 7b,100b\n"
22876+ " .long 8b,100b\n"
22877+ " .long 9b,100b\n"
22878+ " .long 10b,100b\n"
22879+ " .long 11b,100b\n"
22880+ " .long 12b,100b\n"
22881+ " .long 13b,100b\n"
22882+ " .long 14b,100b\n"
22883+ " .long 15b,100b\n"
22884+ " .long 16b,100b\n"
22885+ " .long 17b,100b\n"
22886+ " .long 18b,100b\n"
22887+ " .long 19b,100b\n"
22888+ " .long 20b,100b\n"
22889+ " .long 21b,100b\n"
22890+ " .long 22b,100b\n"
22891+ " .long 23b,100b\n"
22892+ " .long 24b,100b\n"
22893+ " .long 25b,100b\n"
22894+ " .long 26b,100b\n"
22895+ " .long 27b,100b\n"
22896+ " .long 28b,100b\n"
22897+ " .long 29b,100b\n"
22898+ " .long 30b,100b\n"
22899+ " .long 31b,100b\n"
22900+ " .long 32b,100b\n"
22901+ " .long 33b,100b\n"
22902+ " .long 34b,100b\n"
22903+ " .long 35b,100b\n"
22904+ " .long 36b,100b\n"
22905+ " .long 37b,100b\n"
22906+ " .long 99b,101b\n"
22907+ ".previous"
22908+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
22909+ : "1"(to), "2"(from), "0"(size)
22910+ : "eax", "edx", "memory");
22911+ return size;
22912+}
22913+
22914+static unsigned long
22915+__copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size) __size_overflow(3);
22916+static unsigned long
22917 __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22918 {
22919 int d0, d1;
22920 __asm__ __volatile__(
22921 " .align 2,0x90\n"
22922- "0: movl 32(%4), %%eax\n"
22923+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
22924 " cmpl $67, %0\n"
22925 " jbe 2f\n"
22926- "1: movl 64(%4), %%eax\n"
22927+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
22928 " .align 2,0x90\n"
22929- "2: movl 0(%4), %%eax\n"
22930- "21: movl 4(%4), %%edx\n"
22931+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
22932+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
22933 " movl %%eax, 0(%3)\n"
22934 " movl %%edx, 4(%3)\n"
22935- "3: movl 8(%4), %%eax\n"
22936- "31: movl 12(%4),%%edx\n"
22937+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
22938+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
22939 " movl %%eax, 8(%3)\n"
22940 " movl %%edx, 12(%3)\n"
22941- "4: movl 16(%4), %%eax\n"
22942- "41: movl 20(%4), %%edx\n"
22943+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
22944+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
22945 " movl %%eax, 16(%3)\n"
22946 " movl %%edx, 20(%3)\n"
22947- "10: movl 24(%4), %%eax\n"
22948- "51: movl 28(%4), %%edx\n"
22949+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
22950+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
22951 " movl %%eax, 24(%3)\n"
22952 " movl %%edx, 28(%3)\n"
22953- "11: movl 32(%4), %%eax\n"
22954- "61: movl 36(%4), %%edx\n"
22955+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
22956+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
22957 " movl %%eax, 32(%3)\n"
22958 " movl %%edx, 36(%3)\n"
22959- "12: movl 40(%4), %%eax\n"
22960- "71: movl 44(%4), %%edx\n"
22961+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
22962+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
22963 " movl %%eax, 40(%3)\n"
22964 " movl %%edx, 44(%3)\n"
22965- "13: movl 48(%4), %%eax\n"
22966- "81: movl 52(%4), %%edx\n"
22967+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
22968+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
22969 " movl %%eax, 48(%3)\n"
22970 " movl %%edx, 52(%3)\n"
22971- "14: movl 56(%4), %%eax\n"
22972- "91: movl 60(%4), %%edx\n"
22973+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
22974+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
22975 " movl %%eax, 56(%3)\n"
22976 " movl %%edx, 60(%3)\n"
22977 " addl $-64, %0\n"
22978@@ -385,9 +500,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22979 " shrl $2, %0\n"
22980 " andl $3, %%eax\n"
22981 " cld\n"
22982- "6: rep; movsl\n"
22983+ "6: rep; "__copyuser_seg" movsl\n"
22984 " movl %%eax,%0\n"
22985- "7: rep; movsb\n"
22986+ "7: rep; "__copyuser_seg" movsb\n"
22987 "8:\n"
22988 ".section .fixup,\"ax\"\n"
22989 "9: lea 0(%%eax,%0,4),%0\n"
22990@@ -434,47 +549,49 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22991 */
22992
22993 static unsigned long __copy_user_zeroing_intel_nocache(void *to,
22994+ const void __user *from, unsigned long size) __size_overflow(3);
22995+static unsigned long __copy_user_zeroing_intel_nocache(void *to,
22996 const void __user *from, unsigned long size)
22997 {
22998 int d0, d1;
22999
23000 __asm__ __volatile__(
23001 " .align 2,0x90\n"
23002- "0: movl 32(%4), %%eax\n"
23003+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23004 " cmpl $67, %0\n"
23005 " jbe 2f\n"
23006- "1: movl 64(%4), %%eax\n"
23007+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23008 " .align 2,0x90\n"
23009- "2: movl 0(%4), %%eax\n"
23010- "21: movl 4(%4), %%edx\n"
23011+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23012+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23013 " movnti %%eax, 0(%3)\n"
23014 " movnti %%edx, 4(%3)\n"
23015- "3: movl 8(%4), %%eax\n"
23016- "31: movl 12(%4),%%edx\n"
23017+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23018+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23019 " movnti %%eax, 8(%3)\n"
23020 " movnti %%edx, 12(%3)\n"
23021- "4: movl 16(%4), %%eax\n"
23022- "41: movl 20(%4), %%edx\n"
23023+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23024+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23025 " movnti %%eax, 16(%3)\n"
23026 " movnti %%edx, 20(%3)\n"
23027- "10: movl 24(%4), %%eax\n"
23028- "51: movl 28(%4), %%edx\n"
23029+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23030+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23031 " movnti %%eax, 24(%3)\n"
23032 " movnti %%edx, 28(%3)\n"
23033- "11: movl 32(%4), %%eax\n"
23034- "61: movl 36(%4), %%edx\n"
23035+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23036+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23037 " movnti %%eax, 32(%3)\n"
23038 " movnti %%edx, 36(%3)\n"
23039- "12: movl 40(%4), %%eax\n"
23040- "71: movl 44(%4), %%edx\n"
23041+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23042+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23043 " movnti %%eax, 40(%3)\n"
23044 " movnti %%edx, 44(%3)\n"
23045- "13: movl 48(%4), %%eax\n"
23046- "81: movl 52(%4), %%edx\n"
23047+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23048+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23049 " movnti %%eax, 48(%3)\n"
23050 " movnti %%edx, 52(%3)\n"
23051- "14: movl 56(%4), %%eax\n"
23052- "91: movl 60(%4), %%edx\n"
23053+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23054+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23055 " movnti %%eax, 56(%3)\n"
23056 " movnti %%edx, 60(%3)\n"
23057 " addl $-64, %0\n"
23058@@ -487,9 +604,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23059 " shrl $2, %0\n"
23060 " andl $3, %%eax\n"
23061 " cld\n"
23062- "6: rep; movsl\n"
23063+ "6: rep; "__copyuser_seg" movsl\n"
23064 " movl %%eax,%0\n"
23065- "7: rep; movsb\n"
23066+ "7: rep; "__copyuser_seg" movsb\n"
23067 "8:\n"
23068 ".section .fixup,\"ax\"\n"
23069 "9: lea 0(%%eax,%0,4),%0\n"
23070@@ -531,47 +648,49 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23071 }
23072
23073 static unsigned long __copy_user_intel_nocache(void *to,
23074+ const void __user *from, unsigned long size) __size_overflow(3);
23075+static unsigned long __copy_user_intel_nocache(void *to,
23076 const void __user *from, unsigned long size)
23077 {
23078 int d0, d1;
23079
23080 __asm__ __volatile__(
23081 " .align 2,0x90\n"
23082- "0: movl 32(%4), %%eax\n"
23083+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23084 " cmpl $67, %0\n"
23085 " jbe 2f\n"
23086- "1: movl 64(%4), %%eax\n"
23087+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23088 " .align 2,0x90\n"
23089- "2: movl 0(%4), %%eax\n"
23090- "21: movl 4(%4), %%edx\n"
23091+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23092+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23093 " movnti %%eax, 0(%3)\n"
23094 " movnti %%edx, 4(%3)\n"
23095- "3: movl 8(%4), %%eax\n"
23096- "31: movl 12(%4),%%edx\n"
23097+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23098+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23099 " movnti %%eax, 8(%3)\n"
23100 " movnti %%edx, 12(%3)\n"
23101- "4: movl 16(%4), %%eax\n"
23102- "41: movl 20(%4), %%edx\n"
23103+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23104+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23105 " movnti %%eax, 16(%3)\n"
23106 " movnti %%edx, 20(%3)\n"
23107- "10: movl 24(%4), %%eax\n"
23108- "51: movl 28(%4), %%edx\n"
23109+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23110+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23111 " movnti %%eax, 24(%3)\n"
23112 " movnti %%edx, 28(%3)\n"
23113- "11: movl 32(%4), %%eax\n"
23114- "61: movl 36(%4), %%edx\n"
23115+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23116+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23117 " movnti %%eax, 32(%3)\n"
23118 " movnti %%edx, 36(%3)\n"
23119- "12: movl 40(%4), %%eax\n"
23120- "71: movl 44(%4), %%edx\n"
23121+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23122+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23123 " movnti %%eax, 40(%3)\n"
23124 " movnti %%edx, 44(%3)\n"
23125- "13: movl 48(%4), %%eax\n"
23126- "81: movl 52(%4), %%edx\n"
23127+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23128+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23129 " movnti %%eax, 48(%3)\n"
23130 " movnti %%edx, 52(%3)\n"
23131- "14: movl 56(%4), %%eax\n"
23132- "91: movl 60(%4), %%edx\n"
23133+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23134+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23135 " movnti %%eax, 56(%3)\n"
23136 " movnti %%edx, 60(%3)\n"
23137 " addl $-64, %0\n"
23138@@ -584,9 +703,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
23139 " shrl $2, %0\n"
23140 " andl $3, %%eax\n"
23141 " cld\n"
23142- "6: rep; movsl\n"
23143+ "6: rep; "__copyuser_seg" movsl\n"
23144 " movl %%eax,%0\n"
23145- "7: rep; movsb\n"
23146+ "7: rep; "__copyuser_seg" movsb\n"
23147 "8:\n"
23148 ".section .fixup,\"ax\"\n"
23149 "9: lea 0(%%eax,%0,4),%0\n"
23150@@ -629,32 +748,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
23151 */
23152 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
23153 unsigned long size);
23154-unsigned long __copy_user_intel(void __user *to, const void *from,
23155+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
23156+ unsigned long size);
23157+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
23158 unsigned long size);
23159 unsigned long __copy_user_zeroing_intel_nocache(void *to,
23160 const void __user *from, unsigned long size);
23161 #endif /* CONFIG_X86_INTEL_USERCOPY */
23162
23163 /* Generic arbitrary sized copy. */
23164-#define __copy_user(to, from, size) \
23165+#define __copy_user(to, from, size, prefix, set, restore) \
23166 do { \
23167 int __d0, __d1, __d2; \
23168 __asm__ __volatile__( \
23169+ set \
23170 " cmp $7,%0\n" \
23171 " jbe 1f\n" \
23172 " movl %1,%0\n" \
23173 " negl %0\n" \
23174 " andl $7,%0\n" \
23175 " subl %0,%3\n" \
23176- "4: rep; movsb\n" \
23177+ "4: rep; "prefix"movsb\n" \
23178 " movl %3,%0\n" \
23179 " shrl $2,%0\n" \
23180 " andl $3,%3\n" \
23181 " .align 2,0x90\n" \
23182- "0: rep; movsl\n" \
23183+ "0: rep; "prefix"movsl\n" \
23184 " movl %3,%0\n" \
23185- "1: rep; movsb\n" \
23186+ "1: rep; "prefix"movsb\n" \
23187 "2:\n" \
23188+ restore \
23189 ".section .fixup,\"ax\"\n" \
23190 "5: addl %3,%0\n" \
23191 " jmp 2b\n" \
23192@@ -682,14 +805,14 @@ do { \
23193 " negl %0\n" \
23194 " andl $7,%0\n" \
23195 " subl %0,%3\n" \
23196- "4: rep; movsb\n" \
23197+ "4: rep; "__copyuser_seg"movsb\n" \
23198 " movl %3,%0\n" \
23199 " shrl $2,%0\n" \
23200 " andl $3,%3\n" \
23201 " .align 2,0x90\n" \
23202- "0: rep; movsl\n" \
23203+ "0: rep; "__copyuser_seg"movsl\n" \
23204 " movl %3,%0\n" \
23205- "1: rep; movsb\n" \
23206+ "1: rep; "__copyuser_seg"movsb\n" \
23207 "2:\n" \
23208 ".section .fixup,\"ax\"\n" \
23209 "5: addl %3,%0\n" \
23210@@ -775,9 +898,9 @@ survive:
23211 }
23212 #endif
23213 if (movsl_is_ok(to, from, n))
23214- __copy_user(to, from, n);
23215+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
23216 else
23217- n = __copy_user_intel(to, from, n);
23218+ n = __generic_copy_to_user_intel(to, from, n);
23219 return n;
23220 }
23221 EXPORT_SYMBOL(__copy_to_user_ll);
23222@@ -797,10 +920,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
23223 unsigned long n)
23224 {
23225 if (movsl_is_ok(to, from, n))
23226- __copy_user(to, from, n);
23227+ __copy_user(to, from, n, __copyuser_seg, "", "");
23228 else
23229- n = __copy_user_intel((void __user *)to,
23230- (const void *)from, n);
23231+ n = __generic_copy_from_user_intel(to, from, n);
23232 return n;
23233 }
23234 EXPORT_SYMBOL(__copy_from_user_ll_nozero);
23235@@ -827,65 +949,50 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
23236 if (n > 64 && cpu_has_xmm2)
23237 n = __copy_user_intel_nocache(to, from, n);
23238 else
23239- __copy_user(to, from, n);
23240+ __copy_user(to, from, n, __copyuser_seg, "", "");
23241 #else
23242- __copy_user(to, from, n);
23243+ __copy_user(to, from, n, __copyuser_seg, "", "");
23244 #endif
23245 return n;
23246 }
23247 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
23248
23249-/**
23250- * copy_to_user: - Copy a block of data into user space.
23251- * @to: Destination address, in user space.
23252- * @from: Source address, in kernel space.
23253- * @n: Number of bytes to copy.
23254- *
23255- * Context: User context only. This function may sleep.
23256- *
23257- * Copy data from kernel space to user space.
23258- *
23259- * Returns number of bytes that could not be copied.
23260- * On success, this will be zero.
23261- */
23262-unsigned long
23263-copy_to_user(void __user *to, const void *from, unsigned long n)
23264-{
23265- if (access_ok(VERIFY_WRITE, to, n))
23266- n = __copy_to_user(to, from, n);
23267- return n;
23268-}
23269-EXPORT_SYMBOL(copy_to_user);
23270-
23271-/**
23272- * copy_from_user: - Copy a block of data from user space.
23273- * @to: Destination address, in kernel space.
23274- * @from: Source address, in user space.
23275- * @n: Number of bytes to copy.
23276- *
23277- * Context: User context only. This function may sleep.
23278- *
23279- * Copy data from user space to kernel space.
23280- *
23281- * Returns number of bytes that could not be copied.
23282- * On success, this will be zero.
23283- *
23284- * If some data could not be copied, this function will pad the copied
23285- * data to the requested size using zero bytes.
23286- */
23287-unsigned long
23288-_copy_from_user(void *to, const void __user *from, unsigned long n)
23289-{
23290- if (access_ok(VERIFY_READ, from, n))
23291- n = __copy_from_user(to, from, n);
23292- else
23293- memset(to, 0, n);
23294- return n;
23295-}
23296-EXPORT_SYMBOL(_copy_from_user);
23297-
23298 void copy_from_user_overflow(void)
23299 {
23300 WARN(1, "Buffer overflow detected!\n");
23301 }
23302 EXPORT_SYMBOL(copy_from_user_overflow);
23303+
23304+void copy_to_user_overflow(void)
23305+{
23306+ WARN(1, "Buffer overflow detected!\n");
23307+}
23308+EXPORT_SYMBOL(copy_to_user_overflow);
23309+
23310+#ifdef CONFIG_PAX_MEMORY_UDEREF
23311+void __set_fs(mm_segment_t x)
23312+{
23313+ switch (x.seg) {
23314+ case 0:
23315+ loadsegment(gs, 0);
23316+ break;
23317+ case TASK_SIZE_MAX:
23318+ loadsegment(gs, __USER_DS);
23319+ break;
23320+ case -1UL:
23321+ loadsegment(gs, __KERNEL_DS);
23322+ break;
23323+ default:
23324+ BUG();
23325+ }
23326+ return;
23327+}
23328+EXPORT_SYMBOL(__set_fs);
23329+
23330+void set_fs(mm_segment_t x)
23331+{
23332+ current_thread_info()->addr_limit = x;
23333+ __set_fs(x);
23334+}
23335+EXPORT_SYMBOL(set_fs);
23336+#endif
23337diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
23338index b7c2849..bab76d3 100644
23339--- a/arch/x86/lib/usercopy_64.c
23340+++ b/arch/x86/lib/usercopy_64.c
23341@@ -39,16 +39,22 @@ do { \
23342 } while (0)
23343
23344 long
23345-__strncpy_from_user(char *dst, const char __user *src, long count)
23346+__strncpy_from_user(char *dst, const char __user *src, unsigned long count)
23347 {
23348 long res;
23349+
23350+#ifdef CONFIG_PAX_MEMORY_UDEREF
23351+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
23352+ src += PAX_USER_SHADOW_BASE;
23353+#endif
23354+
23355 __do_strncpy_from_user(dst, src, count, res);
23356 return res;
23357 }
23358 EXPORT_SYMBOL(__strncpy_from_user);
23359
23360 long
23361-strncpy_from_user(char *dst, const char __user *src, long count)
23362+strncpy_from_user(char *dst, const char __user *src, unsigned long count)
23363 {
23364 long res = -EFAULT;
23365 if (access_ok(VERIFY_READ, src, 1))
23366@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
23367 {
23368 long __d0;
23369 might_fault();
23370+
23371+#ifdef CONFIG_PAX_MEMORY_UDEREF
23372+ if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
23373+ addr += PAX_USER_SHADOW_BASE;
23374+#endif
23375+
23376 /* no memory constraint because it doesn't change any memory gcc knows
23377 about */
23378 asm volatile(
23379@@ -107,7 +119,7 @@ EXPORT_SYMBOL(clear_user);
23380 * Return 0 on exception, a value greater than N if too long
23381 */
23382
23383-long __strnlen_user(const char __user *s, long n)
23384+long __strnlen_user(const char __user *s, unsigned long n)
23385 {
23386 long res = 0;
23387 char c;
23388@@ -125,7 +137,7 @@ long __strnlen_user(const char __user *s, long n)
23389 }
23390 EXPORT_SYMBOL(__strnlen_user);
23391
23392-long strnlen_user(const char __user *s, long n)
23393+long strnlen_user(const char __user *s, unsigned long n)
23394 {
23395 if (!access_ok(VERIFY_READ, s, 1))
23396 return 0;
23397@@ -149,12 +161,20 @@ long strlen_user(const char __user *s)
23398 }
23399 EXPORT_SYMBOL(strlen_user);
23400
23401-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
23402+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
23403 {
23404- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23405- return copy_user_generic((__force void *)to, (__force void *)from, len);
23406- }
23407- return len;
23408+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23409+
23410+#ifdef CONFIG_PAX_MEMORY_UDEREF
23411+ if ((unsigned long)to < PAX_USER_SHADOW_BASE)
23412+ to += PAX_USER_SHADOW_BASE;
23413+ if ((unsigned long)from < PAX_USER_SHADOW_BASE)
23414+ from += PAX_USER_SHADOW_BASE;
23415+#endif
23416+
23417+ return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
23418+ }
23419+ return len;
23420 }
23421 EXPORT_SYMBOL(copy_in_user);
23422
23423@@ -164,7 +184,7 @@ EXPORT_SYMBOL(copy_in_user);
23424 * it is not necessary to optimize tail handling.
23425 */
23426 unsigned long
23427-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
23428+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
23429 {
23430 char c;
23431 unsigned zero_len;
23432diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
23433index d0474ad..36e9257 100644
23434--- a/arch/x86/mm/extable.c
23435+++ b/arch/x86/mm/extable.c
23436@@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs)
23437 const struct exception_table_entry *fixup;
23438
23439 #ifdef CONFIG_PNPBIOS
23440- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
23441+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
23442 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
23443 extern u32 pnp_bios_is_utter_crap;
23444 pnp_bios_is_utter_crap = 1;
23445diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
23446index 5db0490..2ddce45 100644
23447--- a/arch/x86/mm/fault.c
23448+++ b/arch/x86/mm/fault.c
23449@@ -13,11 +13,18 @@
23450 #include <linux/perf_event.h> /* perf_sw_event */
23451 #include <linux/hugetlb.h> /* hstate_index_to_shift */
23452 #include <linux/prefetch.h> /* prefetchw */
23453+#include <linux/unistd.h>
23454+#include <linux/compiler.h>
23455
23456 #include <asm/traps.h> /* dotraplinkage, ... */
23457 #include <asm/pgalloc.h> /* pgd_*(), ... */
23458 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
23459 #include <asm/fixmap.h> /* VSYSCALL_START */
23460+#include <asm/tlbflush.h>
23461+
23462+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23463+#include <asm/stacktrace.h>
23464+#endif
23465
23466 /*
23467 * Page fault error code bits:
23468@@ -55,7 +62,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
23469 int ret = 0;
23470
23471 /* kprobe_running() needs smp_processor_id() */
23472- if (kprobes_built_in() && !user_mode_vm(regs)) {
23473+ if (kprobes_built_in() && !user_mode(regs)) {
23474 preempt_disable();
23475 if (kprobe_running() && kprobe_fault_handler(regs, 14))
23476 ret = 1;
23477@@ -116,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
23478 return !instr_lo || (instr_lo>>1) == 1;
23479 case 0x00:
23480 /* Prefetch instruction is 0x0F0D or 0x0F18 */
23481- if (probe_kernel_address(instr, opcode))
23482+ if (user_mode(regs)) {
23483+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23484+ return 0;
23485+ } else if (probe_kernel_address(instr, opcode))
23486 return 0;
23487
23488 *prefetch = (instr_lo == 0xF) &&
23489@@ -150,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
23490 while (instr < max_instr) {
23491 unsigned char opcode;
23492
23493- if (probe_kernel_address(instr, opcode))
23494+ if (user_mode(regs)) {
23495+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23496+ break;
23497+ } else if (probe_kernel_address(instr, opcode))
23498 break;
23499
23500 instr++;
23501@@ -181,6 +194,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
23502 force_sig_info(si_signo, &info, tsk);
23503 }
23504
23505+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23506+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
23507+#endif
23508+
23509+#ifdef CONFIG_PAX_EMUTRAMP
23510+static int pax_handle_fetch_fault(struct pt_regs *regs);
23511+#endif
23512+
23513+#ifdef CONFIG_PAX_PAGEEXEC
23514+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
23515+{
23516+ pgd_t *pgd;
23517+ pud_t *pud;
23518+ pmd_t *pmd;
23519+
23520+ pgd = pgd_offset(mm, address);
23521+ if (!pgd_present(*pgd))
23522+ return NULL;
23523+ pud = pud_offset(pgd, address);
23524+ if (!pud_present(*pud))
23525+ return NULL;
23526+ pmd = pmd_offset(pud, address);
23527+ if (!pmd_present(*pmd))
23528+ return NULL;
23529+ return pmd;
23530+}
23531+#endif
23532+
23533 DEFINE_SPINLOCK(pgd_lock);
23534 LIST_HEAD(pgd_list);
23535
23536@@ -231,10 +272,22 @@ void vmalloc_sync_all(void)
23537 for (address = VMALLOC_START & PMD_MASK;
23538 address >= TASK_SIZE && address < FIXADDR_TOP;
23539 address += PMD_SIZE) {
23540+
23541+#ifdef CONFIG_PAX_PER_CPU_PGD
23542+ unsigned long cpu;
23543+#else
23544 struct page *page;
23545+#endif
23546
23547 spin_lock(&pgd_lock);
23548+
23549+#ifdef CONFIG_PAX_PER_CPU_PGD
23550+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
23551+ pgd_t *pgd = get_cpu_pgd(cpu);
23552+ pmd_t *ret;
23553+#else
23554 list_for_each_entry(page, &pgd_list, lru) {
23555+ pgd_t *pgd = page_address(page);
23556 spinlock_t *pgt_lock;
23557 pmd_t *ret;
23558
23559@@ -242,8 +295,13 @@ void vmalloc_sync_all(void)
23560 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
23561
23562 spin_lock(pgt_lock);
23563- ret = vmalloc_sync_one(page_address(page), address);
23564+#endif
23565+
23566+ ret = vmalloc_sync_one(pgd, address);
23567+
23568+#ifndef CONFIG_PAX_PER_CPU_PGD
23569 spin_unlock(pgt_lock);
23570+#endif
23571
23572 if (!ret)
23573 break;
23574@@ -277,6 +335,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23575 * an interrupt in the middle of a task switch..
23576 */
23577 pgd_paddr = read_cr3();
23578+
23579+#ifdef CONFIG_PAX_PER_CPU_PGD
23580+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
23581+#endif
23582+
23583 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
23584 if (!pmd_k)
23585 return -1;
23586@@ -372,7 +435,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23587 * happen within a race in page table update. In the later
23588 * case just flush:
23589 */
23590+
23591+#ifdef CONFIG_PAX_PER_CPU_PGD
23592+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
23593+ pgd = pgd_offset_cpu(smp_processor_id(), address);
23594+#else
23595 pgd = pgd_offset(current->active_mm, address);
23596+#endif
23597+
23598 pgd_ref = pgd_offset_k(address);
23599 if (pgd_none(*pgd_ref))
23600 return -1;
23601@@ -540,7 +610,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
23602 static int is_errata100(struct pt_regs *regs, unsigned long address)
23603 {
23604 #ifdef CONFIG_X86_64
23605- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
23606+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
23607 return 1;
23608 #endif
23609 return 0;
23610@@ -567,7 +637,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
23611 }
23612
23613 static const char nx_warning[] = KERN_CRIT
23614-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
23615+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
23616
23617 static void
23618 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23619@@ -576,15 +646,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23620 if (!oops_may_print())
23621 return;
23622
23623- if (error_code & PF_INSTR) {
23624+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
23625 unsigned int level;
23626
23627 pte_t *pte = lookup_address(address, &level);
23628
23629 if (pte && pte_present(*pte) && !pte_exec(*pte))
23630- printk(nx_warning, current_uid());
23631+ printk(nx_warning, current_uid(), current->comm, task_pid_nr(current));
23632 }
23633
23634+#ifdef CONFIG_PAX_KERNEXEC
23635+ if (init_mm.start_code <= address && address < init_mm.end_code) {
23636+ if (current->signal->curr_ip)
23637+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23638+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
23639+ else
23640+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23641+ current->comm, task_pid_nr(current), current_uid(), current_euid());
23642+ }
23643+#endif
23644+
23645 printk(KERN_ALERT "BUG: unable to handle kernel ");
23646 if (address < PAGE_SIZE)
23647 printk(KERN_CONT "NULL pointer dereference");
23648@@ -739,6 +820,21 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
23649 }
23650 #endif
23651
23652+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23653+ if (pax_is_fetch_fault(regs, error_code, address)) {
23654+
23655+#ifdef CONFIG_PAX_EMUTRAMP
23656+ switch (pax_handle_fetch_fault(regs)) {
23657+ case 2:
23658+ return;
23659+ }
23660+#endif
23661+
23662+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23663+ do_group_exit(SIGKILL);
23664+ }
23665+#endif
23666+
23667 if (unlikely(show_unhandled_signals))
23668 show_signal_msg(regs, error_code, address, tsk);
23669
23670@@ -835,7 +931,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
23671 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
23672 printk(KERN_ERR
23673 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
23674- tsk->comm, tsk->pid, address);
23675+ tsk->comm, task_pid_nr(tsk), address);
23676 code = BUS_MCEERR_AR;
23677 }
23678 #endif
23679@@ -890,6 +986,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
23680 return 1;
23681 }
23682
23683+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
23684+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
23685+{
23686+ pte_t *pte;
23687+ pmd_t *pmd;
23688+ spinlock_t *ptl;
23689+ unsigned char pte_mask;
23690+
23691+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
23692+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
23693+ return 0;
23694+
23695+ /* PaX: it's our fault, let's handle it if we can */
23696+
23697+ /* PaX: take a look at read faults before acquiring any locks */
23698+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
23699+ /* instruction fetch attempt from a protected page in user mode */
23700+ up_read(&mm->mmap_sem);
23701+
23702+#ifdef CONFIG_PAX_EMUTRAMP
23703+ switch (pax_handle_fetch_fault(regs)) {
23704+ case 2:
23705+ return 1;
23706+ }
23707+#endif
23708+
23709+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23710+ do_group_exit(SIGKILL);
23711+ }
23712+
23713+ pmd = pax_get_pmd(mm, address);
23714+ if (unlikely(!pmd))
23715+ return 0;
23716+
23717+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
23718+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
23719+ pte_unmap_unlock(pte, ptl);
23720+ return 0;
23721+ }
23722+
23723+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
23724+ /* write attempt to a protected page in user mode */
23725+ pte_unmap_unlock(pte, ptl);
23726+ return 0;
23727+ }
23728+
23729+#ifdef CONFIG_SMP
23730+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
23731+#else
23732+ if (likely(address > get_limit(regs->cs)))
23733+#endif
23734+ {
23735+ set_pte(pte, pte_mkread(*pte));
23736+ __flush_tlb_one(address);
23737+ pte_unmap_unlock(pte, ptl);
23738+ up_read(&mm->mmap_sem);
23739+ return 1;
23740+ }
23741+
23742+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
23743+
23744+ /*
23745+ * PaX: fill DTLB with user rights and retry
23746+ */
23747+ __asm__ __volatile__ (
23748+ "orb %2,(%1)\n"
23749+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
23750+/*
23751+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
23752+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
23753+ * page fault when examined during a TLB load attempt. this is true not only
23754+ * for PTEs holding a non-present entry but also present entries that will
23755+ * raise a page fault (such as those set up by PaX, or the copy-on-write
23756+ * mechanism). in effect it means that we do *not* need to flush the TLBs
23757+ * for our target pages since their PTEs are simply not in the TLBs at all.
23758+
23759+ * the best thing in omitting it is that we gain around 15-20% speed in the
23760+ * fast path of the page fault handler and can get rid of tracing since we
23761+ * can no longer flush unintended entries.
23762+ */
23763+ "invlpg (%0)\n"
23764+#endif
23765+ __copyuser_seg"testb $0,(%0)\n"
23766+ "xorb %3,(%1)\n"
23767+ :
23768+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
23769+ : "memory", "cc");
23770+ pte_unmap_unlock(pte, ptl);
23771+ up_read(&mm->mmap_sem);
23772+ return 1;
23773+}
23774+#endif
23775+
23776 /*
23777 * Handle a spurious fault caused by a stale TLB entry.
23778 *
23779@@ -962,6 +1151,9 @@ int show_unhandled_signals = 1;
23780 static inline int
23781 access_error(unsigned long error_code, struct vm_area_struct *vma)
23782 {
23783+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
23784+ return 1;
23785+
23786 if (error_code & PF_WRITE) {
23787 /* write, present and write, not present: */
23788 if (unlikely(!(vma->vm_flags & VM_WRITE)))
23789@@ -995,18 +1187,32 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
23790 {
23791 struct vm_area_struct *vma;
23792 struct task_struct *tsk;
23793- unsigned long address;
23794 struct mm_struct *mm;
23795 int fault;
23796 int write = error_code & PF_WRITE;
23797 unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
23798 (write ? FAULT_FLAG_WRITE : 0);
23799
23800- tsk = current;
23801- mm = tsk->mm;
23802-
23803 /* Get the faulting address: */
23804- address = read_cr2();
23805+ unsigned long address = read_cr2();
23806+
23807+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23808+ if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
23809+ if (!search_exception_tables(regs->ip)) {
23810+ bad_area_nosemaphore(regs, error_code, address);
23811+ return;
23812+ }
23813+ if (address < PAX_USER_SHADOW_BASE) {
23814+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
23815+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
23816+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
23817+ } else
23818+ address -= PAX_USER_SHADOW_BASE;
23819+ }
23820+#endif
23821+
23822+ tsk = current;
23823+ mm = tsk->mm;
23824
23825 /*
23826 * Detect and handle instructions that would cause a page fault for
23827@@ -1067,7 +1273,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
23828 * User-mode registers count as a user access even for any
23829 * potential system fault or CPU buglet:
23830 */
23831- if (user_mode_vm(regs)) {
23832+ if (user_mode(regs)) {
23833 local_irq_enable();
23834 error_code |= PF_USER;
23835 } else {
23836@@ -1122,6 +1328,11 @@ retry:
23837 might_sleep();
23838 }
23839
23840+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
23841+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
23842+ return;
23843+#endif
23844+
23845 vma = find_vma(mm, address);
23846 if (unlikely(!vma)) {
23847 bad_area(regs, error_code, address);
23848@@ -1133,18 +1344,24 @@ retry:
23849 bad_area(regs, error_code, address);
23850 return;
23851 }
23852- if (error_code & PF_USER) {
23853- /*
23854- * Accessing the stack below %sp is always a bug.
23855- * The large cushion allows instructions like enter
23856- * and pusha to work. ("enter $65535, $31" pushes
23857- * 32 pointers and then decrements %sp by 65535.)
23858- */
23859- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
23860- bad_area(regs, error_code, address);
23861- return;
23862- }
23863+ /*
23864+ * Accessing the stack below %sp is always a bug.
23865+ * The large cushion allows instructions like enter
23866+ * and pusha to work. ("enter $65535, $31" pushes
23867+ * 32 pointers and then decrements %sp by 65535.)
23868+ */
23869+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
23870+ bad_area(regs, error_code, address);
23871+ return;
23872 }
23873+
23874+#ifdef CONFIG_PAX_SEGMEXEC
23875+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
23876+ bad_area(regs, error_code, address);
23877+ return;
23878+ }
23879+#endif
23880+
23881 if (unlikely(expand_stack(vma, address))) {
23882 bad_area(regs, error_code, address);
23883 return;
23884@@ -1199,3 +1416,292 @@ good_area:
23885
23886 up_read(&mm->mmap_sem);
23887 }
23888+
23889+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23890+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
23891+{
23892+ struct mm_struct *mm = current->mm;
23893+ unsigned long ip = regs->ip;
23894+
23895+ if (v8086_mode(regs))
23896+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
23897+
23898+#ifdef CONFIG_PAX_PAGEEXEC
23899+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
23900+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
23901+ return true;
23902+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
23903+ return true;
23904+ return false;
23905+ }
23906+#endif
23907+
23908+#ifdef CONFIG_PAX_SEGMEXEC
23909+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
23910+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
23911+ return true;
23912+ return false;
23913+ }
23914+#endif
23915+
23916+ return false;
23917+}
23918+#endif
23919+
23920+#ifdef CONFIG_PAX_EMUTRAMP
23921+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
23922+{
23923+ int err;
23924+
23925+ do { /* PaX: libffi trampoline emulation */
23926+ unsigned char mov, jmp;
23927+ unsigned int addr1, addr2;
23928+
23929+#ifdef CONFIG_X86_64
23930+ if ((regs->ip + 9) >> 32)
23931+ break;
23932+#endif
23933+
23934+ err = get_user(mov, (unsigned char __user *)regs->ip);
23935+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23936+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
23937+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23938+
23939+ if (err)
23940+ break;
23941+
23942+ if (mov == 0xB8 && jmp == 0xE9) {
23943+ regs->ax = addr1;
23944+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
23945+ return 2;
23946+ }
23947+ } while (0);
23948+
23949+ do { /* PaX: gcc trampoline emulation #1 */
23950+ unsigned char mov1, mov2;
23951+ unsigned short jmp;
23952+ unsigned int addr1, addr2;
23953+
23954+#ifdef CONFIG_X86_64
23955+ if ((regs->ip + 11) >> 32)
23956+ break;
23957+#endif
23958+
23959+ err = get_user(mov1, (unsigned char __user *)regs->ip);
23960+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23961+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
23962+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23963+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
23964+
23965+ if (err)
23966+ break;
23967+
23968+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
23969+ regs->cx = addr1;
23970+ regs->ax = addr2;
23971+ regs->ip = addr2;
23972+ return 2;
23973+ }
23974+ } while (0);
23975+
23976+ do { /* PaX: gcc trampoline emulation #2 */
23977+ unsigned char mov, jmp;
23978+ unsigned int addr1, addr2;
23979+
23980+#ifdef CONFIG_X86_64
23981+ if ((regs->ip + 9) >> 32)
23982+ break;
23983+#endif
23984+
23985+ err = get_user(mov, (unsigned char __user *)regs->ip);
23986+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23987+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
23988+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23989+
23990+ if (err)
23991+ break;
23992+
23993+ if (mov == 0xB9 && jmp == 0xE9) {
23994+ regs->cx = addr1;
23995+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
23996+ return 2;
23997+ }
23998+ } while (0);
23999+
24000+ return 1; /* PaX in action */
24001+}
24002+
24003+#ifdef CONFIG_X86_64
24004+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
24005+{
24006+ int err;
24007+
24008+ do { /* PaX: libffi trampoline emulation */
24009+ unsigned short mov1, mov2, jmp1;
24010+ unsigned char stcclc, jmp2;
24011+ unsigned long addr1, addr2;
24012+
24013+ err = get_user(mov1, (unsigned short __user *)regs->ip);
24014+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
24015+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
24016+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
24017+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
24018+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
24019+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
24020+
24021+ if (err)
24022+ break;
24023+
24024+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24025+ regs->r11 = addr1;
24026+ regs->r10 = addr2;
24027+ if (stcclc == 0xF8)
24028+ regs->flags &= ~X86_EFLAGS_CF;
24029+ else
24030+ regs->flags |= X86_EFLAGS_CF;
24031+ regs->ip = addr1;
24032+ return 2;
24033+ }
24034+ } while (0);
24035+
24036+ do { /* PaX: gcc trampoline emulation #1 */
24037+ unsigned short mov1, mov2, jmp1;
24038+ unsigned char jmp2;
24039+ unsigned int addr1;
24040+ unsigned long addr2;
24041+
24042+ err = get_user(mov1, (unsigned short __user *)regs->ip);
24043+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
24044+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
24045+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
24046+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
24047+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
24048+
24049+ if (err)
24050+ break;
24051+
24052+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24053+ regs->r11 = addr1;
24054+ regs->r10 = addr2;
24055+ regs->ip = addr1;
24056+ return 2;
24057+ }
24058+ } while (0);
24059+
24060+ do { /* PaX: gcc trampoline emulation #2 */
24061+ unsigned short mov1, mov2, jmp1;
24062+ unsigned char jmp2;
24063+ unsigned long addr1, addr2;
24064+
24065+ err = get_user(mov1, (unsigned short __user *)regs->ip);
24066+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
24067+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
24068+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
24069+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
24070+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
24071+
24072+ if (err)
24073+ break;
24074+
24075+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24076+ regs->r11 = addr1;
24077+ regs->r10 = addr2;
24078+ regs->ip = addr1;
24079+ return 2;
24080+ }
24081+ } while (0);
24082+
24083+ return 1; /* PaX in action */
24084+}
24085+#endif
24086+
24087+/*
24088+ * PaX: decide what to do with offenders (regs->ip = fault address)
24089+ *
24090+ * returns 1 when task should be killed
24091+ * 2 when gcc trampoline was detected
24092+ */
24093+static int pax_handle_fetch_fault(struct pt_regs *regs)
24094+{
24095+ if (v8086_mode(regs))
24096+ return 1;
24097+
24098+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
24099+ return 1;
24100+
24101+#ifdef CONFIG_X86_32
24102+ return pax_handle_fetch_fault_32(regs);
24103+#else
24104+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
24105+ return pax_handle_fetch_fault_32(regs);
24106+ else
24107+ return pax_handle_fetch_fault_64(regs);
24108+#endif
24109+}
24110+#endif
24111+
24112+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24113+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
24114+{
24115+ long i;
24116+
24117+ printk(KERN_ERR "PAX: bytes at PC: ");
24118+ for (i = 0; i < 20; i++) {
24119+ unsigned char c;
24120+ if (get_user(c, (unsigned char __force_user *)pc+i))
24121+ printk(KERN_CONT "?? ");
24122+ else
24123+ printk(KERN_CONT "%02x ", c);
24124+ }
24125+ printk("\n");
24126+
24127+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
24128+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
24129+ unsigned long c;
24130+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
24131+#ifdef CONFIG_X86_32
24132+ printk(KERN_CONT "???????? ");
24133+#else
24134+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
24135+ printk(KERN_CONT "???????? ???????? ");
24136+ else
24137+ printk(KERN_CONT "???????????????? ");
24138+#endif
24139+ } else {
24140+#ifdef CONFIG_X86_64
24141+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
24142+ printk(KERN_CONT "%08x ", (unsigned int)c);
24143+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
24144+ } else
24145+#endif
24146+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
24147+ }
24148+ }
24149+ printk("\n");
24150+}
24151+#endif
24152+
24153+/**
24154+ * probe_kernel_write(): safely attempt to write to a location
24155+ * @dst: address to write to
24156+ * @src: pointer to the data that shall be written
24157+ * @size: size of the data chunk
24158+ *
24159+ * Safely write to address @dst from the buffer at @src. If a kernel fault
24160+ * happens, handle that and return -EFAULT.
24161+ */
24162+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
24163+{
24164+ long ret;
24165+ mm_segment_t old_fs = get_fs();
24166+
24167+ set_fs(KERNEL_DS);
24168+ pagefault_disable();
24169+ pax_open_kernel();
24170+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
24171+ pax_close_kernel();
24172+ pagefault_enable();
24173+ set_fs(old_fs);
24174+
24175+ return ret ? -EFAULT : 0;
24176+}
24177diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
24178index dd74e46..7d26398 100644
24179--- a/arch/x86/mm/gup.c
24180+++ b/arch/x86/mm/gup.c
24181@@ -255,7 +255,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
24182 addr = start;
24183 len = (unsigned long) nr_pages << PAGE_SHIFT;
24184 end = start + len;
24185- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24186+ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24187 (void __user *)start, len)))
24188 return 0;
24189
24190diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
24191index f4f29b1..5cac4fb 100644
24192--- a/arch/x86/mm/highmem_32.c
24193+++ b/arch/x86/mm/highmem_32.c
24194@@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
24195 idx = type + KM_TYPE_NR*smp_processor_id();
24196 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
24197 BUG_ON(!pte_none(*(kmap_pte-idx)));
24198+
24199+ pax_open_kernel();
24200 set_pte(kmap_pte-idx, mk_pte(page, prot));
24201+ pax_close_kernel();
24202+
24203 arch_flush_lazy_mmu_mode();
24204
24205 return (void *)vaddr;
24206diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
24207index f581a18..29efd37 100644
24208--- a/arch/x86/mm/hugetlbpage.c
24209+++ b/arch/x86/mm/hugetlbpage.c
24210@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
24211 struct hstate *h = hstate_file(file);
24212 struct mm_struct *mm = current->mm;
24213 struct vm_area_struct *vma;
24214- unsigned long start_addr;
24215+ unsigned long start_addr, pax_task_size = TASK_SIZE;
24216+
24217+#ifdef CONFIG_PAX_SEGMEXEC
24218+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24219+ pax_task_size = SEGMEXEC_TASK_SIZE;
24220+#endif
24221+
24222+ pax_task_size -= PAGE_SIZE;
24223
24224 if (len > mm->cached_hole_size) {
24225- start_addr = mm->free_area_cache;
24226+ start_addr = mm->free_area_cache;
24227 } else {
24228- start_addr = TASK_UNMAPPED_BASE;
24229- mm->cached_hole_size = 0;
24230+ start_addr = mm->mmap_base;
24231+ mm->cached_hole_size = 0;
24232 }
24233
24234 full_search:
24235@@ -280,26 +287,27 @@ full_search:
24236
24237 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
24238 /* At this point: (!vma || addr < vma->vm_end). */
24239- if (TASK_SIZE - len < addr) {
24240+ if (pax_task_size - len < addr) {
24241 /*
24242 * Start a new search - just in case we missed
24243 * some holes.
24244 */
24245- if (start_addr != TASK_UNMAPPED_BASE) {
24246- start_addr = TASK_UNMAPPED_BASE;
24247+ if (start_addr != mm->mmap_base) {
24248+ start_addr = mm->mmap_base;
24249 mm->cached_hole_size = 0;
24250 goto full_search;
24251 }
24252 return -ENOMEM;
24253 }
24254- if (!vma || addr + len <= vma->vm_start) {
24255- mm->free_area_cache = addr + len;
24256- return addr;
24257- }
24258+ if (check_heap_stack_gap(vma, addr, len))
24259+ break;
24260 if (addr + mm->cached_hole_size < vma->vm_start)
24261 mm->cached_hole_size = vma->vm_start - addr;
24262 addr = ALIGN(vma->vm_end, huge_page_size(h));
24263 }
24264+
24265+ mm->free_area_cache = addr + len;
24266+ return addr;
24267 }
24268
24269 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24270@@ -308,10 +316,9 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24271 {
24272 struct hstate *h = hstate_file(file);
24273 struct mm_struct *mm = current->mm;
24274- struct vm_area_struct *vma, *prev_vma;
24275- unsigned long base = mm->mmap_base, addr = addr0;
24276+ struct vm_area_struct *vma;
24277+ unsigned long base = mm->mmap_base, addr;
24278 unsigned long largest_hole = mm->cached_hole_size;
24279- int first_time = 1;
24280
24281 /* don't allow allocations above current base */
24282 if (mm->free_area_cache > base)
24283@@ -321,64 +328,63 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24284 largest_hole = 0;
24285 mm->free_area_cache = base;
24286 }
24287-try_again:
24288+
24289 /* make sure it can fit in the remaining address space */
24290 if (mm->free_area_cache < len)
24291 goto fail;
24292
24293 /* either no address requested or can't fit in requested address hole */
24294- addr = (mm->free_area_cache - len) & huge_page_mask(h);
24295+ addr = (mm->free_area_cache - len);
24296 do {
24297+ addr &= huge_page_mask(h);
24298+ vma = find_vma(mm, addr);
24299 /*
24300 * Lookup failure means no vma is above this address,
24301 * i.e. return with success:
24302- */
24303- if (!(vma = find_vma_prev(mm, addr, &prev_vma)))
24304- return addr;
24305-
24306- /*
24307 * new region fits between prev_vma->vm_end and
24308 * vma->vm_start, use it:
24309 */
24310- if (addr + len <= vma->vm_start &&
24311- (!prev_vma || (addr >= prev_vma->vm_end))) {
24312+ if (check_heap_stack_gap(vma, addr, len)) {
24313 /* remember the address as a hint for next time */
24314- mm->cached_hole_size = largest_hole;
24315- return (mm->free_area_cache = addr);
24316- } else {
24317- /* pull free_area_cache down to the first hole */
24318- if (mm->free_area_cache == vma->vm_end) {
24319- mm->free_area_cache = vma->vm_start;
24320- mm->cached_hole_size = largest_hole;
24321- }
24322+ mm->cached_hole_size = largest_hole;
24323+ return (mm->free_area_cache = addr);
24324+ }
24325+ /* pull free_area_cache down to the first hole */
24326+ if (mm->free_area_cache == vma->vm_end) {
24327+ mm->free_area_cache = vma->vm_start;
24328+ mm->cached_hole_size = largest_hole;
24329 }
24330
24331 /* remember the largest hole we saw so far */
24332 if (addr + largest_hole < vma->vm_start)
24333- largest_hole = vma->vm_start - addr;
24334+ largest_hole = vma->vm_start - addr;
24335
24336 /* try just below the current vma->vm_start */
24337- addr = (vma->vm_start - len) & huge_page_mask(h);
24338- } while (len <= vma->vm_start);
24339+ addr = skip_heap_stack_gap(vma, len);
24340+ } while (!IS_ERR_VALUE(addr));
24341
24342 fail:
24343 /*
24344- * if hint left us with no space for the requested
24345- * mapping then try again:
24346- */
24347- if (first_time) {
24348- mm->free_area_cache = base;
24349- largest_hole = 0;
24350- first_time = 0;
24351- goto try_again;
24352- }
24353- /*
24354 * A failed mmap() very likely causes application failure,
24355 * so fall back to the bottom-up function here. This scenario
24356 * can happen with large stack limits and large mmap()
24357 * allocations.
24358 */
24359- mm->free_area_cache = TASK_UNMAPPED_BASE;
24360+
24361+#ifdef CONFIG_PAX_SEGMEXEC
24362+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24363+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
24364+ else
24365+#endif
24366+
24367+ mm->mmap_base = TASK_UNMAPPED_BASE;
24368+
24369+#ifdef CONFIG_PAX_RANDMMAP
24370+ if (mm->pax_flags & MF_PAX_RANDMMAP)
24371+ mm->mmap_base += mm->delta_mmap;
24372+#endif
24373+
24374+ mm->free_area_cache = mm->mmap_base;
24375 mm->cached_hole_size = ~0UL;
24376 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
24377 len, pgoff, flags);
24378@@ -386,6 +392,7 @@ fail:
24379 /*
24380 * Restore the topdown base:
24381 */
24382+ mm->mmap_base = base;
24383 mm->free_area_cache = base;
24384 mm->cached_hole_size = ~0UL;
24385
24386@@ -399,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24387 struct hstate *h = hstate_file(file);
24388 struct mm_struct *mm = current->mm;
24389 struct vm_area_struct *vma;
24390+ unsigned long pax_task_size = TASK_SIZE;
24391
24392 if (len & ~huge_page_mask(h))
24393 return -EINVAL;
24394- if (len > TASK_SIZE)
24395+
24396+#ifdef CONFIG_PAX_SEGMEXEC
24397+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24398+ pax_task_size = SEGMEXEC_TASK_SIZE;
24399+#endif
24400+
24401+ pax_task_size -= PAGE_SIZE;
24402+
24403+ if (len > pax_task_size)
24404 return -ENOMEM;
24405
24406 if (flags & MAP_FIXED) {
24407@@ -414,8 +430,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24408 if (addr) {
24409 addr = ALIGN(addr, huge_page_size(h));
24410 vma = find_vma(mm, addr);
24411- if (TASK_SIZE - len >= addr &&
24412- (!vma || addr + len <= vma->vm_start))
24413+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
24414 return addr;
24415 }
24416 if (mm->get_unmapped_area == arch_get_unmapped_area)
24417diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
24418index 87488b9..399f416 100644
24419--- a/arch/x86/mm/init.c
24420+++ b/arch/x86/mm/init.c
24421@@ -15,6 +15,7 @@
24422 #include <asm/tlbflush.h>
24423 #include <asm/tlb.h>
24424 #include <asm/proto.h>
24425+#include <asm/desc.h>
24426
24427 unsigned long __initdata pgt_buf_start;
24428 unsigned long __meminitdata pgt_buf_end;
24429@@ -31,7 +32,7 @@ int direct_gbpages
24430 static void __init find_early_table_space(unsigned long end, int use_pse,
24431 int use_gbpages)
24432 {
24433- unsigned long puds, pmds, ptes, tables, start = 0, good_end = end;
24434+ unsigned long puds, pmds, ptes, tables, start = 0x100000, good_end = end;
24435 phys_addr_t base;
24436
24437 puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
24438@@ -312,8 +313,29 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
24439 */
24440 int devmem_is_allowed(unsigned long pagenr)
24441 {
24442+#ifdef CONFIG_GRKERNSEC_KMEM
24443+ /* allow BDA */
24444+ if (!pagenr)
24445+ return 1;
24446+ /* allow EBDA */
24447+ if ((0x9f000 >> PAGE_SHIFT) == pagenr)
24448+ return 1;
24449+#else
24450+ if (!pagenr)
24451+ return 1;
24452+#ifdef CONFIG_VM86
24453+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
24454+ return 1;
24455+#endif
24456+#endif
24457+
24458+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
24459+ return 1;
24460+#ifdef CONFIG_GRKERNSEC_KMEM
24461+ /* throw out everything else below 1MB */
24462 if (pagenr <= 256)
24463- return 1;
24464+ return 0;
24465+#endif
24466 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
24467 return 0;
24468 if (!page_is_ram(pagenr))
24469@@ -372,6 +394,86 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
24470
24471 void free_initmem(void)
24472 {
24473+
24474+#ifdef CONFIG_PAX_KERNEXEC
24475+#ifdef CONFIG_X86_32
24476+ /* PaX: limit KERNEL_CS to actual size */
24477+ unsigned long addr, limit;
24478+ struct desc_struct d;
24479+ int cpu;
24480+
24481+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
24482+ limit = (limit - 1UL) >> PAGE_SHIFT;
24483+
24484+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
24485+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
24486+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
24487+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
24488+ }
24489+
24490+ /* PaX: make KERNEL_CS read-only */
24491+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
24492+ if (!paravirt_enabled())
24493+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
24494+/*
24495+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
24496+ pgd = pgd_offset_k(addr);
24497+ pud = pud_offset(pgd, addr);
24498+ pmd = pmd_offset(pud, addr);
24499+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24500+ }
24501+*/
24502+#ifdef CONFIG_X86_PAE
24503+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
24504+/*
24505+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
24506+ pgd = pgd_offset_k(addr);
24507+ pud = pud_offset(pgd, addr);
24508+ pmd = pmd_offset(pud, addr);
24509+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24510+ }
24511+*/
24512+#endif
24513+
24514+#ifdef CONFIG_MODULES
24515+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
24516+#endif
24517+
24518+#else
24519+ pgd_t *pgd;
24520+ pud_t *pud;
24521+ pmd_t *pmd;
24522+ unsigned long addr, end;
24523+
24524+ /* PaX: make kernel code/rodata read-only, rest non-executable */
24525+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
24526+ pgd = pgd_offset_k(addr);
24527+ pud = pud_offset(pgd, addr);
24528+ pmd = pmd_offset(pud, addr);
24529+ if (!pmd_present(*pmd))
24530+ continue;
24531+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
24532+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24533+ else
24534+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24535+ }
24536+
24537+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
24538+ end = addr + KERNEL_IMAGE_SIZE;
24539+ for (; addr < end; addr += PMD_SIZE) {
24540+ pgd = pgd_offset_k(addr);
24541+ pud = pud_offset(pgd, addr);
24542+ pmd = pmd_offset(pud, addr);
24543+ if (!pmd_present(*pmd))
24544+ continue;
24545+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
24546+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24547+ }
24548+#endif
24549+
24550+ flush_tlb_all();
24551+#endif
24552+
24553 free_init_pages("unused kernel memory",
24554 (unsigned long)(&__init_begin),
24555 (unsigned long)(&__init_end));
24556diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
24557index 29f7c6d..b46b35b 100644
24558--- a/arch/x86/mm/init_32.c
24559+++ b/arch/x86/mm/init_32.c
24560@@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
24561 }
24562
24563 /*
24564- * Creates a middle page table and puts a pointer to it in the
24565- * given global directory entry. This only returns the gd entry
24566- * in non-PAE compilation mode, since the middle layer is folded.
24567- */
24568-static pmd_t * __init one_md_table_init(pgd_t *pgd)
24569-{
24570- pud_t *pud;
24571- pmd_t *pmd_table;
24572-
24573-#ifdef CONFIG_X86_PAE
24574- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
24575- if (after_bootmem)
24576- pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
24577- else
24578- pmd_table = (pmd_t *)alloc_low_page();
24579- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
24580- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
24581- pud = pud_offset(pgd, 0);
24582- BUG_ON(pmd_table != pmd_offset(pud, 0));
24583-
24584- return pmd_table;
24585- }
24586-#endif
24587- pud = pud_offset(pgd, 0);
24588- pmd_table = pmd_offset(pud, 0);
24589-
24590- return pmd_table;
24591-}
24592-
24593-/*
24594 * Create a page table and place a pointer to it in a middle page
24595 * directory entry:
24596 */
24597@@ -123,13 +93,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
24598 page_table = (pte_t *)alloc_low_page();
24599
24600 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
24601+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24602+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
24603+#else
24604 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
24605+#endif
24606 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
24607 }
24608
24609 return pte_offset_kernel(pmd, 0);
24610 }
24611
24612+static pmd_t * __init one_md_table_init(pgd_t *pgd)
24613+{
24614+ pud_t *pud;
24615+ pmd_t *pmd_table;
24616+
24617+ pud = pud_offset(pgd, 0);
24618+ pmd_table = pmd_offset(pud, 0);
24619+
24620+ return pmd_table;
24621+}
24622+
24623 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
24624 {
24625 int pgd_idx = pgd_index(vaddr);
24626@@ -203,6 +188,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24627 int pgd_idx, pmd_idx;
24628 unsigned long vaddr;
24629 pgd_t *pgd;
24630+ pud_t *pud;
24631 pmd_t *pmd;
24632 pte_t *pte = NULL;
24633
24634@@ -212,8 +198,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24635 pgd = pgd_base + pgd_idx;
24636
24637 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
24638- pmd = one_md_table_init(pgd);
24639- pmd = pmd + pmd_index(vaddr);
24640+ pud = pud_offset(pgd, vaddr);
24641+ pmd = pmd_offset(pud, vaddr);
24642+
24643+#ifdef CONFIG_X86_PAE
24644+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24645+#endif
24646+
24647 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
24648 pmd++, pmd_idx++) {
24649 pte = page_table_kmap_check(one_page_table_init(pmd),
24650@@ -225,11 +216,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24651 }
24652 }
24653
24654-static inline int is_kernel_text(unsigned long addr)
24655+static inline int is_kernel_text(unsigned long start, unsigned long end)
24656 {
24657- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
24658- return 1;
24659- return 0;
24660+ if ((start > ktla_ktva((unsigned long)_etext) ||
24661+ end <= ktla_ktva((unsigned long)_stext)) &&
24662+ (start > ktla_ktva((unsigned long)_einittext) ||
24663+ end <= ktla_ktva((unsigned long)_sinittext)) &&
24664+
24665+#ifdef CONFIG_ACPI_SLEEP
24666+ (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
24667+#endif
24668+
24669+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
24670+ return 0;
24671+ return 1;
24672 }
24673
24674 /*
24675@@ -246,9 +246,10 @@ kernel_physical_mapping_init(unsigned long start,
24676 unsigned long last_map_addr = end;
24677 unsigned long start_pfn, end_pfn;
24678 pgd_t *pgd_base = swapper_pg_dir;
24679- int pgd_idx, pmd_idx, pte_ofs;
24680+ unsigned int pgd_idx, pmd_idx, pte_ofs;
24681 unsigned long pfn;
24682 pgd_t *pgd;
24683+ pud_t *pud;
24684 pmd_t *pmd;
24685 pte_t *pte;
24686 unsigned pages_2m, pages_4k;
24687@@ -281,8 +282,13 @@ repeat:
24688 pfn = start_pfn;
24689 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
24690 pgd = pgd_base + pgd_idx;
24691- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
24692- pmd = one_md_table_init(pgd);
24693+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
24694+ pud = pud_offset(pgd, 0);
24695+ pmd = pmd_offset(pud, 0);
24696+
24697+#ifdef CONFIG_X86_PAE
24698+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24699+#endif
24700
24701 if (pfn >= end_pfn)
24702 continue;
24703@@ -294,14 +300,13 @@ repeat:
24704 #endif
24705 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
24706 pmd++, pmd_idx++) {
24707- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
24708+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
24709
24710 /*
24711 * Map with big pages if possible, otherwise
24712 * create normal page tables:
24713 */
24714 if (use_pse) {
24715- unsigned int addr2;
24716 pgprot_t prot = PAGE_KERNEL_LARGE;
24717 /*
24718 * first pass will use the same initial
24719@@ -311,11 +316,7 @@ repeat:
24720 __pgprot(PTE_IDENT_ATTR |
24721 _PAGE_PSE);
24722
24723- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
24724- PAGE_OFFSET + PAGE_SIZE-1;
24725-
24726- if (is_kernel_text(addr) ||
24727- is_kernel_text(addr2))
24728+ if (is_kernel_text(address, address + PMD_SIZE))
24729 prot = PAGE_KERNEL_LARGE_EXEC;
24730
24731 pages_2m++;
24732@@ -332,7 +333,7 @@ repeat:
24733 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
24734 pte += pte_ofs;
24735 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
24736- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
24737+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
24738 pgprot_t prot = PAGE_KERNEL;
24739 /*
24740 * first pass will use the same initial
24741@@ -340,7 +341,7 @@ repeat:
24742 */
24743 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
24744
24745- if (is_kernel_text(addr))
24746+ if (is_kernel_text(address, address + PAGE_SIZE))
24747 prot = PAGE_KERNEL_EXEC;
24748
24749 pages_4k++;
24750@@ -472,7 +473,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
24751
24752 pud = pud_offset(pgd, va);
24753 pmd = pmd_offset(pud, va);
24754- if (!pmd_present(*pmd))
24755+ if (!pmd_present(*pmd) || pmd_huge(*pmd))
24756 break;
24757
24758 pte = pte_offset_kernel(pmd, va);
24759@@ -524,12 +525,10 @@ void __init early_ioremap_page_table_range_init(void)
24760
24761 static void __init pagetable_init(void)
24762 {
24763- pgd_t *pgd_base = swapper_pg_dir;
24764-
24765- permanent_kmaps_init(pgd_base);
24766+ permanent_kmaps_init(swapper_pg_dir);
24767 }
24768
24769-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
24770+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
24771 EXPORT_SYMBOL_GPL(__supported_pte_mask);
24772
24773 /* user-defined highmem size */
24774@@ -757,6 +756,12 @@ void __init mem_init(void)
24775
24776 pci_iommu_alloc();
24777
24778+#ifdef CONFIG_PAX_PER_CPU_PGD
24779+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
24780+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
24781+ KERNEL_PGD_PTRS);
24782+#endif
24783+
24784 #ifdef CONFIG_FLATMEM
24785 BUG_ON(!mem_map);
24786 #endif
24787@@ -774,7 +779,7 @@ void __init mem_init(void)
24788 set_highmem_pages_init();
24789
24790 codesize = (unsigned long) &_etext - (unsigned long) &_text;
24791- datasize = (unsigned long) &_edata - (unsigned long) &_etext;
24792+ datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
24793 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
24794
24795 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
24796@@ -815,10 +820,10 @@ void __init mem_init(void)
24797 ((unsigned long)&__init_end -
24798 (unsigned long)&__init_begin) >> 10,
24799
24800- (unsigned long)&_etext, (unsigned long)&_edata,
24801- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
24802+ (unsigned long)&_sdata, (unsigned long)&_edata,
24803+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
24804
24805- (unsigned long)&_text, (unsigned long)&_etext,
24806+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
24807 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
24808
24809 /*
24810@@ -896,6 +901,7 @@ void set_kernel_text_rw(void)
24811 if (!kernel_set_to_readonly)
24812 return;
24813
24814+ start = ktla_ktva(start);
24815 pr_debug("Set kernel text: %lx - %lx for read write\n",
24816 start, start+size);
24817
24818@@ -910,6 +916,7 @@ void set_kernel_text_ro(void)
24819 if (!kernel_set_to_readonly)
24820 return;
24821
24822+ start = ktla_ktva(start);
24823 pr_debug("Set kernel text: %lx - %lx for read only\n",
24824 start, start+size);
24825
24826@@ -938,6 +945,7 @@ void mark_rodata_ro(void)
24827 unsigned long start = PFN_ALIGN(_text);
24828 unsigned long size = PFN_ALIGN(_etext) - start;
24829
24830+ start = ktla_ktva(start);
24831 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
24832 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
24833 size >> 10);
24834diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
24835index bbaaa00..796fa65 100644
24836--- a/arch/x86/mm/init_64.c
24837+++ b/arch/x86/mm/init_64.c
24838@@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpages_on);
24839 * around without checking the pgd every time.
24840 */
24841
24842-pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
24843+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
24844 EXPORT_SYMBOL_GPL(__supported_pte_mask);
24845
24846 int force_personality32;
24847@@ -108,12 +108,22 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24848
24849 for (address = start; address <= end; address += PGDIR_SIZE) {
24850 const pgd_t *pgd_ref = pgd_offset_k(address);
24851+
24852+#ifdef CONFIG_PAX_PER_CPU_PGD
24853+ unsigned long cpu;
24854+#else
24855 struct page *page;
24856+#endif
24857
24858 if (pgd_none(*pgd_ref))
24859 continue;
24860
24861 spin_lock(&pgd_lock);
24862+
24863+#ifdef CONFIG_PAX_PER_CPU_PGD
24864+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
24865+ pgd_t *pgd = pgd_offset_cpu(cpu, address);
24866+#else
24867 list_for_each_entry(page, &pgd_list, lru) {
24868 pgd_t *pgd;
24869 spinlock_t *pgt_lock;
24870@@ -122,6 +132,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24871 /* the pgt_lock only for Xen */
24872 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
24873 spin_lock(pgt_lock);
24874+#endif
24875
24876 if (pgd_none(*pgd))
24877 set_pgd(pgd, *pgd_ref);
24878@@ -129,7 +140,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24879 BUG_ON(pgd_page_vaddr(*pgd)
24880 != pgd_page_vaddr(*pgd_ref));
24881
24882+#ifndef CONFIG_PAX_PER_CPU_PGD
24883 spin_unlock(pgt_lock);
24884+#endif
24885+
24886 }
24887 spin_unlock(&pgd_lock);
24888 }
24889@@ -203,7 +217,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
24890 pmd = fill_pmd(pud, vaddr);
24891 pte = fill_pte(pmd, vaddr);
24892
24893+ pax_open_kernel();
24894 set_pte(pte, new_pte);
24895+ pax_close_kernel();
24896
24897 /*
24898 * It's enough to flush this one mapping.
24899@@ -262,14 +278,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
24900 pgd = pgd_offset_k((unsigned long)__va(phys));
24901 if (pgd_none(*pgd)) {
24902 pud = (pud_t *) spp_getpage();
24903- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
24904- _PAGE_USER));
24905+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
24906 }
24907 pud = pud_offset(pgd, (unsigned long)__va(phys));
24908 if (pud_none(*pud)) {
24909 pmd = (pmd_t *) spp_getpage();
24910- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
24911- _PAGE_USER));
24912+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
24913 }
24914 pmd = pmd_offset(pud, phys);
24915 BUG_ON(!pmd_none(*pmd));
24916@@ -330,7 +344,7 @@ static __ref void *alloc_low_page(unsigned long *phys)
24917 if (pfn >= pgt_buf_top)
24918 panic("alloc_low_page: ran out of memory");
24919
24920- adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
24921+ adr = (void __force_kernel *)early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
24922 clear_page(adr);
24923 *phys = pfn * PAGE_SIZE;
24924 return adr;
24925@@ -346,7 +360,7 @@ static __ref void *map_low_page(void *virt)
24926
24927 phys = __pa(virt);
24928 left = phys & (PAGE_SIZE - 1);
24929- adr = early_memremap(phys & PAGE_MASK, PAGE_SIZE);
24930+ adr = (void __force_kernel *)early_memremap(phys & PAGE_MASK, PAGE_SIZE);
24931 adr = (void *)(((unsigned long)adr) | left);
24932
24933 return adr;
24934@@ -693,6 +707,12 @@ void __init mem_init(void)
24935
24936 pci_iommu_alloc();
24937
24938+#ifdef CONFIG_PAX_PER_CPU_PGD
24939+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
24940+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
24941+ KERNEL_PGD_PTRS);
24942+#endif
24943+
24944 /* clear_bss() already clear the empty_zero_page */
24945
24946 reservedpages = 0;
24947@@ -853,8 +873,8 @@ int kern_addr_valid(unsigned long addr)
24948 static struct vm_area_struct gate_vma = {
24949 .vm_start = VSYSCALL_START,
24950 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
24951- .vm_page_prot = PAGE_READONLY_EXEC,
24952- .vm_flags = VM_READ | VM_EXEC
24953+ .vm_page_prot = PAGE_READONLY,
24954+ .vm_flags = VM_READ
24955 };
24956
24957 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
24958@@ -888,7 +908,7 @@ int in_gate_area_no_mm(unsigned long addr)
24959
24960 const char *arch_vma_name(struct vm_area_struct *vma)
24961 {
24962- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
24963+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
24964 return "[vdso]";
24965 if (vma == &gate_vma)
24966 return "[vsyscall]";
24967diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
24968index 7b179b4..6bd1777 100644
24969--- a/arch/x86/mm/iomap_32.c
24970+++ b/arch/x86/mm/iomap_32.c
24971@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
24972 type = kmap_atomic_idx_push();
24973 idx = type + KM_TYPE_NR * smp_processor_id();
24974 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
24975+
24976+ pax_open_kernel();
24977 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
24978+ pax_close_kernel();
24979+
24980 arch_flush_lazy_mmu_mode();
24981
24982 return (void *)vaddr;
24983diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
24984index be1ef57..55f0160 100644
24985--- a/arch/x86/mm/ioremap.c
24986+++ b/arch/x86/mm/ioremap.c
24987@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
24988 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
24989 int is_ram = page_is_ram(pfn);
24990
24991- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
24992+ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
24993 return NULL;
24994 WARN_ON_ONCE(is_ram);
24995 }
24996@@ -315,6 +315,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
24997
24998 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
24999 if (page_is_ram(start >> PAGE_SHIFT))
25000+#ifdef CONFIG_HIGHMEM
25001+ if ((start >> PAGE_SHIFT) < max_low_pfn)
25002+#endif
25003 return __va(phys);
25004
25005 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
25006@@ -344,7 +347,7 @@ static int __init early_ioremap_debug_setup(char *str)
25007 early_param("early_ioremap_debug", early_ioremap_debug_setup);
25008
25009 static __initdata int after_paging_init;
25010-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
25011+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
25012
25013 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
25014 {
25015@@ -381,8 +384,7 @@ void __init early_ioremap_init(void)
25016 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
25017
25018 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
25019- memset(bm_pte, 0, sizeof(bm_pte));
25020- pmd_populate_kernel(&init_mm, pmd, bm_pte);
25021+ pmd_populate_user(&init_mm, pmd, bm_pte);
25022
25023 /*
25024 * The boot-ioremap range spans multiple pmds, for which
25025diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
25026index d87dd6d..bf3fa66 100644
25027--- a/arch/x86/mm/kmemcheck/kmemcheck.c
25028+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
25029@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
25030 * memory (e.g. tracked pages)? For now, we need this to avoid
25031 * invoking kmemcheck for PnP BIOS calls.
25032 */
25033- if (regs->flags & X86_VM_MASK)
25034+ if (v8086_mode(regs))
25035 return false;
25036- if (regs->cs != __KERNEL_CS)
25037+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
25038 return false;
25039
25040 pte = kmemcheck_pte_lookup(address);
25041diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
25042index 845df68..1d8d29f 100644
25043--- a/arch/x86/mm/mmap.c
25044+++ b/arch/x86/mm/mmap.c
25045@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
25046 * Leave an at least ~128 MB hole with possible stack randomization.
25047 */
25048 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
25049-#define MAX_GAP (TASK_SIZE/6*5)
25050+#define MAX_GAP (pax_task_size/6*5)
25051
25052 static int mmap_is_legacy(void)
25053 {
25054@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
25055 return rnd << PAGE_SHIFT;
25056 }
25057
25058-static unsigned long mmap_base(void)
25059+static unsigned long mmap_base(struct mm_struct *mm)
25060 {
25061 unsigned long gap = rlimit(RLIMIT_STACK);
25062+ unsigned long pax_task_size = TASK_SIZE;
25063+
25064+#ifdef CONFIG_PAX_SEGMEXEC
25065+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
25066+ pax_task_size = SEGMEXEC_TASK_SIZE;
25067+#endif
25068
25069 if (gap < MIN_GAP)
25070 gap = MIN_GAP;
25071 else if (gap > MAX_GAP)
25072 gap = MAX_GAP;
25073
25074- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
25075+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
25076 }
25077
25078 /*
25079 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
25080 * does, but not when emulating X86_32
25081 */
25082-static unsigned long mmap_legacy_base(void)
25083+static unsigned long mmap_legacy_base(struct mm_struct *mm)
25084 {
25085- if (mmap_is_ia32())
25086+ if (mmap_is_ia32()) {
25087+
25088+#ifdef CONFIG_PAX_SEGMEXEC
25089+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
25090+ return SEGMEXEC_TASK_UNMAPPED_BASE;
25091+ else
25092+#endif
25093+
25094 return TASK_UNMAPPED_BASE;
25095- else
25096+ } else
25097 return TASK_UNMAPPED_BASE + mmap_rnd();
25098 }
25099
25100@@ -113,11 +126,23 @@ static unsigned long mmap_legacy_base(void)
25101 void arch_pick_mmap_layout(struct mm_struct *mm)
25102 {
25103 if (mmap_is_legacy()) {
25104- mm->mmap_base = mmap_legacy_base();
25105+ mm->mmap_base = mmap_legacy_base(mm);
25106+
25107+#ifdef CONFIG_PAX_RANDMMAP
25108+ if (mm->pax_flags & MF_PAX_RANDMMAP)
25109+ mm->mmap_base += mm->delta_mmap;
25110+#endif
25111+
25112 mm->get_unmapped_area = arch_get_unmapped_area;
25113 mm->unmap_area = arch_unmap_area;
25114 } else {
25115- mm->mmap_base = mmap_base();
25116+ mm->mmap_base = mmap_base(mm);
25117+
25118+#ifdef CONFIG_PAX_RANDMMAP
25119+ if (mm->pax_flags & MF_PAX_RANDMMAP)
25120+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
25121+#endif
25122+
25123 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
25124 mm->unmap_area = arch_unmap_area_topdown;
25125 }
25126diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
25127index de54b9b..799051e 100644
25128--- a/arch/x86/mm/mmio-mod.c
25129+++ b/arch/x86/mm/mmio-mod.c
25130@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
25131 break;
25132 default:
25133 {
25134- unsigned char *ip = (unsigned char *)instptr;
25135+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
25136 my_trace->opcode = MMIO_UNKNOWN_OP;
25137 my_trace->width = 0;
25138 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
25139@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
25140 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25141 void __iomem *addr)
25142 {
25143- static atomic_t next_id;
25144+ static atomic_unchecked_t next_id;
25145 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
25146 /* These are page-unaligned. */
25147 struct mmiotrace_map map = {
25148@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25149 .private = trace
25150 },
25151 .phys = offset,
25152- .id = atomic_inc_return(&next_id)
25153+ .id = atomic_inc_return_unchecked(&next_id)
25154 };
25155 map.map_id = trace->id;
25156
25157diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
25158index b008656..773eac2 100644
25159--- a/arch/x86/mm/pageattr-test.c
25160+++ b/arch/x86/mm/pageattr-test.c
25161@@ -36,7 +36,7 @@ enum {
25162
25163 static int pte_testbit(pte_t pte)
25164 {
25165- return pte_flags(pte) & _PAGE_UNUSED1;
25166+ return pte_flags(pte) & _PAGE_CPA_TEST;
25167 }
25168
25169 struct split_state {
25170diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
25171index f9e5267..77b1a40 100644
25172--- a/arch/x86/mm/pageattr.c
25173+++ b/arch/x86/mm/pageattr.c
25174@@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25175 */
25176 #ifdef CONFIG_PCI_BIOS
25177 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
25178- pgprot_val(forbidden) |= _PAGE_NX;
25179+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25180 #endif
25181
25182 /*
25183@@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25184 * Does not cover __inittext since that is gone later on. On
25185 * 64bit we do not enforce !NX on the low mapping
25186 */
25187- if (within(address, (unsigned long)_text, (unsigned long)_etext))
25188- pgprot_val(forbidden) |= _PAGE_NX;
25189+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
25190+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25191
25192+#ifdef CONFIG_DEBUG_RODATA
25193 /*
25194 * The .rodata section needs to be read-only. Using the pfn
25195 * catches all aliases.
25196@@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25197 if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
25198 __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
25199 pgprot_val(forbidden) |= _PAGE_RW;
25200+#endif
25201
25202 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
25203 /*
25204@@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25205 }
25206 #endif
25207
25208+#ifdef CONFIG_PAX_KERNEXEC
25209+ if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
25210+ pgprot_val(forbidden) |= _PAGE_RW;
25211+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25212+ }
25213+#endif
25214+
25215 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
25216
25217 return prot;
25218@@ -369,23 +378,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
25219 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
25220 {
25221 /* change init_mm */
25222+ pax_open_kernel();
25223 set_pte_atomic(kpte, pte);
25224+
25225 #ifdef CONFIG_X86_32
25226 if (!SHARED_KERNEL_PMD) {
25227+
25228+#ifdef CONFIG_PAX_PER_CPU_PGD
25229+ unsigned long cpu;
25230+#else
25231 struct page *page;
25232+#endif
25233
25234+#ifdef CONFIG_PAX_PER_CPU_PGD
25235+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
25236+ pgd_t *pgd = get_cpu_pgd(cpu);
25237+#else
25238 list_for_each_entry(page, &pgd_list, lru) {
25239- pgd_t *pgd;
25240+ pgd_t *pgd = (pgd_t *)page_address(page);
25241+#endif
25242+
25243 pud_t *pud;
25244 pmd_t *pmd;
25245
25246- pgd = (pgd_t *)page_address(page) + pgd_index(address);
25247+ pgd += pgd_index(address);
25248 pud = pud_offset(pgd, address);
25249 pmd = pmd_offset(pud, address);
25250 set_pte_atomic((pte_t *)pmd, pte);
25251 }
25252 }
25253 #endif
25254+ pax_close_kernel();
25255 }
25256
25257 static int
25258diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
25259index f6ff57b..481690f 100644
25260--- a/arch/x86/mm/pat.c
25261+++ b/arch/x86/mm/pat.c
25262@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
25263
25264 if (!entry) {
25265 printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
25266- current->comm, current->pid, start, end);
25267+ current->comm, task_pid_nr(current), start, end);
25268 return -EINVAL;
25269 }
25270
25271@@ -492,8 +492,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
25272 while (cursor < to) {
25273 if (!devmem_is_allowed(pfn)) {
25274 printk(KERN_INFO
25275- "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
25276- current->comm, from, to);
25277+ "Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n",
25278+ current->comm, from, to, cursor);
25279 return 0;
25280 }
25281 cursor += PAGE_SIZE;
25282@@ -557,7 +557,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
25283 printk(KERN_INFO
25284 "%s:%d ioremap_change_attr failed %s "
25285 "for %Lx-%Lx\n",
25286- current->comm, current->pid,
25287+ current->comm, task_pid_nr(current),
25288 cattr_name(flags),
25289 base, (unsigned long long)(base + size));
25290 return -EINVAL;
25291@@ -593,7 +593,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25292 if (want_flags != flags) {
25293 printk(KERN_WARNING
25294 "%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n",
25295- current->comm, current->pid,
25296+ current->comm, task_pid_nr(current),
25297 cattr_name(want_flags),
25298 (unsigned long long)paddr,
25299 (unsigned long long)(paddr + size),
25300@@ -615,7 +615,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25301 free_memtype(paddr, paddr + size);
25302 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
25303 " for %Lx-%Lx, got %s\n",
25304- current->comm, current->pid,
25305+ current->comm, task_pid_nr(current),
25306 cattr_name(want_flags),
25307 (unsigned long long)paddr,
25308 (unsigned long long)(paddr + size),
25309diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
25310index 9f0614d..92ae64a 100644
25311--- a/arch/x86/mm/pf_in.c
25312+++ b/arch/x86/mm/pf_in.c
25313@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
25314 int i;
25315 enum reason_type rv = OTHERS;
25316
25317- p = (unsigned char *)ins_addr;
25318+ p = (unsigned char *)ktla_ktva(ins_addr);
25319 p += skip_prefix(p, &prf);
25320 p += get_opcode(p, &opcode);
25321
25322@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
25323 struct prefix_bits prf;
25324 int i;
25325
25326- p = (unsigned char *)ins_addr;
25327+ p = (unsigned char *)ktla_ktva(ins_addr);
25328 p += skip_prefix(p, &prf);
25329 p += get_opcode(p, &opcode);
25330
25331@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
25332 struct prefix_bits prf;
25333 int i;
25334
25335- p = (unsigned char *)ins_addr;
25336+ p = (unsigned char *)ktla_ktva(ins_addr);
25337 p += skip_prefix(p, &prf);
25338 p += get_opcode(p, &opcode);
25339
25340@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
25341 struct prefix_bits prf;
25342 int i;
25343
25344- p = (unsigned char *)ins_addr;
25345+ p = (unsigned char *)ktla_ktva(ins_addr);
25346 p += skip_prefix(p, &prf);
25347 p += get_opcode(p, &opcode);
25348 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
25349@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
25350 struct prefix_bits prf;
25351 int i;
25352
25353- p = (unsigned char *)ins_addr;
25354+ p = (unsigned char *)ktla_ktva(ins_addr);
25355 p += skip_prefix(p, &prf);
25356 p += get_opcode(p, &opcode);
25357 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
25358diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
25359index 8573b83..c3b1a30 100644
25360--- a/arch/x86/mm/pgtable.c
25361+++ b/arch/x86/mm/pgtable.c
25362@@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *pgd)
25363 list_del(&page->lru);
25364 }
25365
25366-#define UNSHARED_PTRS_PER_PGD \
25367- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25368+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25369+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
25370
25371+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25372+{
25373+ while (count--)
25374+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
25375+}
25376+#endif
25377
25378+#ifdef CONFIG_PAX_PER_CPU_PGD
25379+void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25380+{
25381+ while (count--)
25382+
25383+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25384+ *dst++ = __pgd(pgd_val(*src++) & clone_pgd_mask);
25385+#else
25386+ *dst++ = *src++;
25387+#endif
25388+
25389+}
25390+#endif
25391+
25392+#ifdef CONFIG_X86_64
25393+#define pxd_t pud_t
25394+#define pyd_t pgd_t
25395+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
25396+#define pxd_free(mm, pud) pud_free((mm), (pud))
25397+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
25398+#define pyd_offset(mm, address) pgd_offset((mm), (address))
25399+#define PYD_SIZE PGDIR_SIZE
25400+#else
25401+#define pxd_t pmd_t
25402+#define pyd_t pud_t
25403+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
25404+#define pxd_free(mm, pud) pmd_free((mm), (pud))
25405+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
25406+#define pyd_offset(mm, address) pud_offset((mm), (address))
25407+#define PYD_SIZE PUD_SIZE
25408+#endif
25409+
25410+#ifdef CONFIG_PAX_PER_CPU_PGD
25411+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
25412+static inline void pgd_dtor(pgd_t *pgd) {}
25413+#else
25414 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
25415 {
25416 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
25417@@ -128,6 +170,7 @@ static void pgd_dtor(pgd_t *pgd)
25418 pgd_list_del(pgd);
25419 spin_unlock(&pgd_lock);
25420 }
25421+#endif
25422
25423 /*
25424 * List of all pgd's needed for non-PAE so it can invalidate entries
25425@@ -140,7 +183,7 @@ static void pgd_dtor(pgd_t *pgd)
25426 * -- wli
25427 */
25428
25429-#ifdef CONFIG_X86_PAE
25430+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25431 /*
25432 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
25433 * updating the top-level pagetable entries to guarantee the
25434@@ -152,7 +195,7 @@ static void pgd_dtor(pgd_t *pgd)
25435 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
25436 * and initialize the kernel pmds here.
25437 */
25438-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
25439+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25440
25441 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25442 {
25443@@ -170,36 +213,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25444 */
25445 flush_tlb_mm(mm);
25446 }
25447+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
25448+#define PREALLOCATED_PXDS USER_PGD_PTRS
25449 #else /* !CONFIG_X86_PAE */
25450
25451 /* No need to prepopulate any pagetable entries in non-PAE modes. */
25452-#define PREALLOCATED_PMDS 0
25453+#define PREALLOCATED_PXDS 0
25454
25455 #endif /* CONFIG_X86_PAE */
25456
25457-static void free_pmds(pmd_t *pmds[])
25458+static void free_pxds(pxd_t *pxds[])
25459 {
25460 int i;
25461
25462- for(i = 0; i < PREALLOCATED_PMDS; i++)
25463- if (pmds[i])
25464- free_page((unsigned long)pmds[i]);
25465+ for(i = 0; i < PREALLOCATED_PXDS; i++)
25466+ if (pxds[i])
25467+ free_page((unsigned long)pxds[i]);
25468 }
25469
25470-static int preallocate_pmds(pmd_t *pmds[])
25471+static int preallocate_pxds(pxd_t *pxds[])
25472 {
25473 int i;
25474 bool failed = false;
25475
25476- for(i = 0; i < PREALLOCATED_PMDS; i++) {
25477- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
25478- if (pmd == NULL)
25479+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
25480+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
25481+ if (pxd == NULL)
25482 failed = true;
25483- pmds[i] = pmd;
25484+ pxds[i] = pxd;
25485 }
25486
25487 if (failed) {
25488- free_pmds(pmds);
25489+ free_pxds(pxds);
25490 return -ENOMEM;
25491 }
25492
25493@@ -212,51 +257,55 @@ static int preallocate_pmds(pmd_t *pmds[])
25494 * preallocate which never got a corresponding vma will need to be
25495 * freed manually.
25496 */
25497-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
25498+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
25499 {
25500 int i;
25501
25502- for(i = 0; i < PREALLOCATED_PMDS; i++) {
25503+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
25504 pgd_t pgd = pgdp[i];
25505
25506 if (pgd_val(pgd) != 0) {
25507- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
25508+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
25509
25510- pgdp[i] = native_make_pgd(0);
25511+ set_pgd(pgdp + i, native_make_pgd(0));
25512
25513- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
25514- pmd_free(mm, pmd);
25515+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
25516+ pxd_free(mm, pxd);
25517 }
25518 }
25519 }
25520
25521-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
25522+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
25523 {
25524- pud_t *pud;
25525+ pyd_t *pyd;
25526 unsigned long addr;
25527 int i;
25528
25529- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
25530+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
25531 return;
25532
25533- pud = pud_offset(pgd, 0);
25534+#ifdef CONFIG_X86_64
25535+ pyd = pyd_offset(mm, 0L);
25536+#else
25537+ pyd = pyd_offset(pgd, 0L);
25538+#endif
25539
25540- for (addr = i = 0; i < PREALLOCATED_PMDS;
25541- i++, pud++, addr += PUD_SIZE) {
25542- pmd_t *pmd = pmds[i];
25543+ for (addr = i = 0; i < PREALLOCATED_PXDS;
25544+ i++, pyd++, addr += PYD_SIZE) {
25545+ pxd_t *pxd = pxds[i];
25546
25547 if (i >= KERNEL_PGD_BOUNDARY)
25548- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25549- sizeof(pmd_t) * PTRS_PER_PMD);
25550+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25551+ sizeof(pxd_t) * PTRS_PER_PMD);
25552
25553- pud_populate(mm, pud, pmd);
25554+ pyd_populate(mm, pyd, pxd);
25555 }
25556 }
25557
25558 pgd_t *pgd_alloc(struct mm_struct *mm)
25559 {
25560 pgd_t *pgd;
25561- pmd_t *pmds[PREALLOCATED_PMDS];
25562+ pxd_t *pxds[PREALLOCATED_PXDS];
25563
25564 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
25565
25566@@ -265,11 +314,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25567
25568 mm->pgd = pgd;
25569
25570- if (preallocate_pmds(pmds) != 0)
25571+ if (preallocate_pxds(pxds) != 0)
25572 goto out_free_pgd;
25573
25574 if (paravirt_pgd_alloc(mm) != 0)
25575- goto out_free_pmds;
25576+ goto out_free_pxds;
25577
25578 /*
25579 * Make sure that pre-populating the pmds is atomic with
25580@@ -279,14 +328,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25581 spin_lock(&pgd_lock);
25582
25583 pgd_ctor(mm, pgd);
25584- pgd_prepopulate_pmd(mm, pgd, pmds);
25585+ pgd_prepopulate_pxd(mm, pgd, pxds);
25586
25587 spin_unlock(&pgd_lock);
25588
25589 return pgd;
25590
25591-out_free_pmds:
25592- free_pmds(pmds);
25593+out_free_pxds:
25594+ free_pxds(pxds);
25595 out_free_pgd:
25596 free_page((unsigned long)pgd);
25597 out:
25598@@ -295,7 +344,7 @@ out:
25599
25600 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
25601 {
25602- pgd_mop_up_pmds(mm, pgd);
25603+ pgd_mop_up_pxds(mm, pgd);
25604 pgd_dtor(pgd);
25605 paravirt_pgd_free(mm, pgd);
25606 free_page((unsigned long)pgd);
25607diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
25608index cac7184..09a39fa 100644
25609--- a/arch/x86/mm/pgtable_32.c
25610+++ b/arch/x86/mm/pgtable_32.c
25611@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
25612 return;
25613 }
25614 pte = pte_offset_kernel(pmd, vaddr);
25615+
25616+ pax_open_kernel();
25617 if (pte_val(pteval))
25618 set_pte_at(&init_mm, vaddr, pte, pteval);
25619 else
25620 pte_clear(&init_mm, vaddr, pte);
25621+ pax_close_kernel();
25622
25623 /*
25624 * It's enough to flush this one mapping.
25625diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
25626index 410531d..0f16030 100644
25627--- a/arch/x86/mm/setup_nx.c
25628+++ b/arch/x86/mm/setup_nx.c
25629@@ -5,8 +5,10 @@
25630 #include <asm/pgtable.h>
25631 #include <asm/proto.h>
25632
25633+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25634 static int disable_nx __cpuinitdata;
25635
25636+#ifndef CONFIG_PAX_PAGEEXEC
25637 /*
25638 * noexec = on|off
25639 *
25640@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
25641 return 0;
25642 }
25643 early_param("noexec", noexec_setup);
25644+#endif
25645+
25646+#endif
25647
25648 void __cpuinit x86_configure_nx(void)
25649 {
25650+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25651 if (cpu_has_nx && !disable_nx)
25652 __supported_pte_mask |= _PAGE_NX;
25653 else
25654+#endif
25655 __supported_pte_mask &= ~_PAGE_NX;
25656 }
25657
25658diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
25659index d6c0418..06a0ad5 100644
25660--- a/arch/x86/mm/tlb.c
25661+++ b/arch/x86/mm/tlb.c
25662@@ -65,7 +65,11 @@ void leave_mm(int cpu)
25663 BUG();
25664 cpumask_clear_cpu(cpu,
25665 mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
25666+
25667+#ifndef CONFIG_PAX_PER_CPU_PGD
25668 load_cr3(swapper_pg_dir);
25669+#endif
25670+
25671 }
25672 EXPORT_SYMBOL_GPL(leave_mm);
25673
25674diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
25675index 6687022..ceabcfa 100644
25676--- a/arch/x86/net/bpf_jit.S
25677+++ b/arch/x86/net/bpf_jit.S
25678@@ -9,6 +9,7 @@
25679 */
25680 #include <linux/linkage.h>
25681 #include <asm/dwarf2.h>
25682+#include <asm/alternative-asm.h>
25683
25684 /*
25685 * Calling convention :
25686@@ -35,6 +36,7 @@ sk_load_word:
25687 jle bpf_slow_path_word
25688 mov (SKBDATA,%rsi),%eax
25689 bswap %eax /* ntohl() */
25690+ pax_force_retaddr
25691 ret
25692
25693
25694@@ -53,6 +55,7 @@ sk_load_half:
25695 jle bpf_slow_path_half
25696 movzwl (SKBDATA,%rsi),%eax
25697 rol $8,%ax # ntohs()
25698+ pax_force_retaddr
25699 ret
25700
25701 sk_load_byte_ind:
25702@@ -66,6 +69,7 @@ sk_load_byte:
25703 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
25704 jle bpf_slow_path_byte
25705 movzbl (SKBDATA,%rsi),%eax
25706+ pax_force_retaddr
25707 ret
25708
25709 /**
25710@@ -82,6 +86,7 @@ ENTRY(sk_load_byte_msh)
25711 movzbl (SKBDATA,%rsi),%ebx
25712 and $15,%bl
25713 shl $2,%bl
25714+ pax_force_retaddr
25715 ret
25716 CFI_ENDPROC
25717 ENDPROC(sk_load_byte_msh)
25718@@ -91,6 +96,7 @@ bpf_error:
25719 xor %eax,%eax
25720 mov -8(%rbp),%rbx
25721 leaveq
25722+ pax_force_retaddr
25723 ret
25724
25725 /* rsi contains offset and can be scratched */
25726@@ -113,6 +119,7 @@ bpf_slow_path_word:
25727 js bpf_error
25728 mov -12(%rbp),%eax
25729 bswap %eax
25730+ pax_force_retaddr
25731 ret
25732
25733 bpf_slow_path_half:
25734@@ -121,12 +128,14 @@ bpf_slow_path_half:
25735 mov -12(%rbp),%ax
25736 rol $8,%ax
25737 movzwl %ax,%eax
25738+ pax_force_retaddr
25739 ret
25740
25741 bpf_slow_path_byte:
25742 bpf_slow_path_common(1)
25743 js bpf_error
25744 movzbl -12(%rbp),%eax
25745+ pax_force_retaddr
25746 ret
25747
25748 bpf_slow_path_byte_msh:
25749@@ -137,4 +146,5 @@ bpf_slow_path_byte_msh:
25750 and $15,%al
25751 shl $2,%al
25752 xchg %eax,%ebx
25753+ pax_force_retaddr
25754 ret
25755diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
25756index 7c1b765..8c072c6 100644
25757--- a/arch/x86/net/bpf_jit_comp.c
25758+++ b/arch/x86/net/bpf_jit_comp.c
25759@@ -117,6 +117,10 @@ static inline void bpf_flush_icache(void *start, void *end)
25760 set_fs(old_fs);
25761 }
25762
25763+struct bpf_jit_work {
25764+ struct work_struct work;
25765+ void *image;
25766+};
25767
25768 void bpf_jit_compile(struct sk_filter *fp)
25769 {
25770@@ -141,6 +145,10 @@ void bpf_jit_compile(struct sk_filter *fp)
25771 if (addrs == NULL)
25772 return;
25773
25774+ fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL);
25775+ if (!fp->work)
25776+ goto out;
25777+
25778 /* Before first pass, make a rough estimation of addrs[]
25779 * each bpf instruction is translated to less than 64 bytes
25780 */
25781@@ -476,7 +484,7 @@ void bpf_jit_compile(struct sk_filter *fp)
25782 func = sk_load_word;
25783 common_load: seen |= SEEN_DATAREF;
25784 if ((int)K < 0)
25785- goto out;
25786+ goto error;
25787 t_offset = func - (image + addrs[i]);
25788 EMIT1_off32(0xbe, K); /* mov imm32,%esi */
25789 EMIT1_off32(0xe8, t_offset); /* call */
25790@@ -586,17 +594,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25791 break;
25792 default:
25793 /* hmm, too complex filter, give up with jit compiler */
25794- goto out;
25795+ goto error;
25796 }
25797 ilen = prog - temp;
25798 if (image) {
25799 if (unlikely(proglen + ilen > oldproglen)) {
25800 pr_err("bpb_jit_compile fatal error\n");
25801- kfree(addrs);
25802- module_free(NULL, image);
25803- return;
25804+ module_free_exec(NULL, image);
25805+ goto error;
25806 }
25807+ pax_open_kernel();
25808 memcpy(image + proglen, temp, ilen);
25809+ pax_close_kernel();
25810 }
25811 proglen += ilen;
25812 addrs[i] = proglen;
25813@@ -617,11 +626,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25814 break;
25815 }
25816 if (proglen == oldproglen) {
25817- image = module_alloc(max_t(unsigned int,
25818- proglen,
25819- sizeof(struct work_struct)));
25820+ image = module_alloc_exec(proglen);
25821 if (!image)
25822- goto out;
25823+ goto error;
25824 }
25825 oldproglen = proglen;
25826 }
25827@@ -637,7 +644,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25828 bpf_flush_icache(image, image + proglen);
25829
25830 fp->bpf_func = (void *)image;
25831- }
25832+ } else
25833+error:
25834+ kfree(fp->work);
25835+
25836 out:
25837 kfree(addrs);
25838 return;
25839@@ -645,18 +655,20 @@ out:
25840
25841 static void jit_free_defer(struct work_struct *arg)
25842 {
25843- module_free(NULL, arg);
25844+ module_free_exec(NULL, ((struct bpf_jit_work *)arg)->image);
25845+ kfree(arg);
25846 }
25847
25848 /* run from softirq, we must use a work_struct to call
25849- * module_free() from process context
25850+ * module_free_exec() from process context
25851 */
25852 void bpf_jit_free(struct sk_filter *fp)
25853 {
25854 if (fp->bpf_func != sk_run_filter) {
25855- struct work_struct *work = (struct work_struct *)fp->bpf_func;
25856+ struct work_struct *work = &fp->work->work;
25857
25858 INIT_WORK(work, jit_free_defer);
25859+ fp->work->image = fp->bpf_func;
25860 schedule_work(work);
25861 }
25862 }
25863diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
25864index bff89df..377758a 100644
25865--- a/arch/x86/oprofile/backtrace.c
25866+++ b/arch/x86/oprofile/backtrace.c
25867@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
25868 struct stack_frame_ia32 *fp;
25869 unsigned long bytes;
25870
25871- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
25872+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
25873 if (bytes != sizeof(bufhead))
25874 return NULL;
25875
25876- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
25877+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
25878
25879 oprofile_add_trace(bufhead[0].return_address);
25880
25881@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
25882 struct stack_frame bufhead[2];
25883 unsigned long bytes;
25884
25885- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
25886+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
25887 if (bytes != sizeof(bufhead))
25888 return NULL;
25889
25890@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
25891 {
25892 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
25893
25894- if (!user_mode_vm(regs)) {
25895+ if (!user_mode(regs)) {
25896 unsigned long stack = kernel_stack_pointer(regs);
25897 if (depth)
25898 dump_trace(NULL, regs, (unsigned long *)stack, 0,
25899diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
25900index cb29191..036766d 100644
25901--- a/arch/x86/pci/mrst.c
25902+++ b/arch/x86/pci/mrst.c
25903@@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
25904 printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
25905 pci_mmcfg_late_init();
25906 pcibios_enable_irq = mrst_pci_irq_enable;
25907- pci_root_ops = pci_mrst_ops;
25908+ pax_open_kernel();
25909+ memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
25910+ pax_close_kernel();
25911 /* Continue with standard init */
25912 return 1;
25913 }
25914diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
25915index db0e9a5..0372c14 100644
25916--- a/arch/x86/pci/pcbios.c
25917+++ b/arch/x86/pci/pcbios.c
25918@@ -79,50 +79,93 @@ union bios32 {
25919 static struct {
25920 unsigned long address;
25921 unsigned short segment;
25922-} bios32_indirect = { 0, __KERNEL_CS };
25923+} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
25924
25925 /*
25926 * Returns the entry point for the given service, NULL on error
25927 */
25928
25929-static unsigned long bios32_service(unsigned long service)
25930+static unsigned long __devinit bios32_service(unsigned long service)
25931 {
25932 unsigned char return_code; /* %al */
25933 unsigned long address; /* %ebx */
25934 unsigned long length; /* %ecx */
25935 unsigned long entry; /* %edx */
25936 unsigned long flags;
25937+ struct desc_struct d, *gdt;
25938
25939 local_irq_save(flags);
25940- __asm__("lcall *(%%edi); cld"
25941+
25942+ gdt = get_cpu_gdt_table(smp_processor_id());
25943+
25944+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
25945+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
25946+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
25947+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
25948+
25949+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
25950 : "=a" (return_code),
25951 "=b" (address),
25952 "=c" (length),
25953 "=d" (entry)
25954 : "0" (service),
25955 "1" (0),
25956- "D" (&bios32_indirect));
25957+ "D" (&bios32_indirect),
25958+ "r"(__PCIBIOS_DS)
25959+ : "memory");
25960+
25961+ pax_open_kernel();
25962+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
25963+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
25964+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
25965+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
25966+ pax_close_kernel();
25967+
25968 local_irq_restore(flags);
25969
25970 switch (return_code) {
25971- case 0:
25972- return address + entry;
25973- case 0x80: /* Not present */
25974- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
25975- return 0;
25976- default: /* Shouldn't happen */
25977- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
25978- service, return_code);
25979+ case 0: {
25980+ int cpu;
25981+ unsigned char flags;
25982+
25983+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
25984+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
25985+ printk(KERN_WARNING "bios32_service: not valid\n");
25986 return 0;
25987+ }
25988+ address = address + PAGE_OFFSET;
25989+ length += 16UL; /* some BIOSs underreport this... */
25990+ flags = 4;
25991+ if (length >= 64*1024*1024) {
25992+ length >>= PAGE_SHIFT;
25993+ flags |= 8;
25994+ }
25995+
25996+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
25997+ gdt = get_cpu_gdt_table(cpu);
25998+ pack_descriptor(&d, address, length, 0x9b, flags);
25999+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
26000+ pack_descriptor(&d, address, length, 0x93, flags);
26001+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
26002+ }
26003+ return entry;
26004+ }
26005+ case 0x80: /* Not present */
26006+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
26007+ return 0;
26008+ default: /* Shouldn't happen */
26009+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
26010+ service, return_code);
26011+ return 0;
26012 }
26013 }
26014
26015 static struct {
26016 unsigned long address;
26017 unsigned short segment;
26018-} pci_indirect = { 0, __KERNEL_CS };
26019+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
26020
26021-static int pci_bios_present;
26022+static int pci_bios_present __read_only;
26023
26024 static int __devinit check_pcibios(void)
26025 {
26026@@ -131,11 +174,13 @@ static int __devinit check_pcibios(void)
26027 unsigned long flags, pcibios_entry;
26028
26029 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
26030- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
26031+ pci_indirect.address = pcibios_entry;
26032
26033 local_irq_save(flags);
26034- __asm__(
26035- "lcall *(%%edi); cld\n\t"
26036+ __asm__("movw %w6, %%ds\n\t"
26037+ "lcall *%%ss:(%%edi); cld\n\t"
26038+ "push %%ss\n\t"
26039+ "pop %%ds\n\t"
26040 "jc 1f\n\t"
26041 "xor %%ah, %%ah\n"
26042 "1:"
26043@@ -144,7 +189,8 @@ static int __devinit check_pcibios(void)
26044 "=b" (ebx),
26045 "=c" (ecx)
26046 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
26047- "D" (&pci_indirect)
26048+ "D" (&pci_indirect),
26049+ "r" (__PCIBIOS_DS)
26050 : "memory");
26051 local_irq_restore(flags);
26052
26053@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26054
26055 switch (len) {
26056 case 1:
26057- __asm__("lcall *(%%esi); cld\n\t"
26058+ __asm__("movw %w6, %%ds\n\t"
26059+ "lcall *%%ss:(%%esi); cld\n\t"
26060+ "push %%ss\n\t"
26061+ "pop %%ds\n\t"
26062 "jc 1f\n\t"
26063 "xor %%ah, %%ah\n"
26064 "1:"
26065@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26066 : "1" (PCIBIOS_READ_CONFIG_BYTE),
26067 "b" (bx),
26068 "D" ((long)reg),
26069- "S" (&pci_indirect));
26070+ "S" (&pci_indirect),
26071+ "r" (__PCIBIOS_DS));
26072 /*
26073 * Zero-extend the result beyond 8 bits, do not trust the
26074 * BIOS having done it:
26075@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26076 *value &= 0xff;
26077 break;
26078 case 2:
26079- __asm__("lcall *(%%esi); cld\n\t"
26080+ __asm__("movw %w6, %%ds\n\t"
26081+ "lcall *%%ss:(%%esi); cld\n\t"
26082+ "push %%ss\n\t"
26083+ "pop %%ds\n\t"
26084 "jc 1f\n\t"
26085 "xor %%ah, %%ah\n"
26086 "1:"
26087@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26088 : "1" (PCIBIOS_READ_CONFIG_WORD),
26089 "b" (bx),
26090 "D" ((long)reg),
26091- "S" (&pci_indirect));
26092+ "S" (&pci_indirect),
26093+ "r" (__PCIBIOS_DS));
26094 /*
26095 * Zero-extend the result beyond 16 bits, do not trust the
26096 * BIOS having done it:
26097@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26098 *value &= 0xffff;
26099 break;
26100 case 4:
26101- __asm__("lcall *(%%esi); cld\n\t"
26102+ __asm__("movw %w6, %%ds\n\t"
26103+ "lcall *%%ss:(%%esi); cld\n\t"
26104+ "push %%ss\n\t"
26105+ "pop %%ds\n\t"
26106 "jc 1f\n\t"
26107 "xor %%ah, %%ah\n"
26108 "1:"
26109@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26110 : "1" (PCIBIOS_READ_CONFIG_DWORD),
26111 "b" (bx),
26112 "D" ((long)reg),
26113- "S" (&pci_indirect));
26114+ "S" (&pci_indirect),
26115+ "r" (__PCIBIOS_DS));
26116 break;
26117 }
26118
26119@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26120
26121 switch (len) {
26122 case 1:
26123- __asm__("lcall *(%%esi); cld\n\t"
26124+ __asm__("movw %w6, %%ds\n\t"
26125+ "lcall *%%ss:(%%esi); cld\n\t"
26126+ "push %%ss\n\t"
26127+ "pop %%ds\n\t"
26128 "jc 1f\n\t"
26129 "xor %%ah, %%ah\n"
26130 "1:"
26131@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26132 "c" (value),
26133 "b" (bx),
26134 "D" ((long)reg),
26135- "S" (&pci_indirect));
26136+ "S" (&pci_indirect),
26137+ "r" (__PCIBIOS_DS));
26138 break;
26139 case 2:
26140- __asm__("lcall *(%%esi); cld\n\t"
26141+ __asm__("movw %w6, %%ds\n\t"
26142+ "lcall *%%ss:(%%esi); cld\n\t"
26143+ "push %%ss\n\t"
26144+ "pop %%ds\n\t"
26145 "jc 1f\n\t"
26146 "xor %%ah, %%ah\n"
26147 "1:"
26148@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26149 "c" (value),
26150 "b" (bx),
26151 "D" ((long)reg),
26152- "S" (&pci_indirect));
26153+ "S" (&pci_indirect),
26154+ "r" (__PCIBIOS_DS));
26155 break;
26156 case 4:
26157- __asm__("lcall *(%%esi); cld\n\t"
26158+ __asm__("movw %w6, %%ds\n\t"
26159+ "lcall *%%ss:(%%esi); cld\n\t"
26160+ "push %%ss\n\t"
26161+ "pop %%ds\n\t"
26162 "jc 1f\n\t"
26163 "xor %%ah, %%ah\n"
26164 "1:"
26165@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26166 "c" (value),
26167 "b" (bx),
26168 "D" ((long)reg),
26169- "S" (&pci_indirect));
26170+ "S" (&pci_indirect),
26171+ "r" (__PCIBIOS_DS));
26172 break;
26173 }
26174
26175@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26176
26177 DBG("PCI: Fetching IRQ routing table... ");
26178 __asm__("push %%es\n\t"
26179+ "movw %w8, %%ds\n\t"
26180 "push %%ds\n\t"
26181 "pop %%es\n\t"
26182- "lcall *(%%esi); cld\n\t"
26183+ "lcall *%%ss:(%%esi); cld\n\t"
26184 "pop %%es\n\t"
26185+ "push %%ss\n\t"
26186+ "pop %%ds\n"
26187 "jc 1f\n\t"
26188 "xor %%ah, %%ah\n"
26189 "1:"
26190@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26191 "1" (0),
26192 "D" ((long) &opt),
26193 "S" (&pci_indirect),
26194- "m" (opt)
26195+ "m" (opt),
26196+ "r" (__PCIBIOS_DS)
26197 : "memory");
26198 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
26199 if (ret & 0xff00)
26200@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26201 {
26202 int ret;
26203
26204- __asm__("lcall *(%%esi); cld\n\t"
26205+ __asm__("movw %w5, %%ds\n\t"
26206+ "lcall *%%ss:(%%esi); cld\n\t"
26207+ "push %%ss\n\t"
26208+ "pop %%ds\n"
26209 "jc 1f\n\t"
26210 "xor %%ah, %%ah\n"
26211 "1:"
26212@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26213 : "0" (PCIBIOS_SET_PCI_HW_INT),
26214 "b" ((dev->bus->number << 8) | dev->devfn),
26215 "c" ((irq << 8) | (pin + 10)),
26216- "S" (&pci_indirect));
26217+ "S" (&pci_indirect),
26218+ "r" (__PCIBIOS_DS));
26219 return !(ret & 0xff00);
26220 }
26221 EXPORT_SYMBOL(pcibios_set_irq_routing);
26222diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
26223index 40e4469..1ab536e 100644
26224--- a/arch/x86/platform/efi/efi_32.c
26225+++ b/arch/x86/platform/efi/efi_32.c
26226@@ -44,11 +44,22 @@ void efi_call_phys_prelog(void)
26227 {
26228 struct desc_ptr gdt_descr;
26229
26230+#ifdef CONFIG_PAX_KERNEXEC
26231+ struct desc_struct d;
26232+#endif
26233+
26234 local_irq_save(efi_rt_eflags);
26235
26236 load_cr3(initial_page_table);
26237 __flush_tlb_all();
26238
26239+#ifdef CONFIG_PAX_KERNEXEC
26240+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
26241+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26242+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
26243+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26244+#endif
26245+
26246 gdt_descr.address = __pa(get_cpu_gdt_table(0));
26247 gdt_descr.size = GDT_SIZE - 1;
26248 load_gdt(&gdt_descr);
26249@@ -58,6 +69,14 @@ void efi_call_phys_epilog(void)
26250 {
26251 struct desc_ptr gdt_descr;
26252
26253+#ifdef CONFIG_PAX_KERNEXEC
26254+ struct desc_struct d;
26255+
26256+ memset(&d, 0, sizeof d);
26257+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26258+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26259+#endif
26260+
26261 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
26262 gdt_descr.size = GDT_SIZE - 1;
26263 load_gdt(&gdt_descr);
26264diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
26265index fbe66e6..c5c0dd2 100644
26266--- a/arch/x86/platform/efi/efi_stub_32.S
26267+++ b/arch/x86/platform/efi/efi_stub_32.S
26268@@ -6,7 +6,9 @@
26269 */
26270
26271 #include <linux/linkage.h>
26272+#include <linux/init.h>
26273 #include <asm/page_types.h>
26274+#include <asm/segment.h>
26275
26276 /*
26277 * efi_call_phys(void *, ...) is a function with variable parameters.
26278@@ -20,7 +22,7 @@
26279 * service functions will comply with gcc calling convention, too.
26280 */
26281
26282-.text
26283+__INIT
26284 ENTRY(efi_call_phys)
26285 /*
26286 * 0. The function can only be called in Linux kernel. So CS has been
26287@@ -36,9 +38,11 @@ ENTRY(efi_call_phys)
26288 * The mapping of lower virtual memory has been created in prelog and
26289 * epilog.
26290 */
26291- movl $1f, %edx
26292- subl $__PAGE_OFFSET, %edx
26293- jmp *%edx
26294+ movl $(__KERNEXEC_EFI_DS), %edx
26295+ mov %edx, %ds
26296+ mov %edx, %es
26297+ mov %edx, %ss
26298+ ljmp $(__KERNEXEC_EFI_CS),$1f-__PAGE_OFFSET
26299 1:
26300
26301 /*
26302@@ -47,14 +51,8 @@ ENTRY(efi_call_phys)
26303 * parameter 2, ..., param n. To make things easy, we save the return
26304 * address of efi_call_phys in a global variable.
26305 */
26306- popl %edx
26307- movl %edx, saved_return_addr
26308- /* get the function pointer into ECX*/
26309- popl %ecx
26310- movl %ecx, efi_rt_function_ptr
26311- movl $2f, %edx
26312- subl $__PAGE_OFFSET, %edx
26313- pushl %edx
26314+ popl (saved_return_addr)
26315+ popl (efi_rt_function_ptr)
26316
26317 /*
26318 * 3. Clear PG bit in %CR0.
26319@@ -73,9 +71,8 @@ ENTRY(efi_call_phys)
26320 /*
26321 * 5. Call the physical function.
26322 */
26323- jmp *%ecx
26324+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
26325
26326-2:
26327 /*
26328 * 6. After EFI runtime service returns, control will return to
26329 * following instruction. We'd better readjust stack pointer first.
26330@@ -88,35 +85,32 @@ ENTRY(efi_call_phys)
26331 movl %cr0, %edx
26332 orl $0x80000000, %edx
26333 movl %edx, %cr0
26334- jmp 1f
26335-1:
26336+
26337 /*
26338 * 8. Now restore the virtual mode from flat mode by
26339 * adding EIP with PAGE_OFFSET.
26340 */
26341- movl $1f, %edx
26342- jmp *%edx
26343+ ljmp $(__KERNEL_CS),$1f+__PAGE_OFFSET
26344 1:
26345+ movl $(__KERNEL_DS), %edx
26346+ mov %edx, %ds
26347+ mov %edx, %es
26348+ mov %edx, %ss
26349
26350 /*
26351 * 9. Balance the stack. And because EAX contain the return value,
26352 * we'd better not clobber it.
26353 */
26354- leal efi_rt_function_ptr, %edx
26355- movl (%edx), %ecx
26356- pushl %ecx
26357+ pushl (efi_rt_function_ptr)
26358
26359 /*
26360- * 10. Push the saved return address onto the stack and return.
26361+ * 10. Return to the saved return address.
26362 */
26363- leal saved_return_addr, %edx
26364- movl (%edx), %ecx
26365- pushl %ecx
26366- ret
26367+ jmpl *(saved_return_addr)
26368 ENDPROC(efi_call_phys)
26369 .previous
26370
26371-.data
26372+__INITDATA
26373 saved_return_addr:
26374 .long 0
26375 efi_rt_function_ptr:
26376diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
26377index 4c07cca..2c8427d 100644
26378--- a/arch/x86/platform/efi/efi_stub_64.S
26379+++ b/arch/x86/platform/efi/efi_stub_64.S
26380@@ -7,6 +7,7 @@
26381 */
26382
26383 #include <linux/linkage.h>
26384+#include <asm/alternative-asm.h>
26385
26386 #define SAVE_XMM \
26387 mov %rsp, %rax; \
26388@@ -40,6 +41,7 @@ ENTRY(efi_call0)
26389 call *%rdi
26390 addq $32, %rsp
26391 RESTORE_XMM
26392+ pax_force_retaddr 0, 1
26393 ret
26394 ENDPROC(efi_call0)
26395
26396@@ -50,6 +52,7 @@ ENTRY(efi_call1)
26397 call *%rdi
26398 addq $32, %rsp
26399 RESTORE_XMM
26400+ pax_force_retaddr 0, 1
26401 ret
26402 ENDPROC(efi_call1)
26403
26404@@ -60,6 +63,7 @@ ENTRY(efi_call2)
26405 call *%rdi
26406 addq $32, %rsp
26407 RESTORE_XMM
26408+ pax_force_retaddr 0, 1
26409 ret
26410 ENDPROC(efi_call2)
26411
26412@@ -71,6 +75,7 @@ ENTRY(efi_call3)
26413 call *%rdi
26414 addq $32, %rsp
26415 RESTORE_XMM
26416+ pax_force_retaddr 0, 1
26417 ret
26418 ENDPROC(efi_call3)
26419
26420@@ -83,6 +88,7 @@ ENTRY(efi_call4)
26421 call *%rdi
26422 addq $32, %rsp
26423 RESTORE_XMM
26424+ pax_force_retaddr 0, 1
26425 ret
26426 ENDPROC(efi_call4)
26427
26428@@ -96,6 +102,7 @@ ENTRY(efi_call5)
26429 call *%rdi
26430 addq $48, %rsp
26431 RESTORE_XMM
26432+ pax_force_retaddr 0, 1
26433 ret
26434 ENDPROC(efi_call5)
26435
26436@@ -112,5 +119,6 @@ ENTRY(efi_call6)
26437 call *%rdi
26438 addq $48, %rsp
26439 RESTORE_XMM
26440+ pax_force_retaddr 0, 1
26441 ret
26442 ENDPROC(efi_call6)
26443diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
26444index ad4ec1c..686479e 100644
26445--- a/arch/x86/platform/mrst/mrst.c
26446+++ b/arch/x86/platform/mrst/mrst.c
26447@@ -76,18 +76,20 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
26448 EXPORT_SYMBOL_GPL(sfi_mrtc_array);
26449 int sfi_mrtc_num;
26450
26451-static void mrst_power_off(void)
26452+static __noreturn void mrst_power_off(void)
26453 {
26454 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
26455 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 1);
26456+ BUG();
26457 }
26458
26459-static void mrst_reboot(void)
26460+static __noreturn void mrst_reboot(void)
26461 {
26462 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
26463 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 0);
26464 else
26465 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
26466+ BUG();
26467 }
26468
26469 /* parse all the mtimer info to a static mtimer array */
26470diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
26471index 81aee5a..9ad9aae 100644
26472--- a/arch/x86/platform/uv/tlb_uv.c
26473+++ b/arch/x86/platform/uv/tlb_uv.c
26474@@ -1433,6 +1433,8 @@ static ssize_t tunables_read(struct file *file, char __user *userbuf,
26475 * 0: display meaning of the statistics
26476 */
26477 static ssize_t ptc_proc_write(struct file *file, const char __user *user,
26478+ size_t count, loff_t *data) __size_overflow(3);
26479+static ssize_t ptc_proc_write(struct file *file, const char __user *user,
26480 size_t count, loff_t *data)
26481 {
26482 int cpu;
26483@@ -1548,6 +1550,8 @@ static int parse_tunables_write(struct bau_control *bcp, char *instr,
26484 * Handle a write to debugfs. (/sys/kernel/debug/sgi_uv/bau_tunables)
26485 */
26486 static ssize_t tunables_write(struct file *file, const char __user *user,
26487+ size_t count, loff_t *data) __size_overflow(3);
26488+static ssize_t tunables_write(struct file *file, const char __user *user,
26489 size_t count, loff_t *data)
26490 {
26491 int cpu;
26492diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
26493index f10c0af..3ec1f95 100644
26494--- a/arch/x86/power/cpu.c
26495+++ b/arch/x86/power/cpu.c
26496@@ -131,7 +131,7 @@ static void do_fpu_end(void)
26497 static void fix_processor_context(void)
26498 {
26499 int cpu = smp_processor_id();
26500- struct tss_struct *t = &per_cpu(init_tss, cpu);
26501+ struct tss_struct *t = init_tss + cpu;
26502
26503 set_tss_desc(cpu, t); /*
26504 * This just modifies memory; should not be
26505@@ -141,7 +141,9 @@ static void fix_processor_context(void)
26506 */
26507
26508 #ifdef CONFIG_X86_64
26509+ pax_open_kernel();
26510 get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
26511+ pax_close_kernel();
26512
26513 syscall_init(); /* This sets MSR_*STAR and related */
26514 #endif
26515diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
26516index 5d17950..2253fc9 100644
26517--- a/arch/x86/vdso/Makefile
26518+++ b/arch/x86/vdso/Makefile
26519@@ -137,7 +137,7 @@ quiet_cmd_vdso = VDSO $@
26520 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
26521 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
26522
26523-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26524+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26525 GCOV_PROFILE := n
26526
26527 #
26528diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
26529index 468d591..8e80a0a 100644
26530--- a/arch/x86/vdso/vdso32-setup.c
26531+++ b/arch/x86/vdso/vdso32-setup.c
26532@@ -25,6 +25,7 @@
26533 #include <asm/tlbflush.h>
26534 #include <asm/vdso.h>
26535 #include <asm/proto.h>
26536+#include <asm/mman.h>
26537
26538 enum {
26539 VDSO_DISABLED = 0,
26540@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
26541 void enable_sep_cpu(void)
26542 {
26543 int cpu = get_cpu();
26544- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26545+ struct tss_struct *tss = init_tss + cpu;
26546
26547 if (!boot_cpu_has(X86_FEATURE_SEP)) {
26548 put_cpu();
26549@@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
26550 gate_vma.vm_start = FIXADDR_USER_START;
26551 gate_vma.vm_end = FIXADDR_USER_END;
26552 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
26553- gate_vma.vm_page_prot = __P101;
26554+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
26555 /*
26556 * Make sure the vDSO gets into every core dump.
26557 * Dumping its contents makes post-mortem fully interpretable later
26558@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26559 if (compat)
26560 addr = VDSO_HIGH_BASE;
26561 else {
26562- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
26563+ addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
26564 if (IS_ERR_VALUE(addr)) {
26565 ret = addr;
26566 goto up_fail;
26567 }
26568 }
26569
26570- current->mm->context.vdso = (void *)addr;
26571+ current->mm->context.vdso = addr;
26572
26573 if (compat_uses_vma || !compat) {
26574 /*
26575@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26576 }
26577
26578 current_thread_info()->sysenter_return =
26579- VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26580+ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26581
26582 up_fail:
26583 if (ret)
26584- current->mm->context.vdso = NULL;
26585+ current->mm->context.vdso = 0;
26586
26587 up_write(&mm->mmap_sem);
26588
26589@@ -412,8 +413,14 @@ __initcall(ia32_binfmt_init);
26590
26591 const char *arch_vma_name(struct vm_area_struct *vma)
26592 {
26593- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
26594+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
26595 return "[vdso]";
26596+
26597+#ifdef CONFIG_PAX_SEGMEXEC
26598+ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
26599+ return "[vdso]";
26600+#endif
26601+
26602 return NULL;
26603 }
26604
26605@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
26606 * Check to see if the corresponding task was created in compat vdso
26607 * mode.
26608 */
26609- if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
26610+ if (mm && mm->context.vdso == VDSO_HIGH_BASE)
26611 return &gate_vma;
26612 return NULL;
26613 }
26614diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
26615index 153407c..611cba9 100644
26616--- a/arch/x86/vdso/vma.c
26617+++ b/arch/x86/vdso/vma.c
26618@@ -16,8 +16,6 @@
26619 #include <asm/vdso.h>
26620 #include <asm/page.h>
26621
26622-unsigned int __read_mostly vdso_enabled = 1;
26623-
26624 extern char vdso_start[], vdso_end[];
26625 extern unsigned short vdso_sync_cpuid;
26626
26627@@ -96,7 +94,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
26628 * unaligned here as a result of stack start randomization.
26629 */
26630 addr = PAGE_ALIGN(addr);
26631- addr = align_addr(addr, NULL, ALIGN_VDSO);
26632
26633 return addr;
26634 }
26635@@ -106,40 +103,35 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
26636 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26637 {
26638 struct mm_struct *mm = current->mm;
26639- unsigned long addr;
26640+ unsigned long addr = 0;
26641 int ret;
26642
26643- if (!vdso_enabled)
26644- return 0;
26645-
26646 down_write(&mm->mmap_sem);
26647+
26648+#ifdef CONFIG_PAX_RANDMMAP
26649+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26650+#endif
26651+
26652 addr = vdso_addr(mm->start_stack, vdso_size);
26653+ addr = align_addr(addr, NULL, ALIGN_VDSO);
26654 addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
26655 if (IS_ERR_VALUE(addr)) {
26656 ret = addr;
26657 goto up_fail;
26658 }
26659
26660- current->mm->context.vdso = (void *)addr;
26661+ mm->context.vdso = addr;
26662
26663 ret = install_special_mapping(mm, addr, vdso_size,
26664 VM_READ|VM_EXEC|
26665 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
26666 VM_ALWAYSDUMP,
26667 vdso_pages);
26668- if (ret) {
26669- current->mm->context.vdso = NULL;
26670- goto up_fail;
26671- }
26672+
26673+ if (ret)
26674+ mm->context.vdso = 0;
26675
26676 up_fail:
26677 up_write(&mm->mmap_sem);
26678 return ret;
26679 }
26680-
26681-static __init int vdso_setup(char *s)
26682-{
26683- vdso_enabled = simple_strtoul(s, NULL, 0);
26684- return 0;
26685-}
26686-__setup("vdso=", vdso_setup);
26687diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
26688index 1f92865..c843b20 100644
26689--- a/arch/x86/xen/enlighten.c
26690+++ b/arch/x86/xen/enlighten.c
26691@@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
26692
26693 struct shared_info xen_dummy_shared_info;
26694
26695-void *xen_initial_gdt;
26696-
26697 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
26698 __read_mostly int xen_have_vector_callback;
26699 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
26700@@ -1029,7 +1027,7 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
26701 #endif
26702 };
26703
26704-static void xen_reboot(int reason)
26705+static __noreturn void xen_reboot(int reason)
26706 {
26707 struct sched_shutdown r = { .reason = reason };
26708
26709@@ -1037,17 +1035,17 @@ static void xen_reboot(int reason)
26710 BUG();
26711 }
26712
26713-static void xen_restart(char *msg)
26714+static __noreturn void xen_restart(char *msg)
26715 {
26716 xen_reboot(SHUTDOWN_reboot);
26717 }
26718
26719-static void xen_emergency_restart(void)
26720+static __noreturn void xen_emergency_restart(void)
26721 {
26722 xen_reboot(SHUTDOWN_reboot);
26723 }
26724
26725-static void xen_machine_halt(void)
26726+static __noreturn void xen_machine_halt(void)
26727 {
26728 xen_reboot(SHUTDOWN_poweroff);
26729 }
26730@@ -1153,7 +1151,17 @@ asmlinkage void __init xen_start_kernel(void)
26731 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
26732
26733 /* Work out if we support NX */
26734- x86_configure_nx();
26735+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
26736+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
26737+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
26738+ unsigned l, h;
26739+
26740+ __supported_pte_mask |= _PAGE_NX;
26741+ rdmsr(MSR_EFER, l, h);
26742+ l |= EFER_NX;
26743+ wrmsr(MSR_EFER, l, h);
26744+ }
26745+#endif
26746
26747 xen_setup_features();
26748
26749@@ -1184,13 +1192,6 @@ asmlinkage void __init xen_start_kernel(void)
26750
26751 machine_ops = xen_machine_ops;
26752
26753- /*
26754- * The only reliable way to retain the initial address of the
26755- * percpu gdt_page is to remember it here, so we can go and
26756- * mark it RW later, when the initial percpu area is freed.
26757- */
26758- xen_initial_gdt = &per_cpu(gdt_page, 0);
26759-
26760 xen_smp_init();
26761
26762 #ifdef CONFIG_ACPI_NUMA
26763diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
26764index 87f6673..e2555a6 100644
26765--- a/arch/x86/xen/mmu.c
26766+++ b/arch/x86/xen/mmu.c
26767@@ -1733,6 +1733,9 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
26768 convert_pfn_mfn(init_level4_pgt);
26769 convert_pfn_mfn(level3_ident_pgt);
26770 convert_pfn_mfn(level3_kernel_pgt);
26771+ convert_pfn_mfn(level3_vmalloc_start_pgt);
26772+ convert_pfn_mfn(level3_vmalloc_end_pgt);
26773+ convert_pfn_mfn(level3_vmemmap_pgt);
26774
26775 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
26776 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
26777@@ -1751,7 +1754,11 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
26778 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
26779 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
26780 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
26781+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
26782+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
26783+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
26784 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
26785+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
26786 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
26787 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
26788
26789@@ -1962,6 +1969,7 @@ static void __init xen_post_allocator_init(void)
26790 pv_mmu_ops.set_pud = xen_set_pud;
26791 #if PAGETABLE_LEVELS == 4
26792 pv_mmu_ops.set_pgd = xen_set_pgd;
26793+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
26794 #endif
26795
26796 /* This will work as long as patching hasn't happened yet
26797@@ -2043,6 +2051,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
26798 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
26799 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
26800 .set_pgd = xen_set_pgd_hyper,
26801+ .set_pgd_batched = xen_set_pgd_hyper,
26802
26803 .alloc_pud = xen_alloc_pmd_init,
26804 .release_pud = xen_release_pmd_init,
26805diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
26806index 041d4fe..7666b7e 100644
26807--- a/arch/x86/xen/smp.c
26808+++ b/arch/x86/xen/smp.c
26809@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
26810 {
26811 BUG_ON(smp_processor_id() != 0);
26812 native_smp_prepare_boot_cpu();
26813-
26814- /* We've switched to the "real" per-cpu gdt, so make sure the
26815- old memory can be recycled */
26816- make_lowmem_page_readwrite(xen_initial_gdt);
26817-
26818 xen_filter_cpu_maps();
26819 xen_setup_vcpu_info_placement();
26820 }
26821@@ -275,12 +270,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
26822 gdt = get_cpu_gdt_table(cpu);
26823
26824 ctxt->flags = VGCF_IN_KERNEL;
26825- ctxt->user_regs.ds = __USER_DS;
26826- ctxt->user_regs.es = __USER_DS;
26827+ ctxt->user_regs.ds = __KERNEL_DS;
26828+ ctxt->user_regs.es = __KERNEL_DS;
26829 ctxt->user_regs.ss = __KERNEL_DS;
26830 #ifdef CONFIG_X86_32
26831 ctxt->user_regs.fs = __KERNEL_PERCPU;
26832- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
26833+ savesegment(gs, ctxt->user_regs.gs);
26834 #else
26835 ctxt->gs_base_kernel = per_cpu_offset(cpu);
26836 #endif
26837@@ -331,13 +326,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
26838 int rc;
26839
26840 per_cpu(current_task, cpu) = idle;
26841+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
26842 #ifdef CONFIG_X86_32
26843 irq_ctx_init(cpu);
26844 #else
26845 clear_tsk_thread_flag(idle, TIF_FORK);
26846- per_cpu(kernel_stack, cpu) =
26847- (unsigned long)task_stack_page(idle) -
26848- KERNEL_STACK_OFFSET + THREAD_SIZE;
26849+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
26850 #endif
26851 xen_setup_runstate_info(cpu);
26852 xen_setup_timer(cpu);
26853diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
26854index b040b0e..8cc4fe0 100644
26855--- a/arch/x86/xen/xen-asm_32.S
26856+++ b/arch/x86/xen/xen-asm_32.S
26857@@ -83,14 +83,14 @@ ENTRY(xen_iret)
26858 ESP_OFFSET=4 # bytes pushed onto stack
26859
26860 /*
26861- * Store vcpu_info pointer for easy access. Do it this way to
26862- * avoid having to reload %fs
26863+ * Store vcpu_info pointer for easy access.
26864 */
26865 #ifdef CONFIG_SMP
26866- GET_THREAD_INFO(%eax)
26867- movl TI_cpu(%eax), %eax
26868- movl __per_cpu_offset(,%eax,4), %eax
26869- mov xen_vcpu(%eax), %eax
26870+ push %fs
26871+ mov $(__KERNEL_PERCPU), %eax
26872+ mov %eax, %fs
26873+ mov PER_CPU_VAR(xen_vcpu), %eax
26874+ pop %fs
26875 #else
26876 movl xen_vcpu, %eax
26877 #endif
26878diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
26879index aaa7291..3f77960 100644
26880--- a/arch/x86/xen/xen-head.S
26881+++ b/arch/x86/xen/xen-head.S
26882@@ -19,6 +19,17 @@ ENTRY(startup_xen)
26883 #ifdef CONFIG_X86_32
26884 mov %esi,xen_start_info
26885 mov $init_thread_union+THREAD_SIZE,%esp
26886+#ifdef CONFIG_SMP
26887+ movl $cpu_gdt_table,%edi
26888+ movl $__per_cpu_load,%eax
26889+ movw %ax,__KERNEL_PERCPU + 2(%edi)
26890+ rorl $16,%eax
26891+ movb %al,__KERNEL_PERCPU + 4(%edi)
26892+ movb %ah,__KERNEL_PERCPU + 7(%edi)
26893+ movl $__per_cpu_end - 1,%eax
26894+ subl $__per_cpu_start,%eax
26895+ movw %ax,__KERNEL_PERCPU + 0(%edi)
26896+#endif
26897 #else
26898 mov %rsi,xen_start_info
26899 mov $init_thread_union+THREAD_SIZE,%rsp
26900diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
26901index b095739..8c17bcd 100644
26902--- a/arch/x86/xen/xen-ops.h
26903+++ b/arch/x86/xen/xen-ops.h
26904@@ -10,8 +10,6 @@
26905 extern const char xen_hypervisor_callback[];
26906 extern const char xen_failsafe_callback[];
26907
26908-extern void *xen_initial_gdt;
26909-
26910 struct trap_info;
26911 void xen_copy_trap_info(struct trap_info *traps);
26912
26913diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
26914index 525bd3d..ef888b1 100644
26915--- a/arch/xtensa/variants/dc232b/include/variant/core.h
26916+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
26917@@ -119,9 +119,9 @@
26918 ----------------------------------------------------------------------*/
26919
26920 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
26921-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
26922 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
26923 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
26924+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
26925
26926 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
26927 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
26928diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
26929index 2f33760..835e50a 100644
26930--- a/arch/xtensa/variants/fsf/include/variant/core.h
26931+++ b/arch/xtensa/variants/fsf/include/variant/core.h
26932@@ -11,6 +11,7 @@
26933 #ifndef _XTENSA_CORE_H
26934 #define _XTENSA_CORE_H
26935
26936+#include <linux/const.h>
26937
26938 /****************************************************************************
26939 Parameters Useful for Any Code, USER or PRIVILEGED
26940@@ -112,9 +113,9 @@
26941 ----------------------------------------------------------------------*/
26942
26943 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
26944-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
26945 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
26946 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
26947+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
26948
26949 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
26950 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
26951diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
26952index af00795..2bb8105 100644
26953--- a/arch/xtensa/variants/s6000/include/variant/core.h
26954+++ b/arch/xtensa/variants/s6000/include/variant/core.h
26955@@ -11,6 +11,7 @@
26956 #ifndef _XTENSA_CORE_CONFIGURATION_H
26957 #define _XTENSA_CORE_CONFIGURATION_H
26958
26959+#include <linux/const.h>
26960
26961 /****************************************************************************
26962 Parameters Useful for Any Code, USER or PRIVILEGED
26963@@ -118,9 +119,9 @@
26964 ----------------------------------------------------------------------*/
26965
26966 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
26967-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
26968 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
26969 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
26970+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
26971
26972 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
26973 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
26974diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
26975index 58916af..9cb880b 100644
26976--- a/block/blk-iopoll.c
26977+++ b/block/blk-iopoll.c
26978@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
26979 }
26980 EXPORT_SYMBOL(blk_iopoll_complete);
26981
26982-static void blk_iopoll_softirq(struct softirq_action *h)
26983+static void blk_iopoll_softirq(void)
26984 {
26985 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
26986 int rearm = 0, budget = blk_iopoll_budget;
26987diff --git a/block/blk-map.c b/block/blk-map.c
26988index 623e1cd..ca1e109 100644
26989--- a/block/blk-map.c
26990+++ b/block/blk-map.c
26991@@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
26992 if (!len || !kbuf)
26993 return -EINVAL;
26994
26995- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
26996+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
26997 if (do_copy)
26998 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
26999 else
27000diff --git a/block/blk-softirq.c b/block/blk-softirq.c
27001index 1366a89..e17f54b 100644
27002--- a/block/blk-softirq.c
27003+++ b/block/blk-softirq.c
27004@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
27005 * Softirq action handler - move entries to local list and loop over them
27006 * while passing them to the queue registered handler.
27007 */
27008-static void blk_done_softirq(struct softirq_action *h)
27009+static void blk_done_softirq(void)
27010 {
27011 struct list_head *cpu_list, local_list;
27012
27013diff --git a/block/bsg.c b/block/bsg.c
27014index c0ab25c..9d49f8f 100644
27015--- a/block/bsg.c
27016+++ b/block/bsg.c
27017@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
27018 struct sg_io_v4 *hdr, struct bsg_device *bd,
27019 fmode_t has_write_perm)
27020 {
27021+ unsigned char tmpcmd[sizeof(rq->__cmd)];
27022+ unsigned char *cmdptr;
27023+
27024 if (hdr->request_len > BLK_MAX_CDB) {
27025 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
27026 if (!rq->cmd)
27027 return -ENOMEM;
27028- }
27029+ cmdptr = rq->cmd;
27030+ } else
27031+ cmdptr = tmpcmd;
27032
27033- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
27034+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
27035 hdr->request_len))
27036 return -EFAULT;
27037
27038+ if (cmdptr != rq->cmd)
27039+ memcpy(rq->cmd, cmdptr, hdr->request_len);
27040+
27041 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
27042 if (blk_verify_command(rq->cmd, has_write_perm))
27043 return -EPERM;
27044diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
27045index 7b72502..646105c 100644
27046--- a/block/compat_ioctl.c
27047+++ b/block/compat_ioctl.c
27048@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
27049 err |= __get_user(f->spec1, &uf->spec1);
27050 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
27051 err |= __get_user(name, &uf->name);
27052- f->name = compat_ptr(name);
27053+ f->name = (void __force_kernel *)compat_ptr(name);
27054 if (err) {
27055 err = -EFAULT;
27056 goto out;
27057diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
27058index 688be8a..8a37d98 100644
27059--- a/block/scsi_ioctl.c
27060+++ b/block/scsi_ioctl.c
27061@@ -223,8 +223,20 @@ EXPORT_SYMBOL(blk_verify_command);
27062 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
27063 struct sg_io_hdr *hdr, fmode_t mode)
27064 {
27065- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
27066+ unsigned char tmpcmd[sizeof(rq->__cmd)];
27067+ unsigned char *cmdptr;
27068+
27069+ if (rq->cmd != rq->__cmd)
27070+ cmdptr = rq->cmd;
27071+ else
27072+ cmdptr = tmpcmd;
27073+
27074+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
27075 return -EFAULT;
27076+
27077+ if (cmdptr != rq->cmd)
27078+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
27079+
27080 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
27081 return -EPERM;
27082
27083@@ -433,6 +445,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27084 int err;
27085 unsigned int in_len, out_len, bytes, opcode, cmdlen;
27086 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
27087+ unsigned char tmpcmd[sizeof(rq->__cmd)];
27088+ unsigned char *cmdptr;
27089
27090 if (!sic)
27091 return -EINVAL;
27092@@ -466,9 +480,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27093 */
27094 err = -EFAULT;
27095 rq->cmd_len = cmdlen;
27096- if (copy_from_user(rq->cmd, sic->data, cmdlen))
27097+
27098+ if (rq->cmd != rq->__cmd)
27099+ cmdptr = rq->cmd;
27100+ else
27101+ cmdptr = tmpcmd;
27102+
27103+ if (copy_from_user(cmdptr, sic->data, cmdlen))
27104 goto error;
27105
27106+ if (rq->cmd != cmdptr)
27107+ memcpy(rq->cmd, cmdptr, cmdlen);
27108+
27109 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
27110 goto error;
27111
27112diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
27113index a0f768c..1da9c73 100644
27114--- a/crypto/ablkcipher.c
27115+++ b/crypto/ablkcipher.c
27116@@ -307,6 +307,8 @@ int ablkcipher_walk_phys(struct ablkcipher_request *req,
27117 EXPORT_SYMBOL_GPL(ablkcipher_walk_phys);
27118
27119 static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27120+ unsigned int keylen) __size_overflow(3);
27121+static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27122 unsigned int keylen)
27123 {
27124 struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
27125@@ -329,6 +331,8 @@ static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27126 }
27127
27128 static int setkey(struct crypto_ablkcipher *tfm, const u8 *key,
27129+ unsigned int keylen) __size_overflow(3);
27130+static int setkey(struct crypto_ablkcipher *tfm, const u8 *key,
27131 unsigned int keylen)
27132 {
27133 struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
27134diff --git a/crypto/aead.c b/crypto/aead.c
27135index 04add3dc..983032f 100644
27136--- a/crypto/aead.c
27137+++ b/crypto/aead.c
27138@@ -27,6 +27,8 @@
27139 #include "internal.h"
27140
27141 static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27142+ unsigned int keylen) __size_overflow(3);
27143+static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27144 unsigned int keylen)
27145 {
27146 struct aead_alg *aead = crypto_aead_alg(tfm);
27147@@ -48,6 +50,7 @@ static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27148 return ret;
27149 }
27150
27151+static int setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27152 static int setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen)
27153 {
27154 struct aead_alg *aead = crypto_aead_alg(tfm);
27155diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
27156index 1e61d1a..cf06b86 100644
27157--- a/crypto/blkcipher.c
27158+++ b/crypto/blkcipher.c
27159@@ -359,6 +359,8 @@ int blkcipher_walk_virt_block(struct blkcipher_desc *desc,
27160 EXPORT_SYMBOL_GPL(blkcipher_walk_virt_block);
27161
27162 static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27163+ unsigned int keylen) __size_overflow(3);
27164+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27165 unsigned int keylen)
27166 {
27167 struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
27168@@ -380,6 +382,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27169 return ret;
27170 }
27171
27172+static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27173 static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
27174 {
27175 struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
27176diff --git a/crypto/cipher.c b/crypto/cipher.c
27177index 39541e0..802d956 100644
27178--- a/crypto/cipher.c
27179+++ b/crypto/cipher.c
27180@@ -21,6 +21,8 @@
27181 #include "internal.h"
27182
27183 static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27184+ unsigned int keylen) __size_overflow(3);
27185+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27186 unsigned int keylen)
27187 {
27188 struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
27189@@ -43,6 +45,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27190
27191 }
27192
27193+static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27194 static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
27195 {
27196 struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
27197diff --git a/crypto/cryptd.c b/crypto/cryptd.c
27198index 671d4d6..5f24030 100644
27199--- a/crypto/cryptd.c
27200+++ b/crypto/cryptd.c
27201@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
27202
27203 struct cryptd_blkcipher_request_ctx {
27204 crypto_completion_t complete;
27205-};
27206+} __no_const;
27207
27208 struct cryptd_hash_ctx {
27209 struct crypto_shash *child;
27210@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
27211
27212 struct cryptd_aead_request_ctx {
27213 crypto_completion_t complete;
27214-};
27215+} __no_const;
27216
27217 static void cryptd_queue_worker(struct work_struct *work);
27218
27219diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
27220index 5d41894..22021e4 100644
27221--- a/drivers/acpi/apei/cper.c
27222+++ b/drivers/acpi/apei/cper.c
27223@@ -38,12 +38,12 @@
27224 */
27225 u64 cper_next_record_id(void)
27226 {
27227- static atomic64_t seq;
27228+ static atomic64_unchecked_t seq;
27229
27230- if (!atomic64_read(&seq))
27231- atomic64_set(&seq, ((u64)get_seconds()) << 32);
27232+ if (!atomic64_read_unchecked(&seq))
27233+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
27234
27235- return atomic64_inc_return(&seq);
27236+ return atomic64_inc_return_unchecked(&seq);
27237 }
27238 EXPORT_SYMBOL_GPL(cper_next_record_id);
27239
27240diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
27241index 7711d94..8622811 100644
27242--- a/drivers/acpi/battery.c
27243+++ b/drivers/acpi/battery.c
27244@@ -787,6 +787,9 @@ static int acpi_battery_print_alarm(struct seq_file *seq, int result)
27245
27246 static ssize_t acpi_battery_write_alarm(struct file *file,
27247 const char __user * buffer,
27248+ size_t count, loff_t * ppos) __size_overflow(3);
27249+static ssize_t acpi_battery_write_alarm(struct file *file,
27250+ const char __user * buffer,
27251 size_t count, loff_t * ppos)
27252 {
27253 int result = 0;
27254diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
27255index 6c47ae9..abfdd63 100644
27256--- a/drivers/acpi/ec_sys.c
27257+++ b/drivers/acpi/ec_sys.c
27258@@ -12,6 +12,7 @@
27259 #include <linux/acpi.h>
27260 #include <linux/debugfs.h>
27261 #include <linux/module.h>
27262+#include <linux/uaccess.h>
27263 #include "internal.h"
27264
27265 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
27266@@ -40,7 +41,7 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
27267 * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
27268 */
27269 unsigned int size = EC_SPACE_SIZE;
27270- u8 *data = (u8 *) buf;
27271+ u8 data;
27272 loff_t init_off = *off;
27273 int err = 0;
27274
27275@@ -53,9 +54,11 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
27276 size = count;
27277
27278 while (size) {
27279- err = ec_read(*off, &data[*off - init_off]);
27280+ err = ec_read(*off, &data);
27281 if (err)
27282 return err;
27283+ if (put_user(data, &buf[*off - init_off]))
27284+ return -EFAULT;
27285 *off += 1;
27286 size--;
27287 }
27288@@ -71,7 +74,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
27289
27290 unsigned int size = count;
27291 loff_t init_off = *off;
27292- u8 *data = (u8 *) buf;
27293 int err = 0;
27294
27295 if (*off >= EC_SPACE_SIZE)
27296@@ -82,7 +84,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
27297 }
27298
27299 while (size) {
27300- u8 byte_write = data[*off - init_off];
27301+ u8 byte_write;
27302+ if (get_user(byte_write, &buf[*off - init_off]))
27303+ return -EFAULT;
27304 err = ec_write(*off, byte_write);
27305 if (err)
27306 return err;
27307diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
27308index 251c7b62..000462d 100644
27309--- a/drivers/acpi/proc.c
27310+++ b/drivers/acpi/proc.c
27311@@ -343,19 +343,13 @@ acpi_system_write_wakeup_device(struct file *file,
27312 size_t count, loff_t * ppos)
27313 {
27314 struct list_head *node, *next;
27315- char strbuf[5];
27316- char str[5] = "";
27317- unsigned int len = count;
27318+ char strbuf[5] = {0};
27319
27320- if (len > 4)
27321- len = 4;
27322- if (len < 0)
27323+ if (count > 4)
27324+ count = 4;
27325+ if (copy_from_user(strbuf, buffer, count))
27326 return -EFAULT;
27327-
27328- if (copy_from_user(strbuf, buffer, len))
27329- return -EFAULT;
27330- strbuf[len] = '\0';
27331- sscanf(strbuf, "%s", str);
27332+ strbuf[count] = '\0';
27333
27334 mutex_lock(&acpi_device_lock);
27335 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
27336@@ -364,7 +358,7 @@ acpi_system_write_wakeup_device(struct file *file,
27337 if (!dev->wakeup.flags.valid)
27338 continue;
27339
27340- if (!strncmp(dev->pnp.bus_id, str, 4)) {
27341+ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
27342 if (device_can_wakeup(&dev->dev)) {
27343 bool enable = !device_may_wakeup(&dev->dev);
27344 device_set_wakeup_enable(&dev->dev, enable);
27345diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
27346index 9d7bc9f..a6fc091 100644
27347--- a/drivers/acpi/processor_driver.c
27348+++ b/drivers/acpi/processor_driver.c
27349@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
27350 return 0;
27351 #endif
27352
27353- BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
27354+ BUG_ON(pr->id >= nr_cpu_ids);
27355
27356 /*
27357 * Buggy BIOS check
27358diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
27359index 6e36d0c..f319944 100644
27360--- a/drivers/acpi/sbs.c
27361+++ b/drivers/acpi/sbs.c
27362@@ -655,6 +655,9 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
27363
27364 static ssize_t
27365 acpi_battery_write_alarm(struct file *file, const char __user * buffer,
27366+ size_t count, loff_t * ppos) __size_overflow(3);
27367+static ssize_t
27368+acpi_battery_write_alarm(struct file *file, const char __user * buffer,
27369 size_t count, loff_t * ppos)
27370 {
27371 struct seq_file *seq = file->private_data;
27372diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
27373index c04ad68..0b99473 100644
27374--- a/drivers/ata/libata-core.c
27375+++ b/drivers/ata/libata-core.c
27376@@ -4733,7 +4733,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
27377 struct ata_port *ap;
27378 unsigned int tag;
27379
27380- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27381+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27382 ap = qc->ap;
27383
27384 qc->flags = 0;
27385@@ -4749,7 +4749,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
27386 struct ata_port *ap;
27387 struct ata_link *link;
27388
27389- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27390+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27391 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
27392 ap = qc->ap;
27393 link = qc->dev->link;
27394@@ -5754,6 +5754,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27395 return;
27396
27397 spin_lock(&lock);
27398+ pax_open_kernel();
27399
27400 for (cur = ops->inherits; cur; cur = cur->inherits) {
27401 void **inherit = (void **)cur;
27402@@ -5767,8 +5768,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27403 if (IS_ERR(*pp))
27404 *pp = NULL;
27405
27406- ops->inherits = NULL;
27407+ *(struct ata_port_operations **)&ops->inherits = NULL;
27408
27409+ pax_close_kernel();
27410 spin_unlock(&lock);
27411 }
27412
27413diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
27414index e8574bb..f9f6a72 100644
27415--- a/drivers/ata/pata_arasan_cf.c
27416+++ b/drivers/ata/pata_arasan_cf.c
27417@@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
27418 /* Handle platform specific quirks */
27419 if (pdata->quirk) {
27420 if (pdata->quirk & CF_BROKEN_PIO) {
27421- ap->ops->set_piomode = NULL;
27422+ pax_open_kernel();
27423+ *(void **)&ap->ops->set_piomode = NULL;
27424+ pax_close_kernel();
27425 ap->pio_mask = 0;
27426 }
27427 if (pdata->quirk & CF_BROKEN_MWDMA)
27428diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
27429index f9b983a..887b9d8 100644
27430--- a/drivers/atm/adummy.c
27431+++ b/drivers/atm/adummy.c
27432@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
27433 vcc->pop(vcc, skb);
27434 else
27435 dev_kfree_skb_any(skb);
27436- atomic_inc(&vcc->stats->tx);
27437+ atomic_inc_unchecked(&vcc->stats->tx);
27438
27439 return 0;
27440 }
27441diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
27442index f8f41e0..1f987dd 100644
27443--- a/drivers/atm/ambassador.c
27444+++ b/drivers/atm/ambassador.c
27445@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
27446 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
27447
27448 // VC layer stats
27449- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27450+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27451
27452 // free the descriptor
27453 kfree (tx_descr);
27454@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
27455 dump_skb ("<<<", vc, skb);
27456
27457 // VC layer stats
27458- atomic_inc(&atm_vcc->stats->rx);
27459+ atomic_inc_unchecked(&atm_vcc->stats->rx);
27460 __net_timestamp(skb);
27461 // end of our responsibility
27462 atm_vcc->push (atm_vcc, skb);
27463@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
27464 } else {
27465 PRINTK (KERN_INFO, "dropped over-size frame");
27466 // should we count this?
27467- atomic_inc(&atm_vcc->stats->rx_drop);
27468+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27469 }
27470
27471 } else {
27472@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
27473 }
27474
27475 if (check_area (skb->data, skb->len)) {
27476- atomic_inc(&atm_vcc->stats->tx_err);
27477+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
27478 return -ENOMEM; // ?
27479 }
27480
27481diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
27482index b22d71c..d6e1049 100644
27483--- a/drivers/atm/atmtcp.c
27484+++ b/drivers/atm/atmtcp.c
27485@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27486 if (vcc->pop) vcc->pop(vcc,skb);
27487 else dev_kfree_skb(skb);
27488 if (dev_data) return 0;
27489- atomic_inc(&vcc->stats->tx_err);
27490+ atomic_inc_unchecked(&vcc->stats->tx_err);
27491 return -ENOLINK;
27492 }
27493 size = skb->len+sizeof(struct atmtcp_hdr);
27494@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27495 if (!new_skb) {
27496 if (vcc->pop) vcc->pop(vcc,skb);
27497 else dev_kfree_skb(skb);
27498- atomic_inc(&vcc->stats->tx_err);
27499+ atomic_inc_unchecked(&vcc->stats->tx_err);
27500 return -ENOBUFS;
27501 }
27502 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
27503@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27504 if (vcc->pop) vcc->pop(vcc,skb);
27505 else dev_kfree_skb(skb);
27506 out_vcc->push(out_vcc,new_skb);
27507- atomic_inc(&vcc->stats->tx);
27508- atomic_inc(&out_vcc->stats->rx);
27509+ atomic_inc_unchecked(&vcc->stats->tx);
27510+ atomic_inc_unchecked(&out_vcc->stats->rx);
27511 return 0;
27512 }
27513
27514@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
27515 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
27516 read_unlock(&vcc_sklist_lock);
27517 if (!out_vcc) {
27518- atomic_inc(&vcc->stats->tx_err);
27519+ atomic_inc_unchecked(&vcc->stats->tx_err);
27520 goto done;
27521 }
27522 skb_pull(skb,sizeof(struct atmtcp_hdr));
27523@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
27524 __net_timestamp(new_skb);
27525 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
27526 out_vcc->push(out_vcc,new_skb);
27527- atomic_inc(&vcc->stats->tx);
27528- atomic_inc(&out_vcc->stats->rx);
27529+ atomic_inc_unchecked(&vcc->stats->tx);
27530+ atomic_inc_unchecked(&out_vcc->stats->rx);
27531 done:
27532 if (vcc->pop) vcc->pop(vcc,skb);
27533 else dev_kfree_skb(skb);
27534diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
27535index 956e9ac..133516d 100644
27536--- a/drivers/atm/eni.c
27537+++ b/drivers/atm/eni.c
27538@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
27539 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
27540 vcc->dev->number);
27541 length = 0;
27542- atomic_inc(&vcc->stats->rx_err);
27543+ atomic_inc_unchecked(&vcc->stats->rx_err);
27544 }
27545 else {
27546 length = ATM_CELL_SIZE-1; /* no HEC */
27547@@ -581,7 +581,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27548 size);
27549 }
27550 eff = length = 0;
27551- atomic_inc(&vcc->stats->rx_err);
27552+ atomic_inc_unchecked(&vcc->stats->rx_err);
27553 }
27554 else {
27555 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
27556@@ -598,7 +598,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27557 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
27558 vcc->dev->number,vcc->vci,length,size << 2,descr);
27559 length = eff = 0;
27560- atomic_inc(&vcc->stats->rx_err);
27561+ atomic_inc_unchecked(&vcc->stats->rx_err);
27562 }
27563 }
27564 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
27565@@ -771,7 +771,7 @@ rx_dequeued++;
27566 vcc->push(vcc,skb);
27567 pushed++;
27568 }
27569- atomic_inc(&vcc->stats->rx);
27570+ atomic_inc_unchecked(&vcc->stats->rx);
27571 }
27572 wake_up(&eni_dev->rx_wait);
27573 }
27574@@ -1229,7 +1229,7 @@ static void dequeue_tx(struct atm_dev *dev)
27575 PCI_DMA_TODEVICE);
27576 if (vcc->pop) vcc->pop(vcc,skb);
27577 else dev_kfree_skb_irq(skb);
27578- atomic_inc(&vcc->stats->tx);
27579+ atomic_inc_unchecked(&vcc->stats->tx);
27580 wake_up(&eni_dev->tx_wait);
27581 dma_complete++;
27582 }
27583@@ -1569,7 +1569,7 @@ tx_complete++;
27584 /*--------------------------------- entries ---------------------------------*/
27585
27586
27587-static const char *media_name[] __devinitdata = {
27588+static const char *media_name[] __devinitconst = {
27589 "MMF", "SMF", "MMF", "03?", /* 0- 3 */
27590 "UTP", "05?", "06?", "07?", /* 4- 7 */
27591 "TAXI","09?", "10?", "11?", /* 8-11 */
27592diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
27593index 5072f8a..fa52520d 100644
27594--- a/drivers/atm/firestream.c
27595+++ b/drivers/atm/firestream.c
27596@@ -750,7 +750,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
27597 }
27598 }
27599
27600- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27601+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27602
27603 fs_dprintk (FS_DEBUG_TXMEM, "i");
27604 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
27605@@ -817,7 +817,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
27606 #endif
27607 skb_put (skb, qe->p1 & 0xffff);
27608 ATM_SKB(skb)->vcc = atm_vcc;
27609- atomic_inc(&atm_vcc->stats->rx);
27610+ atomic_inc_unchecked(&atm_vcc->stats->rx);
27611 __net_timestamp(skb);
27612 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
27613 atm_vcc->push (atm_vcc, skb);
27614@@ -838,12 +838,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
27615 kfree (pe);
27616 }
27617 if (atm_vcc)
27618- atomic_inc(&atm_vcc->stats->rx_drop);
27619+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27620 break;
27621 case 0x1f: /* Reassembly abort: no buffers. */
27622 /* Silently increment error counter. */
27623 if (atm_vcc)
27624- atomic_inc(&atm_vcc->stats->rx_drop);
27625+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27626 break;
27627 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
27628 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
27629diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
27630index 361f5ae..7fc552d 100644
27631--- a/drivers/atm/fore200e.c
27632+++ b/drivers/atm/fore200e.c
27633@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
27634 #endif
27635 /* check error condition */
27636 if (*entry->status & STATUS_ERROR)
27637- atomic_inc(&vcc->stats->tx_err);
27638+ atomic_inc_unchecked(&vcc->stats->tx_err);
27639 else
27640- atomic_inc(&vcc->stats->tx);
27641+ atomic_inc_unchecked(&vcc->stats->tx);
27642 }
27643 }
27644
27645@@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
27646 if (skb == NULL) {
27647 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
27648
27649- atomic_inc(&vcc->stats->rx_drop);
27650+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27651 return -ENOMEM;
27652 }
27653
27654@@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
27655
27656 dev_kfree_skb_any(skb);
27657
27658- atomic_inc(&vcc->stats->rx_drop);
27659+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27660 return -ENOMEM;
27661 }
27662
27663 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27664
27665 vcc->push(vcc, skb);
27666- atomic_inc(&vcc->stats->rx);
27667+ atomic_inc_unchecked(&vcc->stats->rx);
27668
27669 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27670
27671@@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
27672 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
27673 fore200e->atm_dev->number,
27674 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
27675- atomic_inc(&vcc->stats->rx_err);
27676+ atomic_inc_unchecked(&vcc->stats->rx_err);
27677 }
27678 }
27679
27680@@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
27681 goto retry_here;
27682 }
27683
27684- atomic_inc(&vcc->stats->tx_err);
27685+ atomic_inc_unchecked(&vcc->stats->tx_err);
27686
27687 fore200e->tx_sat++;
27688 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
27689diff --git a/drivers/atm/he.c b/drivers/atm/he.c
27690index 9a51df4..f3bb5f8 100644
27691--- a/drivers/atm/he.c
27692+++ b/drivers/atm/he.c
27693@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27694
27695 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
27696 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
27697- atomic_inc(&vcc->stats->rx_drop);
27698+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27699 goto return_host_buffers;
27700 }
27701
27702@@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27703 RBRQ_LEN_ERR(he_dev->rbrq_head)
27704 ? "LEN_ERR" : "",
27705 vcc->vpi, vcc->vci);
27706- atomic_inc(&vcc->stats->rx_err);
27707+ atomic_inc_unchecked(&vcc->stats->rx_err);
27708 goto return_host_buffers;
27709 }
27710
27711@@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27712 vcc->push(vcc, skb);
27713 spin_lock(&he_dev->global_lock);
27714
27715- atomic_inc(&vcc->stats->rx);
27716+ atomic_inc_unchecked(&vcc->stats->rx);
27717
27718 return_host_buffers:
27719 ++pdus_assembled;
27720@@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
27721 tpd->vcc->pop(tpd->vcc, tpd->skb);
27722 else
27723 dev_kfree_skb_any(tpd->skb);
27724- atomic_inc(&tpd->vcc->stats->tx_err);
27725+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
27726 }
27727 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
27728 return;
27729@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27730 vcc->pop(vcc, skb);
27731 else
27732 dev_kfree_skb_any(skb);
27733- atomic_inc(&vcc->stats->tx_err);
27734+ atomic_inc_unchecked(&vcc->stats->tx_err);
27735 return -EINVAL;
27736 }
27737
27738@@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27739 vcc->pop(vcc, skb);
27740 else
27741 dev_kfree_skb_any(skb);
27742- atomic_inc(&vcc->stats->tx_err);
27743+ atomic_inc_unchecked(&vcc->stats->tx_err);
27744 return -EINVAL;
27745 }
27746 #endif
27747@@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27748 vcc->pop(vcc, skb);
27749 else
27750 dev_kfree_skb_any(skb);
27751- atomic_inc(&vcc->stats->tx_err);
27752+ atomic_inc_unchecked(&vcc->stats->tx_err);
27753 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27754 return -ENOMEM;
27755 }
27756@@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27757 vcc->pop(vcc, skb);
27758 else
27759 dev_kfree_skb_any(skb);
27760- atomic_inc(&vcc->stats->tx_err);
27761+ atomic_inc_unchecked(&vcc->stats->tx_err);
27762 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27763 return -ENOMEM;
27764 }
27765@@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27766 __enqueue_tpd(he_dev, tpd, cid);
27767 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27768
27769- atomic_inc(&vcc->stats->tx);
27770+ atomic_inc_unchecked(&vcc->stats->tx);
27771
27772 return 0;
27773 }
27774diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
27775index b812103..e391a49 100644
27776--- a/drivers/atm/horizon.c
27777+++ b/drivers/atm/horizon.c
27778@@ -1035,7 +1035,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
27779 {
27780 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
27781 // VC layer stats
27782- atomic_inc(&vcc->stats->rx);
27783+ atomic_inc_unchecked(&vcc->stats->rx);
27784 __net_timestamp(skb);
27785 // end of our responsibility
27786 vcc->push (vcc, skb);
27787@@ -1187,7 +1187,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
27788 dev->tx_iovec = NULL;
27789
27790 // VC layer stats
27791- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27792+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27793
27794 // free the skb
27795 hrz_kfree_skb (skb);
27796diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
27797index 1c05212..c28e200 100644
27798--- a/drivers/atm/idt77252.c
27799+++ b/drivers/atm/idt77252.c
27800@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
27801 else
27802 dev_kfree_skb(skb);
27803
27804- atomic_inc(&vcc->stats->tx);
27805+ atomic_inc_unchecked(&vcc->stats->tx);
27806 }
27807
27808 atomic_dec(&scq->used);
27809@@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27810 if ((sb = dev_alloc_skb(64)) == NULL) {
27811 printk("%s: Can't allocate buffers for aal0.\n",
27812 card->name);
27813- atomic_add(i, &vcc->stats->rx_drop);
27814+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
27815 break;
27816 }
27817 if (!atm_charge(vcc, sb->truesize)) {
27818 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
27819 card->name);
27820- atomic_add(i - 1, &vcc->stats->rx_drop);
27821+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
27822 dev_kfree_skb(sb);
27823 break;
27824 }
27825@@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27826 ATM_SKB(sb)->vcc = vcc;
27827 __net_timestamp(sb);
27828 vcc->push(vcc, sb);
27829- atomic_inc(&vcc->stats->rx);
27830+ atomic_inc_unchecked(&vcc->stats->rx);
27831
27832 cell += ATM_CELL_PAYLOAD;
27833 }
27834@@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27835 "(CDC: %08x)\n",
27836 card->name, len, rpp->len, readl(SAR_REG_CDC));
27837 recycle_rx_pool_skb(card, rpp);
27838- atomic_inc(&vcc->stats->rx_err);
27839+ atomic_inc_unchecked(&vcc->stats->rx_err);
27840 return;
27841 }
27842 if (stat & SAR_RSQE_CRC) {
27843 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
27844 recycle_rx_pool_skb(card, rpp);
27845- atomic_inc(&vcc->stats->rx_err);
27846+ atomic_inc_unchecked(&vcc->stats->rx_err);
27847 return;
27848 }
27849 if (skb_queue_len(&rpp->queue) > 1) {
27850@@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27851 RXPRINTK("%s: Can't alloc RX skb.\n",
27852 card->name);
27853 recycle_rx_pool_skb(card, rpp);
27854- atomic_inc(&vcc->stats->rx_err);
27855+ atomic_inc_unchecked(&vcc->stats->rx_err);
27856 return;
27857 }
27858 if (!atm_charge(vcc, skb->truesize)) {
27859@@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27860 __net_timestamp(skb);
27861
27862 vcc->push(vcc, skb);
27863- atomic_inc(&vcc->stats->rx);
27864+ atomic_inc_unchecked(&vcc->stats->rx);
27865
27866 return;
27867 }
27868@@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27869 __net_timestamp(skb);
27870
27871 vcc->push(vcc, skb);
27872- atomic_inc(&vcc->stats->rx);
27873+ atomic_inc_unchecked(&vcc->stats->rx);
27874
27875 if (skb->truesize > SAR_FB_SIZE_3)
27876 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
27877@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
27878 if (vcc->qos.aal != ATM_AAL0) {
27879 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
27880 card->name, vpi, vci);
27881- atomic_inc(&vcc->stats->rx_drop);
27882+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27883 goto drop;
27884 }
27885
27886 if ((sb = dev_alloc_skb(64)) == NULL) {
27887 printk("%s: Can't allocate buffers for AAL0.\n",
27888 card->name);
27889- atomic_inc(&vcc->stats->rx_err);
27890+ atomic_inc_unchecked(&vcc->stats->rx_err);
27891 goto drop;
27892 }
27893
27894@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
27895 ATM_SKB(sb)->vcc = vcc;
27896 __net_timestamp(sb);
27897 vcc->push(vcc, sb);
27898- atomic_inc(&vcc->stats->rx);
27899+ atomic_inc_unchecked(&vcc->stats->rx);
27900
27901 drop:
27902 skb_pull(queue, 64);
27903@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
27904
27905 if (vc == NULL) {
27906 printk("%s: NULL connection in send().\n", card->name);
27907- atomic_inc(&vcc->stats->tx_err);
27908+ atomic_inc_unchecked(&vcc->stats->tx_err);
27909 dev_kfree_skb(skb);
27910 return -EINVAL;
27911 }
27912 if (!test_bit(VCF_TX, &vc->flags)) {
27913 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
27914- atomic_inc(&vcc->stats->tx_err);
27915+ atomic_inc_unchecked(&vcc->stats->tx_err);
27916 dev_kfree_skb(skb);
27917 return -EINVAL;
27918 }
27919@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
27920 break;
27921 default:
27922 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
27923- atomic_inc(&vcc->stats->tx_err);
27924+ atomic_inc_unchecked(&vcc->stats->tx_err);
27925 dev_kfree_skb(skb);
27926 return -EINVAL;
27927 }
27928
27929 if (skb_shinfo(skb)->nr_frags != 0) {
27930 printk("%s: No scatter-gather yet.\n", card->name);
27931- atomic_inc(&vcc->stats->tx_err);
27932+ atomic_inc_unchecked(&vcc->stats->tx_err);
27933 dev_kfree_skb(skb);
27934 return -EINVAL;
27935 }
27936@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
27937
27938 err = queue_skb(card, vc, skb, oam);
27939 if (err) {
27940- atomic_inc(&vcc->stats->tx_err);
27941+ atomic_inc_unchecked(&vcc->stats->tx_err);
27942 dev_kfree_skb(skb);
27943 return err;
27944 }
27945@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
27946 skb = dev_alloc_skb(64);
27947 if (!skb) {
27948 printk("%s: Out of memory in send_oam().\n", card->name);
27949- atomic_inc(&vcc->stats->tx_err);
27950+ atomic_inc_unchecked(&vcc->stats->tx_err);
27951 return -ENOMEM;
27952 }
27953 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
27954diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
27955index 3d0c2b0..45441fa 100644
27956--- a/drivers/atm/iphase.c
27957+++ b/drivers/atm/iphase.c
27958@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev)
27959 status = (u_short) (buf_desc_ptr->desc_mode);
27960 if (status & (RX_CER | RX_PTE | RX_OFL))
27961 {
27962- atomic_inc(&vcc->stats->rx_err);
27963+ atomic_inc_unchecked(&vcc->stats->rx_err);
27964 IF_ERR(printk("IA: bad packet, dropping it");)
27965 if (status & RX_CER) {
27966 IF_ERR(printk(" cause: packet CRC error\n");)
27967@@ -1169,7 +1169,7 @@ static int rx_pkt(struct atm_dev *dev)
27968 len = dma_addr - buf_addr;
27969 if (len > iadev->rx_buf_sz) {
27970 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
27971- atomic_inc(&vcc->stats->rx_err);
27972+ atomic_inc_unchecked(&vcc->stats->rx_err);
27973 goto out_free_desc;
27974 }
27975
27976@@ -1319,7 +1319,7 @@ static void rx_dle_intr(struct atm_dev *dev)
27977 ia_vcc = INPH_IA_VCC(vcc);
27978 if (ia_vcc == NULL)
27979 {
27980- atomic_inc(&vcc->stats->rx_err);
27981+ atomic_inc_unchecked(&vcc->stats->rx_err);
27982 dev_kfree_skb_any(skb);
27983 atm_return(vcc, atm_guess_pdu2truesize(len));
27984 goto INCR_DLE;
27985@@ -1331,7 +1331,7 @@ static void rx_dle_intr(struct atm_dev *dev)
27986 if ((length > iadev->rx_buf_sz) || (length >
27987 (skb->len - sizeof(struct cpcs_trailer))))
27988 {
27989- atomic_inc(&vcc->stats->rx_err);
27990+ atomic_inc_unchecked(&vcc->stats->rx_err);
27991 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
27992 length, skb->len);)
27993 dev_kfree_skb_any(skb);
27994@@ -1347,7 +1347,7 @@ static void rx_dle_intr(struct atm_dev *dev)
27995
27996 IF_RX(printk("rx_dle_intr: skb push");)
27997 vcc->push(vcc,skb);
27998- atomic_inc(&vcc->stats->rx);
27999+ atomic_inc_unchecked(&vcc->stats->rx);
28000 iadev->rx_pkt_cnt++;
28001 }
28002 INCR_DLE:
28003@@ -2827,15 +2827,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
28004 {
28005 struct k_sonet_stats *stats;
28006 stats = &PRIV(_ia_dev[board])->sonet_stats;
28007- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
28008- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
28009- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
28010- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
28011- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
28012- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
28013- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
28014- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
28015- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
28016+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
28017+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
28018+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
28019+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
28020+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
28021+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
28022+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
28023+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
28024+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
28025 }
28026 ia_cmds.status = 0;
28027 break;
28028@@ -2940,7 +2940,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
28029 if ((desc == 0) || (desc > iadev->num_tx_desc))
28030 {
28031 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
28032- atomic_inc(&vcc->stats->tx);
28033+ atomic_inc_unchecked(&vcc->stats->tx);
28034 if (vcc->pop)
28035 vcc->pop(vcc, skb);
28036 else
28037@@ -3045,14 +3045,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
28038 ATM_DESC(skb) = vcc->vci;
28039 skb_queue_tail(&iadev->tx_dma_q, skb);
28040
28041- atomic_inc(&vcc->stats->tx);
28042+ atomic_inc_unchecked(&vcc->stats->tx);
28043 iadev->tx_pkt_cnt++;
28044 /* Increment transaction counter */
28045 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
28046
28047 #if 0
28048 /* add flow control logic */
28049- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
28050+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
28051 if (iavcc->vc_desc_cnt > 10) {
28052 vcc->tx_quota = vcc->tx_quota * 3 / 4;
28053 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
28054diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
28055index f556969..0da15eb 100644
28056--- a/drivers/atm/lanai.c
28057+++ b/drivers/atm/lanai.c
28058@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
28059 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
28060 lanai_endtx(lanai, lvcc);
28061 lanai_free_skb(lvcc->tx.atmvcc, skb);
28062- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
28063+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
28064 }
28065
28066 /* Try to fill the buffer - don't call unless there is backlog */
28067@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
28068 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
28069 __net_timestamp(skb);
28070 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
28071- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
28072+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
28073 out:
28074 lvcc->rx.buf.ptr = end;
28075 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
28076@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28077 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
28078 "vcc %d\n", lanai->number, (unsigned int) s, vci);
28079 lanai->stats.service_rxnotaal5++;
28080- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28081+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28082 return 0;
28083 }
28084 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
28085@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28086 int bytes;
28087 read_unlock(&vcc_sklist_lock);
28088 DPRINTK("got trashed rx pdu on vci %d\n", vci);
28089- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28090+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28091 lvcc->stats.x.aal5.service_trash++;
28092 bytes = (SERVICE_GET_END(s) * 16) -
28093 (((unsigned long) lvcc->rx.buf.ptr) -
28094@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28095 }
28096 if (s & SERVICE_STREAM) {
28097 read_unlock(&vcc_sklist_lock);
28098- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28099+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28100 lvcc->stats.x.aal5.service_stream++;
28101 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
28102 "PDU on VCI %d!\n", lanai->number, vci);
28103@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28104 return 0;
28105 }
28106 DPRINTK("got rx crc error on vci %d\n", vci);
28107- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28108+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28109 lvcc->stats.x.aal5.service_rxcrc++;
28110 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
28111 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
28112diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
28113index 1c70c45..300718d 100644
28114--- a/drivers/atm/nicstar.c
28115+++ b/drivers/atm/nicstar.c
28116@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28117 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
28118 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
28119 card->index);
28120- atomic_inc(&vcc->stats->tx_err);
28121+ atomic_inc_unchecked(&vcc->stats->tx_err);
28122 dev_kfree_skb_any(skb);
28123 return -EINVAL;
28124 }
28125@@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28126 if (!vc->tx) {
28127 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
28128 card->index);
28129- atomic_inc(&vcc->stats->tx_err);
28130+ atomic_inc_unchecked(&vcc->stats->tx_err);
28131 dev_kfree_skb_any(skb);
28132 return -EINVAL;
28133 }
28134@@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28135 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
28136 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
28137 card->index);
28138- atomic_inc(&vcc->stats->tx_err);
28139+ atomic_inc_unchecked(&vcc->stats->tx_err);
28140 dev_kfree_skb_any(skb);
28141 return -EINVAL;
28142 }
28143
28144 if (skb_shinfo(skb)->nr_frags != 0) {
28145 printk("nicstar%d: No scatter-gather yet.\n", card->index);
28146- atomic_inc(&vcc->stats->tx_err);
28147+ atomic_inc_unchecked(&vcc->stats->tx_err);
28148 dev_kfree_skb_any(skb);
28149 return -EINVAL;
28150 }
28151@@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28152 }
28153
28154 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
28155- atomic_inc(&vcc->stats->tx_err);
28156+ atomic_inc_unchecked(&vcc->stats->tx_err);
28157 dev_kfree_skb_any(skb);
28158 return -EIO;
28159 }
28160- atomic_inc(&vcc->stats->tx);
28161+ atomic_inc_unchecked(&vcc->stats->tx);
28162
28163 return 0;
28164 }
28165@@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28166 printk
28167 ("nicstar%d: Can't allocate buffers for aal0.\n",
28168 card->index);
28169- atomic_add(i, &vcc->stats->rx_drop);
28170+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
28171 break;
28172 }
28173 if (!atm_charge(vcc, sb->truesize)) {
28174 RXPRINTK
28175 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
28176 card->index);
28177- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28178+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28179 dev_kfree_skb_any(sb);
28180 break;
28181 }
28182@@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28183 ATM_SKB(sb)->vcc = vcc;
28184 __net_timestamp(sb);
28185 vcc->push(vcc, sb);
28186- atomic_inc(&vcc->stats->rx);
28187+ atomic_inc_unchecked(&vcc->stats->rx);
28188 cell += ATM_CELL_PAYLOAD;
28189 }
28190
28191@@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28192 if (iovb == NULL) {
28193 printk("nicstar%d: Out of iovec buffers.\n",
28194 card->index);
28195- atomic_inc(&vcc->stats->rx_drop);
28196+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28197 recycle_rx_buf(card, skb);
28198 return;
28199 }
28200@@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28201 small or large buffer itself. */
28202 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
28203 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
28204- atomic_inc(&vcc->stats->rx_err);
28205+ atomic_inc_unchecked(&vcc->stats->rx_err);
28206 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28207 NS_MAX_IOVECS);
28208 NS_PRV_IOVCNT(iovb) = 0;
28209@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28210 ("nicstar%d: Expected a small buffer, and this is not one.\n",
28211 card->index);
28212 which_list(card, skb);
28213- atomic_inc(&vcc->stats->rx_err);
28214+ atomic_inc_unchecked(&vcc->stats->rx_err);
28215 recycle_rx_buf(card, skb);
28216 vc->rx_iov = NULL;
28217 recycle_iov_buf(card, iovb);
28218@@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28219 ("nicstar%d: Expected a large buffer, and this is not one.\n",
28220 card->index);
28221 which_list(card, skb);
28222- atomic_inc(&vcc->stats->rx_err);
28223+ atomic_inc_unchecked(&vcc->stats->rx_err);
28224 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28225 NS_PRV_IOVCNT(iovb));
28226 vc->rx_iov = NULL;
28227@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28228 printk(" - PDU size mismatch.\n");
28229 else
28230 printk(".\n");
28231- atomic_inc(&vcc->stats->rx_err);
28232+ atomic_inc_unchecked(&vcc->stats->rx_err);
28233 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28234 NS_PRV_IOVCNT(iovb));
28235 vc->rx_iov = NULL;
28236@@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28237 /* skb points to a small buffer */
28238 if (!atm_charge(vcc, skb->truesize)) {
28239 push_rxbufs(card, skb);
28240- atomic_inc(&vcc->stats->rx_drop);
28241+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28242 } else {
28243 skb_put(skb, len);
28244 dequeue_sm_buf(card, skb);
28245@@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28246 ATM_SKB(skb)->vcc = vcc;
28247 __net_timestamp(skb);
28248 vcc->push(vcc, skb);
28249- atomic_inc(&vcc->stats->rx);
28250+ atomic_inc_unchecked(&vcc->stats->rx);
28251 }
28252 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
28253 struct sk_buff *sb;
28254@@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28255 if (len <= NS_SMBUFSIZE) {
28256 if (!atm_charge(vcc, sb->truesize)) {
28257 push_rxbufs(card, sb);
28258- atomic_inc(&vcc->stats->rx_drop);
28259+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28260 } else {
28261 skb_put(sb, len);
28262 dequeue_sm_buf(card, sb);
28263@@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28264 ATM_SKB(sb)->vcc = vcc;
28265 __net_timestamp(sb);
28266 vcc->push(vcc, sb);
28267- atomic_inc(&vcc->stats->rx);
28268+ atomic_inc_unchecked(&vcc->stats->rx);
28269 }
28270
28271 push_rxbufs(card, skb);
28272@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28273
28274 if (!atm_charge(vcc, skb->truesize)) {
28275 push_rxbufs(card, skb);
28276- atomic_inc(&vcc->stats->rx_drop);
28277+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28278 } else {
28279 dequeue_lg_buf(card, skb);
28280 #ifdef NS_USE_DESTRUCTORS
28281@@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28282 ATM_SKB(skb)->vcc = vcc;
28283 __net_timestamp(skb);
28284 vcc->push(vcc, skb);
28285- atomic_inc(&vcc->stats->rx);
28286+ atomic_inc_unchecked(&vcc->stats->rx);
28287 }
28288
28289 push_rxbufs(card, sb);
28290@@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28291 printk
28292 ("nicstar%d: Out of huge buffers.\n",
28293 card->index);
28294- atomic_inc(&vcc->stats->rx_drop);
28295+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28296 recycle_iovec_rx_bufs(card,
28297 (struct iovec *)
28298 iovb->data,
28299@@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28300 card->hbpool.count++;
28301 } else
28302 dev_kfree_skb_any(hb);
28303- atomic_inc(&vcc->stats->rx_drop);
28304+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28305 } else {
28306 /* Copy the small buffer to the huge buffer */
28307 sb = (struct sk_buff *)iov->iov_base;
28308@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28309 #endif /* NS_USE_DESTRUCTORS */
28310 __net_timestamp(hb);
28311 vcc->push(vcc, hb);
28312- atomic_inc(&vcc->stats->rx);
28313+ atomic_inc_unchecked(&vcc->stats->rx);
28314 }
28315 }
28316
28317diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
28318index 5d1d076..12fbca4 100644
28319--- a/drivers/atm/solos-pci.c
28320+++ b/drivers/atm/solos-pci.c
28321@@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
28322 }
28323 atm_charge(vcc, skb->truesize);
28324 vcc->push(vcc, skb);
28325- atomic_inc(&vcc->stats->rx);
28326+ atomic_inc_unchecked(&vcc->stats->rx);
28327 break;
28328
28329 case PKT_STATUS:
28330@@ -1008,7 +1008,7 @@ static uint32_t fpga_tx(struct solos_card *card)
28331 vcc = SKB_CB(oldskb)->vcc;
28332
28333 if (vcc) {
28334- atomic_inc(&vcc->stats->tx);
28335+ atomic_inc_unchecked(&vcc->stats->tx);
28336 solos_pop(vcc, oldskb);
28337 } else
28338 dev_kfree_skb_irq(oldskb);
28339diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
28340index 90f1ccc..04c4a1e 100644
28341--- a/drivers/atm/suni.c
28342+++ b/drivers/atm/suni.c
28343@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
28344
28345
28346 #define ADD_LIMITED(s,v) \
28347- atomic_add((v),&stats->s); \
28348- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
28349+ atomic_add_unchecked((v),&stats->s); \
28350+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
28351
28352
28353 static void suni_hz(unsigned long from_timer)
28354diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
28355index 5120a96..e2572bd 100644
28356--- a/drivers/atm/uPD98402.c
28357+++ b/drivers/atm/uPD98402.c
28358@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
28359 struct sonet_stats tmp;
28360 int error = 0;
28361
28362- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
28363+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
28364 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
28365 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
28366 if (zero && !error) {
28367@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
28368
28369
28370 #define ADD_LIMITED(s,v) \
28371- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
28372- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
28373- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
28374+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
28375+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
28376+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
28377
28378
28379 static void stat_event(struct atm_dev *dev)
28380@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
28381 if (reason & uPD98402_INT_PFM) stat_event(dev);
28382 if (reason & uPD98402_INT_PCO) {
28383 (void) GET(PCOCR); /* clear interrupt cause */
28384- atomic_add(GET(HECCT),
28385+ atomic_add_unchecked(GET(HECCT),
28386 &PRIV(dev)->sonet_stats.uncorr_hcs);
28387 }
28388 if ((reason & uPD98402_INT_RFO) &&
28389@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
28390 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
28391 uPD98402_INT_LOS),PIMR); /* enable them */
28392 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
28393- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28394- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
28395- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
28396+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28397+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
28398+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
28399 return 0;
28400 }
28401
28402diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
28403index d889f56..17eb71e 100644
28404--- a/drivers/atm/zatm.c
28405+++ b/drivers/atm/zatm.c
28406@@ -460,7 +460,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
28407 }
28408 if (!size) {
28409 dev_kfree_skb_irq(skb);
28410- if (vcc) atomic_inc(&vcc->stats->rx_err);
28411+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
28412 continue;
28413 }
28414 if (!atm_charge(vcc,skb->truesize)) {
28415@@ -470,7 +470,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
28416 skb->len = size;
28417 ATM_SKB(skb)->vcc = vcc;
28418 vcc->push(vcc,skb);
28419- atomic_inc(&vcc->stats->rx);
28420+ atomic_inc_unchecked(&vcc->stats->rx);
28421 }
28422 zout(pos & 0xffff,MTA(mbx));
28423 #if 0 /* probably a stupid idea */
28424@@ -734,7 +734,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
28425 skb_queue_head(&zatm_vcc->backlog,skb);
28426 break;
28427 }
28428- atomic_inc(&vcc->stats->tx);
28429+ atomic_inc_unchecked(&vcc->stats->tx);
28430 wake_up(&zatm_vcc->tx_wait);
28431 }
28432
28433diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
28434index a4760e0..51283cf 100644
28435--- a/drivers/base/devtmpfs.c
28436+++ b/drivers/base/devtmpfs.c
28437@@ -368,7 +368,7 @@ int devtmpfs_mount(const char *mntdir)
28438 if (!thread)
28439 return 0;
28440
28441- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
28442+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
28443 if (err)
28444 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
28445 else
28446diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
28447index caf995f..6f76697 100644
28448--- a/drivers/base/power/wakeup.c
28449+++ b/drivers/base/power/wakeup.c
28450@@ -30,14 +30,14 @@ bool events_check_enabled;
28451 * They need to be modified together atomically, so it's better to use one
28452 * atomic variable to hold them both.
28453 */
28454-static atomic_t combined_event_count = ATOMIC_INIT(0);
28455+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
28456
28457 #define IN_PROGRESS_BITS (sizeof(int) * 4)
28458 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
28459
28460 static void split_counters(unsigned int *cnt, unsigned int *inpr)
28461 {
28462- unsigned int comb = atomic_read(&combined_event_count);
28463+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
28464
28465 *cnt = (comb >> IN_PROGRESS_BITS);
28466 *inpr = comb & MAX_IN_PROGRESS;
28467@@ -353,7 +353,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
28468 ws->last_time = ktime_get();
28469
28470 /* Increment the counter of events in progress. */
28471- atomic_inc(&combined_event_count);
28472+ atomic_inc_unchecked(&combined_event_count);
28473 }
28474
28475 /**
28476@@ -443,7 +443,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
28477 * Increment the counter of registered wakeup events and decrement the
28478 * couter of wakeup events in progress simultaneously.
28479 */
28480- atomic_add(MAX_IN_PROGRESS, &combined_event_count);
28481+ atomic_add_unchecked(MAX_IN_PROGRESS, &combined_event_count);
28482 }
28483
28484 /**
28485diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
28486index b0f553b..77b928b 100644
28487--- a/drivers/block/cciss.c
28488+++ b/drivers/block/cciss.c
28489@@ -1198,6 +1198,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
28490 int err;
28491 u32 cp;
28492
28493+ memset(&arg64, 0, sizeof(arg64));
28494+
28495 err = 0;
28496 err |=
28497 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
28498@@ -3007,7 +3009,7 @@ static void start_io(ctlr_info_t *h)
28499 while (!list_empty(&h->reqQ)) {
28500 c = list_entry(h->reqQ.next, CommandList_struct, list);
28501 /* can't do anything if fifo is full */
28502- if ((h->access.fifo_full(h))) {
28503+ if ((h->access->fifo_full(h))) {
28504 dev_warn(&h->pdev->dev, "fifo full\n");
28505 break;
28506 }
28507@@ -3017,7 +3019,7 @@ static void start_io(ctlr_info_t *h)
28508 h->Qdepth--;
28509
28510 /* Tell the controller execute command */
28511- h->access.submit_command(h, c);
28512+ h->access->submit_command(h, c);
28513
28514 /* Put job onto the completed Q */
28515 addQ(&h->cmpQ, c);
28516@@ -3443,17 +3445,17 @@ startio:
28517
28518 static inline unsigned long get_next_completion(ctlr_info_t *h)
28519 {
28520- return h->access.command_completed(h);
28521+ return h->access->command_completed(h);
28522 }
28523
28524 static inline int interrupt_pending(ctlr_info_t *h)
28525 {
28526- return h->access.intr_pending(h);
28527+ return h->access->intr_pending(h);
28528 }
28529
28530 static inline long interrupt_not_for_us(ctlr_info_t *h)
28531 {
28532- return ((h->access.intr_pending(h) == 0) ||
28533+ return ((h->access->intr_pending(h) == 0) ||
28534 (h->interrupts_enabled == 0));
28535 }
28536
28537@@ -3486,7 +3488,7 @@ static inline u32 next_command(ctlr_info_t *h)
28538 u32 a;
28539
28540 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
28541- return h->access.command_completed(h);
28542+ return h->access->command_completed(h);
28543
28544 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
28545 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
28546@@ -4044,7 +4046,7 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h)
28547 trans_support & CFGTBL_Trans_use_short_tags);
28548
28549 /* Change the access methods to the performant access methods */
28550- h->access = SA5_performant_access;
28551+ h->access = &SA5_performant_access;
28552 h->transMethod = CFGTBL_Trans_Performant;
28553
28554 return;
28555@@ -4316,7 +4318,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
28556 if (prod_index < 0)
28557 return -ENODEV;
28558 h->product_name = products[prod_index].product_name;
28559- h->access = *(products[prod_index].access);
28560+ h->access = products[prod_index].access;
28561
28562 if (cciss_board_disabled(h)) {
28563 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
28564@@ -5041,7 +5043,7 @@ reinit_after_soft_reset:
28565 }
28566
28567 /* make sure the board interrupts are off */
28568- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28569+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28570 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
28571 if (rc)
28572 goto clean2;
28573@@ -5093,7 +5095,7 @@ reinit_after_soft_reset:
28574 * fake ones to scoop up any residual completions.
28575 */
28576 spin_lock_irqsave(&h->lock, flags);
28577- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28578+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28579 spin_unlock_irqrestore(&h->lock, flags);
28580 free_irq(h->intr[h->intr_mode], h);
28581 rc = cciss_request_irq(h, cciss_msix_discard_completions,
28582@@ -5113,9 +5115,9 @@ reinit_after_soft_reset:
28583 dev_info(&h->pdev->dev, "Board READY.\n");
28584 dev_info(&h->pdev->dev,
28585 "Waiting for stale completions to drain.\n");
28586- h->access.set_intr_mask(h, CCISS_INTR_ON);
28587+ h->access->set_intr_mask(h, CCISS_INTR_ON);
28588 msleep(10000);
28589- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28590+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28591
28592 rc = controller_reset_failed(h->cfgtable);
28593 if (rc)
28594@@ -5138,7 +5140,7 @@ reinit_after_soft_reset:
28595 cciss_scsi_setup(h);
28596
28597 /* Turn the interrupts on so we can service requests */
28598- h->access.set_intr_mask(h, CCISS_INTR_ON);
28599+ h->access->set_intr_mask(h, CCISS_INTR_ON);
28600
28601 /* Get the firmware version */
28602 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
28603@@ -5211,7 +5213,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
28604 kfree(flush_buf);
28605 if (return_code != IO_OK)
28606 dev_warn(&h->pdev->dev, "Error flushing cache\n");
28607- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28608+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28609 free_irq(h->intr[h->intr_mode], h);
28610 }
28611
28612diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
28613index 7fda30e..eb5dfe0 100644
28614--- a/drivers/block/cciss.h
28615+++ b/drivers/block/cciss.h
28616@@ -101,7 +101,7 @@ struct ctlr_info
28617 /* information about each logical volume */
28618 drive_info_struct *drv[CISS_MAX_LUN];
28619
28620- struct access_method access;
28621+ struct access_method *access;
28622
28623 /* queue and queue Info */
28624 struct list_head reqQ;
28625diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
28626index 9125bbe..eede5c8 100644
28627--- a/drivers/block/cpqarray.c
28628+++ b/drivers/block/cpqarray.c
28629@@ -404,7 +404,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
28630 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
28631 goto Enomem4;
28632 }
28633- hba[i]->access.set_intr_mask(hba[i], 0);
28634+ hba[i]->access->set_intr_mask(hba[i], 0);
28635 if (request_irq(hba[i]->intr, do_ida_intr,
28636 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
28637 {
28638@@ -459,7 +459,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
28639 add_timer(&hba[i]->timer);
28640
28641 /* Enable IRQ now that spinlock and rate limit timer are set up */
28642- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28643+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28644
28645 for(j=0; j<NWD; j++) {
28646 struct gendisk *disk = ida_gendisk[i][j];
28647@@ -694,7 +694,7 @@ DBGINFO(
28648 for(i=0; i<NR_PRODUCTS; i++) {
28649 if (board_id == products[i].board_id) {
28650 c->product_name = products[i].product_name;
28651- c->access = *(products[i].access);
28652+ c->access = products[i].access;
28653 break;
28654 }
28655 }
28656@@ -792,7 +792,7 @@ static int __devinit cpqarray_eisa_detect(void)
28657 hba[ctlr]->intr = intr;
28658 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
28659 hba[ctlr]->product_name = products[j].product_name;
28660- hba[ctlr]->access = *(products[j].access);
28661+ hba[ctlr]->access = products[j].access;
28662 hba[ctlr]->ctlr = ctlr;
28663 hba[ctlr]->board_id = board_id;
28664 hba[ctlr]->pci_dev = NULL; /* not PCI */
28665@@ -980,7 +980,7 @@ static void start_io(ctlr_info_t *h)
28666
28667 while((c = h->reqQ) != NULL) {
28668 /* Can't do anything if we're busy */
28669- if (h->access.fifo_full(h) == 0)
28670+ if (h->access->fifo_full(h) == 0)
28671 return;
28672
28673 /* Get the first entry from the request Q */
28674@@ -988,7 +988,7 @@ static void start_io(ctlr_info_t *h)
28675 h->Qdepth--;
28676
28677 /* Tell the controller to do our bidding */
28678- h->access.submit_command(h, c);
28679+ h->access->submit_command(h, c);
28680
28681 /* Get onto the completion Q */
28682 addQ(&h->cmpQ, c);
28683@@ -1050,7 +1050,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
28684 unsigned long flags;
28685 __u32 a,a1;
28686
28687- istat = h->access.intr_pending(h);
28688+ istat = h->access->intr_pending(h);
28689 /* Is this interrupt for us? */
28690 if (istat == 0)
28691 return IRQ_NONE;
28692@@ -1061,7 +1061,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
28693 */
28694 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
28695 if (istat & FIFO_NOT_EMPTY) {
28696- while((a = h->access.command_completed(h))) {
28697+ while((a = h->access->command_completed(h))) {
28698 a1 = a; a &= ~3;
28699 if ((c = h->cmpQ) == NULL)
28700 {
28701@@ -1449,11 +1449,11 @@ static int sendcmd(
28702 /*
28703 * Disable interrupt
28704 */
28705- info_p->access.set_intr_mask(info_p, 0);
28706+ info_p->access->set_intr_mask(info_p, 0);
28707 /* Make sure there is room in the command FIFO */
28708 /* Actually it should be completely empty at this time. */
28709 for (i = 200000; i > 0; i--) {
28710- temp = info_p->access.fifo_full(info_p);
28711+ temp = info_p->access->fifo_full(info_p);
28712 if (temp != 0) {
28713 break;
28714 }
28715@@ -1466,7 +1466,7 @@ DBG(
28716 /*
28717 * Send the cmd
28718 */
28719- info_p->access.submit_command(info_p, c);
28720+ info_p->access->submit_command(info_p, c);
28721 complete = pollcomplete(ctlr);
28722
28723 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
28724@@ -1549,9 +1549,9 @@ static int revalidate_allvol(ctlr_info_t *host)
28725 * we check the new geometry. Then turn interrupts back on when
28726 * we're done.
28727 */
28728- host->access.set_intr_mask(host, 0);
28729+ host->access->set_intr_mask(host, 0);
28730 getgeometry(ctlr);
28731- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
28732+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
28733
28734 for(i=0; i<NWD; i++) {
28735 struct gendisk *disk = ida_gendisk[ctlr][i];
28736@@ -1591,7 +1591,7 @@ static int pollcomplete(int ctlr)
28737 /* Wait (up to 2 seconds) for a command to complete */
28738
28739 for (i = 200000; i > 0; i--) {
28740- done = hba[ctlr]->access.command_completed(hba[ctlr]);
28741+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
28742 if (done == 0) {
28743 udelay(10); /* a short fixed delay */
28744 } else
28745diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
28746index be73e9d..7fbf140 100644
28747--- a/drivers/block/cpqarray.h
28748+++ b/drivers/block/cpqarray.h
28749@@ -99,7 +99,7 @@ struct ctlr_info {
28750 drv_info_t drv[NWD];
28751 struct proc_dir_entry *proc;
28752
28753- struct access_method access;
28754+ struct access_method *access;
28755
28756 cmdlist_t *reqQ;
28757 cmdlist_t *cmpQ;
28758diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
28759index 9cf2035..bffca95 100644
28760--- a/drivers/block/drbd/drbd_int.h
28761+++ b/drivers/block/drbd/drbd_int.h
28762@@ -736,7 +736,7 @@ struct drbd_request;
28763 struct drbd_epoch {
28764 struct list_head list;
28765 unsigned int barrier_nr;
28766- atomic_t epoch_size; /* increased on every request added. */
28767+ atomic_unchecked_t epoch_size; /* increased on every request added. */
28768 atomic_t active; /* increased on every req. added, and dec on every finished. */
28769 unsigned long flags;
28770 };
28771@@ -1108,7 +1108,7 @@ struct drbd_conf {
28772 void *int_dig_in;
28773 void *int_dig_vv;
28774 wait_queue_head_t seq_wait;
28775- atomic_t packet_seq;
28776+ atomic_unchecked_t packet_seq;
28777 unsigned int peer_seq;
28778 spinlock_t peer_seq_lock;
28779 unsigned int minor;
28780@@ -1617,30 +1617,30 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
28781
28782 static inline void drbd_tcp_cork(struct socket *sock)
28783 {
28784- int __user val = 1;
28785+ int val = 1;
28786 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
28787- (char __user *)&val, sizeof(val));
28788+ (char __force_user *)&val, sizeof(val));
28789 }
28790
28791 static inline void drbd_tcp_uncork(struct socket *sock)
28792 {
28793- int __user val = 0;
28794+ int val = 0;
28795 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
28796- (char __user *)&val, sizeof(val));
28797+ (char __force_user *)&val, sizeof(val));
28798 }
28799
28800 static inline void drbd_tcp_nodelay(struct socket *sock)
28801 {
28802- int __user val = 1;
28803+ int val = 1;
28804 (void) drbd_setsockopt(sock, SOL_TCP, TCP_NODELAY,
28805- (char __user *)&val, sizeof(val));
28806+ (char __force_user *)&val, sizeof(val));
28807 }
28808
28809 static inline void drbd_tcp_quickack(struct socket *sock)
28810 {
28811- int __user val = 2;
28812+ int val = 2;
28813 (void) drbd_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
28814- (char __user *)&val, sizeof(val));
28815+ (char __force_user *)&val, sizeof(val));
28816 }
28817
28818 void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
28819diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
28820index 0358e55..bc33689 100644
28821--- a/drivers/block/drbd/drbd_main.c
28822+++ b/drivers/block/drbd/drbd_main.c
28823@@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd,
28824 p.sector = sector;
28825 p.block_id = block_id;
28826 p.blksize = blksize;
28827- p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
28828+ p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
28829
28830 if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED)
28831 return false;
28832@@ -2696,7 +2696,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
28833 p.sector = cpu_to_be64(req->sector);
28834 p.block_id = (unsigned long)req;
28835 p.seq_num = cpu_to_be32(req->seq_num =
28836- atomic_add_return(1, &mdev->packet_seq));
28837+ atomic_add_return_unchecked(1, &mdev->packet_seq));
28838
28839 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
28840
28841@@ -2981,7 +2981,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
28842 atomic_set(&mdev->unacked_cnt, 0);
28843 atomic_set(&mdev->local_cnt, 0);
28844 atomic_set(&mdev->net_cnt, 0);
28845- atomic_set(&mdev->packet_seq, 0);
28846+ atomic_set_unchecked(&mdev->packet_seq, 0);
28847 atomic_set(&mdev->pp_in_use, 0);
28848 atomic_set(&mdev->pp_in_use_by_net, 0);
28849 atomic_set(&mdev->rs_sect_in, 0);
28850@@ -3063,8 +3063,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev)
28851 mdev->receiver.t_state);
28852
28853 /* no need to lock it, I'm the only thread alive */
28854- if (atomic_read(&mdev->current_epoch->epoch_size) != 0)
28855- dev_err(DEV, "epoch_size:%d\n", atomic_read(&mdev->current_epoch->epoch_size));
28856+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size) != 0)
28857+ dev_err(DEV, "epoch_size:%d\n", atomic_read_unchecked(&mdev->current_epoch->epoch_size));
28858 mdev->al_writ_cnt =
28859 mdev->bm_writ_cnt =
28860 mdev->read_cnt =
28861diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
28862index af2a250..219c74b 100644
28863--- a/drivers/block/drbd/drbd_nl.c
28864+++ b/drivers/block/drbd/drbd_nl.c
28865@@ -2359,7 +2359,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
28866 module_put(THIS_MODULE);
28867 }
28868
28869-static atomic_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
28870+static atomic_unchecked_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
28871
28872 static unsigned short *
28873 __tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data,
28874@@ -2430,7 +2430,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
28875 cn_reply->id.idx = CN_IDX_DRBD;
28876 cn_reply->id.val = CN_VAL_DRBD;
28877
28878- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
28879+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
28880 cn_reply->ack = 0; /* not used here. */
28881 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28882 (int)((char *)tl - (char *)reply->tag_list);
28883@@ -2462,7 +2462,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
28884 cn_reply->id.idx = CN_IDX_DRBD;
28885 cn_reply->id.val = CN_VAL_DRBD;
28886
28887- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
28888+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
28889 cn_reply->ack = 0; /* not used here. */
28890 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28891 (int)((char *)tl - (char *)reply->tag_list);
28892@@ -2540,7 +2540,7 @@ void drbd_bcast_ee(struct drbd_conf *mdev,
28893 cn_reply->id.idx = CN_IDX_DRBD;
28894 cn_reply->id.val = CN_VAL_DRBD;
28895
28896- cn_reply->seq = atomic_add_return(1,&drbd_nl_seq);
28897+ cn_reply->seq = atomic_add_return_unchecked(1,&drbd_nl_seq);
28898 cn_reply->ack = 0; // not used here.
28899 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28900 (int)((char*)tl - (char*)reply->tag_list);
28901@@ -2579,7 +2579,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
28902 cn_reply->id.idx = CN_IDX_DRBD;
28903 cn_reply->id.val = CN_VAL_DRBD;
28904
28905- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
28906+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
28907 cn_reply->ack = 0; /* not used here. */
28908 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28909 (int)((char *)tl - (char *)reply->tag_list);
28910diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
28911index 43beaca..4a5b1dd 100644
28912--- a/drivers/block/drbd/drbd_receiver.c
28913+++ b/drivers/block/drbd/drbd_receiver.c
28914@@ -894,7 +894,7 @@ retry:
28915 sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
28916 sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
28917
28918- atomic_set(&mdev->packet_seq, 0);
28919+ atomic_set_unchecked(&mdev->packet_seq, 0);
28920 mdev->peer_seq = 0;
28921
28922 drbd_thread_start(&mdev->asender);
28923@@ -985,7 +985,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
28924 do {
28925 next_epoch = NULL;
28926
28927- epoch_size = atomic_read(&epoch->epoch_size);
28928+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
28929
28930 switch (ev & ~EV_CLEANUP) {
28931 case EV_PUT:
28932@@ -1020,7 +1020,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
28933 rv = FE_DESTROYED;
28934 } else {
28935 epoch->flags = 0;
28936- atomic_set(&epoch->epoch_size, 0);
28937+ atomic_set_unchecked(&epoch->epoch_size, 0);
28938 /* atomic_set(&epoch->active, 0); is already zero */
28939 if (rv == FE_STILL_LIVE)
28940 rv = FE_RECYCLED;
28941@@ -1191,14 +1191,14 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
28942 drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
28943 drbd_flush(mdev);
28944
28945- if (atomic_read(&mdev->current_epoch->epoch_size)) {
28946+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
28947 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
28948 if (epoch)
28949 break;
28950 }
28951
28952 epoch = mdev->current_epoch;
28953- wait_event(mdev->ee_wait, atomic_read(&epoch->epoch_size) == 0);
28954+ wait_event(mdev->ee_wait, atomic_read_unchecked(&epoch->epoch_size) == 0);
28955
28956 D_ASSERT(atomic_read(&epoch->active) == 0);
28957 D_ASSERT(epoch->flags == 0);
28958@@ -1210,11 +1210,11 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
28959 }
28960
28961 epoch->flags = 0;
28962- atomic_set(&epoch->epoch_size, 0);
28963+ atomic_set_unchecked(&epoch->epoch_size, 0);
28964 atomic_set(&epoch->active, 0);
28965
28966 spin_lock(&mdev->epoch_lock);
28967- if (atomic_read(&mdev->current_epoch->epoch_size)) {
28968+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
28969 list_add(&epoch->list, &mdev->current_epoch->list);
28970 mdev->current_epoch = epoch;
28971 mdev->epochs++;
28972@@ -1663,7 +1663,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
28973 spin_unlock(&mdev->peer_seq_lock);
28974
28975 drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
28976- atomic_inc(&mdev->current_epoch->epoch_size);
28977+ atomic_inc_unchecked(&mdev->current_epoch->epoch_size);
28978 return drbd_drain_block(mdev, data_size);
28979 }
28980
28981@@ -1689,7 +1689,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
28982
28983 spin_lock(&mdev->epoch_lock);
28984 e->epoch = mdev->current_epoch;
28985- atomic_inc(&e->epoch->epoch_size);
28986+ atomic_inc_unchecked(&e->epoch->epoch_size);
28987 atomic_inc(&e->epoch->active);
28988 spin_unlock(&mdev->epoch_lock);
28989
28990@@ -3885,7 +3885,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
28991 D_ASSERT(list_empty(&mdev->done_ee));
28992
28993 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
28994- atomic_set(&mdev->current_epoch->epoch_size, 0);
28995+ atomic_set_unchecked(&mdev->current_epoch->epoch_size, 0);
28996 D_ASSERT(list_empty(&mdev->current_epoch->list));
28997 }
28998
28999diff --git a/drivers/block/loop.c b/drivers/block/loop.c
29000index 1e888c9..05cf1b0 100644
29001--- a/drivers/block/loop.c
29002+++ b/drivers/block/loop.c
29003@@ -227,7 +227,7 @@ static int __do_lo_send_write(struct file *file,
29004 mm_segment_t old_fs = get_fs();
29005
29006 set_fs(get_ds());
29007- bw = file->f_op->write(file, buf, len, &pos);
29008+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
29009 set_fs(old_fs);
29010 if (likely(bw == len))
29011 return 0;
29012diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
29013index 4364303..9adf4ee 100644
29014--- a/drivers/char/Kconfig
29015+++ b/drivers/char/Kconfig
29016@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
29017
29018 config DEVKMEM
29019 bool "/dev/kmem virtual device support"
29020- default y
29021+ default n
29022+ depends on !GRKERNSEC_KMEM
29023 help
29024 Say Y here if you want to support the /dev/kmem device. The
29025 /dev/kmem device is rarely used, but can be used for certain
29026@@ -596,6 +597,7 @@ config DEVPORT
29027 bool
29028 depends on !M68K
29029 depends on ISA || PCI
29030+ depends on !GRKERNSEC_KMEM
29031 default y
29032
29033 source "drivers/s390/char/Kconfig"
29034diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
29035index 2e04433..22afc64 100644
29036--- a/drivers/char/agp/frontend.c
29037+++ b/drivers/char/agp/frontend.c
29038@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
29039 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
29040 return -EFAULT;
29041
29042- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
29043+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
29044 return -EFAULT;
29045
29046 client = agp_find_client_by_pid(reserve.pid);
29047diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
29048index 095ab90..afad0a4 100644
29049--- a/drivers/char/briq_panel.c
29050+++ b/drivers/char/briq_panel.c
29051@@ -9,6 +9,7 @@
29052 #include <linux/types.h>
29053 #include <linux/errno.h>
29054 #include <linux/tty.h>
29055+#include <linux/mutex.h>
29056 #include <linux/timer.h>
29057 #include <linux/kernel.h>
29058 #include <linux/wait.h>
29059@@ -34,6 +35,7 @@ static int vfd_is_open;
29060 static unsigned char vfd[40];
29061 static int vfd_cursor;
29062 static unsigned char ledpb, led;
29063+static DEFINE_MUTEX(vfd_mutex);
29064
29065 static void update_vfd(void)
29066 {
29067@@ -140,12 +142,15 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
29068 if (!vfd_is_open)
29069 return -EBUSY;
29070
29071+ mutex_lock(&vfd_mutex);
29072 for (;;) {
29073 char c;
29074 if (!indx)
29075 break;
29076- if (get_user(c, buf))
29077+ if (get_user(c, buf)) {
29078+ mutex_unlock(&vfd_mutex);
29079 return -EFAULT;
29080+ }
29081 if (esc) {
29082 set_led(c);
29083 esc = 0;
29084@@ -175,6 +180,7 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
29085 buf++;
29086 }
29087 update_vfd();
29088+ mutex_unlock(&vfd_mutex);
29089
29090 return len;
29091 }
29092diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
29093index f773a9d..65cd683 100644
29094--- a/drivers/char/genrtc.c
29095+++ b/drivers/char/genrtc.c
29096@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
29097 switch (cmd) {
29098
29099 case RTC_PLL_GET:
29100+ memset(&pll, 0, sizeof(pll));
29101 if (get_rtc_pll(&pll))
29102 return -EINVAL;
29103 else
29104diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
29105index 0833896..cccce52 100644
29106--- a/drivers/char/hpet.c
29107+++ b/drivers/char/hpet.c
29108@@ -572,7 +572,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
29109 }
29110
29111 static int
29112-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
29113+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
29114 struct hpet_info *info)
29115 {
29116 struct hpet_timer __iomem *timer;
29117diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
29118index 58c0e63..46c16bf 100644
29119--- a/drivers/char/ipmi/ipmi_msghandler.c
29120+++ b/drivers/char/ipmi/ipmi_msghandler.c
29121@@ -415,7 +415,7 @@ struct ipmi_smi {
29122 struct proc_dir_entry *proc_dir;
29123 char proc_dir_name[10];
29124
29125- atomic_t stats[IPMI_NUM_STATS];
29126+ atomic_unchecked_t stats[IPMI_NUM_STATS];
29127
29128 /*
29129 * run_to_completion duplicate of smb_info, smi_info
29130@@ -448,9 +448,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
29131
29132
29133 #define ipmi_inc_stat(intf, stat) \
29134- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
29135+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
29136 #define ipmi_get_stat(intf, stat) \
29137- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
29138+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
29139
29140 static int is_lan_addr(struct ipmi_addr *addr)
29141 {
29142@@ -2868,7 +2868,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
29143 INIT_LIST_HEAD(&intf->cmd_rcvrs);
29144 init_waitqueue_head(&intf->waitq);
29145 for (i = 0; i < IPMI_NUM_STATS; i++)
29146- atomic_set(&intf->stats[i], 0);
29147+ atomic_set_unchecked(&intf->stats[i], 0);
29148
29149 intf->proc_dir = NULL;
29150
29151diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
29152index 9397ab4..d01bee1 100644
29153--- a/drivers/char/ipmi/ipmi_si_intf.c
29154+++ b/drivers/char/ipmi/ipmi_si_intf.c
29155@@ -277,7 +277,7 @@ struct smi_info {
29156 unsigned char slave_addr;
29157
29158 /* Counters and things for the proc filesystem. */
29159- atomic_t stats[SI_NUM_STATS];
29160+ atomic_unchecked_t stats[SI_NUM_STATS];
29161
29162 struct task_struct *thread;
29163
29164@@ -286,9 +286,9 @@ struct smi_info {
29165 };
29166
29167 #define smi_inc_stat(smi, stat) \
29168- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
29169+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
29170 #define smi_get_stat(smi, stat) \
29171- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
29172+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
29173
29174 #define SI_MAX_PARMS 4
29175
29176@@ -3230,7 +3230,7 @@ static int try_smi_init(struct smi_info *new_smi)
29177 atomic_set(&new_smi->req_events, 0);
29178 new_smi->run_to_completion = 0;
29179 for (i = 0; i < SI_NUM_STATS; i++)
29180- atomic_set(&new_smi->stats[i], 0);
29181+ atomic_set_unchecked(&new_smi->stats[i], 0);
29182
29183 new_smi->interrupt_disabled = 1;
29184 atomic_set(&new_smi->stop_operation, 0);
29185diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
29186index 1aeaaba..e018570 100644
29187--- a/drivers/char/mbcs.c
29188+++ b/drivers/char/mbcs.c
29189@@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *dev)
29190 return 0;
29191 }
29192
29193-static const struct cx_device_id __devinitdata mbcs_id_table[] = {
29194+static const struct cx_device_id __devinitconst mbcs_id_table[] = {
29195 {
29196 .part_num = MBCS_PART_NUM,
29197 .mfg_num = MBCS_MFG_NUM,
29198diff --git a/drivers/char/mem.c b/drivers/char/mem.c
29199index 1451790..f705c30 100644
29200--- a/drivers/char/mem.c
29201+++ b/drivers/char/mem.c
29202@@ -18,6 +18,7 @@
29203 #include <linux/raw.h>
29204 #include <linux/tty.h>
29205 #include <linux/capability.h>
29206+#include <linux/security.h>
29207 #include <linux/ptrace.h>
29208 #include <linux/device.h>
29209 #include <linux/highmem.h>
29210@@ -35,6 +36,10 @@
29211 # include <linux/efi.h>
29212 #endif
29213
29214+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29215+extern const struct file_operations grsec_fops;
29216+#endif
29217+
29218 static inline unsigned long size_inside_page(unsigned long start,
29219 unsigned long size)
29220 {
29221@@ -66,9 +71,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29222
29223 while (cursor < to) {
29224 if (!devmem_is_allowed(pfn)) {
29225+#ifdef CONFIG_GRKERNSEC_KMEM
29226+ gr_handle_mem_readwrite(from, to);
29227+#else
29228 printk(KERN_INFO
29229 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
29230 current->comm, from, to);
29231+#endif
29232 return 0;
29233 }
29234 cursor += PAGE_SIZE;
29235@@ -76,6 +85,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29236 }
29237 return 1;
29238 }
29239+#elif defined(CONFIG_GRKERNSEC_KMEM)
29240+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29241+{
29242+ return 0;
29243+}
29244 #else
29245 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29246 {
29247@@ -118,6 +132,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
29248
29249 while (count > 0) {
29250 unsigned long remaining;
29251+ char *temp;
29252
29253 sz = size_inside_page(p, count);
29254
29255@@ -133,7 +148,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
29256 if (!ptr)
29257 return -EFAULT;
29258
29259- remaining = copy_to_user(buf, ptr, sz);
29260+#ifdef CONFIG_PAX_USERCOPY
29261+ temp = kmalloc(sz, GFP_KERNEL);
29262+ if (!temp) {
29263+ unxlate_dev_mem_ptr(p, ptr);
29264+ return -ENOMEM;
29265+ }
29266+ memcpy(temp, ptr, sz);
29267+#else
29268+ temp = ptr;
29269+#endif
29270+
29271+ remaining = copy_to_user(buf, temp, sz);
29272+
29273+#ifdef CONFIG_PAX_USERCOPY
29274+ kfree(temp);
29275+#endif
29276+
29277 unxlate_dev_mem_ptr(p, ptr);
29278 if (remaining)
29279 return -EFAULT;
29280@@ -396,9 +427,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29281 size_t count, loff_t *ppos)
29282 {
29283 unsigned long p = *ppos;
29284- ssize_t low_count, read, sz;
29285+ ssize_t low_count, read, sz, err = 0;
29286 char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
29287- int err = 0;
29288
29289 read = 0;
29290 if (p < (unsigned long) high_memory) {
29291@@ -420,6 +450,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29292 }
29293 #endif
29294 while (low_count > 0) {
29295+ char *temp;
29296+
29297 sz = size_inside_page(p, low_count);
29298
29299 /*
29300@@ -429,7 +461,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29301 */
29302 kbuf = xlate_dev_kmem_ptr((char *)p);
29303
29304- if (copy_to_user(buf, kbuf, sz))
29305+#ifdef CONFIG_PAX_USERCOPY
29306+ temp = kmalloc(sz, GFP_KERNEL);
29307+ if (!temp)
29308+ return -ENOMEM;
29309+ memcpy(temp, kbuf, sz);
29310+#else
29311+ temp = kbuf;
29312+#endif
29313+
29314+ err = copy_to_user(buf, temp, sz);
29315+
29316+#ifdef CONFIG_PAX_USERCOPY
29317+ kfree(temp);
29318+#endif
29319+
29320+ if (err)
29321 return -EFAULT;
29322 buf += sz;
29323 p += sz;
29324@@ -867,6 +914,9 @@ static const struct memdev {
29325 #ifdef CONFIG_CRASH_DUMP
29326 [12] = { "oldmem", 0, &oldmem_fops, NULL },
29327 #endif
29328+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29329+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
29330+#endif
29331 };
29332
29333 static int memory_open(struct inode *inode, struct file *filp)
29334diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
29335index da3cfee..a5a6606 100644
29336--- a/drivers/char/nvram.c
29337+++ b/drivers/char/nvram.c
29338@@ -248,7 +248,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
29339
29340 spin_unlock_irq(&rtc_lock);
29341
29342- if (copy_to_user(buf, contents, tmp - contents))
29343+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
29344 return -EFAULT;
29345
29346 *ppos = i;
29347diff --git a/drivers/char/random.c b/drivers/char/random.c
29348index 6035ab8..bdfe4fd 100644
29349--- a/drivers/char/random.c
29350+++ b/drivers/char/random.c
29351@@ -261,8 +261,13 @@
29352 /*
29353 * Configuration information
29354 */
29355+#ifdef CONFIG_GRKERNSEC_RANDNET
29356+#define INPUT_POOL_WORDS 512
29357+#define OUTPUT_POOL_WORDS 128
29358+#else
29359 #define INPUT_POOL_WORDS 128
29360 #define OUTPUT_POOL_WORDS 32
29361+#endif
29362 #define SEC_XFER_SIZE 512
29363 #define EXTRACT_SIZE 10
29364
29365@@ -300,10 +305,17 @@ static struct poolinfo {
29366 int poolwords;
29367 int tap1, tap2, tap3, tap4, tap5;
29368 } poolinfo_table[] = {
29369+#ifdef CONFIG_GRKERNSEC_RANDNET
29370+ /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
29371+ { 512, 411, 308, 208, 104, 1 },
29372+ /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
29373+ { 128, 103, 76, 51, 25, 1 },
29374+#else
29375 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
29376 { 128, 103, 76, 51, 25, 1 },
29377 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
29378 { 32, 26, 20, 14, 7, 1 },
29379+#endif
29380 #if 0
29381 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
29382 { 2048, 1638, 1231, 819, 411, 1 },
29383@@ -909,7 +921,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
29384
29385 extract_buf(r, tmp);
29386 i = min_t(int, nbytes, EXTRACT_SIZE);
29387- if (copy_to_user(buf, tmp, i)) {
29388+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
29389 ret = -EFAULT;
29390 break;
29391 }
29392@@ -1228,7 +1240,7 @@ EXPORT_SYMBOL(generate_random_uuid);
29393 #include <linux/sysctl.h>
29394
29395 static int min_read_thresh = 8, min_write_thresh;
29396-static int max_read_thresh = INPUT_POOL_WORDS * 32;
29397+static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
29398 static int max_write_thresh = INPUT_POOL_WORDS * 32;
29399 static char sysctl_bootid[16];
29400
29401diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
29402index 1ee8ce7..b778bef 100644
29403--- a/drivers/char/sonypi.c
29404+++ b/drivers/char/sonypi.c
29405@@ -55,6 +55,7 @@
29406 #include <asm/uaccess.h>
29407 #include <asm/io.h>
29408 #include <asm/system.h>
29409+#include <asm/local.h>
29410
29411 #include <linux/sonypi.h>
29412
29413@@ -491,7 +492,7 @@ static struct sonypi_device {
29414 spinlock_t fifo_lock;
29415 wait_queue_head_t fifo_proc_list;
29416 struct fasync_struct *fifo_async;
29417- int open_count;
29418+ local_t open_count;
29419 int model;
29420 struct input_dev *input_jog_dev;
29421 struct input_dev *input_key_dev;
29422@@ -898,7 +899,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
29423 static int sonypi_misc_release(struct inode *inode, struct file *file)
29424 {
29425 mutex_lock(&sonypi_device.lock);
29426- sonypi_device.open_count--;
29427+ local_dec(&sonypi_device.open_count);
29428 mutex_unlock(&sonypi_device.lock);
29429 return 0;
29430 }
29431@@ -907,9 +908,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
29432 {
29433 mutex_lock(&sonypi_device.lock);
29434 /* Flush input queue on first open */
29435- if (!sonypi_device.open_count)
29436+ if (!local_read(&sonypi_device.open_count))
29437 kfifo_reset(&sonypi_device.fifo);
29438- sonypi_device.open_count++;
29439+ local_inc(&sonypi_device.open_count);
29440 mutex_unlock(&sonypi_device.lock);
29441
29442 return 0;
29443diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
29444index 361a1df..2471eee 100644
29445--- a/drivers/char/tpm/tpm.c
29446+++ b/drivers/char/tpm/tpm.c
29447@@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
29448 chip->vendor.req_complete_val)
29449 goto out_recv;
29450
29451- if ((status == chip->vendor.req_canceled)) {
29452+ if (status == chip->vendor.req_canceled) {
29453 dev_err(chip->dev, "Operation Canceled\n");
29454 rc = -ECANCELED;
29455 goto out;
29456diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
29457index 0636520..169c1d0 100644
29458--- a/drivers/char/tpm/tpm_bios.c
29459+++ b/drivers/char/tpm/tpm_bios.c
29460@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
29461 event = addr;
29462
29463 if ((event->event_type == 0 && event->event_size == 0) ||
29464- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
29465+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
29466 return NULL;
29467
29468 return addr;
29469@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
29470 return NULL;
29471
29472 if ((event->event_type == 0 && event->event_size == 0) ||
29473- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
29474+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
29475 return NULL;
29476
29477 (*pos)++;
29478@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
29479 int i;
29480
29481 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
29482- seq_putc(m, data[i]);
29483+ if (!seq_putc(m, data[i]))
29484+ return -EFAULT;
29485
29486 return 0;
29487 }
29488@@ -410,8 +411,13 @@ static int read_log(struct tpm_bios_log *log)
29489 log->bios_event_log_end = log->bios_event_log + len;
29490
29491 virt = acpi_os_map_memory(start, len);
29492+ if (!virt) {
29493+ kfree(log->bios_event_log);
29494+ log->bios_event_log = NULL;
29495+ return -EFAULT;
29496+ }
29497
29498- memcpy(log->bios_event_log, virt, len);
29499+ memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
29500
29501 acpi_os_unmap_memory(virt, len);
29502 return 0;
29503diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
29504index 8e3c46d..c139b99 100644
29505--- a/drivers/char/virtio_console.c
29506+++ b/drivers/char/virtio_console.c
29507@@ -563,7 +563,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
29508 if (to_user) {
29509 ssize_t ret;
29510
29511- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
29512+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
29513 if (ret)
29514 return -EFAULT;
29515 } else {
29516@@ -662,7 +662,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
29517 if (!port_has_data(port) && !port->host_connected)
29518 return 0;
29519
29520- return fill_readbuf(port, ubuf, count, true);
29521+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
29522 }
29523
29524 static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
29525diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
29526index eb1d864..39ee5a7 100644
29527--- a/drivers/dma/dmatest.c
29528+++ b/drivers/dma/dmatest.c
29529@@ -591,7 +591,7 @@ static int dmatest_add_channel(struct dma_chan *chan)
29530 }
29531 if (dma_has_cap(DMA_PQ, dma_dev->cap_mask)) {
29532 cnt = dmatest_add_threads(dtc, DMA_PQ);
29533- thread_count += cnt > 0 ?: 0;
29534+ thread_count += cnt > 0 ? cnt : 0;
29535 }
29536
29537 pr_info("dmatest: Started %u threads using %s\n",
29538diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
29539index c9eee6d..f9d5280 100644
29540--- a/drivers/edac/amd64_edac.c
29541+++ b/drivers/edac/amd64_edac.c
29542@@ -2685,7 +2685,7 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)
29543 * PCI core identifies what devices are on a system during boot, and then
29544 * inquiry this table to see if this driver is for a given device found.
29545 */
29546-static const struct pci_device_id amd64_pci_table[] __devinitdata = {
29547+static const struct pci_device_id amd64_pci_table[] __devinitconst = {
29548 {
29549 .vendor = PCI_VENDOR_ID_AMD,
29550 .device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
29551diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
29552index e47e73b..348e0bd 100644
29553--- a/drivers/edac/amd76x_edac.c
29554+++ b/drivers/edac/amd76x_edac.c
29555@@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
29556 edac_mc_free(mci);
29557 }
29558
29559-static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
29560+static const struct pci_device_id amd76x_pci_tbl[] __devinitconst = {
29561 {
29562 PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29563 AMD762},
29564diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
29565index 1af531a..3a8ff27 100644
29566--- a/drivers/edac/e752x_edac.c
29567+++ b/drivers/edac/e752x_edac.c
29568@@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
29569 edac_mc_free(mci);
29570 }
29571
29572-static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
29573+static const struct pci_device_id e752x_pci_tbl[] __devinitconst = {
29574 {
29575 PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29576 E7520},
29577diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
29578index 6ffb6d2..383d8d7 100644
29579--- a/drivers/edac/e7xxx_edac.c
29580+++ b/drivers/edac/e7xxx_edac.c
29581@@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
29582 edac_mc_free(mci);
29583 }
29584
29585-static const struct pci_device_id e7xxx_pci_tbl[] __devinitdata = {
29586+static const struct pci_device_id e7xxx_pci_tbl[] __devinitconst = {
29587 {
29588 PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29589 E7205},
29590diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
29591index 495198a..ac08c85 100644
29592--- a/drivers/edac/edac_pci_sysfs.c
29593+++ b/drivers/edac/edac_pci_sysfs.c
29594@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
29595 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
29596 static int edac_pci_poll_msec = 1000; /* one second workq period */
29597
29598-static atomic_t pci_parity_count = ATOMIC_INIT(0);
29599-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
29600+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
29601+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
29602
29603 static struct kobject *edac_pci_top_main_kobj;
29604 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
29605@@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29606 edac_printk(KERN_CRIT, EDAC_PCI,
29607 "Signaled System Error on %s\n",
29608 pci_name(dev));
29609- atomic_inc(&pci_nonparity_count);
29610+ atomic_inc_unchecked(&pci_nonparity_count);
29611 }
29612
29613 if (status & (PCI_STATUS_PARITY)) {
29614@@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29615 "Master Data Parity Error on %s\n",
29616 pci_name(dev));
29617
29618- atomic_inc(&pci_parity_count);
29619+ atomic_inc_unchecked(&pci_parity_count);
29620 }
29621
29622 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29623@@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29624 "Detected Parity Error on %s\n",
29625 pci_name(dev));
29626
29627- atomic_inc(&pci_parity_count);
29628+ atomic_inc_unchecked(&pci_parity_count);
29629 }
29630 }
29631
29632@@ -619,7 +619,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29633 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
29634 "Signaled System Error on %s\n",
29635 pci_name(dev));
29636- atomic_inc(&pci_nonparity_count);
29637+ atomic_inc_unchecked(&pci_nonparity_count);
29638 }
29639
29640 if (status & (PCI_STATUS_PARITY)) {
29641@@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29642 "Master Data Parity Error on "
29643 "%s\n", pci_name(dev));
29644
29645- atomic_inc(&pci_parity_count);
29646+ atomic_inc_unchecked(&pci_parity_count);
29647 }
29648
29649 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29650@@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29651 "Detected Parity Error on %s\n",
29652 pci_name(dev));
29653
29654- atomic_inc(&pci_parity_count);
29655+ atomic_inc_unchecked(&pci_parity_count);
29656 }
29657 }
29658 }
29659@@ -677,7 +677,7 @@ void edac_pci_do_parity_check(void)
29660 if (!check_pci_errors)
29661 return;
29662
29663- before_count = atomic_read(&pci_parity_count);
29664+ before_count = atomic_read_unchecked(&pci_parity_count);
29665
29666 /* scan all PCI devices looking for a Parity Error on devices and
29667 * bridges.
29668@@ -689,7 +689,7 @@ void edac_pci_do_parity_check(void)
29669 /* Only if operator has selected panic on PCI Error */
29670 if (edac_pci_get_panic_on_pe()) {
29671 /* If the count is different 'after' from 'before' */
29672- if (before_count != atomic_read(&pci_parity_count))
29673+ if (before_count != atomic_read_unchecked(&pci_parity_count))
29674 panic("EDAC: PCI Parity Error");
29675 }
29676 }
29677diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
29678index c0510b3..6e2a954 100644
29679--- a/drivers/edac/i3000_edac.c
29680+++ b/drivers/edac/i3000_edac.c
29681@@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
29682 edac_mc_free(mci);
29683 }
29684
29685-static const struct pci_device_id i3000_pci_tbl[] __devinitdata = {
29686+static const struct pci_device_id i3000_pci_tbl[] __devinitconst = {
29687 {
29688 PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29689 I3000},
29690diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
29691index aa08497..7e6822a 100644
29692--- a/drivers/edac/i3200_edac.c
29693+++ b/drivers/edac/i3200_edac.c
29694@@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(struct pci_dev *pdev)
29695 edac_mc_free(mci);
29696 }
29697
29698-static const struct pci_device_id i3200_pci_tbl[] __devinitdata = {
29699+static const struct pci_device_id i3200_pci_tbl[] __devinitconst = {
29700 {
29701 PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29702 I3200},
29703diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
29704index 4dc3ac2..67d05a6 100644
29705--- a/drivers/edac/i5000_edac.c
29706+++ b/drivers/edac/i5000_edac.c
29707@@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)
29708 *
29709 * The "E500P" device is the first device supported.
29710 */
29711-static const struct pci_device_id i5000_pci_tbl[] __devinitdata = {
29712+static const struct pci_device_id i5000_pci_tbl[] __devinitconst = {
29713 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
29714 .driver_data = I5000P},
29715
29716diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
29717index bcbdeec..9886d16 100644
29718--- a/drivers/edac/i5100_edac.c
29719+++ b/drivers/edac/i5100_edac.c
29720@@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(struct pci_dev *pdev)
29721 edac_mc_free(mci);
29722 }
29723
29724-static const struct pci_device_id i5100_pci_tbl[] __devinitdata = {
29725+static const struct pci_device_id i5100_pci_tbl[] __devinitconst = {
29726 /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
29727 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
29728 { 0, }
29729diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
29730index 74d6ec34..baff517 100644
29731--- a/drivers/edac/i5400_edac.c
29732+++ b/drivers/edac/i5400_edac.c
29733@@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(struct pci_dev *pdev)
29734 *
29735 * The "E500P" device is the first device supported.
29736 */
29737-static const struct pci_device_id i5400_pci_tbl[] __devinitdata = {
29738+static const struct pci_device_id i5400_pci_tbl[] __devinitconst = {
29739 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
29740 {0,} /* 0 terminated list. */
29741 };
29742diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
29743index 6104dba..e7ea8e1 100644
29744--- a/drivers/edac/i7300_edac.c
29745+++ b/drivers/edac/i7300_edac.c
29746@@ -1192,7 +1192,7 @@ static void __devexit i7300_remove_one(struct pci_dev *pdev)
29747 *
29748 * Has only 8086:360c PCI ID
29749 */
29750-static const struct pci_device_id i7300_pci_tbl[] __devinitdata = {
29751+static const struct pci_device_id i7300_pci_tbl[] __devinitconst = {
29752 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
29753 {0,} /* 0 terminated list. */
29754 };
29755diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
29756index 70ad892..178943c 100644
29757--- a/drivers/edac/i7core_edac.c
29758+++ b/drivers/edac/i7core_edac.c
29759@@ -391,7 +391,7 @@ static const struct pci_id_table pci_dev_table[] = {
29760 /*
29761 * pci_device_id table for which devices we are looking for
29762 */
29763-static const struct pci_device_id i7core_pci_tbl[] __devinitdata = {
29764+static const struct pci_device_id i7core_pci_tbl[] __devinitconst = {
29765 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
29766 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
29767 {0,} /* 0 terminated list. */
29768diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
29769index 4329d39..f3022ef 100644
29770--- a/drivers/edac/i82443bxgx_edac.c
29771+++ b/drivers/edac/i82443bxgx_edac.c
29772@@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
29773
29774 EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
29775
29776-static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitdata = {
29777+static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitconst = {
29778 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
29779 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
29780 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
29781diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
29782index 931a057..fd28340 100644
29783--- a/drivers/edac/i82860_edac.c
29784+++ b/drivers/edac/i82860_edac.c
29785@@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
29786 edac_mc_free(mci);
29787 }
29788
29789-static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
29790+static const struct pci_device_id i82860_pci_tbl[] __devinitconst = {
29791 {
29792 PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29793 I82860},
29794diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
29795index 33864c6..01edc61 100644
29796--- a/drivers/edac/i82875p_edac.c
29797+++ b/drivers/edac/i82875p_edac.c
29798@@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
29799 edac_mc_free(mci);
29800 }
29801
29802-static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
29803+static const struct pci_device_id i82875p_pci_tbl[] __devinitconst = {
29804 {
29805 PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29806 I82875P},
29807diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
29808index a5da732..983363b 100644
29809--- a/drivers/edac/i82975x_edac.c
29810+++ b/drivers/edac/i82975x_edac.c
29811@@ -604,7 +604,7 @@ static void __devexit i82975x_remove_one(struct pci_dev *pdev)
29812 edac_mc_free(mci);
29813 }
29814
29815-static const struct pci_device_id i82975x_pci_tbl[] __devinitdata = {
29816+static const struct pci_device_id i82975x_pci_tbl[] __devinitconst = {
29817 {
29818 PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29819 I82975X
29820diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
29821index 0106747..0b40417 100644
29822--- a/drivers/edac/mce_amd.h
29823+++ b/drivers/edac/mce_amd.h
29824@@ -83,7 +83,7 @@ struct amd_decoder_ops {
29825 bool (*dc_mce)(u16, u8);
29826 bool (*ic_mce)(u16, u8);
29827 bool (*nb_mce)(u16, u8);
29828-};
29829+} __no_const;
29830
29831 void amd_report_gart_errors(bool);
29832 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
29833diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
29834index b153674..ad2ba9b 100644
29835--- a/drivers/edac/r82600_edac.c
29836+++ b/drivers/edac/r82600_edac.c
29837@@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev)
29838 edac_mc_free(mci);
29839 }
29840
29841-static const struct pci_device_id r82600_pci_tbl[] __devinitdata = {
29842+static const struct pci_device_id r82600_pci_tbl[] __devinitconst = {
29843 {
29844 PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
29845 },
29846diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
29847index 7a402bf..af0b211 100644
29848--- a/drivers/edac/sb_edac.c
29849+++ b/drivers/edac/sb_edac.c
29850@@ -367,7 +367,7 @@ static const struct pci_id_table pci_dev_descr_sbridge_table[] = {
29851 /*
29852 * pci_device_id table for which devices we are looking for
29853 */
29854-static const struct pci_device_id sbridge_pci_tbl[] __devinitdata = {
29855+static const struct pci_device_id sbridge_pci_tbl[] __devinitconst = {
29856 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)},
29857 {0,} /* 0 terminated list. */
29858 };
29859diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
29860index b6f47de..c5acf3a 100644
29861--- a/drivers/edac/x38_edac.c
29862+++ b/drivers/edac/x38_edac.c
29863@@ -440,7 +440,7 @@ static void __devexit x38_remove_one(struct pci_dev *pdev)
29864 edac_mc_free(mci);
29865 }
29866
29867-static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
29868+static const struct pci_device_id x38_pci_tbl[] __devinitconst = {
29869 {
29870 PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29871 X38},
29872diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
29873index 85661b0..c784559a 100644
29874--- a/drivers/firewire/core-card.c
29875+++ b/drivers/firewire/core-card.c
29876@@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
29877
29878 void fw_core_remove_card(struct fw_card *card)
29879 {
29880- struct fw_card_driver dummy_driver = dummy_driver_template;
29881+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
29882
29883 card->driver->update_phy_reg(card, 4,
29884 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
29885diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
29886index 4799393..37bd3ab 100644
29887--- a/drivers/firewire/core-cdev.c
29888+++ b/drivers/firewire/core-cdev.c
29889@@ -1331,8 +1331,7 @@ static int init_iso_resource(struct client *client,
29890 int ret;
29891
29892 if ((request->channels == 0 && request->bandwidth == 0) ||
29893- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
29894- request->bandwidth < 0)
29895+ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
29896 return -EINVAL;
29897
29898 r = kmalloc(sizeof(*r), GFP_KERNEL);
29899diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
29900index 855ab3f..11f4bbd 100644
29901--- a/drivers/firewire/core-transaction.c
29902+++ b/drivers/firewire/core-transaction.c
29903@@ -37,6 +37,7 @@
29904 #include <linux/timer.h>
29905 #include <linux/types.h>
29906 #include <linux/workqueue.h>
29907+#include <linux/sched.h>
29908
29909 #include <asm/byteorder.h>
29910
29911diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
29912index b45be57..5fad18b 100644
29913--- a/drivers/firewire/core.h
29914+++ b/drivers/firewire/core.h
29915@@ -101,6 +101,7 @@ struct fw_card_driver {
29916
29917 int (*stop_iso)(struct fw_iso_context *ctx);
29918 };
29919+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
29920
29921 void fw_card_initialize(struct fw_card *card,
29922 const struct fw_card_driver *driver, struct device *device);
29923diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
29924index 153980b..4b4d046 100644
29925--- a/drivers/firmware/dmi_scan.c
29926+++ b/drivers/firmware/dmi_scan.c
29927@@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
29928 }
29929 }
29930 else {
29931- /*
29932- * no iounmap() for that ioremap(); it would be a no-op, but
29933- * it's so early in setup that sucker gets confused into doing
29934- * what it shouldn't if we actually call it.
29935- */
29936 p = dmi_ioremap(0xF0000, 0x10000);
29937 if (p == NULL)
29938 goto error;
29939@@ -723,7 +718,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
29940 if (buf == NULL)
29941 return -1;
29942
29943- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
29944+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
29945
29946 iounmap(buf);
29947 return 0;
29948diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
29949index 98723cb..10ca85b 100644
29950--- a/drivers/gpio/gpio-vr41xx.c
29951+++ b/drivers/gpio/gpio-vr41xx.c
29952@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
29953 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
29954 maskl, pendl, maskh, pendh);
29955
29956- atomic_inc(&irq_err_count);
29957+ atomic_inc_unchecked(&irq_err_count);
29958
29959 return -EINVAL;
29960 }
29961diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
29962index 8323fc3..5c1d755 100644
29963--- a/drivers/gpu/drm/drm_crtc.c
29964+++ b/drivers/gpu/drm/drm_crtc.c
29965@@ -1379,7 +1379,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
29966 */
29967 if ((out_resp->count_modes >= mode_count) && mode_count) {
29968 copied = 0;
29969- mode_ptr = (struct drm_mode_modeinfo *)(unsigned long)out_resp->modes_ptr;
29970+ mode_ptr = (struct drm_mode_modeinfo __user *)(unsigned long)out_resp->modes_ptr;
29971 list_for_each_entry(mode, &connector->modes, head) {
29972 drm_crtc_convert_to_umode(&u_mode, mode);
29973 if (copy_to_user(mode_ptr + copied,
29974@@ -1394,8 +1394,8 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
29975
29976 if ((out_resp->count_props >= props_count) && props_count) {
29977 copied = 0;
29978- prop_ptr = (uint32_t *)(unsigned long)(out_resp->props_ptr);
29979- prop_values = (uint64_t *)(unsigned long)(out_resp->prop_values_ptr);
29980+ prop_ptr = (uint32_t __user *)(unsigned long)(out_resp->props_ptr);
29981+ prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr);
29982 for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
29983 if (connector->property_ids[i] != 0) {
29984 if (put_user(connector->property_ids[i],
29985@@ -1417,7 +1417,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
29986
29987 if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
29988 copied = 0;
29989- encoder_ptr = (uint32_t *)(unsigned long)(out_resp->encoders_ptr);
29990+ encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
29991 for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
29992 if (connector->encoder_ids[i] != 0) {
29993 if (put_user(connector->encoder_ids[i],
29994@@ -1576,7 +1576,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
29995 }
29996
29997 for (i = 0; i < crtc_req->count_connectors; i++) {
29998- set_connectors_ptr = (uint32_t *)(unsigned long)crtc_req->set_connectors_ptr;
29999+ set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
30000 if (get_user(out_id, &set_connectors_ptr[i])) {
30001 ret = -EFAULT;
30002 goto out;
30003@@ -1857,7 +1857,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
30004 fb = obj_to_fb(obj);
30005
30006 num_clips = r->num_clips;
30007- clips_ptr = (struct drm_clip_rect *)(unsigned long)r->clips_ptr;
30008+ clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r->clips_ptr;
30009
30010 if (!num_clips != !clips_ptr) {
30011 ret = -EINVAL;
30012@@ -2283,7 +2283,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
30013 out_resp->flags = property->flags;
30014
30015 if ((out_resp->count_values >= value_count) && value_count) {
30016- values_ptr = (uint64_t *)(unsigned long)out_resp->values_ptr;
30017+ values_ptr = (uint64_t __user *)(unsigned long)out_resp->values_ptr;
30018 for (i = 0; i < value_count; i++) {
30019 if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
30020 ret = -EFAULT;
30021@@ -2296,7 +2296,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
30022 if (property->flags & DRM_MODE_PROP_ENUM) {
30023 if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
30024 copied = 0;
30025- enum_ptr = (struct drm_mode_property_enum *)(unsigned long)out_resp->enum_blob_ptr;
30026+ enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr;
30027 list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
30028
30029 if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
30030@@ -2319,7 +2319,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
30031 if ((out_resp->count_enum_blobs >= blob_count) && blob_count) {
30032 copied = 0;
30033 blob_id_ptr = (uint32_t *)(unsigned long)out_resp->enum_blob_ptr;
30034- blob_length_ptr = (uint32_t *)(unsigned long)out_resp->values_ptr;
30035+ blob_length_ptr = (uint32_t __user *)(unsigned long)out_resp->values_ptr;
30036
30037 list_for_each_entry(prop_blob, &property->enum_blob_list, head) {
30038 if (put_user(prop_blob->base.id, blob_id_ptr + copied)) {
30039@@ -2380,7 +2380,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
30040 struct drm_mode_get_blob *out_resp = data;
30041 struct drm_property_blob *blob;
30042 int ret = 0;
30043- void *blob_ptr;
30044+ void __user *blob_ptr;
30045
30046 if (!drm_core_check_feature(dev, DRIVER_MODESET))
30047 return -EINVAL;
30048@@ -2394,7 +2394,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
30049 blob = obj_to_blob(obj);
30050
30051 if (out_resp->length == blob->length) {
30052- blob_ptr = (void *)(unsigned long)out_resp->data;
30053+ blob_ptr = (void __user *)(unsigned long)out_resp->data;
30054 if (copy_to_user(blob_ptr, blob->data, blob->length)){
30055 ret = -EFAULT;
30056 goto done;
30057diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
30058index d2619d7..bd6bd00 100644
30059--- a/drivers/gpu/drm/drm_crtc_helper.c
30060+++ b/drivers/gpu/drm/drm_crtc_helper.c
30061@@ -279,7 +279,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
30062 struct drm_crtc *tmp;
30063 int crtc_mask = 1;
30064
30065- WARN(!crtc, "checking null crtc?\n");
30066+ BUG_ON(!crtc);
30067
30068 dev = crtc->dev;
30069
30070diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
30071index 40c187c..5746164 100644
30072--- a/drivers/gpu/drm/drm_drv.c
30073+++ b/drivers/gpu/drm/drm_drv.c
30074@@ -308,7 +308,7 @@ module_exit(drm_core_exit);
30075 /**
30076 * Copy and IOCTL return string to user space
30077 */
30078-static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
30079+static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
30080 {
30081 int len;
30082
30083@@ -387,7 +387,7 @@ long drm_ioctl(struct file *filp,
30084
30085 dev = file_priv->minor->dev;
30086 atomic_inc(&dev->ioctl_count);
30087- atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
30088+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
30089 ++file_priv->ioctl_count;
30090
30091 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
30092diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
30093index 828bf65..cdaa0e9 100644
30094--- a/drivers/gpu/drm/drm_fops.c
30095+++ b/drivers/gpu/drm/drm_fops.c
30096@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev)
30097 }
30098
30099 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
30100- atomic_set(&dev->counts[i], 0);
30101+ atomic_set_unchecked(&dev->counts[i], 0);
30102
30103 dev->sigdata.lock = NULL;
30104
30105@@ -135,8 +135,8 @@ int drm_open(struct inode *inode, struct file *filp)
30106
30107 retcode = drm_open_helper(inode, filp, dev);
30108 if (!retcode) {
30109- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
30110- if (!dev->open_count++)
30111+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
30112+ if (local_inc_return(&dev->open_count) == 1)
30113 retcode = drm_setup(dev);
30114 }
30115 if (!retcode) {
30116@@ -473,7 +473,7 @@ int drm_release(struct inode *inode, struct file *filp)
30117
30118 mutex_lock(&drm_global_mutex);
30119
30120- DRM_DEBUG("open_count = %d\n", dev->open_count);
30121+ DRM_DEBUG("open_count = %d\n", local_read(&dev->open_count));
30122
30123 if (dev->driver->preclose)
30124 dev->driver->preclose(dev, file_priv);
30125@@ -485,7 +485,7 @@ int drm_release(struct inode *inode, struct file *filp)
30126 DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
30127 task_pid_nr(current),
30128 (long)old_encode_dev(file_priv->minor->device),
30129- dev->open_count);
30130+ local_read(&dev->open_count));
30131
30132 /* Release any auth tokens that might point to this file_priv,
30133 (do that under the drm_global_mutex) */
30134@@ -571,8 +571,8 @@ int drm_release(struct inode *inode, struct file *filp)
30135 * End inline drm_release
30136 */
30137
30138- atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
30139- if (!--dev->open_count) {
30140+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
30141+ if (local_dec_and_test(&dev->open_count)) {
30142 if (atomic_read(&dev->ioctl_count)) {
30143 DRM_ERROR("Device busy: %d\n",
30144 atomic_read(&dev->ioctl_count));
30145diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
30146index c87dc96..326055d 100644
30147--- a/drivers/gpu/drm/drm_global.c
30148+++ b/drivers/gpu/drm/drm_global.c
30149@@ -36,7 +36,7 @@
30150 struct drm_global_item {
30151 struct mutex mutex;
30152 void *object;
30153- int refcount;
30154+ atomic_t refcount;
30155 };
30156
30157 static struct drm_global_item glob[DRM_GLOBAL_NUM];
30158@@ -49,7 +49,7 @@ void drm_global_init(void)
30159 struct drm_global_item *item = &glob[i];
30160 mutex_init(&item->mutex);
30161 item->object = NULL;
30162- item->refcount = 0;
30163+ atomic_set(&item->refcount, 0);
30164 }
30165 }
30166
30167@@ -59,7 +59,7 @@ void drm_global_release(void)
30168 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
30169 struct drm_global_item *item = &glob[i];
30170 BUG_ON(item->object != NULL);
30171- BUG_ON(item->refcount != 0);
30172+ BUG_ON(atomic_read(&item->refcount) != 0);
30173 }
30174 }
30175
30176@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30177 void *object;
30178
30179 mutex_lock(&item->mutex);
30180- if (item->refcount == 0) {
30181+ if (atomic_read(&item->refcount) == 0) {
30182 item->object = kzalloc(ref->size, GFP_KERNEL);
30183 if (unlikely(item->object == NULL)) {
30184 ret = -ENOMEM;
30185@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30186 goto out_err;
30187
30188 }
30189- ++item->refcount;
30190+ atomic_inc(&item->refcount);
30191 ref->object = item->object;
30192 object = item->object;
30193 mutex_unlock(&item->mutex);
30194@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
30195 struct drm_global_item *item = &glob[ref->global_type];
30196
30197 mutex_lock(&item->mutex);
30198- BUG_ON(item->refcount == 0);
30199+ BUG_ON(atomic_read(&item->refcount) == 0);
30200 BUG_ON(ref->object != item->object);
30201- if (--item->refcount == 0) {
30202+ if (atomic_dec_and_test(&item->refcount)) {
30203 ref->release(ref);
30204 item->object = NULL;
30205 }
30206diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
30207index ab1162d..42587b2 100644
30208--- a/drivers/gpu/drm/drm_info.c
30209+++ b/drivers/gpu/drm/drm_info.c
30210@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
30211 struct drm_local_map *map;
30212 struct drm_map_list *r_list;
30213
30214- /* Hardcoded from _DRM_FRAME_BUFFER,
30215- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
30216- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
30217- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
30218+ static const char * const types[] = {
30219+ [_DRM_FRAME_BUFFER] = "FB",
30220+ [_DRM_REGISTERS] = "REG",
30221+ [_DRM_SHM] = "SHM",
30222+ [_DRM_AGP] = "AGP",
30223+ [_DRM_SCATTER_GATHER] = "SG",
30224+ [_DRM_CONSISTENT] = "PCI",
30225+ [_DRM_GEM] = "GEM" };
30226 const char *type;
30227 int i;
30228
30229@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
30230 map = r_list->map;
30231 if (!map)
30232 continue;
30233- if (map->type < 0 || map->type > 5)
30234+ if (map->type >= ARRAY_SIZE(types))
30235 type = "??";
30236 else
30237 type = types[map->type];
30238@@ -290,7 +294,11 @@ int drm_vma_info(struct seq_file *m, void *data)
30239 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
30240 vma->vm_flags & VM_LOCKED ? 'l' : '-',
30241 vma->vm_flags & VM_IO ? 'i' : '-',
30242+#ifdef CONFIG_GRKERNSEC_HIDESYM
30243+ 0);
30244+#else
30245 vma->vm_pgoff);
30246+#endif
30247
30248 #if defined(__i386__)
30249 pgprot = pgprot_val(vma->vm_page_prot);
30250diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
30251index ddd70db..40321e6 100644
30252--- a/drivers/gpu/drm/drm_ioc32.c
30253+++ b/drivers/gpu/drm/drm_ioc32.c
30254@@ -456,7 +456,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
30255 request = compat_alloc_user_space(nbytes);
30256 if (!access_ok(VERIFY_WRITE, request, nbytes))
30257 return -EFAULT;
30258- list = (struct drm_buf_desc *) (request + 1);
30259+ list = (struct drm_buf_desc __user *) (request + 1);
30260
30261 if (__put_user(count, &request->count)
30262 || __put_user(list, &request->list))
30263@@ -517,7 +517,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
30264 request = compat_alloc_user_space(nbytes);
30265 if (!access_ok(VERIFY_WRITE, request, nbytes))
30266 return -EFAULT;
30267- list = (struct drm_buf_pub *) (request + 1);
30268+ list = (struct drm_buf_pub __user *) (request + 1);
30269
30270 if (__put_user(count, &request->count)
30271 || __put_user(list, &request->list))
30272diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
30273index 904d7e9..ab88581 100644
30274--- a/drivers/gpu/drm/drm_ioctl.c
30275+++ b/drivers/gpu/drm/drm_ioctl.c
30276@@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev, void *data,
30277 stats->data[i].value =
30278 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
30279 else
30280- stats->data[i].value = atomic_read(&dev->counts[i]);
30281+ stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
30282 stats->data[i].type = dev->types[i];
30283 }
30284
30285diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
30286index 632ae24..244cf4a 100644
30287--- a/drivers/gpu/drm/drm_lock.c
30288+++ b/drivers/gpu/drm/drm_lock.c
30289@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30290 if (drm_lock_take(&master->lock, lock->context)) {
30291 master->lock.file_priv = file_priv;
30292 master->lock.lock_time = jiffies;
30293- atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
30294+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
30295 break; /* Got lock */
30296 }
30297
30298@@ -160,7 +160,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30299 return -EINVAL;
30300 }
30301
30302- atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
30303+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
30304
30305 if (drm_lock_free(&master->lock, lock->context)) {
30306 /* FIXME: Should really bail out here. */
30307diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
30308index 8f371e8..9f85d52 100644
30309--- a/drivers/gpu/drm/i810/i810_dma.c
30310+++ b/drivers/gpu/drm/i810/i810_dma.c
30311@@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
30312 dma->buflist[vertex->idx],
30313 vertex->discard, vertex->used);
30314
30315- atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30316- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30317+ atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30318+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30319 sarea_priv->last_enqueue = dev_priv->counter - 1;
30320 sarea_priv->last_dispatch = (int)hw_status[5];
30321
30322@@ -1111,8 +1111,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
30323 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
30324 mc->last_render);
30325
30326- atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30327- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30328+ atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30329+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30330 sarea_priv->last_enqueue = dev_priv->counter - 1;
30331 sarea_priv->last_dispatch = (int)hw_status[5];
30332
30333diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
30334index c9339f4..f5e1b9d 100644
30335--- a/drivers/gpu/drm/i810/i810_drv.h
30336+++ b/drivers/gpu/drm/i810/i810_drv.h
30337@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
30338 int page_flipping;
30339
30340 wait_queue_head_t irq_queue;
30341- atomic_t irq_received;
30342- atomic_t irq_emitted;
30343+ atomic_unchecked_t irq_received;
30344+ atomic_unchecked_t irq_emitted;
30345
30346 int front_offset;
30347 } drm_i810_private_t;
30348diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
30349index b2e3c97..58cf079 100644
30350--- a/drivers/gpu/drm/i915/i915_debugfs.c
30351+++ b/drivers/gpu/drm/i915/i915_debugfs.c
30352@@ -499,7 +499,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
30353 I915_READ(GTIMR));
30354 }
30355 seq_printf(m, "Interrupts received: %d\n",
30356- atomic_read(&dev_priv->irq_received));
30357+ atomic_read_unchecked(&dev_priv->irq_received));
30358 for (i = 0; i < I915_NUM_RINGS; i++) {
30359 if (IS_GEN6(dev) || IS_GEN7(dev)) {
30360 seq_printf(m, "Graphics Interrupt mask (%s): %08x\n",
30361@@ -1232,7 +1232,7 @@ static int i915_opregion(struct seq_file *m, void *unused)
30362 return ret;
30363
30364 if (opregion->header)
30365- seq_write(m, opregion->header, OPREGION_SIZE);
30366+ seq_write(m, (const void __force_kernel *)opregion->header, OPREGION_SIZE);
30367
30368 mutex_unlock(&dev->struct_mutex);
30369
30370diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
30371index c4da951..3c59c5c 100644
30372--- a/drivers/gpu/drm/i915/i915_dma.c
30373+++ b/drivers/gpu/drm/i915/i915_dma.c
30374@@ -1172,7 +1172,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
30375 bool can_switch;
30376
30377 spin_lock(&dev->count_lock);
30378- can_switch = (dev->open_count == 0);
30379+ can_switch = (local_read(&dev->open_count) == 0);
30380 spin_unlock(&dev->count_lock);
30381 return can_switch;
30382 }
30383diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
30384index ae294a0..1755461 100644
30385--- a/drivers/gpu/drm/i915/i915_drv.h
30386+++ b/drivers/gpu/drm/i915/i915_drv.h
30387@@ -229,7 +229,7 @@ struct drm_i915_display_funcs {
30388 /* render clock increase/decrease */
30389 /* display clock increase/decrease */
30390 /* pll clock increase/decrease */
30391-};
30392+} __no_const;
30393
30394 struct intel_device_info {
30395 u8 gen;
30396@@ -318,7 +318,7 @@ typedef struct drm_i915_private {
30397 int current_page;
30398 int page_flipping;
30399
30400- atomic_t irq_received;
30401+ atomic_unchecked_t irq_received;
30402
30403 /* protects the irq masks */
30404 spinlock_t irq_lock;
30405@@ -893,7 +893,7 @@ struct drm_i915_gem_object {
30406 * will be page flipped away on the next vblank. When it
30407 * reaches 0, dev_priv->pending_flip_queue will be woken up.
30408 */
30409- atomic_t pending_flip;
30410+ atomic_unchecked_t pending_flip;
30411 };
30412
30413 #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
30414@@ -1273,7 +1273,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
30415 extern void intel_teardown_gmbus(struct drm_device *dev);
30416 extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
30417 extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
30418-extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30419+static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30420 {
30421 return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
30422 }
30423diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30424index b9da890..cad1d98 100644
30425--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30426+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30427@@ -189,7 +189,7 @@ i915_gem_object_set_to_gpu_domain(struct drm_i915_gem_object *obj,
30428 i915_gem_clflush_object(obj);
30429
30430 if (obj->base.pending_write_domain)
30431- cd->flips |= atomic_read(&obj->pending_flip);
30432+ cd->flips |= atomic_read_unchecked(&obj->pending_flip);
30433
30434 /* The actual obj->write_domain will be updated with
30435 * pending_write_domain after we emit the accumulated flush for all
30436@@ -882,9 +882,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
30437
30438 static int
30439 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
30440- int count)
30441+ unsigned int count)
30442 {
30443- int i;
30444+ unsigned int i;
30445
30446 for (i = 0; i < count; i++) {
30447 char __user *ptr = (char __user *)(uintptr_t)exec[i].relocs_ptr;
30448diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
30449index d47a53b..61154c2 100644
30450--- a/drivers/gpu/drm/i915/i915_irq.c
30451+++ b/drivers/gpu/drm/i915/i915_irq.c
30452@@ -475,7 +475,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
30453 u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
30454 struct drm_i915_master_private *master_priv;
30455
30456- atomic_inc(&dev_priv->irq_received);
30457+ atomic_inc_unchecked(&dev_priv->irq_received);
30458
30459 /* disable master interrupt before clearing iir */
30460 de_ier = I915_READ(DEIER);
30461@@ -566,7 +566,7 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
30462 struct drm_i915_master_private *master_priv;
30463 u32 bsd_usr_interrupt = GT_BSD_USER_INTERRUPT;
30464
30465- atomic_inc(&dev_priv->irq_received);
30466+ atomic_inc_unchecked(&dev_priv->irq_received);
30467
30468 if (IS_GEN6(dev))
30469 bsd_usr_interrupt = GT_GEN6_BSD_USER_INTERRUPT;
30470@@ -1231,7 +1231,7 @@ static irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
30471 int ret = IRQ_NONE, pipe;
30472 bool blc_event = false;
30473
30474- atomic_inc(&dev_priv->irq_received);
30475+ atomic_inc_unchecked(&dev_priv->irq_received);
30476
30477 iir = I915_READ(IIR);
30478
30479@@ -1750,7 +1750,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
30480 {
30481 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30482
30483- atomic_set(&dev_priv->irq_received, 0);
30484+ atomic_set_unchecked(&dev_priv->irq_received, 0);
30485
30486 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
30487 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
30488@@ -1938,7 +1938,7 @@ static void i915_driver_irq_preinstall(struct drm_device * dev)
30489 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30490 int pipe;
30491
30492- atomic_set(&dev_priv->irq_received, 0);
30493+ atomic_set_unchecked(&dev_priv->irq_received, 0);
30494
30495 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
30496 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
30497diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
30498index 9ec9755..6d1cf2d 100644
30499--- a/drivers/gpu/drm/i915/intel_display.c
30500+++ b/drivers/gpu/drm/i915/intel_display.c
30501@@ -2230,7 +2230,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
30502
30503 wait_event(dev_priv->pending_flip_queue,
30504 atomic_read(&dev_priv->mm.wedged) ||
30505- atomic_read(&obj->pending_flip) == 0);
30506+ atomic_read_unchecked(&obj->pending_flip) == 0);
30507
30508 /* Big Hammer, we also need to ensure that any pending
30509 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
30510@@ -2851,7 +2851,7 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
30511 obj = to_intel_framebuffer(crtc->fb)->obj;
30512 dev_priv = crtc->dev->dev_private;
30513 wait_event(dev_priv->pending_flip_queue,
30514- atomic_read(&obj->pending_flip) == 0);
30515+ atomic_read_unchecked(&obj->pending_flip) == 0);
30516 }
30517
30518 static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
30519@@ -6952,7 +6952,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
30520
30521 atomic_clear_mask(1 << intel_crtc->plane,
30522 &obj->pending_flip.counter);
30523- if (atomic_read(&obj->pending_flip) == 0)
30524+ if (atomic_read_unchecked(&obj->pending_flip) == 0)
30525 wake_up(&dev_priv->pending_flip_queue);
30526
30527 schedule_work(&work->work);
30528@@ -7242,7 +7242,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
30529 /* Block clients from rendering to the new back buffer until
30530 * the flip occurs and the object is no longer visible.
30531 */
30532- atomic_add(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30533+ atomic_add_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30534
30535 ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
30536 if (ret)
30537@@ -7256,7 +7256,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
30538 return 0;
30539
30540 cleanup_pending:
30541- atomic_sub(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30542+ atomic_sub_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30543 drm_gem_object_unreference(&work->old_fb_obj->base);
30544 drm_gem_object_unreference(&obj->base);
30545 mutex_unlock(&dev->struct_mutex);
30546diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
30547index 54558a0..2d97005 100644
30548--- a/drivers/gpu/drm/mga/mga_drv.h
30549+++ b/drivers/gpu/drm/mga/mga_drv.h
30550@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
30551 u32 clear_cmd;
30552 u32 maccess;
30553
30554- atomic_t vbl_received; /**< Number of vblanks received. */
30555+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
30556 wait_queue_head_t fence_queue;
30557- atomic_t last_fence_retired;
30558+ atomic_unchecked_t last_fence_retired;
30559 u32 next_fence_to_post;
30560
30561 unsigned int fb_cpp;
30562diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
30563index 2581202..f230a8d9 100644
30564--- a/drivers/gpu/drm/mga/mga_irq.c
30565+++ b/drivers/gpu/drm/mga/mga_irq.c
30566@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
30567 if (crtc != 0)
30568 return 0;
30569
30570- return atomic_read(&dev_priv->vbl_received);
30571+ return atomic_read_unchecked(&dev_priv->vbl_received);
30572 }
30573
30574
30575@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
30576 /* VBLANK interrupt */
30577 if (status & MGA_VLINEPEN) {
30578 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
30579- atomic_inc(&dev_priv->vbl_received);
30580+ atomic_inc_unchecked(&dev_priv->vbl_received);
30581 drm_handle_vblank(dev, 0);
30582 handled = 1;
30583 }
30584@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
30585 if ((prim_start & ~0x03) != (prim_end & ~0x03))
30586 MGA_WRITE(MGA_PRIMEND, prim_end);
30587
30588- atomic_inc(&dev_priv->last_fence_retired);
30589+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
30590 DRM_WAKEUP(&dev_priv->fence_queue);
30591 handled = 1;
30592 }
30593@@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
30594 * using fences.
30595 */
30596 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
30597- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
30598+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
30599 - *sequence) <= (1 << 23)));
30600
30601 *sequence = cur_fence;
30602diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
30603index 5fc201b..7b032b9 100644
30604--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
30605+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
30606@@ -201,7 +201,7 @@ struct methods {
30607 const char desc[8];
30608 void (*loadbios)(struct drm_device *, uint8_t *);
30609 const bool rw;
30610-};
30611+} __do_const;
30612
30613 static struct methods shadow_methods[] = {
30614 { "PRAMIN", load_vbios_pramin, true },
30615@@ -5474,7 +5474,7 @@ parse_bit_U_tbl_entry(struct drm_device *dev, struct nvbios *bios,
30616 struct bit_table {
30617 const char id;
30618 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
30619-};
30620+} __no_const;
30621
30622 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
30623
30624diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
30625index 4c0be3a..5757582 100644
30626--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
30627+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
30628@@ -238,7 +238,7 @@ struct nouveau_channel {
30629 struct list_head pending;
30630 uint32_t sequence;
30631 uint32_t sequence_ack;
30632- atomic_t last_sequence_irq;
30633+ atomic_unchecked_t last_sequence_irq;
30634 struct nouveau_vma vma;
30635 } fence;
30636
30637@@ -319,7 +319,7 @@ struct nouveau_exec_engine {
30638 u32 handle, u16 class);
30639 void (*set_tile_region)(struct drm_device *dev, int i);
30640 void (*tlb_flush)(struct drm_device *, int engine);
30641-};
30642+} __no_const;
30643
30644 struct nouveau_instmem_engine {
30645 void *priv;
30646@@ -341,13 +341,13 @@ struct nouveau_instmem_engine {
30647 struct nouveau_mc_engine {
30648 int (*init)(struct drm_device *dev);
30649 void (*takedown)(struct drm_device *dev);
30650-};
30651+} __no_const;
30652
30653 struct nouveau_timer_engine {
30654 int (*init)(struct drm_device *dev);
30655 void (*takedown)(struct drm_device *dev);
30656 uint64_t (*read)(struct drm_device *dev);
30657-};
30658+} __no_const;
30659
30660 struct nouveau_fb_engine {
30661 int num_tiles;
30662@@ -558,7 +558,7 @@ struct nouveau_vram_engine {
30663 void (*put)(struct drm_device *, struct nouveau_mem **);
30664
30665 bool (*flags_valid)(struct drm_device *, u32 tile_flags);
30666-};
30667+} __no_const;
30668
30669 struct nouveau_engine {
30670 struct nouveau_instmem_engine instmem;
30671@@ -706,7 +706,7 @@ struct drm_nouveau_private {
30672 struct drm_global_reference mem_global_ref;
30673 struct ttm_bo_global_ref bo_global_ref;
30674 struct ttm_bo_device bdev;
30675- atomic_t validate_sequence;
30676+ atomic_unchecked_t validate_sequence;
30677 } ttm;
30678
30679 struct {
30680diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
30681index 2f6daae..c9d7b9e 100644
30682--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
30683+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
30684@@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_channel *chan)
30685 if (USE_REFCNT(dev))
30686 sequence = nvchan_rd32(chan, 0x48);
30687 else
30688- sequence = atomic_read(&chan->fence.last_sequence_irq);
30689+ sequence = atomic_read_unchecked(&chan->fence.last_sequence_irq);
30690
30691 if (chan->fence.sequence_ack == sequence)
30692 goto out;
30693@@ -539,7 +539,7 @@ nouveau_fence_channel_init(struct nouveau_channel *chan)
30694 return ret;
30695 }
30696
30697- atomic_set(&chan->fence.last_sequence_irq, 0);
30698+ atomic_set_unchecked(&chan->fence.last_sequence_irq, 0);
30699 return 0;
30700 }
30701
30702diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
30703index 7ce3fde..cb3ea04 100644
30704--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
30705+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
30706@@ -314,7 +314,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
30707 int trycnt = 0;
30708 int ret, i;
30709
30710- sequence = atomic_add_return(1, &dev_priv->ttm.validate_sequence);
30711+ sequence = atomic_add_return_unchecked(1, &dev_priv->ttm.validate_sequence);
30712 retry:
30713 if (++trycnt > 100000) {
30714 NV_ERROR(dev, "%s failed and gave up.\n", __func__);
30715diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
30716index d8831ab..0ba8356 100644
30717--- a/drivers/gpu/drm/nouveau/nouveau_state.c
30718+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
30719@@ -542,7 +542,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
30720 bool can_switch;
30721
30722 spin_lock(&dev->count_lock);
30723- can_switch = (dev->open_count == 0);
30724+ can_switch = (local_read(&dev->open_count) == 0);
30725 spin_unlock(&dev->count_lock);
30726 return can_switch;
30727 }
30728diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
30729index dbdea8e..cd6eeeb 100644
30730--- a/drivers/gpu/drm/nouveau/nv04_graph.c
30731+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
30732@@ -554,7 +554,7 @@ static int
30733 nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
30734 u32 class, u32 mthd, u32 data)
30735 {
30736- atomic_set(&chan->fence.last_sequence_irq, data);
30737+ atomic_set_unchecked(&chan->fence.last_sequence_irq, data);
30738 return 0;
30739 }
30740
30741diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
30742index bcac90b..53bfc76 100644
30743--- a/drivers/gpu/drm/r128/r128_cce.c
30744+++ b/drivers/gpu/drm/r128/r128_cce.c
30745@@ -378,7 +378,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
30746
30747 /* GH: Simple idle check.
30748 */
30749- atomic_set(&dev_priv->idle_count, 0);
30750+ atomic_set_unchecked(&dev_priv->idle_count, 0);
30751
30752 /* We don't support anything other than bus-mastering ring mode,
30753 * but the ring can be in either AGP or PCI space for the ring
30754diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
30755index 930c71b..499aded 100644
30756--- a/drivers/gpu/drm/r128/r128_drv.h
30757+++ b/drivers/gpu/drm/r128/r128_drv.h
30758@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
30759 int is_pci;
30760 unsigned long cce_buffers_offset;
30761
30762- atomic_t idle_count;
30763+ atomic_unchecked_t idle_count;
30764
30765 int page_flipping;
30766 int current_page;
30767 u32 crtc_offset;
30768 u32 crtc_offset_cntl;
30769
30770- atomic_t vbl_received;
30771+ atomic_unchecked_t vbl_received;
30772
30773 u32 color_fmt;
30774 unsigned int front_offset;
30775diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
30776index 429d5a0..7e899ed 100644
30777--- a/drivers/gpu/drm/r128/r128_irq.c
30778+++ b/drivers/gpu/drm/r128/r128_irq.c
30779@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
30780 if (crtc != 0)
30781 return 0;
30782
30783- return atomic_read(&dev_priv->vbl_received);
30784+ return atomic_read_unchecked(&dev_priv->vbl_received);
30785 }
30786
30787 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
30788@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
30789 /* VBLANK interrupt */
30790 if (status & R128_CRTC_VBLANK_INT) {
30791 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
30792- atomic_inc(&dev_priv->vbl_received);
30793+ atomic_inc_unchecked(&dev_priv->vbl_received);
30794 drm_handle_vblank(dev, 0);
30795 return IRQ_HANDLED;
30796 }
30797diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
30798index a9e33ce..09edd4b 100644
30799--- a/drivers/gpu/drm/r128/r128_state.c
30800+++ b/drivers/gpu/drm/r128/r128_state.c
30801@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
30802
30803 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
30804 {
30805- if (atomic_read(&dev_priv->idle_count) == 0)
30806+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
30807 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
30808 else
30809- atomic_set(&dev_priv->idle_count, 0);
30810+ atomic_set_unchecked(&dev_priv->idle_count, 0);
30811 }
30812
30813 #endif
30814diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
30815index 5a82b6b..9e69c73 100644
30816--- a/drivers/gpu/drm/radeon/mkregtable.c
30817+++ b/drivers/gpu/drm/radeon/mkregtable.c
30818@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
30819 regex_t mask_rex;
30820 regmatch_t match[4];
30821 char buf[1024];
30822- size_t end;
30823+ long end;
30824 int len;
30825 int done = 0;
30826 int r;
30827 unsigned o;
30828 struct offset *offset;
30829 char last_reg_s[10];
30830- int last_reg;
30831+ unsigned long last_reg;
30832
30833 if (regcomp
30834 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
30835diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
30836index cb1acff..8861bc5 100644
30837--- a/drivers/gpu/drm/radeon/r600_cs.c
30838+++ b/drivers/gpu/drm/radeon/r600_cs.c
30839@@ -1304,6 +1304,7 @@ static int r600_check_texture_resource(struct radeon_cs_parser *p, u32 idx,
30840 h0 = G_038004_TEX_HEIGHT(word1) + 1;
30841 d0 = G_038004_TEX_DEPTH(word1);
30842 nfaces = 1;
30843+ array = 0;
30844 switch (G_038000_DIM(word0)) {
30845 case V_038000_SQ_TEX_DIM_1D:
30846 case V_038000_SQ_TEX_DIM_2D:
30847diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
30848index 8227e76..ce0b195 100644
30849--- a/drivers/gpu/drm/radeon/radeon.h
30850+++ b/drivers/gpu/drm/radeon/radeon.h
30851@@ -192,7 +192,7 @@ extern int sumo_get_temp(struct radeon_device *rdev);
30852 */
30853 struct radeon_fence_driver {
30854 uint32_t scratch_reg;
30855- atomic_t seq;
30856+ atomic_unchecked_t seq;
30857 uint32_t last_seq;
30858 unsigned long last_jiffies;
30859 unsigned long last_timeout;
30860@@ -530,7 +530,7 @@ struct r600_blit_cp_primitives {
30861 int x2, int y2);
30862 void (*draw_auto)(struct radeon_device *rdev);
30863 void (*set_default_state)(struct radeon_device *rdev);
30864-};
30865+} __no_const;
30866
30867 struct r600_blit {
30868 struct mutex mutex;
30869@@ -954,7 +954,7 @@ struct radeon_asic {
30870 void (*pre_page_flip)(struct radeon_device *rdev, int crtc);
30871 u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base);
30872 void (*post_page_flip)(struct radeon_device *rdev, int crtc);
30873-};
30874+} __no_const;
30875
30876 /*
30877 * Asic structures
30878diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
30879index 9231564..78b00fd 100644
30880--- a/drivers/gpu/drm/radeon/radeon_device.c
30881+++ b/drivers/gpu/drm/radeon/radeon_device.c
30882@@ -687,7 +687,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
30883 bool can_switch;
30884
30885 spin_lock(&dev->count_lock);
30886- can_switch = (dev->open_count == 0);
30887+ can_switch = (local_read(&dev->open_count) == 0);
30888 spin_unlock(&dev->count_lock);
30889 return can_switch;
30890 }
30891diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
30892index a1b59ca..86f2d44 100644
30893--- a/drivers/gpu/drm/radeon/radeon_drv.h
30894+++ b/drivers/gpu/drm/radeon/radeon_drv.h
30895@@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
30896
30897 /* SW interrupt */
30898 wait_queue_head_t swi_queue;
30899- atomic_t swi_emitted;
30900+ atomic_unchecked_t swi_emitted;
30901 int vblank_crtc;
30902 uint32_t irq_enable_reg;
30903 uint32_t r500_disp_irq_reg;
30904diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
30905index 76ec0e9..6feb1a3 100644
30906--- a/drivers/gpu/drm/radeon/radeon_fence.c
30907+++ b/drivers/gpu/drm/radeon/radeon_fence.c
30908@@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
30909 write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
30910 return 0;
30911 }
30912- fence->seq = atomic_add_return(1, &rdev->fence_drv.seq);
30913+ fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv.seq);
30914 if (!rdev->cp.ready)
30915 /* FIXME: cp is not running assume everythings is done right
30916 * away
30917@@ -373,7 +373,7 @@ int radeon_fence_driver_init(struct radeon_device *rdev)
30918 return r;
30919 }
30920 radeon_fence_write(rdev, 0);
30921- atomic_set(&rdev->fence_drv.seq, 0);
30922+ atomic_set_unchecked(&rdev->fence_drv.seq, 0);
30923 INIT_LIST_HEAD(&rdev->fence_drv.created);
30924 INIT_LIST_HEAD(&rdev->fence_drv.emited);
30925 INIT_LIST_HEAD(&rdev->fence_drv.signaled);
30926diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
30927index 48b7cea..342236f 100644
30928--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
30929+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
30930@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
30931 request = compat_alloc_user_space(sizeof(*request));
30932 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
30933 || __put_user(req32.param, &request->param)
30934- || __put_user((void __user *)(unsigned long)req32.value,
30935+ || __put_user((unsigned long)req32.value,
30936 &request->value))
30937 return -EFAULT;
30938
30939diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
30940index 00da384..32f972d 100644
30941--- a/drivers/gpu/drm/radeon/radeon_irq.c
30942+++ b/drivers/gpu/drm/radeon/radeon_irq.c
30943@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
30944 unsigned int ret;
30945 RING_LOCALS;
30946
30947- atomic_inc(&dev_priv->swi_emitted);
30948- ret = atomic_read(&dev_priv->swi_emitted);
30949+ atomic_inc_unchecked(&dev_priv->swi_emitted);
30950+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
30951
30952 BEGIN_RING(4);
30953 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
30954@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
30955 drm_radeon_private_t *dev_priv =
30956 (drm_radeon_private_t *) dev->dev_private;
30957
30958- atomic_set(&dev_priv->swi_emitted, 0);
30959+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
30960 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
30961
30962 dev->max_vblank_count = 0x001fffff;
30963diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
30964index e8422ae..d22d4a8 100644
30965--- a/drivers/gpu/drm/radeon/radeon_state.c
30966+++ b/drivers/gpu/drm/radeon/radeon_state.c
30967@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
30968 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
30969 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
30970
30971- if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
30972+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
30973 sarea_priv->nbox * sizeof(depth_boxes[0])))
30974 return -EFAULT;
30975
30976@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
30977 {
30978 drm_radeon_private_t *dev_priv = dev->dev_private;
30979 drm_radeon_getparam_t *param = data;
30980- int value;
30981+ int value = 0;
30982
30983 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
30984
30985diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
30986index 0b5468b..9c4b308 100644
30987--- a/drivers/gpu/drm/radeon/radeon_ttm.c
30988+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
30989@@ -672,8 +672,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
30990 }
30991 if (unlikely(ttm_vm_ops == NULL)) {
30992 ttm_vm_ops = vma->vm_ops;
30993- radeon_ttm_vm_ops = *ttm_vm_ops;
30994- radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
30995+ pax_open_kernel();
30996+ memcpy((void *)&radeon_ttm_vm_ops, ttm_vm_ops, sizeof(radeon_ttm_vm_ops));
30997+ *(void **)&radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
30998+ pax_close_kernel();
30999 }
31000 vma->vm_ops = &radeon_ttm_vm_ops;
31001 return 0;
31002diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
31003index a9049ed..501f284 100644
31004--- a/drivers/gpu/drm/radeon/rs690.c
31005+++ b/drivers/gpu/drm/radeon/rs690.c
31006@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
31007 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
31008 rdev->pm.sideport_bandwidth.full)
31009 rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
31010- read_delay_latency.full = dfixed_const(370 * 800 * 1000);
31011+ read_delay_latency.full = dfixed_const(800 * 1000);
31012 read_delay_latency.full = dfixed_div(read_delay_latency,
31013 rdev->pm.igp_sideport_mclk);
31014+ a.full = dfixed_const(370);
31015+ read_delay_latency.full = dfixed_mul(read_delay_latency, a);
31016 } else {
31017 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
31018 rdev->pm.k8_bandwidth.full)
31019diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
31020index 727e93d..1565650 100644
31021--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
31022+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
31023@@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages(void)
31024 static int ttm_pool_mm_shrink(struct shrinker *shrink,
31025 struct shrink_control *sc)
31026 {
31027- static atomic_t start_pool = ATOMIC_INIT(0);
31028+ static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
31029 unsigned i;
31030- unsigned pool_offset = atomic_add_return(1, &start_pool);
31031+ unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
31032 struct ttm_page_pool *pool;
31033 int shrink_pages = sc->nr_to_scan;
31034
31035diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
31036index 9cf87d9..2000b7d 100644
31037--- a/drivers/gpu/drm/via/via_drv.h
31038+++ b/drivers/gpu/drm/via/via_drv.h
31039@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
31040 typedef uint32_t maskarray_t[5];
31041
31042 typedef struct drm_via_irq {
31043- atomic_t irq_received;
31044+ atomic_unchecked_t irq_received;
31045 uint32_t pending_mask;
31046 uint32_t enable_mask;
31047 wait_queue_head_t irq_queue;
31048@@ -75,7 +75,7 @@ typedef struct drm_via_private {
31049 struct timeval last_vblank;
31050 int last_vblank_valid;
31051 unsigned usec_per_vblank;
31052- atomic_t vbl_received;
31053+ atomic_unchecked_t vbl_received;
31054 drm_via_state_t hc_state;
31055 char pci_buf[VIA_PCI_BUF_SIZE];
31056 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
31057diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
31058index d391f48..10c8ca3 100644
31059--- a/drivers/gpu/drm/via/via_irq.c
31060+++ b/drivers/gpu/drm/via/via_irq.c
31061@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
31062 if (crtc != 0)
31063 return 0;
31064
31065- return atomic_read(&dev_priv->vbl_received);
31066+ return atomic_read_unchecked(&dev_priv->vbl_received);
31067 }
31068
31069 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31070@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31071
31072 status = VIA_READ(VIA_REG_INTERRUPT);
31073 if (status & VIA_IRQ_VBLANK_PENDING) {
31074- atomic_inc(&dev_priv->vbl_received);
31075- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
31076+ atomic_inc_unchecked(&dev_priv->vbl_received);
31077+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
31078 do_gettimeofday(&cur_vblank);
31079 if (dev_priv->last_vblank_valid) {
31080 dev_priv->usec_per_vblank =
31081@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31082 dev_priv->last_vblank = cur_vblank;
31083 dev_priv->last_vblank_valid = 1;
31084 }
31085- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
31086+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
31087 DRM_DEBUG("US per vblank is: %u\n",
31088 dev_priv->usec_per_vblank);
31089 }
31090@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31091
31092 for (i = 0; i < dev_priv->num_irqs; ++i) {
31093 if (status & cur_irq->pending_mask) {
31094- atomic_inc(&cur_irq->irq_received);
31095+ atomic_inc_unchecked(&cur_irq->irq_received);
31096 DRM_WAKEUP(&cur_irq->irq_queue);
31097 handled = 1;
31098 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
31099@@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
31100 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31101 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
31102 masks[irq][4]));
31103- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
31104+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
31105 } else {
31106 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31107 (((cur_irq_sequence =
31108- atomic_read(&cur_irq->irq_received)) -
31109+ atomic_read_unchecked(&cur_irq->irq_received)) -
31110 *sequence) <= (1 << 23)));
31111 }
31112 *sequence = cur_irq_sequence;
31113@@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
31114 }
31115
31116 for (i = 0; i < dev_priv->num_irqs; ++i) {
31117- atomic_set(&cur_irq->irq_received, 0);
31118+ atomic_set_unchecked(&cur_irq->irq_received, 0);
31119 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
31120 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
31121 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
31122@@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
31123 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
31124 case VIA_IRQ_RELATIVE:
31125 irqwait->request.sequence +=
31126- atomic_read(&cur_irq->irq_received);
31127+ atomic_read_unchecked(&cur_irq->irq_received);
31128 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
31129 case VIA_IRQ_ABSOLUTE:
31130 break;
31131diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31132index dc27970..f18b008 100644
31133--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31134+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31135@@ -260,7 +260,7 @@ struct vmw_private {
31136 * Fencing and IRQs.
31137 */
31138
31139- atomic_t marker_seq;
31140+ atomic_unchecked_t marker_seq;
31141 wait_queue_head_t fence_queue;
31142 wait_queue_head_t fifo_queue;
31143 int fence_queue_waiters; /* Protected by hw_mutex */
31144diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31145index a0c2f12..68ae6cb 100644
31146--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31147+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31148@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
31149 (unsigned int) min,
31150 (unsigned int) fifo->capabilities);
31151
31152- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31153+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31154 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
31155 vmw_marker_queue_init(&fifo->marker_queue);
31156 return vmw_fifo_send_fence(dev_priv, &dummy);
31157@@ -355,7 +355,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
31158 if (reserveable)
31159 iowrite32(bytes, fifo_mem +
31160 SVGA_FIFO_RESERVED);
31161- return fifo_mem + (next_cmd >> 2);
31162+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
31163 } else {
31164 need_bounce = true;
31165 }
31166@@ -475,7 +475,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31167
31168 fm = vmw_fifo_reserve(dev_priv, bytes);
31169 if (unlikely(fm == NULL)) {
31170- *seqno = atomic_read(&dev_priv->marker_seq);
31171+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31172 ret = -ENOMEM;
31173 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
31174 false, 3*HZ);
31175@@ -483,7 +483,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31176 }
31177
31178 do {
31179- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
31180+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
31181 } while (*seqno == 0);
31182
31183 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
31184diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31185index cabc95f..14b3d77 100644
31186--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31187+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31188@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
31189 * emitted. Then the fence is stale and signaled.
31190 */
31191
31192- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
31193+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
31194 > VMW_FENCE_WRAP);
31195
31196 return ret;
31197@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
31198
31199 if (fifo_idle)
31200 down_read(&fifo_state->rwsem);
31201- signal_seq = atomic_read(&dev_priv->marker_seq);
31202+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
31203 ret = 0;
31204
31205 for (;;) {
31206diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31207index 8a8725c..afed796 100644
31208--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31209+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31210@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
31211 while (!vmw_lag_lt(queue, us)) {
31212 spin_lock(&queue->lock);
31213 if (list_empty(&queue->head))
31214- seqno = atomic_read(&dev_priv->marker_seq);
31215+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31216 else {
31217 marker = list_first_entry(&queue->head,
31218 struct vmw_marker, head);
31219diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
31220index bb656d8..4169fca 100644
31221--- a/drivers/hid/hid-core.c
31222+++ b/drivers/hid/hid-core.c
31223@@ -2012,7 +2012,7 @@ static bool hid_ignore(struct hid_device *hdev)
31224
31225 int hid_add_device(struct hid_device *hdev)
31226 {
31227- static atomic_t id = ATOMIC_INIT(0);
31228+ static atomic_unchecked_t id = ATOMIC_INIT(0);
31229 int ret;
31230
31231 if (WARN_ON(hdev->status & HID_STAT_ADDED))
31232@@ -2027,7 +2027,7 @@ int hid_add_device(struct hid_device *hdev)
31233 /* XXX hack, any other cleaner solution after the driver core
31234 * is converted to allow more than 20 bytes as the device name? */
31235 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
31236- hdev->vendor, hdev->product, atomic_inc_return(&id));
31237+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
31238
31239 hid_debug_register(hdev, dev_name(&hdev->dev));
31240 ret = device_add(&hdev->dev);
31241diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
31242index 4ef02b2..8a96831 100644
31243--- a/drivers/hid/usbhid/hiddev.c
31244+++ b/drivers/hid/usbhid/hiddev.c
31245@@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
31246 break;
31247
31248 case HIDIOCAPPLICATION:
31249- if (arg < 0 || arg >= hid->maxapplication)
31250+ if (arg >= hid->maxapplication)
31251 break;
31252
31253 for (i = 0; i < hid->maxcollection; i++)
31254diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
31255index 4065374..10ed7dc 100644
31256--- a/drivers/hv/channel.c
31257+++ b/drivers/hv/channel.c
31258@@ -400,8 +400,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
31259 int ret = 0;
31260 int t;
31261
31262- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
31263- atomic_inc(&vmbus_connection.next_gpadl_handle);
31264+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
31265+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
31266
31267 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
31268 if (ret)
31269diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
31270index 0fb100e..baf87e5 100644
31271--- a/drivers/hv/hv.c
31272+++ b/drivers/hv/hv.c
31273@@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
31274 u64 output_address = (output) ? virt_to_phys(output) : 0;
31275 u32 output_address_hi = output_address >> 32;
31276 u32 output_address_lo = output_address & 0xFFFFFFFF;
31277- void *hypercall_page = hv_context.hypercall_page;
31278+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
31279
31280 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
31281 "=a"(hv_status_lo) : "d" (control_hi),
31282diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
31283index 0aee112..b72d21f 100644
31284--- a/drivers/hv/hyperv_vmbus.h
31285+++ b/drivers/hv/hyperv_vmbus.h
31286@@ -556,7 +556,7 @@ enum vmbus_connect_state {
31287 struct vmbus_connection {
31288 enum vmbus_connect_state conn_state;
31289
31290- atomic_t next_gpadl_handle;
31291+ atomic_unchecked_t next_gpadl_handle;
31292
31293 /*
31294 * Represents channel interrupts. Each bit position represents a
31295diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
31296index d2d0a2a..90b8f4d 100644
31297--- a/drivers/hv/vmbus_drv.c
31298+++ b/drivers/hv/vmbus_drv.c
31299@@ -663,10 +663,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
31300 {
31301 int ret = 0;
31302
31303- static atomic_t device_num = ATOMIC_INIT(0);
31304+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
31305
31306 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
31307- atomic_inc_return(&device_num));
31308+ atomic_inc_return_unchecked(&device_num));
31309
31310 child_device_obj->device.bus = &hv_bus;
31311 child_device_obj->device.parent = &hv_acpi_dev->dev;
31312diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
31313index 66f6729..2d6de0a 100644
31314--- a/drivers/hwmon/acpi_power_meter.c
31315+++ b/drivers/hwmon/acpi_power_meter.c
31316@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
31317 return res;
31318
31319 temp /= 1000;
31320- if (temp < 0)
31321- return -EINVAL;
31322
31323 mutex_lock(&resource->lock);
31324 resource->trip[attr->index - 7] = temp;
31325diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
31326index 5357925..6cf0418 100644
31327--- a/drivers/hwmon/sht15.c
31328+++ b/drivers/hwmon/sht15.c
31329@@ -166,7 +166,7 @@ struct sht15_data {
31330 int supply_uV;
31331 bool supply_uV_valid;
31332 struct work_struct update_supply_work;
31333- atomic_t interrupt_handled;
31334+ atomic_unchecked_t interrupt_handled;
31335 };
31336
31337 /**
31338@@ -509,13 +509,13 @@ static int sht15_measurement(struct sht15_data *data,
31339 return ret;
31340
31341 gpio_direction_input(data->pdata->gpio_data);
31342- atomic_set(&data->interrupt_handled, 0);
31343+ atomic_set_unchecked(&data->interrupt_handled, 0);
31344
31345 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31346 if (gpio_get_value(data->pdata->gpio_data) == 0) {
31347 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
31348 /* Only relevant if the interrupt hasn't occurred. */
31349- if (!atomic_read(&data->interrupt_handled))
31350+ if (!atomic_read_unchecked(&data->interrupt_handled))
31351 schedule_work(&data->read_work);
31352 }
31353 ret = wait_event_timeout(data->wait_queue,
31354@@ -782,7 +782,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
31355
31356 /* First disable the interrupt */
31357 disable_irq_nosync(irq);
31358- atomic_inc(&data->interrupt_handled);
31359+ atomic_inc_unchecked(&data->interrupt_handled);
31360 /* Then schedule a reading work struct */
31361 if (data->state != SHT15_READING_NOTHING)
31362 schedule_work(&data->read_work);
31363@@ -804,11 +804,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
31364 * If not, then start the interrupt again - care here as could
31365 * have gone low in meantime so verify it hasn't!
31366 */
31367- atomic_set(&data->interrupt_handled, 0);
31368+ atomic_set_unchecked(&data->interrupt_handled, 0);
31369 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31370 /* If still not occurred or another handler has been scheduled */
31371 if (gpio_get_value(data->pdata->gpio_data)
31372- || atomic_read(&data->interrupt_handled))
31373+ || atomic_read_unchecked(&data->interrupt_handled))
31374 return;
31375 }
31376
31377diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
31378index 378fcb5..5e91fa8 100644
31379--- a/drivers/i2c/busses/i2c-amd756-s4882.c
31380+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
31381@@ -43,7 +43,7 @@
31382 extern struct i2c_adapter amd756_smbus;
31383
31384 static struct i2c_adapter *s4882_adapter;
31385-static struct i2c_algorithm *s4882_algo;
31386+static i2c_algorithm_no_const *s4882_algo;
31387
31388 /* Wrapper access functions for multiplexed SMBus */
31389 static DEFINE_MUTEX(amd756_lock);
31390diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
31391index 29015eb..af2d8e9 100644
31392--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
31393+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
31394@@ -41,7 +41,7 @@
31395 extern struct i2c_adapter *nforce2_smbus;
31396
31397 static struct i2c_adapter *s4985_adapter;
31398-static struct i2c_algorithm *s4985_algo;
31399+static i2c_algorithm_no_const *s4985_algo;
31400
31401 /* Wrapper access functions for multiplexed SMBus */
31402 static DEFINE_MUTEX(nforce2_lock);
31403diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
31404index d7a4833..7fae376 100644
31405--- a/drivers/i2c/i2c-mux.c
31406+++ b/drivers/i2c/i2c-mux.c
31407@@ -28,7 +28,7 @@
31408 /* multiplexer per channel data */
31409 struct i2c_mux_priv {
31410 struct i2c_adapter adap;
31411- struct i2c_algorithm algo;
31412+ i2c_algorithm_no_const algo;
31413
31414 struct i2c_adapter *parent;
31415 void *mux_dev; /* the mux chip/device */
31416diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
31417index 57d00ca..0145194 100644
31418--- a/drivers/ide/aec62xx.c
31419+++ b/drivers/ide/aec62xx.c
31420@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = {
31421 .cable_detect = atp86x_cable_detect,
31422 };
31423
31424-static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
31425+static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
31426 { /* 0: AEC6210 */
31427 .name = DRV_NAME,
31428 .init_chipset = init_chipset_aec62xx,
31429diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
31430index 2c8016a..911a27c 100644
31431--- a/drivers/ide/alim15x3.c
31432+++ b/drivers/ide/alim15x3.c
31433@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ops = {
31434 .dma_sff_read_status = ide_dma_sff_read_status,
31435 };
31436
31437-static const struct ide_port_info ali15x3_chipset __devinitdata = {
31438+static const struct ide_port_info ali15x3_chipset __devinitconst = {
31439 .name = DRV_NAME,
31440 .init_chipset = init_chipset_ali15x3,
31441 .init_hwif = init_hwif_ali15x3,
31442diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
31443index 3747b25..56fc995 100644
31444--- a/drivers/ide/amd74xx.c
31445+++ b/drivers/ide/amd74xx.c
31446@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = {
31447 .udma_mask = udma, \
31448 }
31449
31450-static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
31451+static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
31452 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
31453 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
31454 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
31455diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
31456index 15f0ead..cb43480 100644
31457--- a/drivers/ide/atiixp.c
31458+++ b/drivers/ide/atiixp.c
31459@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = {
31460 .cable_detect = atiixp_cable_detect,
31461 };
31462
31463-static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
31464+static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
31465 { /* 0: IXP200/300/400/700 */
31466 .name = DRV_NAME,
31467 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
31468diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
31469index 5f80312..d1fc438 100644
31470--- a/drivers/ide/cmd64x.c
31471+++ b/drivers/ide/cmd64x.c
31472@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
31473 .dma_sff_read_status = ide_dma_sff_read_status,
31474 };
31475
31476-static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
31477+static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
31478 { /* 0: CMD643 */
31479 .name = DRV_NAME,
31480 .init_chipset = init_chipset_cmd64x,
31481diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
31482index 2c1e5f7..1444762 100644
31483--- a/drivers/ide/cs5520.c
31484+++ b/drivers/ide/cs5520.c
31485@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = {
31486 .set_dma_mode = cs5520_set_dma_mode,
31487 };
31488
31489-static const struct ide_port_info cyrix_chipset __devinitdata = {
31490+static const struct ide_port_info cyrix_chipset __devinitconst = {
31491 .name = DRV_NAME,
31492 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
31493 .port_ops = &cs5520_port_ops,
31494diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
31495index 4dc4eb9..49b40ad 100644
31496--- a/drivers/ide/cs5530.c
31497+++ b/drivers/ide/cs5530.c
31498@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = {
31499 .udma_filter = cs5530_udma_filter,
31500 };
31501
31502-static const struct ide_port_info cs5530_chipset __devinitdata = {
31503+static const struct ide_port_info cs5530_chipset __devinitconst = {
31504 .name = DRV_NAME,
31505 .init_chipset = init_chipset_cs5530,
31506 .init_hwif = init_hwif_cs5530,
31507diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
31508index 5059faf..18d4c85 100644
31509--- a/drivers/ide/cs5535.c
31510+++ b/drivers/ide/cs5535.c
31511@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
31512 .cable_detect = cs5535_cable_detect,
31513 };
31514
31515-static const struct ide_port_info cs5535_chipset __devinitdata = {
31516+static const struct ide_port_info cs5535_chipset __devinitconst = {
31517 .name = DRV_NAME,
31518 .port_ops = &cs5535_port_ops,
31519 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
31520diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
31521index 847553f..3ffb49d 100644
31522--- a/drivers/ide/cy82c693.c
31523+++ b/drivers/ide/cy82c693.c
31524@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
31525 .set_dma_mode = cy82c693_set_dma_mode,
31526 };
31527
31528-static const struct ide_port_info cy82c693_chipset __devinitdata = {
31529+static const struct ide_port_info cy82c693_chipset __devinitconst = {
31530 .name = DRV_NAME,
31531 .init_iops = init_iops_cy82c693,
31532 .port_ops = &cy82c693_port_ops,
31533diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
31534index 58c51cd..4aec3b8 100644
31535--- a/drivers/ide/hpt366.c
31536+++ b/drivers/ide/hpt366.c
31537@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = {
31538 }
31539 };
31540
31541-static const struct hpt_info hpt36x __devinitdata = {
31542+static const struct hpt_info hpt36x __devinitconst = {
31543 .chip_name = "HPT36x",
31544 .chip_type = HPT36x,
31545 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
31546@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitdata = {
31547 .timings = &hpt36x_timings
31548 };
31549
31550-static const struct hpt_info hpt370 __devinitdata = {
31551+static const struct hpt_info hpt370 __devinitconst = {
31552 .chip_name = "HPT370",
31553 .chip_type = HPT370,
31554 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
31555@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitdata = {
31556 .timings = &hpt37x_timings
31557 };
31558
31559-static const struct hpt_info hpt370a __devinitdata = {
31560+static const struct hpt_info hpt370a __devinitconst = {
31561 .chip_name = "HPT370A",
31562 .chip_type = HPT370A,
31563 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
31564@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitdata = {
31565 .timings = &hpt37x_timings
31566 };
31567
31568-static const struct hpt_info hpt374 __devinitdata = {
31569+static const struct hpt_info hpt374 __devinitconst = {
31570 .chip_name = "HPT374",
31571 .chip_type = HPT374,
31572 .udma_mask = ATA_UDMA5,
31573@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitdata = {
31574 .timings = &hpt37x_timings
31575 };
31576
31577-static const struct hpt_info hpt372 __devinitdata = {
31578+static const struct hpt_info hpt372 __devinitconst = {
31579 .chip_name = "HPT372",
31580 .chip_type = HPT372,
31581 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31582@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitdata = {
31583 .timings = &hpt37x_timings
31584 };
31585
31586-static const struct hpt_info hpt372a __devinitdata = {
31587+static const struct hpt_info hpt372a __devinitconst = {
31588 .chip_name = "HPT372A",
31589 .chip_type = HPT372A,
31590 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31591@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitdata = {
31592 .timings = &hpt37x_timings
31593 };
31594
31595-static const struct hpt_info hpt302 __devinitdata = {
31596+static const struct hpt_info hpt302 __devinitconst = {
31597 .chip_name = "HPT302",
31598 .chip_type = HPT302,
31599 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31600@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitdata = {
31601 .timings = &hpt37x_timings
31602 };
31603
31604-static const struct hpt_info hpt371 __devinitdata = {
31605+static const struct hpt_info hpt371 __devinitconst = {
31606 .chip_name = "HPT371",
31607 .chip_type = HPT371,
31608 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31609@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitdata = {
31610 .timings = &hpt37x_timings
31611 };
31612
31613-static const struct hpt_info hpt372n __devinitdata = {
31614+static const struct hpt_info hpt372n __devinitconst = {
31615 .chip_name = "HPT372N",
31616 .chip_type = HPT372N,
31617 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31618@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitdata = {
31619 .timings = &hpt37x_timings
31620 };
31621
31622-static const struct hpt_info hpt302n __devinitdata = {
31623+static const struct hpt_info hpt302n __devinitconst = {
31624 .chip_name = "HPT302N",
31625 .chip_type = HPT302N,
31626 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31627@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitdata = {
31628 .timings = &hpt37x_timings
31629 };
31630
31631-static const struct hpt_info hpt371n __devinitdata = {
31632+static const struct hpt_info hpt371n __devinitconst = {
31633 .chip_name = "HPT371N",
31634 .chip_type = HPT371N,
31635 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31636@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
31637 .dma_sff_read_status = ide_dma_sff_read_status,
31638 };
31639
31640-static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
31641+static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
31642 { /* 0: HPT36x */
31643 .name = DRV_NAME,
31644 .init_chipset = init_chipset_hpt366,
31645diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
31646index 8126824..55a2798 100644
31647--- a/drivers/ide/ide-cd.c
31648+++ b/drivers/ide/ide-cd.c
31649@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
31650 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
31651 if ((unsigned long)buf & alignment
31652 || blk_rq_bytes(rq) & q->dma_pad_mask
31653- || object_is_on_stack(buf))
31654+ || object_starts_on_stack(buf))
31655 drive->dma = 0;
31656 }
31657 }
31658diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
31659index a743e68..1cfd674 100644
31660--- a/drivers/ide/ide-pci-generic.c
31661+++ b/drivers/ide/ide-pci-generic.c
31662@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
31663 .udma_mask = ATA_UDMA6, \
31664 }
31665
31666-static const struct ide_port_info generic_chipsets[] __devinitdata = {
31667+static const struct ide_port_info generic_chipsets[] __devinitconst = {
31668 /* 0: Unknown */
31669 DECLARE_GENERIC_PCI_DEV(0),
31670
31671diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
31672index 560e66d..d5dd180 100644
31673--- a/drivers/ide/it8172.c
31674+++ b/drivers/ide/it8172.c
31675@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
31676 .set_dma_mode = it8172_set_dma_mode,
31677 };
31678
31679-static const struct ide_port_info it8172_port_info __devinitdata = {
31680+static const struct ide_port_info it8172_port_info __devinitconst = {
31681 .name = DRV_NAME,
31682 .port_ops = &it8172_port_ops,
31683 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
31684diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
31685index 46816ba..1847aeb 100644
31686--- a/drivers/ide/it8213.c
31687+++ b/drivers/ide/it8213.c
31688@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
31689 .cable_detect = it8213_cable_detect,
31690 };
31691
31692-static const struct ide_port_info it8213_chipset __devinitdata = {
31693+static const struct ide_port_info it8213_chipset __devinitconst = {
31694 .name = DRV_NAME,
31695 .enablebits = { {0x41, 0x80, 0x80} },
31696 .port_ops = &it8213_port_ops,
31697diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
31698index 2e3169f..c5611db 100644
31699--- a/drivers/ide/it821x.c
31700+++ b/drivers/ide/it821x.c
31701@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = {
31702 .cable_detect = it821x_cable_detect,
31703 };
31704
31705-static const struct ide_port_info it821x_chipset __devinitdata = {
31706+static const struct ide_port_info it821x_chipset __devinitconst = {
31707 .name = DRV_NAME,
31708 .init_chipset = init_chipset_it821x,
31709 .init_hwif = init_hwif_it821x,
31710diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
31711index 74c2c4a..efddd7d 100644
31712--- a/drivers/ide/jmicron.c
31713+++ b/drivers/ide/jmicron.c
31714@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
31715 .cable_detect = jmicron_cable_detect,
31716 };
31717
31718-static const struct ide_port_info jmicron_chipset __devinitdata = {
31719+static const struct ide_port_info jmicron_chipset __devinitconst = {
31720 .name = DRV_NAME,
31721 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
31722 .port_ops = &jmicron_port_ops,
31723diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
31724index 95327a2..73f78d8 100644
31725--- a/drivers/ide/ns87415.c
31726+++ b/drivers/ide/ns87415.c
31727@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
31728 .dma_sff_read_status = superio_dma_sff_read_status,
31729 };
31730
31731-static const struct ide_port_info ns87415_chipset __devinitdata = {
31732+static const struct ide_port_info ns87415_chipset __devinitconst = {
31733 .name = DRV_NAME,
31734 .init_hwif = init_hwif_ns87415,
31735 .tp_ops = &ns87415_tp_ops,
31736diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
31737index 1a53a4c..39edc66 100644
31738--- a/drivers/ide/opti621.c
31739+++ b/drivers/ide/opti621.c
31740@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = {
31741 .set_pio_mode = opti621_set_pio_mode,
31742 };
31743
31744-static const struct ide_port_info opti621_chipset __devinitdata = {
31745+static const struct ide_port_info opti621_chipset __devinitconst = {
31746 .name = DRV_NAME,
31747 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
31748 .port_ops = &opti621_port_ops,
31749diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
31750index 9546fe2..2e5ceb6 100644
31751--- a/drivers/ide/pdc202xx_new.c
31752+++ b/drivers/ide/pdc202xx_new.c
31753@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
31754 .udma_mask = udma, \
31755 }
31756
31757-static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
31758+static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
31759 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
31760 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
31761 };
31762diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
31763index 3a35ec6..5634510 100644
31764--- a/drivers/ide/pdc202xx_old.c
31765+++ b/drivers/ide/pdc202xx_old.c
31766@@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
31767 .max_sectors = sectors, \
31768 }
31769
31770-static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
31771+static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
31772 { /* 0: PDC20246 */
31773 .name = DRV_NAME,
31774 .init_chipset = init_chipset_pdc202xx,
31775diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
31776index 1892e81..fe0fd60 100644
31777--- a/drivers/ide/piix.c
31778+++ b/drivers/ide/piix.c
31779@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
31780 .udma_mask = udma, \
31781 }
31782
31783-static const struct ide_port_info piix_pci_info[] __devinitdata = {
31784+static const struct ide_port_info piix_pci_info[] __devinitconst = {
31785 /* 0: MPIIX */
31786 { /*
31787 * MPIIX actually has only a single IDE channel mapped to
31788diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
31789index a6414a8..c04173e 100644
31790--- a/drivers/ide/rz1000.c
31791+++ b/drivers/ide/rz1000.c
31792@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
31793 }
31794 }
31795
31796-static const struct ide_port_info rz1000_chipset __devinitdata = {
31797+static const struct ide_port_info rz1000_chipset __devinitconst = {
31798 .name = DRV_NAME,
31799 .host_flags = IDE_HFLAG_NO_DMA,
31800 };
31801diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
31802index 356b9b5..d4758eb 100644
31803--- a/drivers/ide/sc1200.c
31804+++ b/drivers/ide/sc1200.c
31805@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
31806 .dma_sff_read_status = ide_dma_sff_read_status,
31807 };
31808
31809-static const struct ide_port_info sc1200_chipset __devinitdata = {
31810+static const struct ide_port_info sc1200_chipset __devinitconst = {
31811 .name = DRV_NAME,
31812 .port_ops = &sc1200_port_ops,
31813 .dma_ops = &sc1200_dma_ops,
31814diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
31815index b7f5b0c..9701038 100644
31816--- a/drivers/ide/scc_pata.c
31817+++ b/drivers/ide/scc_pata.c
31818@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ops = {
31819 .dma_sff_read_status = scc_dma_sff_read_status,
31820 };
31821
31822-static const struct ide_port_info scc_chipset __devinitdata = {
31823+static const struct ide_port_info scc_chipset __devinitconst = {
31824 .name = "sccIDE",
31825 .init_iops = init_iops_scc,
31826 .init_dma = scc_init_dma,
31827diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
31828index 35fb8da..24d72ef 100644
31829--- a/drivers/ide/serverworks.c
31830+++ b/drivers/ide/serverworks.c
31831@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = {
31832 .cable_detect = svwks_cable_detect,
31833 };
31834
31835-static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
31836+static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
31837 { /* 0: OSB4 */
31838 .name = DRV_NAME,
31839 .init_chipset = init_chipset_svwks,
31840diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
31841index ddeda44..46f7e30 100644
31842--- a/drivers/ide/siimage.c
31843+++ b/drivers/ide/siimage.c
31844@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
31845 .udma_mask = ATA_UDMA6, \
31846 }
31847
31848-static const struct ide_port_info siimage_chipsets[] __devinitdata = {
31849+static const struct ide_port_info siimage_chipsets[] __devinitconst = {
31850 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
31851 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
31852 };
31853diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
31854index 4a00225..09e61b4 100644
31855--- a/drivers/ide/sis5513.c
31856+++ b/drivers/ide/sis5513.c
31857@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
31858 .cable_detect = sis_cable_detect,
31859 };
31860
31861-static const struct ide_port_info sis5513_chipset __devinitdata = {
31862+static const struct ide_port_info sis5513_chipset __devinitconst = {
31863 .name = DRV_NAME,
31864 .init_chipset = init_chipset_sis5513,
31865 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
31866diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
31867index f21dc2a..d051cd2 100644
31868--- a/drivers/ide/sl82c105.c
31869+++ b/drivers/ide/sl82c105.c
31870@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
31871 .dma_sff_read_status = ide_dma_sff_read_status,
31872 };
31873
31874-static const struct ide_port_info sl82c105_chipset __devinitdata = {
31875+static const struct ide_port_info sl82c105_chipset __devinitconst = {
31876 .name = DRV_NAME,
31877 .init_chipset = init_chipset_sl82c105,
31878 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
31879diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
31880index 864ffe0..863a5e9 100644
31881--- a/drivers/ide/slc90e66.c
31882+++ b/drivers/ide/slc90e66.c
31883@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
31884 .cable_detect = slc90e66_cable_detect,
31885 };
31886
31887-static const struct ide_port_info slc90e66_chipset __devinitdata = {
31888+static const struct ide_port_info slc90e66_chipset __devinitconst = {
31889 .name = DRV_NAME,
31890 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
31891 .port_ops = &slc90e66_port_ops,
31892diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
31893index 4799d5c..1794678 100644
31894--- a/drivers/ide/tc86c001.c
31895+++ b/drivers/ide/tc86c001.c
31896@@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
31897 .dma_sff_read_status = ide_dma_sff_read_status,
31898 };
31899
31900-static const struct ide_port_info tc86c001_chipset __devinitdata = {
31901+static const struct ide_port_info tc86c001_chipset __devinitconst = {
31902 .name = DRV_NAME,
31903 .init_hwif = init_hwif_tc86c001,
31904 .port_ops = &tc86c001_port_ops,
31905diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
31906index 281c914..55ce1b8 100644
31907--- a/drivers/ide/triflex.c
31908+++ b/drivers/ide/triflex.c
31909@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
31910 .set_dma_mode = triflex_set_mode,
31911 };
31912
31913-static const struct ide_port_info triflex_device __devinitdata = {
31914+static const struct ide_port_info triflex_device __devinitconst = {
31915 .name = DRV_NAME,
31916 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
31917 .port_ops = &triflex_port_ops,
31918diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
31919index 4b42ca0..e494a98 100644
31920--- a/drivers/ide/trm290.c
31921+++ b/drivers/ide/trm290.c
31922@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
31923 .dma_check = trm290_dma_check,
31924 };
31925
31926-static const struct ide_port_info trm290_chipset __devinitdata = {
31927+static const struct ide_port_info trm290_chipset __devinitconst = {
31928 .name = DRV_NAME,
31929 .init_hwif = init_hwif_trm290,
31930 .tp_ops = &trm290_tp_ops,
31931diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
31932index f46f49c..eb77678 100644
31933--- a/drivers/ide/via82cxxx.c
31934+++ b/drivers/ide/via82cxxx.c
31935@@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = {
31936 .cable_detect = via82cxxx_cable_detect,
31937 };
31938
31939-static const struct ide_port_info via82cxxx_chipset __devinitdata = {
31940+static const struct ide_port_info via82cxxx_chipset __devinitconst = {
31941 .name = DRV_NAME,
31942 .init_chipset = init_chipset_via82cxxx,
31943 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
31944diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
31945index eb0e2cc..14241c7 100644
31946--- a/drivers/ieee802154/fakehard.c
31947+++ b/drivers/ieee802154/fakehard.c
31948@@ -386,7 +386,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
31949 phy->transmit_power = 0xbf;
31950
31951 dev->netdev_ops = &fake_ops;
31952- dev->ml_priv = &fake_mlme;
31953+ dev->ml_priv = (void *)&fake_mlme;
31954
31955 priv = netdev_priv(dev);
31956 priv->phy = phy;
31957diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
31958index 8b72f39..55df4c8 100644
31959--- a/drivers/infiniband/core/cm.c
31960+++ b/drivers/infiniband/core/cm.c
31961@@ -114,7 +114,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
31962
31963 struct cm_counter_group {
31964 struct kobject obj;
31965- atomic_long_t counter[CM_ATTR_COUNT];
31966+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
31967 };
31968
31969 struct cm_counter_attribute {
31970@@ -1394,7 +1394,7 @@ static void cm_dup_req_handler(struct cm_work *work,
31971 struct ib_mad_send_buf *msg = NULL;
31972 int ret;
31973
31974- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31975+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31976 counter[CM_REQ_COUNTER]);
31977
31978 /* Quick state check to discard duplicate REQs. */
31979@@ -1778,7 +1778,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
31980 if (!cm_id_priv)
31981 return;
31982
31983- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31984+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31985 counter[CM_REP_COUNTER]);
31986 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
31987 if (ret)
31988@@ -1945,7 +1945,7 @@ static int cm_rtu_handler(struct cm_work *work)
31989 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
31990 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
31991 spin_unlock_irq(&cm_id_priv->lock);
31992- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31993+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31994 counter[CM_RTU_COUNTER]);
31995 goto out;
31996 }
31997@@ -2128,7 +2128,7 @@ static int cm_dreq_handler(struct cm_work *work)
31998 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
31999 dreq_msg->local_comm_id);
32000 if (!cm_id_priv) {
32001- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32002+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32003 counter[CM_DREQ_COUNTER]);
32004 cm_issue_drep(work->port, work->mad_recv_wc);
32005 return -EINVAL;
32006@@ -2153,7 +2153,7 @@ static int cm_dreq_handler(struct cm_work *work)
32007 case IB_CM_MRA_REP_RCVD:
32008 break;
32009 case IB_CM_TIMEWAIT:
32010- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32011+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32012 counter[CM_DREQ_COUNTER]);
32013 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
32014 goto unlock;
32015@@ -2167,7 +2167,7 @@ static int cm_dreq_handler(struct cm_work *work)
32016 cm_free_msg(msg);
32017 goto deref;
32018 case IB_CM_DREQ_RCVD:
32019- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32020+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32021 counter[CM_DREQ_COUNTER]);
32022 goto unlock;
32023 default:
32024@@ -2534,7 +2534,7 @@ static int cm_mra_handler(struct cm_work *work)
32025 ib_modify_mad(cm_id_priv->av.port->mad_agent,
32026 cm_id_priv->msg, timeout)) {
32027 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
32028- atomic_long_inc(&work->port->
32029+ atomic_long_inc_unchecked(&work->port->
32030 counter_group[CM_RECV_DUPLICATES].
32031 counter[CM_MRA_COUNTER]);
32032 goto out;
32033@@ -2543,7 +2543,7 @@ static int cm_mra_handler(struct cm_work *work)
32034 break;
32035 case IB_CM_MRA_REQ_RCVD:
32036 case IB_CM_MRA_REP_RCVD:
32037- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32038+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32039 counter[CM_MRA_COUNTER]);
32040 /* fall through */
32041 default:
32042@@ -2705,7 +2705,7 @@ static int cm_lap_handler(struct cm_work *work)
32043 case IB_CM_LAP_IDLE:
32044 break;
32045 case IB_CM_MRA_LAP_SENT:
32046- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32047+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32048 counter[CM_LAP_COUNTER]);
32049 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
32050 goto unlock;
32051@@ -2721,7 +2721,7 @@ static int cm_lap_handler(struct cm_work *work)
32052 cm_free_msg(msg);
32053 goto deref;
32054 case IB_CM_LAP_RCVD:
32055- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32056+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32057 counter[CM_LAP_COUNTER]);
32058 goto unlock;
32059 default:
32060@@ -3005,7 +3005,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
32061 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
32062 if (cur_cm_id_priv) {
32063 spin_unlock_irq(&cm.lock);
32064- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32065+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32066 counter[CM_SIDR_REQ_COUNTER]);
32067 goto out; /* Duplicate message. */
32068 }
32069@@ -3217,10 +3217,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
32070 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
32071 msg->retries = 1;
32072
32073- atomic_long_add(1 + msg->retries,
32074+ atomic_long_add_unchecked(1 + msg->retries,
32075 &port->counter_group[CM_XMIT].counter[attr_index]);
32076 if (msg->retries)
32077- atomic_long_add(msg->retries,
32078+ atomic_long_add_unchecked(msg->retries,
32079 &port->counter_group[CM_XMIT_RETRIES].
32080 counter[attr_index]);
32081
32082@@ -3430,7 +3430,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
32083 }
32084
32085 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
32086- atomic_long_inc(&port->counter_group[CM_RECV].
32087+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
32088 counter[attr_id - CM_ATTR_ID_OFFSET]);
32089
32090 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
32091@@ -3635,7 +3635,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
32092 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
32093
32094 return sprintf(buf, "%ld\n",
32095- atomic_long_read(&group->counter[cm_attr->index]));
32096+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
32097 }
32098
32099 static const struct sysfs_ops cm_counter_ops = {
32100diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
32101index 176c8f9..2627b62 100644
32102--- a/drivers/infiniband/core/fmr_pool.c
32103+++ b/drivers/infiniband/core/fmr_pool.c
32104@@ -98,8 +98,8 @@ struct ib_fmr_pool {
32105
32106 struct task_struct *thread;
32107
32108- atomic_t req_ser;
32109- atomic_t flush_ser;
32110+ atomic_unchecked_t req_ser;
32111+ atomic_unchecked_t flush_ser;
32112
32113 wait_queue_head_t force_wait;
32114 };
32115@@ -180,10 +180,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
32116 struct ib_fmr_pool *pool = pool_ptr;
32117
32118 do {
32119- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
32120+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
32121 ib_fmr_batch_release(pool);
32122
32123- atomic_inc(&pool->flush_ser);
32124+ atomic_inc_unchecked(&pool->flush_ser);
32125 wake_up_interruptible(&pool->force_wait);
32126
32127 if (pool->flush_function)
32128@@ -191,7 +191,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
32129 }
32130
32131 set_current_state(TASK_INTERRUPTIBLE);
32132- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
32133+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
32134 !kthread_should_stop())
32135 schedule();
32136 __set_current_state(TASK_RUNNING);
32137@@ -283,8 +283,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
32138 pool->dirty_watermark = params->dirty_watermark;
32139 pool->dirty_len = 0;
32140 spin_lock_init(&pool->pool_lock);
32141- atomic_set(&pool->req_ser, 0);
32142- atomic_set(&pool->flush_ser, 0);
32143+ atomic_set_unchecked(&pool->req_ser, 0);
32144+ atomic_set_unchecked(&pool->flush_ser, 0);
32145 init_waitqueue_head(&pool->force_wait);
32146
32147 pool->thread = kthread_run(ib_fmr_cleanup_thread,
32148@@ -412,11 +412,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
32149 }
32150 spin_unlock_irq(&pool->pool_lock);
32151
32152- serial = atomic_inc_return(&pool->req_ser);
32153+ serial = atomic_inc_return_unchecked(&pool->req_ser);
32154 wake_up_process(pool->thread);
32155
32156 if (wait_event_interruptible(pool->force_wait,
32157- atomic_read(&pool->flush_ser) - serial >= 0))
32158+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
32159 return -EINTR;
32160
32161 return 0;
32162@@ -526,7 +526,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
32163 } else {
32164 list_add_tail(&fmr->list, &pool->dirty_list);
32165 if (++pool->dirty_len >= pool->dirty_watermark) {
32166- atomic_inc(&pool->req_ser);
32167+ atomic_inc_unchecked(&pool->req_ser);
32168 wake_up_process(pool->thread);
32169 }
32170 }
32171diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
32172index 40c8353..946b0e4 100644
32173--- a/drivers/infiniband/hw/cxgb4/mem.c
32174+++ b/drivers/infiniband/hw/cxgb4/mem.c
32175@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32176 int err;
32177 struct fw_ri_tpte tpt;
32178 u32 stag_idx;
32179- static atomic_t key;
32180+ static atomic_unchecked_t key;
32181
32182 if (c4iw_fatal_error(rdev))
32183 return -EIO;
32184@@ -135,7 +135,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32185 &rdev->resource.tpt_fifo_lock);
32186 if (!stag_idx)
32187 return -ENOMEM;
32188- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
32189+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
32190 }
32191 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
32192 __func__, stag_state, type, pdid, stag_idx);
32193diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
32194index 31ae1b1..641d285 100644
32195--- a/drivers/infiniband/hw/ipath/ipath_fs.c
32196+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
32197@@ -126,6 +126,8 @@ static const struct file_operations atomic_counters_ops = {
32198 };
32199
32200 static ssize_t flash_read(struct file *file, char __user *buf,
32201+ size_t count, loff_t *ppos) __size_overflow(3);
32202+static ssize_t flash_read(struct file *file, char __user *buf,
32203 size_t count, loff_t *ppos)
32204 {
32205 struct ipath_devdata *dd;
32206diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
32207index 79b3dbc..96e5fcc 100644
32208--- a/drivers/infiniband/hw/ipath/ipath_rc.c
32209+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
32210@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32211 struct ib_atomic_eth *ateth;
32212 struct ipath_ack_entry *e;
32213 u64 vaddr;
32214- atomic64_t *maddr;
32215+ atomic64_unchecked_t *maddr;
32216 u64 sdata;
32217 u32 rkey;
32218 u8 next;
32219@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32220 IB_ACCESS_REMOTE_ATOMIC)))
32221 goto nack_acc_unlck;
32222 /* Perform atomic OP and save result. */
32223- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32224+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32225 sdata = be64_to_cpu(ateth->swap_data);
32226 e = &qp->s_ack_queue[qp->r_head_ack_queue];
32227 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
32228- (u64) atomic64_add_return(sdata, maddr) - sdata :
32229+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32230 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32231 be64_to_cpu(ateth->compare_data),
32232 sdata);
32233diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
32234index 1f95bba..9530f87 100644
32235--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
32236+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
32237@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
32238 unsigned long flags;
32239 struct ib_wc wc;
32240 u64 sdata;
32241- atomic64_t *maddr;
32242+ atomic64_unchecked_t *maddr;
32243 enum ib_wc_status send_status;
32244
32245 /*
32246@@ -382,11 +382,11 @@ again:
32247 IB_ACCESS_REMOTE_ATOMIC)))
32248 goto acc_err;
32249 /* Perform atomic OP and save result. */
32250- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32251+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32252 sdata = wqe->wr.wr.atomic.compare_add;
32253 *(u64 *) sqp->s_sge.sge.vaddr =
32254 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
32255- (u64) atomic64_add_return(sdata, maddr) - sdata :
32256+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32257 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32258 sdata, wqe->wr.wr.atomic.swap);
32259 goto send_comp;
32260diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
32261index 5965b3d..16817fb 100644
32262--- a/drivers/infiniband/hw/nes/nes.c
32263+++ b/drivers/infiniband/hw/nes/nes.c
32264@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
32265 LIST_HEAD(nes_adapter_list);
32266 static LIST_HEAD(nes_dev_list);
32267
32268-atomic_t qps_destroyed;
32269+atomic_unchecked_t qps_destroyed;
32270
32271 static unsigned int ee_flsh_adapter;
32272 static unsigned int sysfs_nonidx_addr;
32273@@ -272,7 +272,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
32274 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
32275 struct nes_adapter *nesadapter = nesdev->nesadapter;
32276
32277- atomic_inc(&qps_destroyed);
32278+ atomic_inc_unchecked(&qps_destroyed);
32279
32280 /* Free the control structures */
32281
32282diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
32283index 568b4f1..5ea3eff 100644
32284--- a/drivers/infiniband/hw/nes/nes.h
32285+++ b/drivers/infiniband/hw/nes/nes.h
32286@@ -178,17 +178,17 @@ extern unsigned int nes_debug_level;
32287 extern unsigned int wqm_quanta;
32288 extern struct list_head nes_adapter_list;
32289
32290-extern atomic_t cm_connects;
32291-extern atomic_t cm_accepts;
32292-extern atomic_t cm_disconnects;
32293-extern atomic_t cm_closes;
32294-extern atomic_t cm_connecteds;
32295-extern atomic_t cm_connect_reqs;
32296-extern atomic_t cm_rejects;
32297-extern atomic_t mod_qp_timouts;
32298-extern atomic_t qps_created;
32299-extern atomic_t qps_destroyed;
32300-extern atomic_t sw_qps_destroyed;
32301+extern atomic_unchecked_t cm_connects;
32302+extern atomic_unchecked_t cm_accepts;
32303+extern atomic_unchecked_t cm_disconnects;
32304+extern atomic_unchecked_t cm_closes;
32305+extern atomic_unchecked_t cm_connecteds;
32306+extern atomic_unchecked_t cm_connect_reqs;
32307+extern atomic_unchecked_t cm_rejects;
32308+extern atomic_unchecked_t mod_qp_timouts;
32309+extern atomic_unchecked_t qps_created;
32310+extern atomic_unchecked_t qps_destroyed;
32311+extern atomic_unchecked_t sw_qps_destroyed;
32312 extern u32 mh_detected;
32313 extern u32 mh_pauses_sent;
32314 extern u32 cm_packets_sent;
32315@@ -197,16 +197,16 @@ extern u32 cm_packets_created;
32316 extern u32 cm_packets_received;
32317 extern u32 cm_packets_dropped;
32318 extern u32 cm_packets_retrans;
32319-extern atomic_t cm_listens_created;
32320-extern atomic_t cm_listens_destroyed;
32321+extern atomic_unchecked_t cm_listens_created;
32322+extern atomic_unchecked_t cm_listens_destroyed;
32323 extern u32 cm_backlog_drops;
32324-extern atomic_t cm_loopbacks;
32325-extern atomic_t cm_nodes_created;
32326-extern atomic_t cm_nodes_destroyed;
32327-extern atomic_t cm_accel_dropped_pkts;
32328-extern atomic_t cm_resets_recvd;
32329-extern atomic_t pau_qps_created;
32330-extern atomic_t pau_qps_destroyed;
32331+extern atomic_unchecked_t cm_loopbacks;
32332+extern atomic_unchecked_t cm_nodes_created;
32333+extern atomic_unchecked_t cm_nodes_destroyed;
32334+extern atomic_unchecked_t cm_accel_dropped_pkts;
32335+extern atomic_unchecked_t cm_resets_recvd;
32336+extern atomic_unchecked_t pau_qps_created;
32337+extern atomic_unchecked_t pau_qps_destroyed;
32338
32339 extern u32 int_mod_timer_init;
32340 extern u32 int_mod_cq_depth_256;
32341diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
32342index 0a52d72..0642f36 100644
32343--- a/drivers/infiniband/hw/nes/nes_cm.c
32344+++ b/drivers/infiniband/hw/nes/nes_cm.c
32345@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
32346 u32 cm_packets_retrans;
32347 u32 cm_packets_created;
32348 u32 cm_packets_received;
32349-atomic_t cm_listens_created;
32350-atomic_t cm_listens_destroyed;
32351+atomic_unchecked_t cm_listens_created;
32352+atomic_unchecked_t cm_listens_destroyed;
32353 u32 cm_backlog_drops;
32354-atomic_t cm_loopbacks;
32355-atomic_t cm_nodes_created;
32356-atomic_t cm_nodes_destroyed;
32357-atomic_t cm_accel_dropped_pkts;
32358-atomic_t cm_resets_recvd;
32359+atomic_unchecked_t cm_loopbacks;
32360+atomic_unchecked_t cm_nodes_created;
32361+atomic_unchecked_t cm_nodes_destroyed;
32362+atomic_unchecked_t cm_accel_dropped_pkts;
32363+atomic_unchecked_t cm_resets_recvd;
32364
32365 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
32366 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
32367@@ -148,13 +148,13 @@ static struct nes_cm_ops nes_cm_api = {
32368
32369 static struct nes_cm_core *g_cm_core;
32370
32371-atomic_t cm_connects;
32372-atomic_t cm_accepts;
32373-atomic_t cm_disconnects;
32374-atomic_t cm_closes;
32375-atomic_t cm_connecteds;
32376-atomic_t cm_connect_reqs;
32377-atomic_t cm_rejects;
32378+atomic_unchecked_t cm_connects;
32379+atomic_unchecked_t cm_accepts;
32380+atomic_unchecked_t cm_disconnects;
32381+atomic_unchecked_t cm_closes;
32382+atomic_unchecked_t cm_connecteds;
32383+atomic_unchecked_t cm_connect_reqs;
32384+atomic_unchecked_t cm_rejects;
32385
32386 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
32387 {
32388@@ -1271,7 +1271,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
32389 kfree(listener);
32390 listener = NULL;
32391 ret = 0;
32392- atomic_inc(&cm_listens_destroyed);
32393+ atomic_inc_unchecked(&cm_listens_destroyed);
32394 } else {
32395 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
32396 }
32397@@ -1473,7 +1473,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
32398 cm_node->rem_mac);
32399
32400 add_hte_node(cm_core, cm_node);
32401- atomic_inc(&cm_nodes_created);
32402+ atomic_inc_unchecked(&cm_nodes_created);
32403
32404 return cm_node;
32405 }
32406@@ -1531,7 +1531,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
32407 }
32408
32409 atomic_dec(&cm_core->node_cnt);
32410- atomic_inc(&cm_nodes_destroyed);
32411+ atomic_inc_unchecked(&cm_nodes_destroyed);
32412 nesqp = cm_node->nesqp;
32413 if (nesqp) {
32414 nesqp->cm_node = NULL;
32415@@ -1595,7 +1595,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
32416
32417 static void drop_packet(struct sk_buff *skb)
32418 {
32419- atomic_inc(&cm_accel_dropped_pkts);
32420+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
32421 dev_kfree_skb_any(skb);
32422 }
32423
32424@@ -1658,7 +1658,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
32425 {
32426
32427 int reset = 0; /* whether to send reset in case of err.. */
32428- atomic_inc(&cm_resets_recvd);
32429+ atomic_inc_unchecked(&cm_resets_recvd);
32430 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
32431 " refcnt=%d\n", cm_node, cm_node->state,
32432 atomic_read(&cm_node->ref_count));
32433@@ -2299,7 +2299,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
32434 rem_ref_cm_node(cm_node->cm_core, cm_node);
32435 return NULL;
32436 }
32437- atomic_inc(&cm_loopbacks);
32438+ atomic_inc_unchecked(&cm_loopbacks);
32439 loopbackremotenode->loopbackpartner = cm_node;
32440 loopbackremotenode->tcp_cntxt.rcv_wscale =
32441 NES_CM_DEFAULT_RCV_WND_SCALE;
32442@@ -2574,7 +2574,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
32443 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
32444 else {
32445 rem_ref_cm_node(cm_core, cm_node);
32446- atomic_inc(&cm_accel_dropped_pkts);
32447+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
32448 dev_kfree_skb_any(skb);
32449 }
32450 break;
32451@@ -2880,7 +2880,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32452
32453 if ((cm_id) && (cm_id->event_handler)) {
32454 if (issue_disconn) {
32455- atomic_inc(&cm_disconnects);
32456+ atomic_inc_unchecked(&cm_disconnects);
32457 cm_event.event = IW_CM_EVENT_DISCONNECT;
32458 cm_event.status = disconn_status;
32459 cm_event.local_addr = cm_id->local_addr;
32460@@ -2902,7 +2902,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32461 }
32462
32463 if (issue_close) {
32464- atomic_inc(&cm_closes);
32465+ atomic_inc_unchecked(&cm_closes);
32466 nes_disconnect(nesqp, 1);
32467
32468 cm_id->provider_data = nesqp;
32469@@ -3038,7 +3038,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
32470
32471 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
32472 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
32473- atomic_inc(&cm_accepts);
32474+ atomic_inc_unchecked(&cm_accepts);
32475
32476 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
32477 netdev_refcnt_read(nesvnic->netdev));
32478@@ -3240,7 +3240,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
32479 struct nes_cm_core *cm_core;
32480 u8 *start_buff;
32481
32482- atomic_inc(&cm_rejects);
32483+ atomic_inc_unchecked(&cm_rejects);
32484 cm_node = (struct nes_cm_node *)cm_id->provider_data;
32485 loopback = cm_node->loopbackpartner;
32486 cm_core = cm_node->cm_core;
32487@@ -3300,7 +3300,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
32488 ntohl(cm_id->local_addr.sin_addr.s_addr),
32489 ntohs(cm_id->local_addr.sin_port));
32490
32491- atomic_inc(&cm_connects);
32492+ atomic_inc_unchecked(&cm_connects);
32493 nesqp->active_conn = 1;
32494
32495 /* cache the cm_id in the qp */
32496@@ -3406,7 +3406,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
32497 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
32498 return err;
32499 }
32500- atomic_inc(&cm_listens_created);
32501+ atomic_inc_unchecked(&cm_listens_created);
32502 }
32503
32504 cm_id->add_ref(cm_id);
32505@@ -3507,7 +3507,7 @@ static void cm_event_connected(struct nes_cm_event *event)
32506
32507 if (nesqp->destroyed)
32508 return;
32509- atomic_inc(&cm_connecteds);
32510+ atomic_inc_unchecked(&cm_connecteds);
32511 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
32512 " local port 0x%04X. jiffies = %lu.\n",
32513 nesqp->hwqp.qp_id,
32514@@ -3694,7 +3694,7 @@ static void cm_event_reset(struct nes_cm_event *event)
32515
32516 cm_id->add_ref(cm_id);
32517 ret = cm_id->event_handler(cm_id, &cm_event);
32518- atomic_inc(&cm_closes);
32519+ atomic_inc_unchecked(&cm_closes);
32520 cm_event.event = IW_CM_EVENT_CLOSE;
32521 cm_event.status = 0;
32522 cm_event.provider_data = cm_id->provider_data;
32523@@ -3730,7 +3730,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
32524 return;
32525 cm_id = cm_node->cm_id;
32526
32527- atomic_inc(&cm_connect_reqs);
32528+ atomic_inc_unchecked(&cm_connect_reqs);
32529 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32530 cm_node, cm_id, jiffies);
32531
32532@@ -3770,7 +3770,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
32533 return;
32534 cm_id = cm_node->cm_id;
32535
32536- atomic_inc(&cm_connect_reqs);
32537+ atomic_inc_unchecked(&cm_connect_reqs);
32538 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32539 cm_node, cm_id, jiffies);
32540
32541diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
32542index b3b2a24..7bfaf1e 100644
32543--- a/drivers/infiniband/hw/nes/nes_mgt.c
32544+++ b/drivers/infiniband/hw/nes/nes_mgt.c
32545@@ -40,8 +40,8 @@
32546 #include "nes.h"
32547 #include "nes_mgt.h"
32548
32549-atomic_t pau_qps_created;
32550-atomic_t pau_qps_destroyed;
32551+atomic_unchecked_t pau_qps_created;
32552+atomic_unchecked_t pau_qps_destroyed;
32553
32554 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
32555 {
32556@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
32557 {
32558 struct sk_buff *skb;
32559 unsigned long flags;
32560- atomic_inc(&pau_qps_destroyed);
32561+ atomic_inc_unchecked(&pau_qps_destroyed);
32562
32563 /* Free packets that have not yet been forwarded */
32564 /* Lock is acquired by skb_dequeue when removing the skb */
32565@@ -812,7 +812,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
32566 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
32567 skb_queue_head_init(&nesqp->pau_list);
32568 spin_lock_init(&nesqp->pau_lock);
32569- atomic_inc(&pau_qps_created);
32570+ atomic_inc_unchecked(&pau_qps_created);
32571 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
32572 }
32573
32574diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
32575index c00d2f3..8834298 100644
32576--- a/drivers/infiniband/hw/nes/nes_nic.c
32577+++ b/drivers/infiniband/hw/nes/nes_nic.c
32578@@ -1277,39 +1277,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
32579 target_stat_values[++index] = mh_detected;
32580 target_stat_values[++index] = mh_pauses_sent;
32581 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
32582- target_stat_values[++index] = atomic_read(&cm_connects);
32583- target_stat_values[++index] = atomic_read(&cm_accepts);
32584- target_stat_values[++index] = atomic_read(&cm_disconnects);
32585- target_stat_values[++index] = atomic_read(&cm_connecteds);
32586- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
32587- target_stat_values[++index] = atomic_read(&cm_rejects);
32588- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
32589- target_stat_values[++index] = atomic_read(&qps_created);
32590- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
32591- target_stat_values[++index] = atomic_read(&qps_destroyed);
32592- target_stat_values[++index] = atomic_read(&cm_closes);
32593+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
32594+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
32595+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
32596+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
32597+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
32598+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
32599+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
32600+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
32601+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
32602+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
32603+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
32604 target_stat_values[++index] = cm_packets_sent;
32605 target_stat_values[++index] = cm_packets_bounced;
32606 target_stat_values[++index] = cm_packets_created;
32607 target_stat_values[++index] = cm_packets_received;
32608 target_stat_values[++index] = cm_packets_dropped;
32609 target_stat_values[++index] = cm_packets_retrans;
32610- target_stat_values[++index] = atomic_read(&cm_listens_created);
32611- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
32612+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
32613+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
32614 target_stat_values[++index] = cm_backlog_drops;
32615- target_stat_values[++index] = atomic_read(&cm_loopbacks);
32616- target_stat_values[++index] = atomic_read(&cm_nodes_created);
32617- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
32618- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
32619- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
32620+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
32621+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
32622+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
32623+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
32624+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
32625 target_stat_values[++index] = nesadapter->free_4kpbl;
32626 target_stat_values[++index] = nesadapter->free_256pbl;
32627 target_stat_values[++index] = int_mod_timer_init;
32628 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
32629 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
32630 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
32631- target_stat_values[++index] = atomic_read(&pau_qps_created);
32632- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
32633+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
32634+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
32635 }
32636
32637 /**
32638diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
32639index 5095bc4..41e8fff 100644
32640--- a/drivers/infiniband/hw/nes/nes_verbs.c
32641+++ b/drivers/infiniband/hw/nes/nes_verbs.c
32642@@ -46,9 +46,9 @@
32643
32644 #include <rdma/ib_umem.h>
32645
32646-atomic_t mod_qp_timouts;
32647-atomic_t qps_created;
32648-atomic_t sw_qps_destroyed;
32649+atomic_unchecked_t mod_qp_timouts;
32650+atomic_unchecked_t qps_created;
32651+atomic_unchecked_t sw_qps_destroyed;
32652
32653 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
32654
32655@@ -1131,7 +1131,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
32656 if (init_attr->create_flags)
32657 return ERR_PTR(-EINVAL);
32658
32659- atomic_inc(&qps_created);
32660+ atomic_inc_unchecked(&qps_created);
32661 switch (init_attr->qp_type) {
32662 case IB_QPT_RC:
32663 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
32664@@ -1460,7 +1460,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
32665 struct iw_cm_event cm_event;
32666 int ret = 0;
32667
32668- atomic_inc(&sw_qps_destroyed);
32669+ atomic_inc_unchecked(&sw_qps_destroyed);
32670 nesqp->destroyed = 1;
32671
32672 /* Blow away the connection if it exists. */
32673diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
32674index b881bdc..c2e360c 100644
32675--- a/drivers/infiniband/hw/qib/qib.h
32676+++ b/drivers/infiniband/hw/qib/qib.h
32677@@ -51,6 +51,7 @@
32678 #include <linux/completion.h>
32679 #include <linux/kref.h>
32680 #include <linux/sched.h>
32681+#include <linux/slab.h>
32682
32683 #include "qib_common.h"
32684 #include "qib_verbs.h"
32685diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
32686index df7fa25..0c854f0 100644
32687--- a/drivers/infiniband/hw/qib/qib_fs.c
32688+++ b/drivers/infiniband/hw/qib/qib_fs.c
32689@@ -267,6 +267,8 @@ static const struct file_operations qsfp_ops[] = {
32690 };
32691
32692 static ssize_t flash_read(struct file *file, char __user *buf,
32693+ size_t count, loff_t *ppos) __size_overflow(3);
32694+static ssize_t flash_read(struct file *file, char __user *buf,
32695 size_t count, loff_t *ppos)
32696 {
32697 struct qib_devdata *dd;
32698diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
32699index c351aa4..e6967c2 100644
32700--- a/drivers/input/gameport/gameport.c
32701+++ b/drivers/input/gameport/gameport.c
32702@@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
32703 */
32704 static void gameport_init_port(struct gameport *gameport)
32705 {
32706- static atomic_t gameport_no = ATOMIC_INIT(0);
32707+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
32708
32709 __module_get(THIS_MODULE);
32710
32711 mutex_init(&gameport->drv_mutex);
32712 device_initialize(&gameport->dev);
32713 dev_set_name(&gameport->dev, "gameport%lu",
32714- (unsigned long)atomic_inc_return(&gameport_no) - 1);
32715+ (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
32716 gameport->dev.bus = &gameport_bus;
32717 gameport->dev.release = gameport_release_port;
32718 if (gameport->parent)
32719diff --git a/drivers/input/input.c b/drivers/input/input.c
32720index da38d97..2aa0b79 100644
32721--- a/drivers/input/input.c
32722+++ b/drivers/input/input.c
32723@@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev)
32724 */
32725 int input_register_device(struct input_dev *dev)
32726 {
32727- static atomic_t input_no = ATOMIC_INIT(0);
32728+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
32729 struct input_handler *handler;
32730 const char *path;
32731 int error;
32732@@ -1851,7 +1851,7 @@ int input_register_device(struct input_dev *dev)
32733 dev->setkeycode = input_default_setkeycode;
32734
32735 dev_set_name(&dev->dev, "input%ld",
32736- (unsigned long) atomic_inc_return(&input_no) - 1);
32737+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
32738
32739 error = device_add(&dev->dev);
32740 if (error)
32741diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
32742index b8d8611..7a4a04b 100644
32743--- a/drivers/input/joystick/sidewinder.c
32744+++ b/drivers/input/joystick/sidewinder.c
32745@@ -30,6 +30,7 @@
32746 #include <linux/kernel.h>
32747 #include <linux/module.h>
32748 #include <linux/slab.h>
32749+#include <linux/sched.h>
32750 #include <linux/init.h>
32751 #include <linux/input.h>
32752 #include <linux/gameport.h>
32753diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
32754index d728875..844c89b 100644
32755--- a/drivers/input/joystick/xpad.c
32756+++ b/drivers/input/joystick/xpad.c
32757@@ -710,7 +710,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
32758
32759 static int xpad_led_probe(struct usb_xpad *xpad)
32760 {
32761- static atomic_t led_seq = ATOMIC_INIT(0);
32762+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
32763 long led_no;
32764 struct xpad_led *led;
32765 struct led_classdev *led_cdev;
32766@@ -723,7 +723,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
32767 if (!led)
32768 return -ENOMEM;
32769
32770- led_no = (long)atomic_inc_return(&led_seq) - 1;
32771+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
32772
32773 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
32774 led->xpad = xpad;
32775diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
32776index 0110b5a..d3ad144 100644
32777--- a/drivers/input/mousedev.c
32778+++ b/drivers/input/mousedev.c
32779@@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
32780
32781 spin_unlock_irq(&client->packet_lock);
32782
32783- if (copy_to_user(buffer, data, count))
32784+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
32785 return -EFAULT;
32786
32787 return count;
32788diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
32789index ba70058..571d25d 100644
32790--- a/drivers/input/serio/serio.c
32791+++ b/drivers/input/serio/serio.c
32792@@ -497,7 +497,7 @@ static void serio_release_port(struct device *dev)
32793 */
32794 static void serio_init_port(struct serio *serio)
32795 {
32796- static atomic_t serio_no = ATOMIC_INIT(0);
32797+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
32798
32799 __module_get(THIS_MODULE);
32800
32801@@ -508,7 +508,7 @@ static void serio_init_port(struct serio *serio)
32802 mutex_init(&serio->drv_mutex);
32803 device_initialize(&serio->dev);
32804 dev_set_name(&serio->dev, "serio%ld",
32805- (long)atomic_inc_return(&serio_no) - 1);
32806+ (long)atomic_inc_return_unchecked(&serio_no) - 1);
32807 serio->dev.bus = &serio_bus;
32808 serio->dev.release = serio_release_port;
32809 serio->dev.groups = serio_device_attr_groups;
32810diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
32811index e44933d..9ba484a 100644
32812--- a/drivers/isdn/capi/capi.c
32813+++ b/drivers/isdn/capi/capi.c
32814@@ -83,8 +83,8 @@ struct capiminor {
32815
32816 struct capi20_appl *ap;
32817 u32 ncci;
32818- atomic_t datahandle;
32819- atomic_t msgid;
32820+ atomic_unchecked_t datahandle;
32821+ atomic_unchecked_t msgid;
32822
32823 struct tty_port port;
32824 int ttyinstop;
32825@@ -397,7 +397,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
32826 capimsg_setu16(s, 2, mp->ap->applid);
32827 capimsg_setu8 (s, 4, CAPI_DATA_B3);
32828 capimsg_setu8 (s, 5, CAPI_RESP);
32829- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
32830+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
32831 capimsg_setu32(s, 8, mp->ncci);
32832 capimsg_setu16(s, 12, datahandle);
32833 }
32834@@ -518,14 +518,14 @@ static void handle_minor_send(struct capiminor *mp)
32835 mp->outbytes -= len;
32836 spin_unlock_bh(&mp->outlock);
32837
32838- datahandle = atomic_inc_return(&mp->datahandle);
32839+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
32840 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
32841 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
32842 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
32843 capimsg_setu16(skb->data, 2, mp->ap->applid);
32844 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
32845 capimsg_setu8 (skb->data, 5, CAPI_REQ);
32846- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
32847+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
32848 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
32849 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
32850 capimsg_setu16(skb->data, 16, len); /* Data length */
32851diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
32852index db621db..825ea1a 100644
32853--- a/drivers/isdn/gigaset/common.c
32854+++ b/drivers/isdn/gigaset/common.c
32855@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
32856 cs->commands_pending = 0;
32857 cs->cur_at_seq = 0;
32858 cs->gotfwver = -1;
32859- cs->open_count = 0;
32860+ local_set(&cs->open_count, 0);
32861 cs->dev = NULL;
32862 cs->tty = NULL;
32863 cs->tty_dev = NULL;
32864diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
32865index 212efaf..f187c6b 100644
32866--- a/drivers/isdn/gigaset/gigaset.h
32867+++ b/drivers/isdn/gigaset/gigaset.h
32868@@ -35,6 +35,7 @@
32869 #include <linux/tty_driver.h>
32870 #include <linux/list.h>
32871 #include <linux/atomic.h>
32872+#include <asm/local.h>
32873
32874 #define GIG_VERSION {0, 5, 0, 0}
32875 #define GIG_COMPAT {0, 4, 0, 0}
32876@@ -433,7 +434,7 @@ struct cardstate {
32877 spinlock_t cmdlock;
32878 unsigned curlen, cmdbytes;
32879
32880- unsigned open_count;
32881+ local_t open_count;
32882 struct tty_struct *tty;
32883 struct tasklet_struct if_wake_tasklet;
32884 unsigned control_state;
32885diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
32886index ee0a549..a7c9798 100644
32887--- a/drivers/isdn/gigaset/interface.c
32888+++ b/drivers/isdn/gigaset/interface.c
32889@@ -163,9 +163,7 @@ static int if_open(struct tty_struct *tty, struct file *filp)
32890 }
32891 tty->driver_data = cs;
32892
32893- ++cs->open_count;
32894-
32895- if (cs->open_count == 1) {
32896+ if (local_inc_return(&cs->open_count) == 1) {
32897 spin_lock_irqsave(&cs->lock, flags);
32898 cs->tty = tty;
32899 spin_unlock_irqrestore(&cs->lock, flags);
32900@@ -193,10 +191,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
32901
32902 if (!cs->connected)
32903 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32904- else if (!cs->open_count)
32905+ else if (!local_read(&cs->open_count))
32906 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32907 else {
32908- if (!--cs->open_count) {
32909+ if (!local_dec_return(&cs->open_count)) {
32910 spin_lock_irqsave(&cs->lock, flags);
32911 cs->tty = NULL;
32912 spin_unlock_irqrestore(&cs->lock, flags);
32913@@ -231,7 +229,7 @@ static int if_ioctl(struct tty_struct *tty,
32914 if (!cs->connected) {
32915 gig_dbg(DEBUG_IF, "not connected");
32916 retval = -ENODEV;
32917- } else if (!cs->open_count)
32918+ } else if (!local_read(&cs->open_count))
32919 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32920 else {
32921 retval = 0;
32922@@ -361,7 +359,7 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
32923 retval = -ENODEV;
32924 goto done;
32925 }
32926- if (!cs->open_count) {
32927+ if (!local_read(&cs->open_count)) {
32928 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32929 retval = -ENODEV;
32930 goto done;
32931@@ -414,7 +412,7 @@ static int if_write_room(struct tty_struct *tty)
32932 if (!cs->connected) {
32933 gig_dbg(DEBUG_IF, "not connected");
32934 retval = -ENODEV;
32935- } else if (!cs->open_count)
32936+ } else if (!local_read(&cs->open_count))
32937 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32938 else if (cs->mstate != MS_LOCKED) {
32939 dev_warn(cs->dev, "can't write to unlocked device\n");
32940@@ -444,7 +442,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
32941
32942 if (!cs->connected)
32943 gig_dbg(DEBUG_IF, "not connected");
32944- else if (!cs->open_count)
32945+ else if (!local_read(&cs->open_count))
32946 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32947 else if (cs->mstate != MS_LOCKED)
32948 dev_warn(cs->dev, "can't write to unlocked device\n");
32949@@ -472,7 +470,7 @@ static void if_throttle(struct tty_struct *tty)
32950
32951 if (!cs->connected)
32952 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32953- else if (!cs->open_count)
32954+ else if (!local_read(&cs->open_count))
32955 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32956 else
32957 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
32958@@ -496,7 +494,7 @@ static void if_unthrottle(struct tty_struct *tty)
32959
32960 if (!cs->connected)
32961 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32962- else if (!cs->open_count)
32963+ else if (!local_read(&cs->open_count))
32964 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32965 else
32966 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
32967@@ -527,7 +525,7 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
32968 goto out;
32969 }
32970
32971- if (!cs->open_count) {
32972+ if (!local_read(&cs->open_count)) {
32973 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32974 goto out;
32975 }
32976diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
32977index 2a57da59..e7a12ed 100644
32978--- a/drivers/isdn/hardware/avm/b1.c
32979+++ b/drivers/isdn/hardware/avm/b1.c
32980@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart * t4file)
32981 }
32982 if (left) {
32983 if (t4file->user) {
32984- if (copy_from_user(buf, dp, left))
32985+ if (left > sizeof buf || copy_from_user(buf, dp, left))
32986 return -EFAULT;
32987 } else {
32988 memcpy(buf, dp, left);
32989@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart * config)
32990 }
32991 if (left) {
32992 if (config->user) {
32993- if (copy_from_user(buf, dp, left))
32994+ if (left > sizeof buf || copy_from_user(buf, dp, left))
32995 return -EFAULT;
32996 } else {
32997 memcpy(buf, dp, left);
32998diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h
32999index 85784a7..a19ca98 100644
33000--- a/drivers/isdn/hardware/eicon/divasync.h
33001+++ b/drivers/isdn/hardware/eicon/divasync.h
33002@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
33003 } diva_didd_add_adapter_t;
33004 typedef struct _diva_didd_remove_adapter {
33005 IDI_CALL p_request;
33006-} diva_didd_remove_adapter_t;
33007+} __no_const diva_didd_remove_adapter_t;
33008 typedef struct _diva_didd_read_adapter_array {
33009 void * buffer;
33010 dword length;
33011diff --git a/drivers/isdn/hardware/eicon/xdi_adapter.h b/drivers/isdn/hardware/eicon/xdi_adapter.h
33012index a3bd163..8956575 100644
33013--- a/drivers/isdn/hardware/eicon/xdi_adapter.h
33014+++ b/drivers/isdn/hardware/eicon/xdi_adapter.h
33015@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
33016 typedef struct _diva_os_idi_adapter_interface {
33017 diva_init_card_proc_t cleanup_adapter_proc;
33018 diva_cmd_card_proc_t cmd_proc;
33019-} diva_os_idi_adapter_interface_t;
33020+} __no_const diva_os_idi_adapter_interface_t;
33021
33022 typedef struct _diva_os_xdi_adapter {
33023 struct list_head link;
33024diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
33025index 2339d73..802ab87 100644
33026--- a/drivers/isdn/i4l/isdn_net.c
33027+++ b/drivers/isdn/i4l/isdn_net.c
33028@@ -1901,7 +1901,7 @@ static int isdn_net_header(struct sk_buff *skb, struct net_device *dev,
33029 {
33030 isdn_net_local *lp = netdev_priv(dev);
33031 unsigned char *p;
33032- ushort len = 0;
33033+ int len = 0;
33034
33035 switch (lp->p_encap) {
33036 case ISDN_NET_ENCAP_ETHER:
33037diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
33038index 1f355bb..43f1fea 100644
33039--- a/drivers/isdn/icn/icn.c
33040+++ b/drivers/isdn/icn/icn.c
33041@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card)
33042 if (count > len)
33043 count = len;
33044 if (user) {
33045- if (copy_from_user(msg, buf, count))
33046+ if (count > sizeof msg || copy_from_user(msg, buf, count))
33047 return -EFAULT;
33048 } else
33049 memcpy(msg, buf, count);
33050diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
33051index b5fdcb7..5b6c59f 100644
33052--- a/drivers/lguest/core.c
33053+++ b/drivers/lguest/core.c
33054@@ -92,9 +92,17 @@ static __init int map_switcher(void)
33055 * it's worked so far. The end address needs +1 because __get_vm_area
33056 * allocates an extra guard page, so we need space for that.
33057 */
33058+
33059+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
33060+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
33061+ VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR
33062+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
33063+#else
33064 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
33065 VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR
33066 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
33067+#endif
33068+
33069 if (!switcher_vma) {
33070 err = -ENOMEM;
33071 printk("lguest: could not map switcher pages high\n");
33072@@ -119,7 +127,7 @@ static __init int map_switcher(void)
33073 * Now the Switcher is mapped at the right address, we can't fail!
33074 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
33075 */
33076- memcpy(switcher_vma->addr, start_switcher_text,
33077+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
33078 end_switcher_text - start_switcher_text);
33079
33080 printk(KERN_INFO "lguest: mapped switcher at %p\n",
33081diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c
33082index ff4a0bc..f5fdd9c 100644
33083--- a/drivers/lguest/lguest_user.c
33084+++ b/drivers/lguest/lguest_user.c
33085@@ -198,6 +198,7 @@ static int user_send_irq(struct lg_cpu *cpu, const unsigned long __user *input)
33086 * Once our Guest is initialized, the Launcher makes it run by reading
33087 * from /dev/lguest.
33088 */
33089+static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o) __size_overflow(3);
33090 static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o)
33091 {
33092 struct lguest *lg = file->private_data;
33093diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
33094index 65af42f..530c87a 100644
33095--- a/drivers/lguest/x86/core.c
33096+++ b/drivers/lguest/x86/core.c
33097@@ -59,7 +59,7 @@ static struct {
33098 /* Offset from where switcher.S was compiled to where we've copied it */
33099 static unsigned long switcher_offset(void)
33100 {
33101- return SWITCHER_ADDR - (unsigned long)start_switcher_text;
33102+ return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
33103 }
33104
33105 /* This cpu's struct lguest_pages. */
33106@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
33107 * These copies are pretty cheap, so we do them unconditionally: */
33108 /* Save the current Host top-level page directory.
33109 */
33110+
33111+#ifdef CONFIG_PAX_PER_CPU_PGD
33112+ pages->state.host_cr3 = read_cr3();
33113+#else
33114 pages->state.host_cr3 = __pa(current->mm->pgd);
33115+#endif
33116+
33117 /*
33118 * Set up the Guest's page tables to see this CPU's pages (and no
33119 * other CPU's pages).
33120@@ -472,7 +478,7 @@ void __init lguest_arch_host_init(void)
33121 * compiled-in switcher code and the high-mapped copy we just made.
33122 */
33123 for (i = 0; i < IDT_ENTRIES; i++)
33124- default_idt_entries[i] += switcher_offset();
33125+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
33126
33127 /*
33128 * Set up the Switcher's per-cpu areas.
33129@@ -555,7 +561,7 @@ void __init lguest_arch_host_init(void)
33130 * it will be undisturbed when we switch. To change %cs and jump we
33131 * need this structure to feed to Intel's "lcall" instruction.
33132 */
33133- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
33134+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
33135 lguest_entry.segment = LGUEST_CS;
33136
33137 /*
33138diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
33139index 40634b0..4f5855e 100644
33140--- a/drivers/lguest/x86/switcher_32.S
33141+++ b/drivers/lguest/x86/switcher_32.S
33142@@ -87,6 +87,7 @@
33143 #include <asm/page.h>
33144 #include <asm/segment.h>
33145 #include <asm/lguest.h>
33146+#include <asm/processor-flags.h>
33147
33148 // We mark the start of the code to copy
33149 // It's placed in .text tho it's never run here
33150@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
33151 // Changes type when we load it: damn Intel!
33152 // For after we switch over our page tables
33153 // That entry will be read-only: we'd crash.
33154+
33155+#ifdef CONFIG_PAX_KERNEXEC
33156+ mov %cr0, %edx
33157+ xor $X86_CR0_WP, %edx
33158+ mov %edx, %cr0
33159+#endif
33160+
33161 movl $(GDT_ENTRY_TSS*8), %edx
33162 ltr %dx
33163
33164@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
33165 // Let's clear it again for our return.
33166 // The GDT descriptor of the Host
33167 // Points to the table after two "size" bytes
33168- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
33169+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
33170 // Clear "used" from type field (byte 5, bit 2)
33171- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
33172+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
33173+
33174+#ifdef CONFIG_PAX_KERNEXEC
33175+ mov %cr0, %eax
33176+ xor $X86_CR0_WP, %eax
33177+ mov %eax, %cr0
33178+#endif
33179
33180 // Once our page table's switched, the Guest is live!
33181 // The Host fades as we run this final step.
33182@@ -295,13 +309,12 @@ deliver_to_host:
33183 // I consulted gcc, and it gave
33184 // These instructions, which I gladly credit:
33185 leal (%edx,%ebx,8), %eax
33186- movzwl (%eax),%edx
33187- movl 4(%eax), %eax
33188- xorw %ax, %ax
33189- orl %eax, %edx
33190+ movl 4(%eax), %edx
33191+ movw (%eax), %dx
33192 // Now the address of the handler's in %edx
33193 // We call it now: its "iret" drops us home.
33194- jmp *%edx
33195+ ljmp $__KERNEL_CS, $1f
33196+1: jmp *%edx
33197
33198 // Every interrupt can come to us here
33199 // But we must truly tell each apart.
33200diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
33201index 4daf9e5..b8d1d0f 100644
33202--- a/drivers/macintosh/macio_asic.c
33203+++ b/drivers/macintosh/macio_asic.c
33204@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
33205 * MacIO is matched against any Apple ID, it's probe() function
33206 * will then decide wether it applies or not
33207 */
33208-static const struct pci_device_id __devinitdata pci_ids [] = { {
33209+static const struct pci_device_id __devinitconst pci_ids [] = { {
33210 .vendor = PCI_VENDOR_ID_APPLE,
33211 .device = PCI_ANY_ID,
33212 .subvendor = PCI_ANY_ID,
33213diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
33214index 1ce84ed..0fdd40a 100644
33215--- a/drivers/md/dm-ioctl.c
33216+++ b/drivers/md/dm-ioctl.c
33217@@ -1589,7 +1589,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
33218 cmd == DM_LIST_VERSIONS_CMD)
33219 return 0;
33220
33221- if ((cmd == DM_DEV_CREATE_CMD)) {
33222+ if (cmd == DM_DEV_CREATE_CMD) {
33223 if (!*param->name) {
33224 DMWARN("name not supplied when creating device");
33225 return -EINVAL;
33226diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
33227index 9bfd057..01180bc 100644
33228--- a/drivers/md/dm-raid1.c
33229+++ b/drivers/md/dm-raid1.c
33230@@ -40,7 +40,7 @@ enum dm_raid1_error {
33231
33232 struct mirror {
33233 struct mirror_set *ms;
33234- atomic_t error_count;
33235+ atomic_unchecked_t error_count;
33236 unsigned long error_type;
33237 struct dm_dev *dev;
33238 sector_t offset;
33239@@ -185,7 +185,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
33240 struct mirror *m;
33241
33242 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
33243- if (!atomic_read(&m->error_count))
33244+ if (!atomic_read_unchecked(&m->error_count))
33245 return m;
33246
33247 return NULL;
33248@@ -217,7 +217,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
33249 * simple way to tell if a device has encountered
33250 * errors.
33251 */
33252- atomic_inc(&m->error_count);
33253+ atomic_inc_unchecked(&m->error_count);
33254
33255 if (test_and_set_bit(error_type, &m->error_type))
33256 return;
33257@@ -408,7 +408,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
33258 struct mirror *m = get_default_mirror(ms);
33259
33260 do {
33261- if (likely(!atomic_read(&m->error_count)))
33262+ if (likely(!atomic_read_unchecked(&m->error_count)))
33263 return m;
33264
33265 if (m-- == ms->mirror)
33266@@ -422,7 +422,7 @@ static int default_ok(struct mirror *m)
33267 {
33268 struct mirror *default_mirror = get_default_mirror(m->ms);
33269
33270- return !atomic_read(&default_mirror->error_count);
33271+ return !atomic_read_unchecked(&default_mirror->error_count);
33272 }
33273
33274 static int mirror_available(struct mirror_set *ms, struct bio *bio)
33275@@ -559,7 +559,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
33276 */
33277 if (likely(region_in_sync(ms, region, 1)))
33278 m = choose_mirror(ms, bio->bi_sector);
33279- else if (m && atomic_read(&m->error_count))
33280+ else if (m && atomic_read_unchecked(&m->error_count))
33281 m = NULL;
33282
33283 if (likely(m))
33284@@ -937,7 +937,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
33285 }
33286
33287 ms->mirror[mirror].ms = ms;
33288- atomic_set(&(ms->mirror[mirror].error_count), 0);
33289+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
33290 ms->mirror[mirror].error_type = 0;
33291 ms->mirror[mirror].offset = offset;
33292
33293@@ -1347,7 +1347,7 @@ static void mirror_resume(struct dm_target *ti)
33294 */
33295 static char device_status_char(struct mirror *m)
33296 {
33297- if (!atomic_read(&(m->error_count)))
33298+ if (!atomic_read_unchecked(&(m->error_count)))
33299 return 'A';
33300
33301 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
33302diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
33303index 3d80cf0..b77cc47 100644
33304--- a/drivers/md/dm-stripe.c
33305+++ b/drivers/md/dm-stripe.c
33306@@ -20,7 +20,7 @@ struct stripe {
33307 struct dm_dev *dev;
33308 sector_t physical_start;
33309
33310- atomic_t error_count;
33311+ atomic_unchecked_t error_count;
33312 };
33313
33314 struct stripe_c {
33315@@ -192,7 +192,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
33316 kfree(sc);
33317 return r;
33318 }
33319- atomic_set(&(sc->stripe[i].error_count), 0);
33320+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
33321 }
33322
33323 ti->private = sc;
33324@@ -314,7 +314,7 @@ static int stripe_status(struct dm_target *ti,
33325 DMEMIT("%d ", sc->stripes);
33326 for (i = 0; i < sc->stripes; i++) {
33327 DMEMIT("%s ", sc->stripe[i].dev->name);
33328- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
33329+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
33330 'D' : 'A';
33331 }
33332 buffer[i] = '\0';
33333@@ -361,8 +361,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
33334 */
33335 for (i = 0; i < sc->stripes; i++)
33336 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
33337- atomic_inc(&(sc->stripe[i].error_count));
33338- if (atomic_read(&(sc->stripe[i].error_count)) <
33339+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
33340+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
33341 DM_IO_ERROR_THRESHOLD)
33342 schedule_work(&sc->trigger_event);
33343 }
33344diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
33345index 8e91321..fd17aef 100644
33346--- a/drivers/md/dm-table.c
33347+++ b/drivers/md/dm-table.c
33348@@ -391,7 +391,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
33349 if (!dev_size)
33350 return 0;
33351
33352- if ((start >= dev_size) || (start + len > dev_size)) {
33353+ if ((start >= dev_size) || (len > dev_size - start)) {
33354 DMWARN("%s: %s too small for target: "
33355 "start=%llu, len=%llu, dev_size=%llu",
33356 dm_device_name(ti->table->md), bdevname(bdev, b),
33357diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
33358index 237571a..fb6d19b 100644
33359--- a/drivers/md/dm-thin-metadata.c
33360+++ b/drivers/md/dm-thin-metadata.c
33361@@ -432,7 +432,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
33362
33363 pmd->info.tm = tm;
33364 pmd->info.levels = 2;
33365- pmd->info.value_type.context = pmd->data_sm;
33366+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33367 pmd->info.value_type.size = sizeof(__le64);
33368 pmd->info.value_type.inc = data_block_inc;
33369 pmd->info.value_type.dec = data_block_dec;
33370@@ -451,7 +451,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
33371
33372 pmd->bl_info.tm = tm;
33373 pmd->bl_info.levels = 1;
33374- pmd->bl_info.value_type.context = pmd->data_sm;
33375+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33376 pmd->bl_info.value_type.size = sizeof(__le64);
33377 pmd->bl_info.value_type.inc = data_block_inc;
33378 pmd->bl_info.value_type.dec = data_block_dec;
33379diff --git a/drivers/md/dm.c b/drivers/md/dm.c
33380index 4720f68..78d1df7 100644
33381--- a/drivers/md/dm.c
33382+++ b/drivers/md/dm.c
33383@@ -177,9 +177,9 @@ struct mapped_device {
33384 /*
33385 * Event handling.
33386 */
33387- atomic_t event_nr;
33388+ atomic_unchecked_t event_nr;
33389 wait_queue_head_t eventq;
33390- atomic_t uevent_seq;
33391+ atomic_unchecked_t uevent_seq;
33392 struct list_head uevent_list;
33393 spinlock_t uevent_lock; /* Protect access to uevent_list */
33394
33395@@ -1845,8 +1845,8 @@ static struct mapped_device *alloc_dev(int minor)
33396 rwlock_init(&md->map_lock);
33397 atomic_set(&md->holders, 1);
33398 atomic_set(&md->open_count, 0);
33399- atomic_set(&md->event_nr, 0);
33400- atomic_set(&md->uevent_seq, 0);
33401+ atomic_set_unchecked(&md->event_nr, 0);
33402+ atomic_set_unchecked(&md->uevent_seq, 0);
33403 INIT_LIST_HEAD(&md->uevent_list);
33404 spin_lock_init(&md->uevent_lock);
33405
33406@@ -1980,7 +1980,7 @@ static void event_callback(void *context)
33407
33408 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
33409
33410- atomic_inc(&md->event_nr);
33411+ atomic_inc_unchecked(&md->event_nr);
33412 wake_up(&md->eventq);
33413 }
33414
33415@@ -2622,18 +2622,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
33416
33417 uint32_t dm_next_uevent_seq(struct mapped_device *md)
33418 {
33419- return atomic_add_return(1, &md->uevent_seq);
33420+ return atomic_add_return_unchecked(1, &md->uevent_seq);
33421 }
33422
33423 uint32_t dm_get_event_nr(struct mapped_device *md)
33424 {
33425- return atomic_read(&md->event_nr);
33426+ return atomic_read_unchecked(&md->event_nr);
33427 }
33428
33429 int dm_wait_event(struct mapped_device *md, int event_nr)
33430 {
33431 return wait_event_interruptible(md->eventq,
33432- (event_nr != atomic_read(&md->event_nr)));
33433+ (event_nr != atomic_read_unchecked(&md->event_nr)));
33434 }
33435
33436 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
33437diff --git a/drivers/md/md.c b/drivers/md/md.c
33438index f47f1f8..b7f559e 100644
33439--- a/drivers/md/md.c
33440+++ b/drivers/md/md.c
33441@@ -278,10 +278,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
33442 * start build, activate spare
33443 */
33444 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
33445-static atomic_t md_event_count;
33446+static atomic_unchecked_t md_event_count;
33447 void md_new_event(struct mddev *mddev)
33448 {
33449- atomic_inc(&md_event_count);
33450+ atomic_inc_unchecked(&md_event_count);
33451 wake_up(&md_event_waiters);
33452 }
33453 EXPORT_SYMBOL_GPL(md_new_event);
33454@@ -291,7 +291,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
33455 */
33456 static void md_new_event_inintr(struct mddev *mddev)
33457 {
33458- atomic_inc(&md_event_count);
33459+ atomic_inc_unchecked(&md_event_count);
33460 wake_up(&md_event_waiters);
33461 }
33462
33463@@ -1525,7 +1525,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
33464
33465 rdev->preferred_minor = 0xffff;
33466 rdev->data_offset = le64_to_cpu(sb->data_offset);
33467- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33468+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33469
33470 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
33471 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
33472@@ -1742,7 +1742,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
33473 else
33474 sb->resync_offset = cpu_to_le64(0);
33475
33476- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
33477+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
33478
33479 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
33480 sb->size = cpu_to_le64(mddev->dev_sectors);
33481@@ -2639,7 +2639,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
33482 static ssize_t
33483 errors_show(struct md_rdev *rdev, char *page)
33484 {
33485- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
33486+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
33487 }
33488
33489 static ssize_t
33490@@ -2648,7 +2648,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
33491 char *e;
33492 unsigned long n = simple_strtoul(buf, &e, 10);
33493 if (*buf && (*e == 0 || *e == '\n')) {
33494- atomic_set(&rdev->corrected_errors, n);
33495+ atomic_set_unchecked(&rdev->corrected_errors, n);
33496 return len;
33497 }
33498 return -EINVAL;
33499@@ -3039,8 +3039,8 @@ int md_rdev_init(struct md_rdev *rdev)
33500 rdev->sb_loaded = 0;
33501 rdev->bb_page = NULL;
33502 atomic_set(&rdev->nr_pending, 0);
33503- atomic_set(&rdev->read_errors, 0);
33504- atomic_set(&rdev->corrected_errors, 0);
33505+ atomic_set_unchecked(&rdev->read_errors, 0);
33506+ atomic_set_unchecked(&rdev->corrected_errors, 0);
33507
33508 INIT_LIST_HEAD(&rdev->same_set);
33509 init_waitqueue_head(&rdev->blocked_wait);
33510@@ -6683,7 +6683,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
33511
33512 spin_unlock(&pers_lock);
33513 seq_printf(seq, "\n");
33514- seq->poll_event = atomic_read(&md_event_count);
33515+ seq->poll_event = atomic_read_unchecked(&md_event_count);
33516 return 0;
33517 }
33518 if (v == (void*)2) {
33519@@ -6772,7 +6772,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
33520 chunk_kb ? "KB" : "B");
33521 if (bitmap->file) {
33522 seq_printf(seq, ", file: ");
33523- seq_path(seq, &bitmap->file->f_path, " \t\n");
33524+ seq_path(seq, &bitmap->file->f_path, " \t\n\\");
33525 }
33526
33527 seq_printf(seq, "\n");
33528@@ -6803,7 +6803,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
33529 return error;
33530
33531 seq = file->private_data;
33532- seq->poll_event = atomic_read(&md_event_count);
33533+ seq->poll_event = atomic_read_unchecked(&md_event_count);
33534 return error;
33535 }
33536
33537@@ -6817,7 +6817,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
33538 /* always allow read */
33539 mask = POLLIN | POLLRDNORM;
33540
33541- if (seq->poll_event != atomic_read(&md_event_count))
33542+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
33543 mask |= POLLERR | POLLPRI;
33544 return mask;
33545 }
33546@@ -6861,7 +6861,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
33547 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
33548 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
33549 (int)part_stat_read(&disk->part0, sectors[1]) -
33550- atomic_read(&disk->sync_io);
33551+ atomic_read_unchecked(&disk->sync_io);
33552 /* sync IO will cause sync_io to increase before the disk_stats
33553 * as sync_io is counted when a request starts, and
33554 * disk_stats is counted when it completes.
33555diff --git a/drivers/md/md.h b/drivers/md/md.h
33556index cf742d9..7c7c745 100644
33557--- a/drivers/md/md.h
33558+++ b/drivers/md/md.h
33559@@ -120,13 +120,13 @@ struct md_rdev {
33560 * only maintained for arrays that
33561 * support hot removal
33562 */
33563- atomic_t read_errors; /* number of consecutive read errors that
33564+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
33565 * we have tried to ignore.
33566 */
33567 struct timespec last_read_error; /* monotonic time since our
33568 * last read error
33569 */
33570- atomic_t corrected_errors; /* number of corrected read errors,
33571+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
33572 * for reporting to userspace and storing
33573 * in superblock.
33574 */
33575@@ -410,7 +410,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
33576
33577 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
33578 {
33579- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33580+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33581 }
33582
33583 struct md_personality
33584diff --git a/drivers/md/persistent-data/dm-space-map-checker.c b/drivers/md/persistent-data/dm-space-map-checker.c
33585index 50ed53b..4f29d7d 100644
33586--- a/drivers/md/persistent-data/dm-space-map-checker.c
33587+++ b/drivers/md/persistent-data/dm-space-map-checker.c
33588@@ -159,7 +159,7 @@ static void ca_destroy(struct count_array *ca)
33589 /*----------------------------------------------------------------*/
33590
33591 struct sm_checker {
33592- struct dm_space_map sm;
33593+ dm_space_map_no_const sm;
33594
33595 struct count_array old_counts;
33596 struct count_array counts;
33597diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
33598index fc469ba..2d91555 100644
33599--- a/drivers/md/persistent-data/dm-space-map-disk.c
33600+++ b/drivers/md/persistent-data/dm-space-map-disk.c
33601@@ -23,7 +23,7 @@
33602 * Space map interface.
33603 */
33604 struct sm_disk {
33605- struct dm_space_map sm;
33606+ dm_space_map_no_const sm;
33607
33608 struct ll_disk ll;
33609 struct ll_disk old_ll;
33610diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
33611index e89ae5e..062e4c2 100644
33612--- a/drivers/md/persistent-data/dm-space-map-metadata.c
33613+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
33614@@ -43,7 +43,7 @@ struct block_op {
33615 };
33616
33617 struct sm_metadata {
33618- struct dm_space_map sm;
33619+ dm_space_map_no_const sm;
33620
33621 struct ll_disk ll;
33622 struct ll_disk old_ll;
33623diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
33624index 1cbfc6b..56e1dbb 100644
33625--- a/drivers/md/persistent-data/dm-space-map.h
33626+++ b/drivers/md/persistent-data/dm-space-map.h
33627@@ -60,6 +60,7 @@ struct dm_space_map {
33628 int (*root_size)(struct dm_space_map *sm, size_t *result);
33629 int (*copy_root)(struct dm_space_map *sm, void *copy_to_here_le, size_t len);
33630 };
33631+typedef struct dm_space_map __no_const dm_space_map_no_const;
33632
33633 /*----------------------------------------------------------------*/
33634
33635diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
33636index 7d9e071..015b1d5 100644
33637--- a/drivers/md/raid1.c
33638+++ b/drivers/md/raid1.c
33639@@ -1568,7 +1568,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
33640 if (r1_sync_page_io(rdev, sect, s,
33641 bio->bi_io_vec[idx].bv_page,
33642 READ) != 0)
33643- atomic_add(s, &rdev->corrected_errors);
33644+ atomic_add_unchecked(s, &rdev->corrected_errors);
33645 }
33646 sectors -= s;
33647 sect += s;
33648@@ -1781,7 +1781,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
33649 test_bit(In_sync, &rdev->flags)) {
33650 if (r1_sync_page_io(rdev, sect, s,
33651 conf->tmppage, READ)) {
33652- atomic_add(s, &rdev->corrected_errors);
33653+ atomic_add_unchecked(s, &rdev->corrected_errors);
33654 printk(KERN_INFO
33655 "md/raid1:%s: read error corrected "
33656 "(%d sectors at %llu on %s)\n",
33657diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
33658index 685ddf3..955b087 100644
33659--- a/drivers/md/raid10.c
33660+++ b/drivers/md/raid10.c
33661@@ -1440,7 +1440,7 @@ static void end_sync_read(struct bio *bio, int error)
33662 /* The write handler will notice the lack of
33663 * R10BIO_Uptodate and record any errors etc
33664 */
33665- atomic_add(r10_bio->sectors,
33666+ atomic_add_unchecked(r10_bio->sectors,
33667 &conf->mirrors[d].rdev->corrected_errors);
33668
33669 /* for reconstruct, we always reschedule after a read.
33670@@ -1740,7 +1740,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
33671 {
33672 struct timespec cur_time_mon;
33673 unsigned long hours_since_last;
33674- unsigned int read_errors = atomic_read(&rdev->read_errors);
33675+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
33676
33677 ktime_get_ts(&cur_time_mon);
33678
33679@@ -1762,9 +1762,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
33680 * overflowing the shift of read_errors by hours_since_last.
33681 */
33682 if (hours_since_last >= 8 * sizeof(read_errors))
33683- atomic_set(&rdev->read_errors, 0);
33684+ atomic_set_unchecked(&rdev->read_errors, 0);
33685 else
33686- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
33687+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
33688 }
33689
33690 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
33691@@ -1814,8 +1814,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33692 return;
33693
33694 check_decay_read_errors(mddev, rdev);
33695- atomic_inc(&rdev->read_errors);
33696- if (atomic_read(&rdev->read_errors) > max_read_errors) {
33697+ atomic_inc_unchecked(&rdev->read_errors);
33698+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
33699 char b[BDEVNAME_SIZE];
33700 bdevname(rdev->bdev, b);
33701
33702@@ -1823,7 +1823,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33703 "md/raid10:%s: %s: Raid device exceeded "
33704 "read_error threshold [cur %d:max %d]\n",
33705 mdname(mddev), b,
33706- atomic_read(&rdev->read_errors), max_read_errors);
33707+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
33708 printk(KERN_NOTICE
33709 "md/raid10:%s: %s: Failing raid device\n",
33710 mdname(mddev), b);
33711@@ -1968,7 +1968,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33712 (unsigned long long)(
33713 sect + rdev->data_offset),
33714 bdevname(rdev->bdev, b));
33715- atomic_add(s, &rdev->corrected_errors);
33716+ atomic_add_unchecked(s, &rdev->corrected_errors);
33717 }
33718
33719 rdev_dec_pending(rdev, mddev);
33720diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
33721index 858fdbb..b2dac95 100644
33722--- a/drivers/md/raid5.c
33723+++ b/drivers/md/raid5.c
33724@@ -1610,19 +1610,19 @@ static void raid5_end_read_request(struct bio * bi, int error)
33725 (unsigned long long)(sh->sector
33726 + rdev->data_offset),
33727 bdevname(rdev->bdev, b));
33728- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
33729+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
33730 clear_bit(R5_ReadError, &sh->dev[i].flags);
33731 clear_bit(R5_ReWrite, &sh->dev[i].flags);
33732 }
33733- if (atomic_read(&conf->disks[i].rdev->read_errors))
33734- atomic_set(&conf->disks[i].rdev->read_errors, 0);
33735+ if (atomic_read_unchecked(&conf->disks[i].rdev->read_errors))
33736+ atomic_set_unchecked(&conf->disks[i].rdev->read_errors, 0);
33737 } else {
33738 const char *bdn = bdevname(conf->disks[i].rdev->bdev, b);
33739 int retry = 0;
33740 rdev = conf->disks[i].rdev;
33741
33742 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
33743- atomic_inc(&rdev->read_errors);
33744+ atomic_inc_unchecked(&rdev->read_errors);
33745 if (conf->mddev->degraded >= conf->max_degraded)
33746 printk_ratelimited(
33747 KERN_WARNING
33748@@ -1642,7 +1642,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
33749 (unsigned long long)(sh->sector
33750 + rdev->data_offset),
33751 bdn);
33752- else if (atomic_read(&rdev->read_errors)
33753+ else if (atomic_read_unchecked(&rdev->read_errors)
33754 > conf->max_nr_stripes)
33755 printk(KERN_WARNING
33756 "md/raid:%s: Too many read errors, failing device %s.\n",
33757diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
33758index ba9a643..e474ab5 100644
33759--- a/drivers/media/dvb/ddbridge/ddbridge-core.c
33760+++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
33761@@ -1678,7 +1678,7 @@ static struct ddb_info ddb_v6 = {
33762 .subvendor = _subvend, .subdevice = _subdev, \
33763 .driver_data = (unsigned long)&_driverdata }
33764
33765-static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
33766+static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
33767 DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
33768 DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
33769 DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
33770diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb/dvb-core/dvb_demux.h
33771index a7d876f..8c21b61 100644
33772--- a/drivers/media/dvb/dvb-core/dvb_demux.h
33773+++ b/drivers/media/dvb/dvb-core/dvb_demux.h
33774@@ -73,7 +73,7 @@ struct dvb_demux_feed {
33775 union {
33776 dmx_ts_cb ts;
33777 dmx_section_cb sec;
33778- } cb;
33779+ } __no_const cb;
33780
33781 struct dvb_demux *demux;
33782 void *priv;
33783diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
33784index f732877..d38c35a 100644
33785--- a/drivers/media/dvb/dvb-core/dvbdev.c
33786+++ b/drivers/media/dvb/dvb-core/dvbdev.c
33787@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
33788 const struct dvb_device *template, void *priv, int type)
33789 {
33790 struct dvb_device *dvbdev;
33791- struct file_operations *dvbdevfops;
33792+ file_operations_no_const *dvbdevfops;
33793 struct device *clsdev;
33794 int minor;
33795 int id;
33796diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
33797index 9f2a02c..5920f88 100644
33798--- a/drivers/media/dvb/dvb-usb/cxusb.c
33799+++ b/drivers/media/dvb/dvb-usb/cxusb.c
33800@@ -1069,7 +1069,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
33801 struct dib0700_adapter_state {
33802 int (*set_param_save) (struct dvb_frontend *,
33803 struct dvb_frontend_parameters *);
33804-};
33805+} __no_const;
33806
33807 static int dib7070_set_param_override(struct dvb_frontend *fe,
33808 struct dvb_frontend_parameters *fep)
33809diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
33810index f103ec1..5e8968b 100644
33811--- a/drivers/media/dvb/dvb-usb/dw2102.c
33812+++ b/drivers/media/dvb/dvb-usb/dw2102.c
33813@@ -95,7 +95,7 @@ struct su3000_state {
33814
33815 struct s6x0_state {
33816 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
33817-};
33818+} __no_const;
33819
33820 /* debug */
33821 static int dvb_usb_dw2102_debug;
33822diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
33823index 404f63a..4796533 100644
33824--- a/drivers/media/dvb/frontends/dib3000.h
33825+++ b/drivers/media/dvb/frontends/dib3000.h
33826@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
33827 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
33828 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
33829 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
33830-};
33831+} __no_const;
33832
33833 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
33834 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
33835diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c
33836index 90bf573..e8463da 100644
33837--- a/drivers/media/dvb/frontends/ds3000.c
33838+++ b/drivers/media/dvb/frontends/ds3000.c
33839@@ -1210,7 +1210,7 @@ static int ds3000_set_frontend(struct dvb_frontend *fe,
33840
33841 for (i = 0; i < 30 ; i++) {
33842 ds3000_read_status(fe, &status);
33843- if (status && FE_HAS_LOCK)
33844+ if (status & FE_HAS_LOCK)
33845 break;
33846
33847 msleep(10);
33848diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
33849index 0564192..75b16f5 100644
33850--- a/drivers/media/dvb/ngene/ngene-cards.c
33851+++ b/drivers/media/dvb/ngene/ngene-cards.c
33852@@ -477,7 +477,7 @@ static struct ngene_info ngene_info_m780 = {
33853
33854 /****************************************************************************/
33855
33856-static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
33857+static const struct pci_device_id ngene_id_tbl[] __devinitconst = {
33858 NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
33859 NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
33860 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
33861diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
33862index 16a089f..ab1667d 100644
33863--- a/drivers/media/radio/radio-cadet.c
33864+++ b/drivers/media/radio/radio-cadet.c
33865@@ -326,6 +326,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
33866 unsigned char readbuf[RDS_BUFFER];
33867 int i = 0;
33868
33869+ if (count > RDS_BUFFER)
33870+ return -EFAULT;
33871 mutex_lock(&dev->lock);
33872 if (dev->rdsstat == 0) {
33873 dev->rdsstat = 1;
33874diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
33875index 61287fc..8b08712 100644
33876--- a/drivers/media/rc/redrat3.c
33877+++ b/drivers/media/rc/redrat3.c
33878@@ -905,7 +905,7 @@ static int redrat3_set_tx_carrier(struct rc_dev *dev, u32 carrier)
33879 return carrier;
33880 }
33881
33882-static int redrat3_transmit_ir(struct rc_dev *rcdev, int *txbuf, u32 n)
33883+static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf, u32 n)
33884 {
33885 struct redrat3_dev *rr3 = rcdev->priv;
33886 struct device *dev = rr3->dev;
33887diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
33888index 9cde353..8c6a1c3 100644
33889--- a/drivers/media/video/au0828/au0828.h
33890+++ b/drivers/media/video/au0828/au0828.h
33891@@ -191,7 +191,7 @@ struct au0828_dev {
33892
33893 /* I2C */
33894 struct i2c_adapter i2c_adap;
33895- struct i2c_algorithm i2c_algo;
33896+ i2c_algorithm_no_const i2c_algo;
33897 struct i2c_client i2c_client;
33898 u32 i2c_rc;
33899
33900diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
33901index 68d1240..46b32eb 100644
33902--- a/drivers/media/video/cx88/cx88-alsa.c
33903+++ b/drivers/media/video/cx88/cx88-alsa.c
33904@@ -766,7 +766,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = {
33905 * Only boards with eeprom and byte 1 at eeprom=1 have it
33906 */
33907
33908-static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {
33909+static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitconst = {
33910 {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
33911 {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
33912 {0, }
33913diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
33914index ee0d0b3..63f6b78 100644
33915--- a/drivers/media/video/omap/omap_vout.c
33916+++ b/drivers/media/video/omap/omap_vout.c
33917@@ -64,7 +64,6 @@ enum omap_vout_channels {
33918 OMAP_VIDEO2,
33919 };
33920
33921-static struct videobuf_queue_ops video_vbq_ops;
33922 /* Variables configurable through module params*/
33923 static u32 video1_numbuffers = 3;
33924 static u32 video2_numbuffers = 3;
33925@@ -999,6 +998,12 @@ static int omap_vout_open(struct file *file)
33926 {
33927 struct videobuf_queue *q;
33928 struct omap_vout_device *vout = NULL;
33929+ static struct videobuf_queue_ops video_vbq_ops = {
33930+ .buf_setup = omap_vout_buffer_setup,
33931+ .buf_prepare = omap_vout_buffer_prepare,
33932+ .buf_release = omap_vout_buffer_release,
33933+ .buf_queue = omap_vout_buffer_queue,
33934+ };
33935
33936 vout = video_drvdata(file);
33937 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
33938@@ -1016,10 +1021,6 @@ static int omap_vout_open(struct file *file)
33939 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
33940
33941 q = &vout->vbq;
33942- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
33943- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
33944- video_vbq_ops.buf_release = omap_vout_buffer_release;
33945- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
33946 spin_lock_init(&vout->vbq_lock);
33947
33948 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
33949diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33950index 305e6aa..0143317 100644
33951--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33952+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33953@@ -196,7 +196,7 @@ struct pvr2_hdw {
33954
33955 /* I2C stuff */
33956 struct i2c_adapter i2c_adap;
33957- struct i2c_algorithm i2c_algo;
33958+ i2c_algorithm_no_const i2c_algo;
33959 pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
33960 int i2c_cx25840_hack_state;
33961 int i2c_linked;
33962diff --git a/drivers/media/video/saa7164/saa7164-encoder.c b/drivers/media/video/saa7164/saa7164-encoder.c
33963index 2fd38a0..ddec3c4 100644
33964--- a/drivers/media/video/saa7164/saa7164-encoder.c
33965+++ b/drivers/media/video/saa7164/saa7164-encoder.c
33966@@ -1136,6 +1136,8 @@ struct saa7164_user_buffer *saa7164_enc_next_buf(struct saa7164_port *port)
33967 }
33968
33969 static ssize_t fops_read(struct file *file, char __user *buffer,
33970+ size_t count, loff_t *pos) __size_overflow(3);
33971+static ssize_t fops_read(struct file *file, char __user *buffer,
33972 size_t count, loff_t *pos)
33973 {
33974 struct saa7164_encoder_fh *fh = file->private_data;
33975diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c
33976index e2e0341..b80056c 100644
33977--- a/drivers/media/video/saa7164/saa7164-vbi.c
33978+++ b/drivers/media/video/saa7164/saa7164-vbi.c
33979@@ -1081,6 +1081,8 @@ struct saa7164_user_buffer *saa7164_vbi_next_buf(struct saa7164_port *port)
33980 }
33981
33982 static ssize_t fops_read(struct file *file, char __user *buffer,
33983+ size_t count, loff_t *pos) __size_overflow(3);
33984+static ssize_t fops_read(struct file *file, char __user *buffer,
33985 size_t count, loff_t *pos)
33986 {
33987 struct saa7164_vbi_fh *fh = file->private_data;
33988diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
33989index a0895bf..b7ebb1b 100644
33990--- a/drivers/media/video/timblogiw.c
33991+++ b/drivers/media/video/timblogiw.c
33992@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
33993
33994 /* Platform device functions */
33995
33996-static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
33997+static __devinitconst v4l2_ioctl_ops_no_const timblogiw_ioctl_ops = {
33998 .vidioc_querycap = timblogiw_querycap,
33999 .vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt,
34000 .vidioc_g_fmt_vid_cap = timblogiw_g_fmt,
34001@@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
34002 .vidioc_enum_framesizes = timblogiw_enum_framesizes,
34003 };
34004
34005-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
34006+static __devinitconst v4l2_file_operations_no_const timblogiw_fops = {
34007 .owner = THIS_MODULE,
34008 .open = timblogiw_open,
34009 .release = timblogiw_close,
34010diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
34011index e9c6a60..daf6a33 100644
34012--- a/drivers/message/fusion/mptbase.c
34013+++ b/drivers/message/fusion/mptbase.c
34014@@ -6753,8 +6753,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
34015 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
34016 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
34017
34018+#ifdef CONFIG_GRKERNSEC_HIDESYM
34019+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
34020+#else
34021 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
34022 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
34023+#endif
34024+
34025 /*
34026 * Rounding UP to nearest 4-kB boundary here...
34027 */
34028diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
34029index 9d95042..b808101 100644
34030--- a/drivers/message/fusion/mptsas.c
34031+++ b/drivers/message/fusion/mptsas.c
34032@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
34033 return 0;
34034 }
34035
34036+static inline void
34037+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
34038+{
34039+ if (phy_info->port_details) {
34040+ phy_info->port_details->rphy = rphy;
34041+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
34042+ ioc->name, rphy));
34043+ }
34044+
34045+ if (rphy) {
34046+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
34047+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
34048+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
34049+ ioc->name, rphy, rphy->dev.release));
34050+ }
34051+}
34052+
34053 /* no mutex */
34054 static void
34055 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
34056@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
34057 return NULL;
34058 }
34059
34060-static inline void
34061-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
34062-{
34063- if (phy_info->port_details) {
34064- phy_info->port_details->rphy = rphy;
34065- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
34066- ioc->name, rphy));
34067- }
34068-
34069- if (rphy) {
34070- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
34071- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
34072- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
34073- ioc->name, rphy, rphy->dev.release));
34074- }
34075-}
34076-
34077 static inline struct sas_port *
34078 mptsas_get_port(struct mptsas_phyinfo *phy_info)
34079 {
34080diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
34081index 0c3ced7..1fe34ec 100644
34082--- a/drivers/message/fusion/mptscsih.c
34083+++ b/drivers/message/fusion/mptscsih.c
34084@@ -1270,15 +1270,16 @@ mptscsih_info(struct Scsi_Host *SChost)
34085
34086 h = shost_priv(SChost);
34087
34088- if (h) {
34089- if (h->info_kbuf == NULL)
34090- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
34091- return h->info_kbuf;
34092- h->info_kbuf[0] = '\0';
34093+ if (!h)
34094+ return NULL;
34095
34096- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
34097- h->info_kbuf[size-1] = '\0';
34098- }
34099+ if (h->info_kbuf == NULL)
34100+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
34101+ return h->info_kbuf;
34102+ h->info_kbuf[0] = '\0';
34103+
34104+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
34105+ h->info_kbuf[size-1] = '\0';
34106
34107 return h->info_kbuf;
34108 }
34109diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
34110index 07dbeaf..5533142 100644
34111--- a/drivers/message/i2o/i2o_proc.c
34112+++ b/drivers/message/i2o/i2o_proc.c
34113@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
34114 "Array Controller Device"
34115 };
34116
34117-static char *chtostr(u8 * chars, int n)
34118-{
34119- char tmp[256];
34120- tmp[0] = 0;
34121- return strncat(tmp, (char *)chars, n);
34122-}
34123-
34124 static int i2o_report_query_status(struct seq_file *seq, int block_status,
34125 char *group)
34126 {
34127@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
34128
34129 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
34130 seq_printf(seq, "%-#8x", ddm_table.module_id);
34131- seq_printf(seq, "%-29s",
34132- chtostr(ddm_table.module_name_version, 28));
34133+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
34134 seq_printf(seq, "%9d ", ddm_table.data_size);
34135 seq_printf(seq, "%8d", ddm_table.code_size);
34136
34137@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
34138
34139 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
34140 seq_printf(seq, "%-#8x", dst->module_id);
34141- seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
34142- seq_printf(seq, "%-9s", chtostr(dst->date, 8));
34143+ seq_printf(seq, "%-.28s", dst->module_name_version);
34144+ seq_printf(seq, "%-.8s", dst->date);
34145 seq_printf(seq, "%8d ", dst->module_size);
34146 seq_printf(seq, "%8d ", dst->mpb_size);
34147 seq_printf(seq, "0x%04x", dst->module_flags);
34148@@ -1272,14 +1264,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
34149 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
34150 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
34151 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
34152- seq_printf(seq, "Vendor info : %s\n",
34153- chtostr((u8 *) (work32 + 2), 16));
34154- seq_printf(seq, "Product info : %s\n",
34155- chtostr((u8 *) (work32 + 6), 16));
34156- seq_printf(seq, "Description : %s\n",
34157- chtostr((u8 *) (work32 + 10), 16));
34158- seq_printf(seq, "Product rev. : %s\n",
34159- chtostr((u8 *) (work32 + 14), 8));
34160+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
34161+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
34162+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
34163+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
34164
34165 seq_printf(seq, "Serial number : ");
34166 print_serial_number(seq, (u8 *) (work32 + 16),
34167@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
34168 }
34169
34170 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
34171- seq_printf(seq, "Module name : %s\n",
34172- chtostr(result.module_name, 24));
34173- seq_printf(seq, "Module revision : %s\n",
34174- chtostr(result.module_rev, 8));
34175+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
34176+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
34177
34178 seq_printf(seq, "Serial number : ");
34179 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
34180@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
34181 return 0;
34182 }
34183
34184- seq_printf(seq, "Device name : %s\n",
34185- chtostr(result.device_name, 64));
34186- seq_printf(seq, "Service name : %s\n",
34187- chtostr(result.service_name, 64));
34188- seq_printf(seq, "Physical name : %s\n",
34189- chtostr(result.physical_location, 64));
34190- seq_printf(seq, "Instance number : %s\n",
34191- chtostr(result.instance_number, 4));
34192+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
34193+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
34194+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
34195+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
34196
34197 return 0;
34198 }
34199diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
34200index a8c08f3..155fe3d 100644
34201--- a/drivers/message/i2o/iop.c
34202+++ b/drivers/message/i2o/iop.c
34203@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
34204
34205 spin_lock_irqsave(&c->context_list_lock, flags);
34206
34207- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
34208- atomic_inc(&c->context_list_counter);
34209+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
34210+ atomic_inc_unchecked(&c->context_list_counter);
34211
34212- entry->context = atomic_read(&c->context_list_counter);
34213+ entry->context = atomic_read_unchecked(&c->context_list_counter);
34214
34215 list_add(&entry->list, &c->context_list);
34216
34217@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
34218
34219 #if BITS_PER_LONG == 64
34220 spin_lock_init(&c->context_list_lock);
34221- atomic_set(&c->context_list_counter, 0);
34222+ atomic_set_unchecked(&c->context_list_counter, 0);
34223 INIT_LIST_HEAD(&c->context_list);
34224 #endif
34225
34226diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c
34227index 7ce65f4..e66e9bc 100644
34228--- a/drivers/mfd/abx500-core.c
34229+++ b/drivers/mfd/abx500-core.c
34230@@ -15,7 +15,7 @@ static LIST_HEAD(abx500_list);
34231
34232 struct abx500_device_entry {
34233 struct list_head list;
34234- struct abx500_ops ops;
34235+ abx500_ops_no_const ops;
34236 struct device *dev;
34237 };
34238
34239diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
34240index 5c2a06a..8fa077c 100644
34241--- a/drivers/mfd/janz-cmodio.c
34242+++ b/drivers/mfd/janz-cmodio.c
34243@@ -13,6 +13,7 @@
34244
34245 #include <linux/kernel.h>
34246 #include <linux/module.h>
34247+#include <linux/slab.h>
34248 #include <linux/init.h>
34249 #include <linux/pci.h>
34250 #include <linux/interrupt.h>
34251diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
34252index 29d12a7..f900ba4 100644
34253--- a/drivers/misc/lis3lv02d/lis3lv02d.c
34254+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
34255@@ -464,7 +464,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
34256 * the lid is closed. This leads to interrupts as soon as a little move
34257 * is done.
34258 */
34259- atomic_inc(&lis3->count);
34260+ atomic_inc_unchecked(&lis3->count);
34261
34262 wake_up_interruptible(&lis3->misc_wait);
34263 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
34264@@ -550,7 +550,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
34265 if (lis3->pm_dev)
34266 pm_runtime_get_sync(lis3->pm_dev);
34267
34268- atomic_set(&lis3->count, 0);
34269+ atomic_set_unchecked(&lis3->count, 0);
34270 return 0;
34271 }
34272
34273@@ -583,7 +583,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
34274 add_wait_queue(&lis3->misc_wait, &wait);
34275 while (true) {
34276 set_current_state(TASK_INTERRUPTIBLE);
34277- data = atomic_xchg(&lis3->count, 0);
34278+ data = atomic_xchg_unchecked(&lis3->count, 0);
34279 if (data)
34280 break;
34281
34282@@ -624,7 +624,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
34283 struct lis3lv02d, miscdev);
34284
34285 poll_wait(file, &lis3->misc_wait, wait);
34286- if (atomic_read(&lis3->count))
34287+ if (atomic_read_unchecked(&lis3->count))
34288 return POLLIN | POLLRDNORM;
34289 return 0;
34290 }
34291diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
34292index 2b1482a..5d33616 100644
34293--- a/drivers/misc/lis3lv02d/lis3lv02d.h
34294+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
34295@@ -266,7 +266,7 @@ struct lis3lv02d {
34296 struct input_polled_dev *idev; /* input device */
34297 struct platform_device *pdev; /* platform device */
34298 struct regulator_bulk_data regulators[2];
34299- atomic_t count; /* interrupt count after last read */
34300+ atomic_unchecked_t count; /* interrupt count after last read */
34301 union axis_conversion ac; /* hw -> logical axis */
34302 int mapped_btns[3];
34303
34304diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
34305index 2f30bad..c4c13d0 100644
34306--- a/drivers/misc/sgi-gru/gruhandles.c
34307+++ b/drivers/misc/sgi-gru/gruhandles.c
34308@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
34309 unsigned long nsec;
34310
34311 nsec = CLKS2NSEC(clks);
34312- atomic_long_inc(&mcs_op_statistics[op].count);
34313- atomic_long_add(nsec, &mcs_op_statistics[op].total);
34314+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
34315+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
34316 if (mcs_op_statistics[op].max < nsec)
34317 mcs_op_statistics[op].max = nsec;
34318 }
34319diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
34320index 7768b87..f8aac38 100644
34321--- a/drivers/misc/sgi-gru/gruprocfs.c
34322+++ b/drivers/misc/sgi-gru/gruprocfs.c
34323@@ -32,9 +32,9 @@
34324
34325 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
34326
34327-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
34328+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
34329 {
34330- unsigned long val = atomic_long_read(v);
34331+ unsigned long val = atomic_long_read_unchecked(v);
34332
34333 seq_printf(s, "%16lu %s\n", val, id);
34334 }
34335@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
34336
34337 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
34338 for (op = 0; op < mcsop_last; op++) {
34339- count = atomic_long_read(&mcs_op_statistics[op].count);
34340- total = atomic_long_read(&mcs_op_statistics[op].total);
34341+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
34342+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
34343 max = mcs_op_statistics[op].max;
34344 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
34345 count ? total / count : 0, max);
34346diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
34347index 5c3ce24..4915ccb 100644
34348--- a/drivers/misc/sgi-gru/grutables.h
34349+++ b/drivers/misc/sgi-gru/grutables.h
34350@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
34351 * GRU statistics.
34352 */
34353 struct gru_stats_s {
34354- atomic_long_t vdata_alloc;
34355- atomic_long_t vdata_free;
34356- atomic_long_t gts_alloc;
34357- atomic_long_t gts_free;
34358- atomic_long_t gms_alloc;
34359- atomic_long_t gms_free;
34360- atomic_long_t gts_double_allocate;
34361- atomic_long_t assign_context;
34362- atomic_long_t assign_context_failed;
34363- atomic_long_t free_context;
34364- atomic_long_t load_user_context;
34365- atomic_long_t load_kernel_context;
34366- atomic_long_t lock_kernel_context;
34367- atomic_long_t unlock_kernel_context;
34368- atomic_long_t steal_user_context;
34369- atomic_long_t steal_kernel_context;
34370- atomic_long_t steal_context_failed;
34371- atomic_long_t nopfn;
34372- atomic_long_t asid_new;
34373- atomic_long_t asid_next;
34374- atomic_long_t asid_wrap;
34375- atomic_long_t asid_reuse;
34376- atomic_long_t intr;
34377- atomic_long_t intr_cbr;
34378- atomic_long_t intr_tfh;
34379- atomic_long_t intr_spurious;
34380- atomic_long_t intr_mm_lock_failed;
34381- atomic_long_t call_os;
34382- atomic_long_t call_os_wait_queue;
34383- atomic_long_t user_flush_tlb;
34384- atomic_long_t user_unload_context;
34385- atomic_long_t user_exception;
34386- atomic_long_t set_context_option;
34387- atomic_long_t check_context_retarget_intr;
34388- atomic_long_t check_context_unload;
34389- atomic_long_t tlb_dropin;
34390- atomic_long_t tlb_preload_page;
34391- atomic_long_t tlb_dropin_fail_no_asid;
34392- atomic_long_t tlb_dropin_fail_upm;
34393- atomic_long_t tlb_dropin_fail_invalid;
34394- atomic_long_t tlb_dropin_fail_range_active;
34395- atomic_long_t tlb_dropin_fail_idle;
34396- atomic_long_t tlb_dropin_fail_fmm;
34397- atomic_long_t tlb_dropin_fail_no_exception;
34398- atomic_long_t tfh_stale_on_fault;
34399- atomic_long_t mmu_invalidate_range;
34400- atomic_long_t mmu_invalidate_page;
34401- atomic_long_t flush_tlb;
34402- atomic_long_t flush_tlb_gru;
34403- atomic_long_t flush_tlb_gru_tgh;
34404- atomic_long_t flush_tlb_gru_zero_asid;
34405+ atomic_long_unchecked_t vdata_alloc;
34406+ atomic_long_unchecked_t vdata_free;
34407+ atomic_long_unchecked_t gts_alloc;
34408+ atomic_long_unchecked_t gts_free;
34409+ atomic_long_unchecked_t gms_alloc;
34410+ atomic_long_unchecked_t gms_free;
34411+ atomic_long_unchecked_t gts_double_allocate;
34412+ atomic_long_unchecked_t assign_context;
34413+ atomic_long_unchecked_t assign_context_failed;
34414+ atomic_long_unchecked_t free_context;
34415+ atomic_long_unchecked_t load_user_context;
34416+ atomic_long_unchecked_t load_kernel_context;
34417+ atomic_long_unchecked_t lock_kernel_context;
34418+ atomic_long_unchecked_t unlock_kernel_context;
34419+ atomic_long_unchecked_t steal_user_context;
34420+ atomic_long_unchecked_t steal_kernel_context;
34421+ atomic_long_unchecked_t steal_context_failed;
34422+ atomic_long_unchecked_t nopfn;
34423+ atomic_long_unchecked_t asid_new;
34424+ atomic_long_unchecked_t asid_next;
34425+ atomic_long_unchecked_t asid_wrap;
34426+ atomic_long_unchecked_t asid_reuse;
34427+ atomic_long_unchecked_t intr;
34428+ atomic_long_unchecked_t intr_cbr;
34429+ atomic_long_unchecked_t intr_tfh;
34430+ atomic_long_unchecked_t intr_spurious;
34431+ atomic_long_unchecked_t intr_mm_lock_failed;
34432+ atomic_long_unchecked_t call_os;
34433+ atomic_long_unchecked_t call_os_wait_queue;
34434+ atomic_long_unchecked_t user_flush_tlb;
34435+ atomic_long_unchecked_t user_unload_context;
34436+ atomic_long_unchecked_t user_exception;
34437+ atomic_long_unchecked_t set_context_option;
34438+ atomic_long_unchecked_t check_context_retarget_intr;
34439+ atomic_long_unchecked_t check_context_unload;
34440+ atomic_long_unchecked_t tlb_dropin;
34441+ atomic_long_unchecked_t tlb_preload_page;
34442+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
34443+ atomic_long_unchecked_t tlb_dropin_fail_upm;
34444+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
34445+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
34446+ atomic_long_unchecked_t tlb_dropin_fail_idle;
34447+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
34448+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
34449+ atomic_long_unchecked_t tfh_stale_on_fault;
34450+ atomic_long_unchecked_t mmu_invalidate_range;
34451+ atomic_long_unchecked_t mmu_invalidate_page;
34452+ atomic_long_unchecked_t flush_tlb;
34453+ atomic_long_unchecked_t flush_tlb_gru;
34454+ atomic_long_unchecked_t flush_tlb_gru_tgh;
34455+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
34456
34457- atomic_long_t copy_gpa;
34458- atomic_long_t read_gpa;
34459+ atomic_long_unchecked_t copy_gpa;
34460+ atomic_long_unchecked_t read_gpa;
34461
34462- atomic_long_t mesq_receive;
34463- atomic_long_t mesq_receive_none;
34464- atomic_long_t mesq_send;
34465- atomic_long_t mesq_send_failed;
34466- atomic_long_t mesq_noop;
34467- atomic_long_t mesq_send_unexpected_error;
34468- atomic_long_t mesq_send_lb_overflow;
34469- atomic_long_t mesq_send_qlimit_reached;
34470- atomic_long_t mesq_send_amo_nacked;
34471- atomic_long_t mesq_send_put_nacked;
34472- atomic_long_t mesq_page_overflow;
34473- atomic_long_t mesq_qf_locked;
34474- atomic_long_t mesq_qf_noop_not_full;
34475- atomic_long_t mesq_qf_switch_head_failed;
34476- atomic_long_t mesq_qf_unexpected_error;
34477- atomic_long_t mesq_noop_unexpected_error;
34478- atomic_long_t mesq_noop_lb_overflow;
34479- atomic_long_t mesq_noop_qlimit_reached;
34480- atomic_long_t mesq_noop_amo_nacked;
34481- atomic_long_t mesq_noop_put_nacked;
34482- atomic_long_t mesq_noop_page_overflow;
34483+ atomic_long_unchecked_t mesq_receive;
34484+ atomic_long_unchecked_t mesq_receive_none;
34485+ atomic_long_unchecked_t mesq_send;
34486+ atomic_long_unchecked_t mesq_send_failed;
34487+ atomic_long_unchecked_t mesq_noop;
34488+ atomic_long_unchecked_t mesq_send_unexpected_error;
34489+ atomic_long_unchecked_t mesq_send_lb_overflow;
34490+ atomic_long_unchecked_t mesq_send_qlimit_reached;
34491+ atomic_long_unchecked_t mesq_send_amo_nacked;
34492+ atomic_long_unchecked_t mesq_send_put_nacked;
34493+ atomic_long_unchecked_t mesq_page_overflow;
34494+ atomic_long_unchecked_t mesq_qf_locked;
34495+ atomic_long_unchecked_t mesq_qf_noop_not_full;
34496+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
34497+ atomic_long_unchecked_t mesq_qf_unexpected_error;
34498+ atomic_long_unchecked_t mesq_noop_unexpected_error;
34499+ atomic_long_unchecked_t mesq_noop_lb_overflow;
34500+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
34501+ atomic_long_unchecked_t mesq_noop_amo_nacked;
34502+ atomic_long_unchecked_t mesq_noop_put_nacked;
34503+ atomic_long_unchecked_t mesq_noop_page_overflow;
34504
34505 };
34506
34507@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
34508 tghop_invalidate, mcsop_last};
34509
34510 struct mcs_op_statistic {
34511- atomic_long_t count;
34512- atomic_long_t total;
34513+ atomic_long_unchecked_t count;
34514+ atomic_long_unchecked_t total;
34515 unsigned long max;
34516 };
34517
34518@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
34519
34520 #define STAT(id) do { \
34521 if (gru_options & OPT_STATS) \
34522- atomic_long_inc(&gru_stats.id); \
34523+ atomic_long_inc_unchecked(&gru_stats.id); \
34524 } while (0)
34525
34526 #ifdef CONFIG_SGI_GRU_DEBUG
34527diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
34528index 851b2f2..a4ec097 100644
34529--- a/drivers/misc/sgi-xp/xp.h
34530+++ b/drivers/misc/sgi-xp/xp.h
34531@@ -289,7 +289,7 @@ struct xpc_interface {
34532 xpc_notify_func, void *);
34533 void (*received) (short, int, void *);
34534 enum xp_retval (*partid_to_nasids) (short, void *);
34535-};
34536+} __no_const;
34537
34538 extern struct xpc_interface xpc_interface;
34539
34540diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
34541index b94d5f7..7f494c5 100644
34542--- a/drivers/misc/sgi-xp/xpc.h
34543+++ b/drivers/misc/sgi-xp/xpc.h
34544@@ -835,6 +835,7 @@ struct xpc_arch_operations {
34545 void (*received_payload) (struct xpc_channel *, void *);
34546 void (*notify_senders_of_disconnect) (struct xpc_channel *);
34547 };
34548+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
34549
34550 /* struct xpc_partition act_state values (for XPC HB) */
34551
34552@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
34553 /* found in xpc_main.c */
34554 extern struct device *xpc_part;
34555 extern struct device *xpc_chan;
34556-extern struct xpc_arch_operations xpc_arch_ops;
34557+extern xpc_arch_operations_no_const xpc_arch_ops;
34558 extern int xpc_disengage_timelimit;
34559 extern int xpc_disengage_timedout;
34560 extern int xpc_activate_IRQ_rcvd;
34561diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
34562index 8d082b4..aa749ae 100644
34563--- a/drivers/misc/sgi-xp/xpc_main.c
34564+++ b/drivers/misc/sgi-xp/xpc_main.c
34565@@ -162,7 +162,7 @@ static struct notifier_block xpc_die_notifier = {
34566 .notifier_call = xpc_system_die,
34567 };
34568
34569-struct xpc_arch_operations xpc_arch_ops;
34570+xpc_arch_operations_no_const xpc_arch_ops;
34571
34572 /*
34573 * Timer function to enforce the timelimit on the partition disengage.
34574diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
34575index 6878a94..fe5c5f1 100644
34576--- a/drivers/mmc/host/sdhci-pci.c
34577+++ b/drivers/mmc/host/sdhci-pci.c
34578@@ -673,7 +673,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
34579 .probe = via_probe,
34580 };
34581
34582-static const struct pci_device_id pci_ids[] __devinitdata = {
34583+static const struct pci_device_id pci_ids[] __devinitconst = {
34584 {
34585 .vendor = PCI_VENDOR_ID_RICOH,
34586 .device = PCI_DEVICE_ID_RICOH_R5C822,
34587diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
34588index e9fad91..0a7a16a 100644
34589--- a/drivers/mtd/devices/doc2000.c
34590+++ b/drivers/mtd/devices/doc2000.c
34591@@ -773,7 +773,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
34592
34593 /* The ECC will not be calculated correctly if less than 512 is written */
34594 /* DBB-
34595- if (len != 0x200 && eccbuf)
34596+ if (len != 0x200)
34597 printk(KERN_WARNING
34598 "ECC needs a full sector write (adr: %lx size %lx)\n",
34599 (long) to, (long) len);
34600diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
34601index a3f7a27..234016e 100644
34602--- a/drivers/mtd/devices/doc2001.c
34603+++ b/drivers/mtd/devices/doc2001.c
34604@@ -392,7 +392,7 @@ static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,
34605 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
34606
34607 /* Don't allow read past end of device */
34608- if (from >= this->totlen)
34609+ if (from >= this->totlen || !len)
34610 return -EINVAL;
34611
34612 /* Don't allow a single read to cross a 512-byte block boundary */
34613diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
34614index 3984d48..28aa897 100644
34615--- a/drivers/mtd/nand/denali.c
34616+++ b/drivers/mtd/nand/denali.c
34617@@ -26,6 +26,7 @@
34618 #include <linux/pci.h>
34619 #include <linux/mtd/mtd.h>
34620 #include <linux/module.h>
34621+#include <linux/slab.h>
34622
34623 #include "denali.h"
34624
34625diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
34626index ac40925..483b753 100644
34627--- a/drivers/mtd/nftlmount.c
34628+++ b/drivers/mtd/nftlmount.c
34629@@ -24,6 +24,7 @@
34630 #include <asm/errno.h>
34631 #include <linux/delay.h>
34632 #include <linux/slab.h>
34633+#include <linux/sched.h>
34634 #include <linux/mtd/mtd.h>
34635 #include <linux/mtd/nand.h>
34636 #include <linux/mtd/nftl.h>
34637diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
34638index 6c3fb5a..5b2eeb0 100644
34639--- a/drivers/mtd/ubi/build.c
34640+++ b/drivers/mtd/ubi/build.c
34641@@ -1311,7 +1311,7 @@ module_exit(ubi_exit);
34642 static int __init bytes_str_to_int(const char *str)
34643 {
34644 char *endp;
34645- unsigned long result;
34646+ unsigned long result, scale = 1;
34647
34648 result = simple_strtoul(str, &endp, 0);
34649 if (str == endp || result >= INT_MAX) {
34650@@ -1322,11 +1322,11 @@ static int __init bytes_str_to_int(const char *str)
34651
34652 switch (*endp) {
34653 case 'G':
34654- result *= 1024;
34655+ scale *= 1024;
34656 case 'M':
34657- result *= 1024;
34658+ scale *= 1024;
34659 case 'K':
34660- result *= 1024;
34661+ scale *= 1024;
34662 if (endp[1] == 'i' && endp[2] == 'B')
34663 endp += 2;
34664 case '\0':
34665@@ -1337,7 +1337,13 @@ static int __init bytes_str_to_int(const char *str)
34666 return -EINVAL;
34667 }
34668
34669- return result;
34670+ if (result*scale >= INT_MAX) {
34671+ printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n",
34672+ str);
34673+ return -EINVAL;
34674+ }
34675+
34676+ return result*scale;
34677 }
34678
34679 /**
34680diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
34681index ab80c0d..aec8580 100644
34682--- a/drivers/mtd/ubi/debug.c
34683+++ b/drivers/mtd/ubi/debug.c
34684@@ -338,6 +338,8 @@ out:
34685
34686 /* Write an UBI debugfs file */
34687 static ssize_t dfs_file_write(struct file *file, const char __user *user_buf,
34688+ size_t count, loff_t *ppos) __size_overflow(3);
34689+static ssize_t dfs_file_write(struct file *file, const char __user *user_buf,
34690 size_t count, loff_t *ppos)
34691 {
34692 unsigned long ubi_num = (unsigned long)file->private_data;
34693diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
34694index 1feae59..c2a61d2 100644
34695--- a/drivers/net/ethernet/atheros/atlx/atl2.c
34696+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
34697@@ -2857,7 +2857,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
34698 */
34699
34700 #define ATL2_PARAM(X, desc) \
34701- static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
34702+ static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
34703 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
34704 MODULE_PARM_DESC(X, desc);
34705 #else
34706diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34707index 9a517c2..a50cfcb 100644
34708--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34709+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34710@@ -449,7 +449,7 @@ struct bnx2x_rx_mode_obj {
34711
34712 int (*wait_comp)(struct bnx2x *bp,
34713 struct bnx2x_rx_mode_ramrod_params *p);
34714-};
34715+} __no_const;
34716
34717 /********************** Set multicast group ***********************************/
34718
34719diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
34720index 94b4bd0..73c02de 100644
34721--- a/drivers/net/ethernet/broadcom/tg3.h
34722+++ b/drivers/net/ethernet/broadcom/tg3.h
34723@@ -134,6 +134,7 @@
34724 #define CHIPREV_ID_5750_A0 0x4000
34725 #define CHIPREV_ID_5750_A1 0x4001
34726 #define CHIPREV_ID_5750_A3 0x4003
34727+#define CHIPREV_ID_5750_C1 0x4201
34728 #define CHIPREV_ID_5750_C2 0x4202
34729 #define CHIPREV_ID_5752_A0_HW 0x5000
34730 #define CHIPREV_ID_5752_A0 0x6000
34731diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34732index c5f5479..2e8c260 100644
34733--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34734+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34735@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
34736 */
34737 struct l2t_skb_cb {
34738 arp_failure_handler_func arp_failure_handler;
34739-};
34740+} __no_const;
34741
34742 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
34743
34744diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
34745index cfb60e1..9c76da7 100644
34746--- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
34747+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
34748@@ -611,6 +611,8 @@ static void recycle_rx_buf(struct adapter *adap, struct sge_fl *q,
34749 * of the SW ring.
34750 */
34751 static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size,
34752+ size_t sw_size, dma_addr_t * phys, void *metadata) __size_overflow(2,4);
34753+static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size,
34754 size_t sw_size, dma_addr_t * phys, void *metadata)
34755 {
34756 size_t len = nelem * elem_size;
34757diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
34758index 140254c..5b8a0a6 100644
34759--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
34760+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
34761@@ -593,6 +593,9 @@ static inline void __refill_fl(struct adapter *adap, struct sge_fl *fl)
34762 */
34763 static void *alloc_ring(struct device *dev, size_t nelem, size_t elem_size,
34764 size_t sw_size, dma_addr_t *phys, void *metadata,
34765+ size_t stat_size, int node) __size_overflow(2,4);
34766+static void *alloc_ring(struct device *dev, size_t nelem, size_t elem_size,
34767+ size_t sw_size, dma_addr_t *phys, void *metadata,
34768 size_t stat_size, int node)
34769 {
34770 size_t len = nelem * elem_size + stat_size;
34771diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34772index 8d5d55a..a3c3474 100644
34773--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34774+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34775@@ -730,6 +730,9 @@ static inline void __refill_fl(struct adapter *adapter, struct sge_fl *fl)
34776 */
34777 static void *alloc_ring(struct device *dev, size_t nelem, size_t hwsize,
34778 size_t swsize, dma_addr_t *busaddrp, void *swringp,
34779+ size_t stat_size) __size_overflow(2,4);
34780+static void *alloc_ring(struct device *dev, size_t nelem, size_t hwsize,
34781+ size_t swsize, dma_addr_t *busaddrp, void *swringp,
34782 size_t stat_size)
34783 {
34784 /*
34785diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
34786index 871bcaa..4043505 100644
34787--- a/drivers/net/ethernet/dec/tulip/de4x5.c
34788+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
34789@@ -5397,7 +5397,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
34790 for (i=0; i<ETH_ALEN; i++) {
34791 tmp.addr[i] = dev->dev_addr[i];
34792 }
34793- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
34794+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
34795 break;
34796
34797 case DE4X5_SET_HWADDR: /* Set the hardware address */
34798@@ -5437,7 +5437,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
34799 spin_lock_irqsave(&lp->lock, flags);
34800 memcpy(&statbuf, &lp->pktStats, ioc->len);
34801 spin_unlock_irqrestore(&lp->lock, flags);
34802- if (copy_to_user(ioc->data, &statbuf, ioc->len))
34803+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
34804 return -EFAULT;
34805 break;
34806 }
34807diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
34808index 14d5b61..1398636 100644
34809--- a/drivers/net/ethernet/dec/tulip/eeprom.c
34810+++ b/drivers/net/ethernet/dec/tulip/eeprom.c
34811@@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
34812 {NULL}};
34813
34814
34815-static const char *block_name[] __devinitdata = {
34816+static const char *block_name[] __devinitconst = {
34817 "21140 non-MII",
34818 "21140 MII PHY",
34819 "21142 Serial PHY",
34820diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
34821index 4d01219..b58d26d 100644
34822--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
34823+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
34824@@ -236,7 +236,7 @@ struct pci_id_info {
34825 int drv_flags; /* Driver use, intended as capability flags. */
34826 };
34827
34828-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
34829+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
34830 { /* Sometime a Level-One switch card. */
34831 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
34832 { "Winbond W89c840", CanHaveMII | HasBrokenTx},
34833diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
34834index dcd7f7a..ecb7fb3 100644
34835--- a/drivers/net/ethernet/dlink/sundance.c
34836+++ b/drivers/net/ethernet/dlink/sundance.c
34837@@ -218,7 +218,7 @@ enum {
34838 struct pci_id_info {
34839 const char *name;
34840 };
34841-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
34842+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
34843 {"D-Link DFE-550TX FAST Ethernet Adapter"},
34844 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
34845 {"D-Link DFE-580TX 4 port Server Adapter"},
34846diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
34847index bf266a0..e024af7 100644
34848--- a/drivers/net/ethernet/emulex/benet/be_main.c
34849+++ b/drivers/net/ethernet/emulex/benet/be_main.c
34850@@ -397,7 +397,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
34851
34852 if (wrapped)
34853 newacc += 65536;
34854- ACCESS_ONCE(*acc) = newacc;
34855+ ACCESS_ONCE_RW(*acc) = newacc;
34856 }
34857
34858 void be_parse_stats(struct be_adapter *adapter)
34859diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
34860index fb5579a..debdffa 100644
34861--- a/drivers/net/ethernet/faraday/ftgmac100.c
34862+++ b/drivers/net/ethernet/faraday/ftgmac100.c
34863@@ -30,6 +30,8 @@
34864 #include <linux/netdevice.h>
34865 #include <linux/phy.h>
34866 #include <linux/platform_device.h>
34867+#include <linux/interrupt.h>
34868+#include <linux/irqreturn.h>
34869 #include <net/ip.h>
34870
34871 #include "ftgmac100.h"
34872diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
34873index a127cb2..0d043cd 100644
34874--- a/drivers/net/ethernet/faraday/ftmac100.c
34875+++ b/drivers/net/ethernet/faraday/ftmac100.c
34876@@ -30,6 +30,8 @@
34877 #include <linux/module.h>
34878 #include <linux/netdevice.h>
34879 #include <linux/platform_device.h>
34880+#include <linux/interrupt.h>
34881+#include <linux/irqreturn.h>
34882
34883 #include "ftmac100.h"
34884
34885diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
34886index 61d2bdd..7f1154a 100644
34887--- a/drivers/net/ethernet/fealnx.c
34888+++ b/drivers/net/ethernet/fealnx.c
34889@@ -150,7 +150,7 @@ struct chip_info {
34890 int flags;
34891 };
34892
34893-static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
34894+static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
34895 { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
34896 { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
34897 { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
34898diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
34899index e1159e5..e18684d 100644
34900--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
34901+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
34902@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
34903 {
34904 struct e1000_hw *hw = &adapter->hw;
34905 struct e1000_mac_info *mac = &hw->mac;
34906- struct e1000_mac_operations *func = &mac->ops;
34907+ e1000_mac_operations_no_const *func = &mac->ops;
34908
34909 /* Set media type */
34910 switch (adapter->pdev->device) {
34911diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
34912index a3e65fd..f451444 100644
34913--- a/drivers/net/ethernet/intel/e1000e/82571.c
34914+++ b/drivers/net/ethernet/intel/e1000e/82571.c
34915@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
34916 {
34917 struct e1000_hw *hw = &adapter->hw;
34918 struct e1000_mac_info *mac = &hw->mac;
34919- struct e1000_mac_operations *func = &mac->ops;
34920+ e1000_mac_operations_no_const *func = &mac->ops;
34921 u32 swsm = 0;
34922 u32 swsm2 = 0;
34923 bool force_clear_smbi = false;
34924diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
34925index 2967039..ca8c40c 100644
34926--- a/drivers/net/ethernet/intel/e1000e/hw.h
34927+++ b/drivers/net/ethernet/intel/e1000e/hw.h
34928@@ -778,6 +778,7 @@ struct e1000_mac_operations {
34929 void (*write_vfta)(struct e1000_hw *, u32, u32);
34930 s32 (*read_mac_addr)(struct e1000_hw *);
34931 };
34932+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34933
34934 /*
34935 * When to use various PHY register access functions:
34936@@ -818,6 +819,7 @@ struct e1000_phy_operations {
34937 void (*power_up)(struct e1000_hw *);
34938 void (*power_down)(struct e1000_hw *);
34939 };
34940+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
34941
34942 /* Function pointers for the NVM. */
34943 struct e1000_nvm_operations {
34944@@ -829,9 +831,10 @@ struct e1000_nvm_operations {
34945 s32 (*validate)(struct e1000_hw *);
34946 s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
34947 };
34948+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
34949
34950 struct e1000_mac_info {
34951- struct e1000_mac_operations ops;
34952+ e1000_mac_operations_no_const ops;
34953 u8 addr[ETH_ALEN];
34954 u8 perm_addr[ETH_ALEN];
34955
34956@@ -872,7 +875,7 @@ struct e1000_mac_info {
34957 };
34958
34959 struct e1000_phy_info {
34960- struct e1000_phy_operations ops;
34961+ e1000_phy_operations_no_const ops;
34962
34963 enum e1000_phy_type type;
34964
34965@@ -906,7 +909,7 @@ struct e1000_phy_info {
34966 };
34967
34968 struct e1000_nvm_info {
34969- struct e1000_nvm_operations ops;
34970+ e1000_nvm_operations_no_const ops;
34971
34972 enum e1000_nvm_type type;
34973 enum e1000_nvm_override override;
34974diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
34975index 4519a13..f97fcd0 100644
34976--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
34977+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
34978@@ -314,6 +314,7 @@ struct e1000_mac_operations {
34979 s32 (*read_mac_addr)(struct e1000_hw *);
34980 s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
34981 };
34982+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34983
34984 struct e1000_phy_operations {
34985 s32 (*acquire)(struct e1000_hw *);
34986@@ -330,6 +331,7 @@ struct e1000_phy_operations {
34987 s32 (*set_d3_lplu_state)(struct e1000_hw *, bool);
34988 s32 (*write_reg)(struct e1000_hw *, u32, u16);
34989 };
34990+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
34991
34992 struct e1000_nvm_operations {
34993 s32 (*acquire)(struct e1000_hw *);
34994@@ -339,6 +341,7 @@ struct e1000_nvm_operations {
34995 s32 (*update)(struct e1000_hw *);
34996 s32 (*validate)(struct e1000_hw *);
34997 };
34998+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
34999
35000 struct e1000_info {
35001 s32 (*get_invariants)(struct e1000_hw *);
35002@@ -350,7 +353,7 @@ struct e1000_info {
35003 extern const struct e1000_info e1000_82575_info;
35004
35005 struct e1000_mac_info {
35006- struct e1000_mac_operations ops;
35007+ e1000_mac_operations_no_const ops;
35008
35009 u8 addr[6];
35010 u8 perm_addr[6];
35011@@ -388,7 +391,7 @@ struct e1000_mac_info {
35012 };
35013
35014 struct e1000_phy_info {
35015- struct e1000_phy_operations ops;
35016+ e1000_phy_operations_no_const ops;
35017
35018 enum e1000_phy_type type;
35019
35020@@ -423,7 +426,7 @@ struct e1000_phy_info {
35021 };
35022
35023 struct e1000_nvm_info {
35024- struct e1000_nvm_operations ops;
35025+ e1000_nvm_operations_no_const ops;
35026 enum e1000_nvm_type type;
35027 enum e1000_nvm_override override;
35028
35029@@ -468,6 +471,7 @@ struct e1000_mbx_operations {
35030 s32 (*check_for_ack)(struct e1000_hw *, u16);
35031 s32 (*check_for_rst)(struct e1000_hw *, u16);
35032 };
35033+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
35034
35035 struct e1000_mbx_stats {
35036 u32 msgs_tx;
35037@@ -479,7 +483,7 @@ struct e1000_mbx_stats {
35038 };
35039
35040 struct e1000_mbx_info {
35041- struct e1000_mbx_operations ops;
35042+ e1000_mbx_operations_no_const ops;
35043 struct e1000_mbx_stats stats;
35044 u32 timeout;
35045 u32 usec_delay;
35046diff --git a/drivers/net/ethernet/intel/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
35047index d7ed58f..64cde36 100644
35048--- a/drivers/net/ethernet/intel/igbvf/vf.h
35049+++ b/drivers/net/ethernet/intel/igbvf/vf.h
35050@@ -189,9 +189,10 @@ struct e1000_mac_operations {
35051 s32 (*read_mac_addr)(struct e1000_hw *);
35052 s32 (*set_vfta)(struct e1000_hw *, u16, bool);
35053 };
35054+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
35055
35056 struct e1000_mac_info {
35057- struct e1000_mac_operations ops;
35058+ e1000_mac_operations_no_const ops;
35059 u8 addr[6];
35060 u8 perm_addr[6];
35061
35062@@ -213,6 +214,7 @@ struct e1000_mbx_operations {
35063 s32 (*check_for_ack)(struct e1000_hw *);
35064 s32 (*check_for_rst)(struct e1000_hw *);
35065 };
35066+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
35067
35068 struct e1000_mbx_stats {
35069 u32 msgs_tx;
35070@@ -224,7 +226,7 @@ struct e1000_mbx_stats {
35071 };
35072
35073 struct e1000_mbx_info {
35074- struct e1000_mbx_operations ops;
35075+ e1000_mbx_operations_no_const ops;
35076 struct e1000_mbx_stats stats;
35077 u32 timeout;
35078 u32 usec_delay;
35079diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35080index 6c5cca8..de8ef63 100644
35081--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35082+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35083@@ -2708,6 +2708,7 @@ struct ixgbe_eeprom_operations {
35084 s32 (*update_checksum)(struct ixgbe_hw *);
35085 u16 (*calc_checksum)(struct ixgbe_hw *);
35086 };
35087+typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
35088
35089 struct ixgbe_mac_operations {
35090 s32 (*init_hw)(struct ixgbe_hw *);
35091@@ -2769,6 +2770,7 @@ struct ixgbe_mac_operations {
35092 /* Manageability interface */
35093 s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
35094 };
35095+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
35096
35097 struct ixgbe_phy_operations {
35098 s32 (*identify)(struct ixgbe_hw *);
35099@@ -2788,9 +2790,10 @@ struct ixgbe_phy_operations {
35100 s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
35101 s32 (*check_overtemp)(struct ixgbe_hw *);
35102 };
35103+typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
35104
35105 struct ixgbe_eeprom_info {
35106- struct ixgbe_eeprom_operations ops;
35107+ ixgbe_eeprom_operations_no_const ops;
35108 enum ixgbe_eeprom_type type;
35109 u32 semaphore_delay;
35110 u16 word_size;
35111@@ -2800,7 +2803,7 @@ struct ixgbe_eeprom_info {
35112
35113 #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED 0x01
35114 struct ixgbe_mac_info {
35115- struct ixgbe_mac_operations ops;
35116+ ixgbe_mac_operations_no_const ops;
35117 enum ixgbe_mac_type type;
35118 u8 addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
35119 u8 perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
35120@@ -2828,7 +2831,7 @@ struct ixgbe_mac_info {
35121 };
35122
35123 struct ixgbe_phy_info {
35124- struct ixgbe_phy_operations ops;
35125+ ixgbe_phy_operations_no_const ops;
35126 struct mdio_if_info mdio;
35127 enum ixgbe_phy_type type;
35128 u32 id;
35129@@ -2856,6 +2859,7 @@ struct ixgbe_mbx_operations {
35130 s32 (*check_for_ack)(struct ixgbe_hw *, u16);
35131 s32 (*check_for_rst)(struct ixgbe_hw *, u16);
35132 };
35133+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
35134
35135 struct ixgbe_mbx_stats {
35136 u32 msgs_tx;
35137@@ -2867,7 +2871,7 @@ struct ixgbe_mbx_stats {
35138 };
35139
35140 struct ixgbe_mbx_info {
35141- struct ixgbe_mbx_operations ops;
35142+ ixgbe_mbx_operations_no_const ops;
35143 struct ixgbe_mbx_stats stats;
35144 u32 timeout;
35145 u32 usec_delay;
35146diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
35147index 10306b4..28df758 100644
35148--- a/drivers/net/ethernet/intel/ixgbevf/vf.h
35149+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
35150@@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
35151 s32 (*clear_vfta)(struct ixgbe_hw *);
35152 s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
35153 };
35154+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
35155
35156 enum ixgbe_mac_type {
35157 ixgbe_mac_unknown = 0,
35158@@ -79,7 +80,7 @@ enum ixgbe_mac_type {
35159 };
35160
35161 struct ixgbe_mac_info {
35162- struct ixgbe_mac_operations ops;
35163+ ixgbe_mac_operations_no_const ops;
35164 u8 addr[6];
35165 u8 perm_addr[6];
35166
35167@@ -103,6 +104,7 @@ struct ixgbe_mbx_operations {
35168 s32 (*check_for_ack)(struct ixgbe_hw *);
35169 s32 (*check_for_rst)(struct ixgbe_hw *);
35170 };
35171+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
35172
35173 struct ixgbe_mbx_stats {
35174 u32 msgs_tx;
35175@@ -114,7 +116,7 @@ struct ixgbe_mbx_stats {
35176 };
35177
35178 struct ixgbe_mbx_info {
35179- struct ixgbe_mbx_operations ops;
35180+ ixgbe_mbx_operations_no_const ops;
35181 struct ixgbe_mbx_stats stats;
35182 u32 timeout;
35183 u32 udelay;
35184diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
35185index 94bbc85..78c12e6 100644
35186--- a/drivers/net/ethernet/mellanox/mlx4/main.c
35187+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
35188@@ -40,6 +40,7 @@
35189 #include <linux/dma-mapping.h>
35190 #include <linux/slab.h>
35191 #include <linux/io-mapping.h>
35192+#include <linux/sched.h>
35193
35194 #include <linux/mlx4/device.h>
35195 #include <linux/mlx4/doorbell.h>
35196diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35197index 5046a64..71ca936 100644
35198--- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
35199+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35200@@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
35201 void (*link_down)(struct __vxge_hw_device *devh);
35202 void (*crit_err)(struct __vxge_hw_device *devh,
35203 enum vxge_hw_event type, u64 ext_data);
35204-};
35205+} __no_const;
35206
35207 /*
35208 * struct __vxge_hw_blockpool_entry - Block private data structure
35209diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35210index 4a518a3..936b334 100644
35211--- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35212+++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35213@@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
35214 struct vxge_hw_mempool_dma *dma_object,
35215 u32 index,
35216 u32 is_last);
35217-};
35218+} __no_const;
35219
35220 #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \
35221 ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
35222diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
35223index c8f47f1..5da9840 100644
35224--- a/drivers/net/ethernet/realtek/r8169.c
35225+++ b/drivers/net/ethernet/realtek/r8169.c
35226@@ -698,17 +698,17 @@ struct rtl8169_private {
35227 struct mdio_ops {
35228 void (*write)(void __iomem *, int, int);
35229 int (*read)(void __iomem *, int);
35230- } mdio_ops;
35231+ } __no_const mdio_ops;
35232
35233 struct pll_power_ops {
35234 void (*down)(struct rtl8169_private *);
35235 void (*up)(struct rtl8169_private *);
35236- } pll_power_ops;
35237+ } __no_const pll_power_ops;
35238
35239 struct jumbo_ops {
35240 void (*enable)(struct rtl8169_private *);
35241 void (*disable)(struct rtl8169_private *);
35242- } jumbo_ops;
35243+ } __no_const jumbo_ops;
35244
35245 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
35246 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
35247diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
35248index 1b4658c..a30dabb 100644
35249--- a/drivers/net/ethernet/sis/sis190.c
35250+++ b/drivers/net/ethernet/sis/sis190.c
35251@@ -1624,7 +1624,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
35252 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
35253 struct net_device *dev)
35254 {
35255- static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
35256+ static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
35257 struct sis190_private *tp = netdev_priv(dev);
35258 struct pci_dev *isa_bridge;
35259 u8 reg, tmp8;
35260diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35261index 41e6b33..8e89b0f 100644
35262--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35263+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35264@@ -139,8 +139,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
35265
35266 writel(value, ioaddr + MMC_CNTRL);
35267
35268- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35269- MMC_CNTRL, value);
35270+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35271+// MMC_CNTRL, value);
35272 }
35273
35274 /* To mask all all interrupts.*/
35275diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
35276index edfa15d..002bfa9 100644
35277--- a/drivers/net/ppp/ppp_generic.c
35278+++ b/drivers/net/ppp/ppp_generic.c
35279@@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35280 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
35281 struct ppp_stats stats;
35282 struct ppp_comp_stats cstats;
35283- char *vers;
35284
35285 switch (cmd) {
35286 case SIOCGPPPSTATS:
35287@@ -1009,8 +1008,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35288 break;
35289
35290 case SIOCGPPPVER:
35291- vers = PPP_VERSION;
35292- if (copy_to_user(addr, vers, strlen(vers) + 1))
35293+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
35294 break;
35295 err = 0;
35296 break;
35297diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
35298index 515f122..41dd273 100644
35299--- a/drivers/net/tokenring/abyss.c
35300+++ b/drivers/net/tokenring/abyss.c
35301@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = {
35302
35303 static int __init abyss_init (void)
35304 {
35305- abyss_netdev_ops = tms380tr_netdev_ops;
35306+ pax_open_kernel();
35307+ memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35308
35309- abyss_netdev_ops.ndo_open = abyss_open;
35310- abyss_netdev_ops.ndo_stop = abyss_close;
35311+ *(void **)&abyss_netdev_ops.ndo_open = abyss_open;
35312+ *(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
35313+ pax_close_kernel();
35314
35315 return pci_register_driver(&abyss_driver);
35316 }
35317diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
35318index 6153cfd..cf69c1c 100644
35319--- a/drivers/net/tokenring/madgemc.c
35320+++ b/drivers/net/tokenring/madgemc.c
35321@@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver = {
35322
35323 static int __init madgemc_init (void)
35324 {
35325- madgemc_netdev_ops = tms380tr_netdev_ops;
35326- madgemc_netdev_ops.ndo_open = madgemc_open;
35327- madgemc_netdev_ops.ndo_stop = madgemc_close;
35328+ pax_open_kernel();
35329+ memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35330+ *(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
35331+ *(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
35332+ pax_close_kernel();
35333
35334 return mca_register_driver (&madgemc_driver);
35335 }
35336diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
35337index 8d362e6..f91cc52 100644
35338--- a/drivers/net/tokenring/proteon.c
35339+++ b/drivers/net/tokenring/proteon.c
35340@@ -353,9 +353,11 @@ static int __init proteon_init(void)
35341 struct platform_device *pdev;
35342 int i, num = 0, err = 0;
35343
35344- proteon_netdev_ops = tms380tr_netdev_ops;
35345- proteon_netdev_ops.ndo_open = proteon_open;
35346- proteon_netdev_ops.ndo_stop = tms380tr_close;
35347+ pax_open_kernel();
35348+ memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35349+ *(void **)&proteon_netdev_ops.ndo_open = proteon_open;
35350+ *(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
35351+ pax_close_kernel();
35352
35353 err = platform_driver_register(&proteon_driver);
35354 if (err)
35355diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
35356index 46db5c5..37c1536 100644
35357--- a/drivers/net/tokenring/skisa.c
35358+++ b/drivers/net/tokenring/skisa.c
35359@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
35360 struct platform_device *pdev;
35361 int i, num = 0, err = 0;
35362
35363- sk_isa_netdev_ops = tms380tr_netdev_ops;
35364- sk_isa_netdev_ops.ndo_open = sk_isa_open;
35365- sk_isa_netdev_ops.ndo_stop = tms380tr_close;
35366+ pax_open_kernel();
35367+ memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35368+ *(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
35369+ *(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
35370+ pax_close_kernel();
35371
35372 err = platform_driver_register(&sk_isa_driver);
35373 if (err)
35374diff --git a/drivers/net/tun.c b/drivers/net/tun.c
35375index 7bea9c6..7ef073c 100644
35376--- a/drivers/net/tun.c
35377+++ b/drivers/net/tun.c
35378@@ -359,7 +359,7 @@ static void tun_free_netdev(struct net_device *dev)
35379 {
35380 struct tun_struct *tun = netdev_priv(dev);
35381
35382- sock_put(tun->socket.sk);
35383+ sk_release_kernel(tun->socket.sk);
35384 }
35385
35386 /* Net device open. */
35387@@ -979,10 +979,18 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
35388 return ret;
35389 }
35390
35391+static int tun_release(struct socket *sock)
35392+{
35393+ if (sock->sk)
35394+ sock_put(sock->sk);
35395+ return 0;
35396+}
35397+
35398 /* Ops structure to mimic raw sockets with tun */
35399 static const struct proto_ops tun_socket_ops = {
35400 .sendmsg = tun_sendmsg,
35401 .recvmsg = tun_recvmsg,
35402+ .release = tun_release,
35403 };
35404
35405 static struct proto tun_proto = {
35406@@ -1109,10 +1117,11 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
35407 tun->vnet_hdr_sz = sizeof(struct virtio_net_hdr);
35408
35409 err = -ENOMEM;
35410- sk = sk_alloc(net, AF_UNSPEC, GFP_KERNEL, &tun_proto);
35411+ sk = sk_alloc(&init_net, AF_UNSPEC, GFP_KERNEL, &tun_proto);
35412 if (!sk)
35413 goto err_free_dev;
35414
35415+ sk_change_net(sk, net);
35416 tun->socket.wq = &tun->wq;
35417 init_waitqueue_head(&tun->wq.wait);
35418 tun->socket.ops = &tun_socket_ops;
35419@@ -1173,7 +1182,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
35420 return 0;
35421
35422 err_free_sk:
35423- sock_put(sk);
35424+ tun_free_netdev(dev);
35425 err_free_dev:
35426 free_netdev(dev);
35427 failed:
35428diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
35429index 304fe78..db112fa 100644
35430--- a/drivers/net/usb/hso.c
35431+++ b/drivers/net/usb/hso.c
35432@@ -71,7 +71,7 @@
35433 #include <asm/byteorder.h>
35434 #include <linux/serial_core.h>
35435 #include <linux/serial.h>
35436-
35437+#include <asm/local.h>
35438
35439 #define MOD_AUTHOR "Option Wireless"
35440 #define MOD_DESCRIPTION "USB High Speed Option driver"
35441@@ -257,7 +257,7 @@ struct hso_serial {
35442
35443 /* from usb_serial_port */
35444 struct tty_struct *tty;
35445- int open_count;
35446+ local_t open_count;
35447 spinlock_t serial_lock;
35448
35449 int (*write_data) (struct hso_serial *serial);
35450@@ -1190,7 +1190,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
35451 struct urb *urb;
35452
35453 urb = serial->rx_urb[0];
35454- if (serial->open_count > 0) {
35455+ if (local_read(&serial->open_count) > 0) {
35456 count = put_rxbuf_data(urb, serial);
35457 if (count == -1)
35458 return;
35459@@ -1226,7 +1226,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
35460 DUMP1(urb->transfer_buffer, urb->actual_length);
35461
35462 /* Anyone listening? */
35463- if (serial->open_count == 0)
35464+ if (local_read(&serial->open_count) == 0)
35465 return;
35466
35467 if (status == 0) {
35468@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35469 spin_unlock_irq(&serial->serial_lock);
35470
35471 /* check for port already opened, if not set the termios */
35472- serial->open_count++;
35473- if (serial->open_count == 1) {
35474+ if (local_inc_return(&serial->open_count) == 1) {
35475 serial->rx_state = RX_IDLE;
35476 /* Force default termio settings */
35477 _hso_serial_set_termios(tty, NULL);
35478@@ -1324,7 +1323,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35479 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
35480 if (result) {
35481 hso_stop_serial_device(serial->parent);
35482- serial->open_count--;
35483+ local_dec(&serial->open_count);
35484 kref_put(&serial->parent->ref, hso_serial_ref_free);
35485 }
35486 } else {
35487@@ -1361,10 +1360,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
35488
35489 /* reset the rts and dtr */
35490 /* do the actual close */
35491- serial->open_count--;
35492+ local_dec(&serial->open_count);
35493
35494- if (serial->open_count <= 0) {
35495- serial->open_count = 0;
35496+ if (local_read(&serial->open_count) <= 0) {
35497+ local_set(&serial->open_count, 0);
35498 spin_lock_irq(&serial->serial_lock);
35499 if (serial->tty == tty) {
35500 serial->tty->driver_data = NULL;
35501@@ -1446,7 +1445,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
35502
35503 /* the actual setup */
35504 spin_lock_irqsave(&serial->serial_lock, flags);
35505- if (serial->open_count)
35506+ if (local_read(&serial->open_count))
35507 _hso_serial_set_termios(tty, old);
35508 else
35509 tty->termios = old;
35510@@ -1905,7 +1904,7 @@ static void intr_callback(struct urb *urb)
35511 D1("Pending read interrupt on port %d\n", i);
35512 spin_lock(&serial->serial_lock);
35513 if (serial->rx_state == RX_IDLE &&
35514- serial->open_count > 0) {
35515+ local_read(&serial->open_count) > 0) {
35516 /* Setup and send a ctrl req read on
35517 * port i */
35518 if (!serial->rx_urb_filled[0]) {
35519@@ -3098,7 +3097,7 @@ static int hso_resume(struct usb_interface *iface)
35520 /* Start all serial ports */
35521 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
35522 if (serial_table[i] && (serial_table[i]->interface == iface)) {
35523- if (dev2ser(serial_table[i])->open_count) {
35524+ if (local_read(&dev2ser(serial_table[i])->open_count)) {
35525 result =
35526 hso_start_serial_device(serial_table[i], GFP_NOIO);
35527 hso_kick_transmit(dev2ser(serial_table[i]));
35528diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
35529index e662cbc..8d4a102 100644
35530--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
35531+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
35532@@ -601,8 +601,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev,
35533 * Return with error code if any of the queue indices
35534 * is out of range
35535 */
35536- if (p->ring_index[i] < 0 ||
35537- p->ring_index[i] >= adapter->num_rx_queues)
35538+ if (p->ring_index[i] >= adapter->num_rx_queues)
35539 return -EINVAL;
35540 }
35541
35542diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
35543index 0f9ee46..e2d6e65 100644
35544--- a/drivers/net/wireless/ath/ath.h
35545+++ b/drivers/net/wireless/ath/ath.h
35546@@ -119,6 +119,7 @@ struct ath_ops {
35547 void (*write_flush) (void *);
35548 u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
35549 };
35550+typedef struct ath_ops __no_const ath_ops_no_const;
35551
35552 struct ath_common;
35553 struct ath_bus_ops;
35554diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
35555index 8c5ce8b..abf101b 100644
35556--- a/drivers/net/wireless/ath/ath5k/debug.c
35557+++ b/drivers/net/wireless/ath/ath5k/debug.c
35558@@ -343,6 +343,9 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
35559
35560 static ssize_t write_file_debug(struct file *file,
35561 const char __user *userbuf,
35562+ size_t count, loff_t *ppos) __size_overflow(3);
35563+static ssize_t write_file_debug(struct file *file,
35564+ const char __user *userbuf,
35565 size_t count, loff_t *ppos)
35566 {
35567 struct ath5k_hw *ah = file->private_data;
35568diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35569index b592016..fe47870 100644
35570--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35571+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35572@@ -183,8 +183,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35573 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
35574 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
35575
35576- ACCESS_ONCE(ads->ds_link) = i->link;
35577- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
35578+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
35579+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
35580
35581 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
35582 ctl6 = SM(i->keytype, AR_EncrType);
35583@@ -198,26 +198,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35584
35585 if ((i->is_first || i->is_last) &&
35586 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
35587- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
35588+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
35589 | set11nTries(i->rates, 1)
35590 | set11nTries(i->rates, 2)
35591 | set11nTries(i->rates, 3)
35592 | (i->dur_update ? AR_DurUpdateEna : 0)
35593 | SM(0, AR_BurstDur);
35594
35595- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
35596+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
35597 | set11nRate(i->rates, 1)
35598 | set11nRate(i->rates, 2)
35599 | set11nRate(i->rates, 3);
35600 } else {
35601- ACCESS_ONCE(ads->ds_ctl2) = 0;
35602- ACCESS_ONCE(ads->ds_ctl3) = 0;
35603+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
35604+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
35605 }
35606
35607 if (!i->is_first) {
35608- ACCESS_ONCE(ads->ds_ctl0) = 0;
35609- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35610- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35611+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
35612+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35613+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35614 return;
35615 }
35616
35617@@ -242,7 +242,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35618 break;
35619 }
35620
35621- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35622+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35623 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
35624 | SM(i->txpower, AR_XmitPower)
35625 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
35626@@ -252,19 +252,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35627 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
35628 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
35629
35630- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35631- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35632+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35633+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35634
35635 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
35636 return;
35637
35638- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35639+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35640 | set11nPktDurRTSCTS(i->rates, 1);
35641
35642- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35643+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35644 | set11nPktDurRTSCTS(i->rates, 3);
35645
35646- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35647+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35648 | set11nRateFlags(i->rates, 1)
35649 | set11nRateFlags(i->rates, 2)
35650 | set11nRateFlags(i->rates, 3)
35651diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35652index f5ae3c6..7936af3 100644
35653--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35654+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35655@@ -35,47 +35,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35656 (i->qcu << AR_TxQcuNum_S) | 0x17;
35657
35658 checksum += val;
35659- ACCESS_ONCE(ads->info) = val;
35660+ ACCESS_ONCE_RW(ads->info) = val;
35661
35662 checksum += i->link;
35663- ACCESS_ONCE(ads->link) = i->link;
35664+ ACCESS_ONCE_RW(ads->link) = i->link;
35665
35666 checksum += i->buf_addr[0];
35667- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
35668+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
35669 checksum += i->buf_addr[1];
35670- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
35671+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
35672 checksum += i->buf_addr[2];
35673- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
35674+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
35675 checksum += i->buf_addr[3];
35676- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
35677+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
35678
35679 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
35680- ACCESS_ONCE(ads->ctl3) = val;
35681+ ACCESS_ONCE_RW(ads->ctl3) = val;
35682 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
35683- ACCESS_ONCE(ads->ctl5) = val;
35684+ ACCESS_ONCE_RW(ads->ctl5) = val;
35685 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
35686- ACCESS_ONCE(ads->ctl7) = val;
35687+ ACCESS_ONCE_RW(ads->ctl7) = val;
35688 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
35689- ACCESS_ONCE(ads->ctl9) = val;
35690+ ACCESS_ONCE_RW(ads->ctl9) = val;
35691
35692 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
35693- ACCESS_ONCE(ads->ctl10) = checksum;
35694+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
35695
35696 if (i->is_first || i->is_last) {
35697- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
35698+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
35699 | set11nTries(i->rates, 1)
35700 | set11nTries(i->rates, 2)
35701 | set11nTries(i->rates, 3)
35702 | (i->dur_update ? AR_DurUpdateEna : 0)
35703 | SM(0, AR_BurstDur);
35704
35705- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
35706+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
35707 | set11nRate(i->rates, 1)
35708 | set11nRate(i->rates, 2)
35709 | set11nRate(i->rates, 3);
35710 } else {
35711- ACCESS_ONCE(ads->ctl13) = 0;
35712- ACCESS_ONCE(ads->ctl14) = 0;
35713+ ACCESS_ONCE_RW(ads->ctl13) = 0;
35714+ ACCESS_ONCE_RW(ads->ctl14) = 0;
35715 }
35716
35717 ads->ctl20 = 0;
35718@@ -84,17 +84,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35719
35720 ctl17 = SM(i->keytype, AR_EncrType);
35721 if (!i->is_first) {
35722- ACCESS_ONCE(ads->ctl11) = 0;
35723- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
35724- ACCESS_ONCE(ads->ctl15) = 0;
35725- ACCESS_ONCE(ads->ctl16) = 0;
35726- ACCESS_ONCE(ads->ctl17) = ctl17;
35727- ACCESS_ONCE(ads->ctl18) = 0;
35728- ACCESS_ONCE(ads->ctl19) = 0;
35729+ ACCESS_ONCE_RW(ads->ctl11) = 0;
35730+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
35731+ ACCESS_ONCE_RW(ads->ctl15) = 0;
35732+ ACCESS_ONCE_RW(ads->ctl16) = 0;
35733+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
35734+ ACCESS_ONCE_RW(ads->ctl18) = 0;
35735+ ACCESS_ONCE_RW(ads->ctl19) = 0;
35736 return;
35737 }
35738
35739- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
35740+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
35741 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
35742 | SM(i->txpower, AR_XmitPower)
35743 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
35744@@ -130,22 +130,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35745 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
35746 ctl12 |= SM(val, AR_PAPRDChainMask);
35747
35748- ACCESS_ONCE(ads->ctl12) = ctl12;
35749- ACCESS_ONCE(ads->ctl17) = ctl17;
35750+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
35751+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
35752
35753- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
35754+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
35755 | set11nPktDurRTSCTS(i->rates, 1);
35756
35757- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
35758+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
35759 | set11nPktDurRTSCTS(i->rates, 3);
35760
35761- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
35762+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
35763 | set11nRateFlags(i->rates, 1)
35764 | set11nRateFlags(i->rates, 2)
35765 | set11nRateFlags(i->rates, 3)
35766 | SM(i->rtscts_rate, AR_RTSCTSRate);
35767
35768- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
35769+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
35770 }
35771
35772 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
35773diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
35774index 2741203..837a960 100644
35775--- a/drivers/net/wireless/ath/ath9k/debug.c
35776+++ b/drivers/net/wireless/ath/ath9k/debug.c
35777@@ -60,6 +60,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
35778 }
35779
35780 static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35781+ size_t count, loff_t *ppos) __size_overflow(3);
35782+static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35783 size_t count, loff_t *ppos)
35784 {
35785 struct ath_softc *sc = file->private_data;
35786diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
35787index d3ff33c..c98bcda 100644
35788--- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
35789+++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
35790@@ -464,6 +464,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
35791 }
35792
35793 static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35794+ size_t count, loff_t *ppos) __size_overflow(3);
35795+static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35796 size_t count, loff_t *ppos)
35797 {
35798 struct ath9k_htc_priv *priv = file->private_data;
35799diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
35800index 1bd8edf..10c6d30 100644
35801--- a/drivers/net/wireless/ath/ath9k/hw.h
35802+++ b/drivers/net/wireless/ath/ath9k/hw.h
35803@@ -605,7 +605,7 @@ struct ath_hw_private_ops {
35804
35805 /* ANI */
35806 void (*ani_cache_ini_regs)(struct ath_hw *ah);
35807-};
35808+} __no_const;
35809
35810 /**
35811 * struct ath_hw_ops - callbacks used by hardware code and driver code
35812@@ -635,7 +635,7 @@ struct ath_hw_ops {
35813 void (*antdiv_comb_conf_set)(struct ath_hw *ah,
35814 struct ath_hw_antcomb_conf *antconf);
35815
35816-};
35817+} __no_const;
35818
35819 struct ath_nf_limits {
35820 s16 max;
35821@@ -655,7 +655,7 @@ enum ath_cal_list {
35822 #define AH_FASTCC 0x4
35823
35824 struct ath_hw {
35825- struct ath_ops reg_ops;
35826+ ath_ops_no_const reg_ops;
35827
35828 struct ieee80211_hw *hw;
35829 struct ath_common common;
35830diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35831index bea8524..c677c06 100644
35832--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35833+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35834@@ -547,7 +547,7 @@ struct phy_func_ptr {
35835 void (*carrsuppr)(struct brcms_phy *);
35836 s32 (*rxsigpwr)(struct brcms_phy *, s32);
35837 void (*detach)(struct brcms_phy *);
35838-};
35839+} __no_const;
35840
35841 struct brcms_phy {
35842 struct brcms_phy_pub pubpi_ro;
35843diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
35844index 05f2ad1..ae00eea 100644
35845--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
35846+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
35847@@ -3685,7 +3685,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
35848 */
35849 if (iwl3945_mod_params.disable_hw_scan) {
35850 IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
35851- iwl3945_hw_ops.hw_scan = NULL;
35852+ pax_open_kernel();
35853+ *(void **)&iwl3945_hw_ops.hw_scan = NULL;
35854+ pax_close_kernel();
35855 }
35856
35857 IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
35858diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
35859index 69a77e2..552b42c 100644
35860--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
35861+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
35862@@ -71,8 +71,8 @@ do { \
35863 } while (0)
35864
35865 #else
35866-#define IWL_DEBUG(m, level, fmt, args...)
35867-#define IWL_DEBUG_LIMIT(m, level, fmt, args...)
35868+#define IWL_DEBUG(m, level, fmt, args...) do {} while (0)
35869+#define IWL_DEBUG_LIMIT(m, level, fmt, args...) do {} while (0)
35870 #define iwl_print_hex_dump(m, level, p, len)
35871 #endif /* CONFIG_IWLWIFI_DEBUG */
35872
35873diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
35874index 523ad55..f8c5dc5 100644
35875--- a/drivers/net/wireless/mac80211_hwsim.c
35876+++ b/drivers/net/wireless/mac80211_hwsim.c
35877@@ -1678,9 +1678,11 @@ static int __init init_mac80211_hwsim(void)
35878 return -EINVAL;
35879
35880 if (fake_hw_scan) {
35881- mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
35882- mac80211_hwsim_ops.sw_scan_start = NULL;
35883- mac80211_hwsim_ops.sw_scan_complete = NULL;
35884+ pax_open_kernel();
35885+ *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
35886+ *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
35887+ *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
35888+ pax_close_kernel();
35889 }
35890
35891 spin_lock_init(&hwsim_radio_lock);
35892diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
35893index 30f138b..c904585 100644
35894--- a/drivers/net/wireless/mwifiex/main.h
35895+++ b/drivers/net/wireless/mwifiex/main.h
35896@@ -543,7 +543,7 @@ struct mwifiex_if_ops {
35897 void (*cleanup_mpa_buf) (struct mwifiex_adapter *);
35898 int (*cmdrsp_complete) (struct mwifiex_adapter *, struct sk_buff *);
35899 int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);
35900-};
35901+} __no_const;
35902
35903 struct mwifiex_adapter {
35904 u8 iface_type;
35905diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
35906index 0c13840..a5c3ed6 100644
35907--- a/drivers/net/wireless/rndis_wlan.c
35908+++ b/drivers/net/wireless/rndis_wlan.c
35909@@ -1275,7 +1275,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
35910
35911 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
35912
35913- if (rts_threshold < 0 || rts_threshold > 2347)
35914+ if (rts_threshold > 2347)
35915 rts_threshold = 2347;
35916
35917 tmp = cpu_to_le32(rts_threshold);
35918diff --git a/drivers/net/wireless/wl1251/wl1251.h b/drivers/net/wireless/wl1251/wl1251.h
35919index a77f1bb..c608b2b 100644
35920--- a/drivers/net/wireless/wl1251/wl1251.h
35921+++ b/drivers/net/wireless/wl1251/wl1251.h
35922@@ -266,7 +266,7 @@ struct wl1251_if_operations {
35923 void (*reset)(struct wl1251 *wl);
35924 void (*enable_irq)(struct wl1251 *wl);
35925 void (*disable_irq)(struct wl1251 *wl);
35926-};
35927+} __no_const;
35928
35929 struct wl1251 {
35930 struct ieee80211_hw *hw;
35931diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
35932index f34b5b2..b5abb9f 100644
35933--- a/drivers/oprofile/buffer_sync.c
35934+++ b/drivers/oprofile/buffer_sync.c
35935@@ -343,7 +343,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
35936 if (cookie == NO_COOKIE)
35937 offset = pc;
35938 if (cookie == INVALID_COOKIE) {
35939- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
35940+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
35941 offset = pc;
35942 }
35943 if (cookie != last_cookie) {
35944@@ -387,14 +387,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
35945 /* add userspace sample */
35946
35947 if (!mm) {
35948- atomic_inc(&oprofile_stats.sample_lost_no_mm);
35949+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
35950 return 0;
35951 }
35952
35953 cookie = lookup_dcookie(mm, s->eip, &offset);
35954
35955 if (cookie == INVALID_COOKIE) {
35956- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
35957+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
35958 return 0;
35959 }
35960
35961@@ -563,7 +563,7 @@ void sync_buffer(int cpu)
35962 /* ignore backtraces if failed to add a sample */
35963 if (state == sb_bt_start) {
35964 state = sb_bt_ignore;
35965- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
35966+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
35967 }
35968 }
35969 release_mm(mm);
35970diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
35971index c0cc4e7..44d4e54 100644
35972--- a/drivers/oprofile/event_buffer.c
35973+++ b/drivers/oprofile/event_buffer.c
35974@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
35975 }
35976
35977 if (buffer_pos == buffer_size) {
35978- atomic_inc(&oprofile_stats.event_lost_overflow);
35979+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
35980 return;
35981 }
35982
35983diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
35984index f8c752e..28bf4fc 100644
35985--- a/drivers/oprofile/oprof.c
35986+++ b/drivers/oprofile/oprof.c
35987@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
35988 if (oprofile_ops.switch_events())
35989 return;
35990
35991- atomic_inc(&oprofile_stats.multiplex_counter);
35992+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
35993 start_switch_worker();
35994 }
35995
35996diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
35997index 84a208d..f07d177 100644
35998--- a/drivers/oprofile/oprofile_files.c
35999+++ b/drivers/oprofile/oprofile_files.c
36000@@ -36,6 +36,8 @@ static ssize_t timeout_read(struct file *file, char __user *buf,
36001
36002
36003 static ssize_t timeout_write(struct file *file, char const __user *buf,
36004+ size_t count, loff_t *offset) __size_overflow(3);
36005+static ssize_t timeout_write(struct file *file, char const __user *buf,
36006 size_t count, loff_t *offset)
36007 {
36008 unsigned long val;
36009@@ -72,6 +74,7 @@ static ssize_t depth_read(struct file *file, char __user *buf, size_t count, lof
36010 }
36011
36012
36013+static ssize_t depth_write(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
36014 static ssize_t depth_write(struct file *file, char const __user *buf, size_t count, loff_t *offset)
36015 {
36016 unsigned long val;
36017@@ -126,12 +129,14 @@ static const struct file_operations cpu_type_fops = {
36018 };
36019
36020
36021+static ssize_t enable_read(struct file *file, char __user *buf, size_t count, loff_t *offset) __size_overflow(3);
36022 static ssize_t enable_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
36023 {
36024 return oprofilefs_ulong_to_user(oprofile_started, buf, count, offset);
36025 }
36026
36027
36028+static ssize_t enable_write(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
36029 static ssize_t enable_write(struct file *file, char const __user *buf, size_t count, loff_t *offset)
36030 {
36031 unsigned long val;
36032diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
36033index 917d28e..d62d981 100644
36034--- a/drivers/oprofile/oprofile_stats.c
36035+++ b/drivers/oprofile/oprofile_stats.c
36036@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
36037 cpu_buf->sample_invalid_eip = 0;
36038 }
36039
36040- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
36041- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
36042- atomic_set(&oprofile_stats.event_lost_overflow, 0);
36043- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
36044- atomic_set(&oprofile_stats.multiplex_counter, 0);
36045+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
36046+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
36047+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
36048+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
36049+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
36050 }
36051
36052
36053diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
36054index 38b6fc0..b5cbfce 100644
36055--- a/drivers/oprofile/oprofile_stats.h
36056+++ b/drivers/oprofile/oprofile_stats.h
36057@@ -13,11 +13,11 @@
36058 #include <linux/atomic.h>
36059
36060 struct oprofile_stat_struct {
36061- atomic_t sample_lost_no_mm;
36062- atomic_t sample_lost_no_mapping;
36063- atomic_t bt_lost_no_mapping;
36064- atomic_t event_lost_overflow;
36065- atomic_t multiplex_counter;
36066+ atomic_unchecked_t sample_lost_no_mm;
36067+ atomic_unchecked_t sample_lost_no_mapping;
36068+ atomic_unchecked_t bt_lost_no_mapping;
36069+ atomic_unchecked_t event_lost_overflow;
36070+ atomic_unchecked_t multiplex_counter;
36071 };
36072
36073 extern struct oprofile_stat_struct oprofile_stats;
36074diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
36075index 2f0aa0f..d5246c3 100644
36076--- a/drivers/oprofile/oprofilefs.c
36077+++ b/drivers/oprofile/oprofilefs.c
36078@@ -97,6 +97,7 @@ static ssize_t ulong_read_file(struct file *file, char __user *buf, size_t count
36079 }
36080
36081
36082+static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
36083 static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_t count, loff_t *offset)
36084 {
36085 unsigned long value;
36086@@ -193,7 +194,7 @@ static const struct file_operations atomic_ro_fops = {
36087
36088
36089 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
36090- char const *name, atomic_t *val)
36091+ char const *name, atomic_unchecked_t *val)
36092 {
36093 return __oprofilefs_create_file(sb, root, name,
36094 &atomic_ro_fops, 0444, val);
36095diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
36096index 3f56bc0..707d642 100644
36097--- a/drivers/parport/procfs.c
36098+++ b/drivers/parport/procfs.c
36099@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
36100
36101 *ppos += len;
36102
36103- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
36104+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
36105 }
36106
36107 #ifdef CONFIG_PARPORT_1284
36108@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
36109
36110 *ppos += len;
36111
36112- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
36113+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
36114 }
36115 #endif /* IEEE1284.3 support. */
36116
36117diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h
36118index 9fff878..ad0ad53 100644
36119--- a/drivers/pci/hotplug/cpci_hotplug.h
36120+++ b/drivers/pci/hotplug/cpci_hotplug.h
36121@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
36122 int (*hardware_test) (struct slot* slot, u32 value);
36123 u8 (*get_power) (struct slot* slot);
36124 int (*set_power) (struct slot* slot, int value);
36125-};
36126+} __no_const;
36127
36128 struct cpci_hp_controller {
36129 unsigned int irq;
36130diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
36131index 76ba8a1..20ca857 100644
36132--- a/drivers/pci/hotplug/cpqphp_nvram.c
36133+++ b/drivers/pci/hotplug/cpqphp_nvram.c
36134@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
36135
36136 void compaq_nvram_init (void __iomem *rom_start)
36137 {
36138+
36139+#ifndef CONFIG_PAX_KERNEXEC
36140 if (rom_start) {
36141 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
36142 }
36143+#endif
36144+
36145 dbg("int15 entry = %p\n", compaq_int15_entry_point);
36146
36147 /* initialize our int15 lock */
36148diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
36149index 1cfbf22..be96487 100644
36150--- a/drivers/pci/pcie/aspm.c
36151+++ b/drivers/pci/pcie/aspm.c
36152@@ -27,9 +27,9 @@
36153 #define MODULE_PARAM_PREFIX "pcie_aspm."
36154
36155 /* Note: those are not register definitions */
36156-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
36157-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
36158-#define ASPM_STATE_L1 (4) /* L1 state */
36159+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
36160+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
36161+#define ASPM_STATE_L1 (4U) /* L1 state */
36162 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
36163 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
36164
36165diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
36166index dfee1b3..a454fb6 100644
36167--- a/drivers/pci/probe.c
36168+++ b/drivers/pci/probe.c
36169@@ -136,7 +136,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
36170 u32 l, sz, mask;
36171 u16 orig_cmd;
36172
36173- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
36174+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
36175
36176 if (!dev->mmio_always_on) {
36177 pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
36178diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
36179index 27911b5..5b6db88 100644
36180--- a/drivers/pci/proc.c
36181+++ b/drivers/pci/proc.c
36182@@ -476,7 +476,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
36183 static int __init pci_proc_init(void)
36184 {
36185 struct pci_dev *dev = NULL;
36186+
36187+#ifdef CONFIG_GRKERNSEC_PROC_ADD
36188+#ifdef CONFIG_GRKERNSEC_PROC_USER
36189+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
36190+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
36191+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
36192+#endif
36193+#else
36194 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
36195+#endif
36196 proc_create("devices", 0, proc_bus_pci_dir,
36197 &proc_bus_pci_dev_operations);
36198 proc_initialized = 1;
36199diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
36200index d9312b3..59f63f2 100644
36201--- a/drivers/platform/x86/asus_acpi.c
36202+++ b/drivers/platform/x86/asus_acpi.c
36203@@ -887,6 +887,8 @@ static int lcd_proc_open(struct inode *inode, struct file *file)
36204 }
36205
36206 static ssize_t lcd_proc_write(struct file *file, const char __user *buffer,
36207+ size_t count, loff_t *pos) __size_overflow(3);
36208+static ssize_t lcd_proc_write(struct file *file, const char __user *buffer,
36209 size_t count, loff_t *pos)
36210 {
36211 int rv, value;
36212diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
36213index 7b82868..b9344c9 100644
36214--- a/drivers/platform/x86/thinkpad_acpi.c
36215+++ b/drivers/platform/x86/thinkpad_acpi.c
36216@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
36217 return 0;
36218 }
36219
36220-void static hotkey_mask_warn_incomplete_mask(void)
36221+static void hotkey_mask_warn_incomplete_mask(void)
36222 {
36223 /* log only what the user can fix... */
36224 const u32 wantedmask = hotkey_driver_mask &
36225@@ -2325,11 +2325,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
36226 }
36227 }
36228
36229-static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36230- struct tp_nvram_state *newn,
36231- const u32 event_mask)
36232-{
36233-
36234 #define TPACPI_COMPARE_KEY(__scancode, __member) \
36235 do { \
36236 if ((event_mask & (1 << __scancode)) && \
36237@@ -2343,36 +2338,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36238 tpacpi_hotkey_send_key(__scancode); \
36239 } while (0)
36240
36241- void issue_volchange(const unsigned int oldvol,
36242- const unsigned int newvol)
36243- {
36244- unsigned int i = oldvol;
36245+static void issue_volchange(const unsigned int oldvol,
36246+ const unsigned int newvol,
36247+ const u32 event_mask)
36248+{
36249+ unsigned int i = oldvol;
36250
36251- while (i > newvol) {
36252- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
36253- i--;
36254- }
36255- while (i < newvol) {
36256- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36257- i++;
36258- }
36259+ while (i > newvol) {
36260+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
36261+ i--;
36262 }
36263+ while (i < newvol) {
36264+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36265+ i++;
36266+ }
36267+}
36268
36269- void issue_brightnesschange(const unsigned int oldbrt,
36270- const unsigned int newbrt)
36271- {
36272- unsigned int i = oldbrt;
36273+static void issue_brightnesschange(const unsigned int oldbrt,
36274+ const unsigned int newbrt,
36275+ const u32 event_mask)
36276+{
36277+ unsigned int i = oldbrt;
36278
36279- while (i > newbrt) {
36280- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
36281- i--;
36282- }
36283- while (i < newbrt) {
36284- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36285- i++;
36286- }
36287+ while (i > newbrt) {
36288+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
36289+ i--;
36290+ }
36291+ while (i < newbrt) {
36292+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36293+ i++;
36294 }
36295+}
36296
36297+static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36298+ struct tp_nvram_state *newn,
36299+ const u32 event_mask)
36300+{
36301 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
36302 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
36303 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
36304@@ -2406,7 +2407,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36305 oldn->volume_level != newn->volume_level) {
36306 /* recently muted, or repeated mute keypress, or
36307 * multiple presses ending in mute */
36308- issue_volchange(oldn->volume_level, newn->volume_level);
36309+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
36310 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
36311 }
36312 } else {
36313@@ -2416,7 +2417,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36314 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36315 }
36316 if (oldn->volume_level != newn->volume_level) {
36317- issue_volchange(oldn->volume_level, newn->volume_level);
36318+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
36319 } else if (oldn->volume_toggle != newn->volume_toggle) {
36320 /* repeated vol up/down keypress at end of scale ? */
36321 if (newn->volume_level == 0)
36322@@ -2429,7 +2430,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36323 /* handle brightness */
36324 if (oldn->brightness_level != newn->brightness_level) {
36325 issue_brightnesschange(oldn->brightness_level,
36326- newn->brightness_level);
36327+ newn->brightness_level,
36328+ event_mask);
36329 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
36330 /* repeated key presses that didn't change state */
36331 if (newn->brightness_level == 0)
36332@@ -2438,10 +2440,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36333 && !tp_features.bright_unkfw)
36334 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36335 }
36336+}
36337
36338 #undef TPACPI_COMPARE_KEY
36339 #undef TPACPI_MAY_SEND_KEY
36340-}
36341
36342 /*
36343 * Polling driver
36344diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
36345index dcdc1f4..85cee16 100644
36346--- a/drivers/platform/x86/toshiba_acpi.c
36347+++ b/drivers/platform/x86/toshiba_acpi.c
36348@@ -517,6 +517,8 @@ static int set_lcd_status(struct backlight_device *bd)
36349 }
36350
36351 static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
36352+ size_t count, loff_t *pos) __size_overflow(3);
36353+static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
36354 size_t count, loff_t *pos)
36355 {
36356 struct toshiba_acpi_dev *dev = PDE(file->f_path.dentry->d_inode)->data;
36357diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
36358index b859d16..5cc6b1a 100644
36359--- a/drivers/pnp/pnpbios/bioscalls.c
36360+++ b/drivers/pnp/pnpbios/bioscalls.c
36361@@ -59,7 +59,7 @@ do { \
36362 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
36363 } while(0)
36364
36365-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
36366+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
36367 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
36368
36369 /*
36370@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36371
36372 cpu = get_cpu();
36373 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
36374+
36375+ pax_open_kernel();
36376 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
36377+ pax_close_kernel();
36378
36379 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
36380 spin_lock_irqsave(&pnp_bios_lock, flags);
36381@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36382 :"memory");
36383 spin_unlock_irqrestore(&pnp_bios_lock, flags);
36384
36385+ pax_open_kernel();
36386 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
36387+ pax_close_kernel();
36388+
36389 put_cpu();
36390
36391 /* If we get here and this is set then the PnP BIOS faulted on us. */
36392@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
36393 return status;
36394 }
36395
36396-void pnpbios_calls_init(union pnp_bios_install_struct *header)
36397+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
36398 {
36399 int i;
36400
36401@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36402 pnp_bios_callpoint.offset = header->fields.pm16offset;
36403 pnp_bios_callpoint.segment = PNP_CS16;
36404
36405+ pax_open_kernel();
36406+
36407 for_each_possible_cpu(i) {
36408 struct desc_struct *gdt = get_cpu_gdt_table(i);
36409 if (!gdt)
36410@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36411 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
36412 (unsigned long)__va(header->fields.pm16dseg));
36413 }
36414+
36415+ pax_close_kernel();
36416 }
36417diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
36418index b0ecacb..7c9da2e 100644
36419--- a/drivers/pnp/resource.c
36420+++ b/drivers/pnp/resource.c
36421@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
36422 return 1;
36423
36424 /* check if the resource is valid */
36425- if (*irq < 0 || *irq > 15)
36426+ if (*irq > 15)
36427 return 0;
36428
36429 /* check if the resource is reserved */
36430@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
36431 return 1;
36432
36433 /* check if the resource is valid */
36434- if (*dma < 0 || *dma == 4 || *dma > 7)
36435+ if (*dma == 4 || *dma > 7)
36436 return 0;
36437
36438 /* check if the resource is reserved */
36439diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
36440index bb16f5b..c751eef 100644
36441--- a/drivers/power/bq27x00_battery.c
36442+++ b/drivers/power/bq27x00_battery.c
36443@@ -67,7 +67,7 @@
36444 struct bq27x00_device_info;
36445 struct bq27x00_access_methods {
36446 int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
36447-};
36448+} __no_const;
36449
36450 enum bq27x00_chip { BQ27000, BQ27500 };
36451
36452diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
36453index 33f5d9a..d957d3f 100644
36454--- a/drivers/regulator/max8660.c
36455+++ b/drivers/regulator/max8660.c
36456@@ -383,8 +383,10 @@ static int __devinit max8660_probe(struct i2c_client *client,
36457 max8660->shadow_regs[MAX8660_OVER1] = 5;
36458 } else {
36459 /* Otherwise devices can be toggled via software */
36460- max8660_dcdc_ops.enable = max8660_dcdc_enable;
36461- max8660_dcdc_ops.disable = max8660_dcdc_disable;
36462+ pax_open_kernel();
36463+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
36464+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
36465+ pax_close_kernel();
36466 }
36467
36468 /*
36469diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
36470index 023d17d..74ef35b 100644
36471--- a/drivers/regulator/mc13892-regulator.c
36472+++ b/drivers/regulator/mc13892-regulator.c
36473@@ -565,10 +565,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
36474 }
36475 mc13xxx_unlock(mc13892);
36476
36477- mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36478+ pax_open_kernel();
36479+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36480 = mc13892_vcam_set_mode;
36481- mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36482+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36483 = mc13892_vcam_get_mode;
36484+ pax_close_kernel();
36485 for (i = 0; i < pdata->num_regulators; i++) {
36486 init_data = &pdata->regulators[i];
36487 priv->regulators[i] = regulator_register(
36488diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
36489index cace6d3..f623fda 100644
36490--- a/drivers/rtc/rtc-dev.c
36491+++ b/drivers/rtc/rtc-dev.c
36492@@ -14,6 +14,7 @@
36493 #include <linux/module.h>
36494 #include <linux/rtc.h>
36495 #include <linux/sched.h>
36496+#include <linux/grsecurity.h>
36497 #include "rtc-core.h"
36498
36499 static dev_t rtc_devt;
36500@@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *file,
36501 if (copy_from_user(&tm, uarg, sizeof(tm)))
36502 return -EFAULT;
36503
36504+ gr_log_timechange();
36505+
36506 return rtc_set_time(rtc, &tm);
36507
36508 case RTC_PIE_ON:
36509diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
36510index ffb5878..e6d785c 100644
36511--- a/drivers/scsi/aacraid/aacraid.h
36512+++ b/drivers/scsi/aacraid/aacraid.h
36513@@ -492,7 +492,7 @@ struct adapter_ops
36514 int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
36515 /* Administrative operations */
36516 int (*adapter_comm)(struct aac_dev * dev, int comm);
36517-};
36518+} __no_const;
36519
36520 /*
36521 * Define which interrupt handler needs to be installed
36522diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
36523index 705e13e..91c873c 100644
36524--- a/drivers/scsi/aacraid/linit.c
36525+++ b/drivers/scsi/aacraid/linit.c
36526@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
36527 #elif defined(__devinitconst)
36528 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36529 #else
36530-static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
36531+static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36532 #endif
36533 { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
36534 { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
36535diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
36536index d5ff142..49c0ebb 100644
36537--- a/drivers/scsi/aic94xx/aic94xx_init.c
36538+++ b/drivers/scsi/aic94xx/aic94xx_init.c
36539@@ -1012,7 +1012,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
36540 .lldd_control_phy = asd_control_phy,
36541 };
36542
36543-static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
36544+static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
36545 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
36546 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
36547 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
36548diff --git a/drivers/scsi/bfa/bfa.h b/drivers/scsi/bfa/bfa.h
36549index a796de9..1ef20e1 100644
36550--- a/drivers/scsi/bfa/bfa.h
36551+++ b/drivers/scsi/bfa/bfa.h
36552@@ -196,7 +196,7 @@ struct bfa_hwif_s {
36553 u32 *end);
36554 int cpe_vec_q0;
36555 int rme_vec_q0;
36556-};
36557+} __no_const;
36558 typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
36559
36560 struct bfa_faa_cbfn_s {
36561diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c
36562index e07bd47..cd1bbbb 100644
36563--- a/drivers/scsi/bfa/bfa_fcpim.c
36564+++ b/drivers/scsi/bfa/bfa_fcpim.c
36565@@ -4121,7 +4121,7 @@ bfa_fcp_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,
36566
36567 bfa_iotag_attach(fcp);
36568
36569- fcp->itn_arr = (struct bfa_itn_s *) bfa_mem_kva_curp(fcp);
36570+ fcp->itn_arr = (bfa_itn_s_no_const *) bfa_mem_kva_curp(fcp);
36571 bfa_mem_kva_curp(fcp) = (u8 *)fcp->itn_arr +
36572 (fcp->num_itns * sizeof(struct bfa_itn_s));
36573 memset(fcp->itn_arr, 0,
36574@@ -4179,7 +4179,7 @@ bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36575 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
36576 {
36577 struct bfa_fcp_mod_s *fcp = BFA_FCP_MOD(bfa);
36578- struct bfa_itn_s *itn;
36579+ bfa_itn_s_no_const *itn;
36580
36581 itn = BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
36582 itn->isr = isr;
36583diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
36584index 1080bcb..a3b39e3 100644
36585--- a/drivers/scsi/bfa/bfa_fcpim.h
36586+++ b/drivers/scsi/bfa/bfa_fcpim.h
36587@@ -37,6 +37,7 @@ struct bfa_iotag_s {
36588 struct bfa_itn_s {
36589 bfa_isr_func_t isr;
36590 };
36591+typedef struct bfa_itn_s __no_const bfa_itn_s_no_const;
36592
36593 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36594 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
36595@@ -149,7 +150,7 @@ struct bfa_fcp_mod_s {
36596 struct list_head iotag_tio_free_q; /* free IO resources */
36597 struct list_head iotag_unused_q; /* unused IO resources*/
36598 struct bfa_iotag_s *iotag_arr;
36599- struct bfa_itn_s *itn_arr;
36600+ bfa_itn_s_no_const *itn_arr;
36601 int num_ioim_reqs;
36602 int num_fwtio_reqs;
36603 int num_itns;
36604diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
36605index 546d46b..642fa5b 100644
36606--- a/drivers/scsi/bfa/bfa_ioc.h
36607+++ b/drivers/scsi/bfa/bfa_ioc.h
36608@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
36609 bfa_ioc_disable_cbfn_t disable_cbfn;
36610 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
36611 bfa_ioc_reset_cbfn_t reset_cbfn;
36612-};
36613+} __no_const;
36614
36615 /*
36616 * IOC event notification mechanism.
36617@@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
36618 void (*ioc_sync_ack) (struct bfa_ioc_s *ioc);
36619 bfa_boolean_t (*ioc_sync_complete) (struct bfa_ioc_s *ioc);
36620 bfa_boolean_t (*ioc_lpu_read_stat) (struct bfa_ioc_s *ioc);
36621-};
36622+} __no_const;
36623
36624 /*
36625 * Queue element to wait for room in request queue. FIFO order is
36626diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
36627index 351dc0b..951dc32 100644
36628--- a/drivers/scsi/hosts.c
36629+++ b/drivers/scsi/hosts.c
36630@@ -42,7 +42,7 @@
36631 #include "scsi_logging.h"
36632
36633
36634-static atomic_t scsi_host_next_hn; /* host_no for next new host */
36635+static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
36636
36637
36638 static void scsi_host_cls_release(struct device *dev)
36639@@ -357,7 +357,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
36640 * subtract one because we increment first then return, but we need to
36641 * know what the next host number was before increment
36642 */
36643- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
36644+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
36645 shost->dma_channel = 0xff;
36646
36647 /* These three are default values which can be overridden */
36648diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
36649index 865d452..e9b7fa7 100644
36650--- a/drivers/scsi/hpsa.c
36651+++ b/drivers/scsi/hpsa.c
36652@@ -505,7 +505,7 @@ static inline u32 next_command(struct ctlr_info *h)
36653 u32 a;
36654
36655 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
36656- return h->access.command_completed(h);
36657+ return h->access->command_completed(h);
36658
36659 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
36660 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
36661@@ -2989,7 +2989,7 @@ static void start_io(struct ctlr_info *h)
36662 while (!list_empty(&h->reqQ)) {
36663 c = list_entry(h->reqQ.next, struct CommandList, list);
36664 /* can't do anything if fifo is full */
36665- if ((h->access.fifo_full(h))) {
36666+ if ((h->access->fifo_full(h))) {
36667 dev_warn(&h->pdev->dev, "fifo full\n");
36668 break;
36669 }
36670@@ -2999,7 +2999,7 @@ static void start_io(struct ctlr_info *h)
36671 h->Qdepth--;
36672
36673 /* Tell the controller execute command */
36674- h->access.submit_command(h, c);
36675+ h->access->submit_command(h, c);
36676
36677 /* Put job onto the completed Q */
36678 addQ(&h->cmpQ, c);
36679@@ -3008,17 +3008,17 @@ static void start_io(struct ctlr_info *h)
36680
36681 static inline unsigned long get_next_completion(struct ctlr_info *h)
36682 {
36683- return h->access.command_completed(h);
36684+ return h->access->command_completed(h);
36685 }
36686
36687 static inline bool interrupt_pending(struct ctlr_info *h)
36688 {
36689- return h->access.intr_pending(h);
36690+ return h->access->intr_pending(h);
36691 }
36692
36693 static inline long interrupt_not_for_us(struct ctlr_info *h)
36694 {
36695- return (h->access.intr_pending(h) == 0) ||
36696+ return (h->access->intr_pending(h) == 0) ||
36697 (h->interrupts_enabled == 0);
36698 }
36699
36700@@ -3917,7 +3917,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
36701 if (prod_index < 0)
36702 return -ENODEV;
36703 h->product_name = products[prod_index].product_name;
36704- h->access = *(products[prod_index].access);
36705+ h->access = products[prod_index].access;
36706
36707 if (hpsa_board_disabled(h->pdev)) {
36708 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
36709@@ -4162,7 +4162,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
36710
36711 assert_spin_locked(&lockup_detector_lock);
36712 remove_ctlr_from_lockup_detector_list(h);
36713- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36714+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36715 spin_lock_irqsave(&h->lock, flags);
36716 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
36717 spin_unlock_irqrestore(&h->lock, flags);
36718@@ -4340,7 +4340,7 @@ reinit_after_soft_reset:
36719 }
36720
36721 /* make sure the board interrupts are off */
36722- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36723+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36724
36725 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
36726 goto clean2;
36727@@ -4374,7 +4374,7 @@ reinit_after_soft_reset:
36728 * fake ones to scoop up any residual completions.
36729 */
36730 spin_lock_irqsave(&h->lock, flags);
36731- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36732+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36733 spin_unlock_irqrestore(&h->lock, flags);
36734 free_irq(h->intr[h->intr_mode], h);
36735 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
36736@@ -4393,9 +4393,9 @@ reinit_after_soft_reset:
36737 dev_info(&h->pdev->dev, "Board READY.\n");
36738 dev_info(&h->pdev->dev,
36739 "Waiting for stale completions to drain.\n");
36740- h->access.set_intr_mask(h, HPSA_INTR_ON);
36741+ h->access->set_intr_mask(h, HPSA_INTR_ON);
36742 msleep(10000);
36743- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36744+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36745
36746 rc = controller_reset_failed(h->cfgtable);
36747 if (rc)
36748@@ -4416,7 +4416,7 @@ reinit_after_soft_reset:
36749 }
36750
36751 /* Turn the interrupts on so we can service requests */
36752- h->access.set_intr_mask(h, HPSA_INTR_ON);
36753+ h->access->set_intr_mask(h, HPSA_INTR_ON);
36754
36755 hpsa_hba_inquiry(h);
36756 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
36757@@ -4468,7 +4468,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
36758 * To write all data in the battery backed cache to disks
36759 */
36760 hpsa_flush_cache(h);
36761- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36762+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36763 free_irq(h->intr[h->intr_mode], h);
36764 #ifdef CONFIG_PCI_MSI
36765 if (h->msix_vector)
36766@@ -4632,7 +4632,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
36767 return;
36768 }
36769 /* Change the access methods to the performant access methods */
36770- h->access = SA5_performant_access;
36771+ h->access = &SA5_performant_access;
36772 h->transMethod = CFGTBL_Trans_Performant;
36773 }
36774
36775diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
36776index 91edafb..a9b88ec 100644
36777--- a/drivers/scsi/hpsa.h
36778+++ b/drivers/scsi/hpsa.h
36779@@ -73,7 +73,7 @@ struct ctlr_info {
36780 unsigned int msix_vector;
36781 unsigned int msi_vector;
36782 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
36783- struct access_method access;
36784+ struct access_method *access;
36785
36786 /* queue and queue Info */
36787 struct list_head reqQ;
36788diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
36789index f2df059..a3a9930 100644
36790--- a/drivers/scsi/ips.h
36791+++ b/drivers/scsi/ips.h
36792@@ -1027,7 +1027,7 @@ typedef struct {
36793 int (*intr)(struct ips_ha *);
36794 void (*enableint)(struct ips_ha *);
36795 uint32_t (*statupd)(struct ips_ha *);
36796-} ips_hw_func_t;
36797+} __no_const ips_hw_func_t;
36798
36799 typedef struct ips_ha {
36800 uint8_t ha_id[IPS_MAX_CHANNELS+1];
36801diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
36802index 9de9db2..1e09660 100644
36803--- a/drivers/scsi/libfc/fc_exch.c
36804+++ b/drivers/scsi/libfc/fc_exch.c
36805@@ -105,12 +105,12 @@ struct fc_exch_mgr {
36806 * all together if not used XXX
36807 */
36808 struct {
36809- atomic_t no_free_exch;
36810- atomic_t no_free_exch_xid;
36811- atomic_t xid_not_found;
36812- atomic_t xid_busy;
36813- atomic_t seq_not_found;
36814- atomic_t non_bls_resp;
36815+ atomic_unchecked_t no_free_exch;
36816+ atomic_unchecked_t no_free_exch_xid;
36817+ atomic_unchecked_t xid_not_found;
36818+ atomic_unchecked_t xid_busy;
36819+ atomic_unchecked_t seq_not_found;
36820+ atomic_unchecked_t non_bls_resp;
36821 } stats;
36822 };
36823
36824@@ -719,7 +719,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
36825 /* allocate memory for exchange */
36826 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
36827 if (!ep) {
36828- atomic_inc(&mp->stats.no_free_exch);
36829+ atomic_inc_unchecked(&mp->stats.no_free_exch);
36830 goto out;
36831 }
36832 memset(ep, 0, sizeof(*ep));
36833@@ -780,7 +780,7 @@ out:
36834 return ep;
36835 err:
36836 spin_unlock_bh(&pool->lock);
36837- atomic_inc(&mp->stats.no_free_exch_xid);
36838+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
36839 mempool_free(ep, mp->ep_pool);
36840 return NULL;
36841 }
36842@@ -923,7 +923,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36843 xid = ntohs(fh->fh_ox_id); /* we originated exch */
36844 ep = fc_exch_find(mp, xid);
36845 if (!ep) {
36846- atomic_inc(&mp->stats.xid_not_found);
36847+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36848 reject = FC_RJT_OX_ID;
36849 goto out;
36850 }
36851@@ -953,7 +953,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36852 ep = fc_exch_find(mp, xid);
36853 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
36854 if (ep) {
36855- atomic_inc(&mp->stats.xid_busy);
36856+ atomic_inc_unchecked(&mp->stats.xid_busy);
36857 reject = FC_RJT_RX_ID;
36858 goto rel;
36859 }
36860@@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36861 }
36862 xid = ep->xid; /* get our XID */
36863 } else if (!ep) {
36864- atomic_inc(&mp->stats.xid_not_found);
36865+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36866 reject = FC_RJT_RX_ID; /* XID not found */
36867 goto out;
36868 }
36869@@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36870 } else {
36871 sp = &ep->seq;
36872 if (sp->id != fh->fh_seq_id) {
36873- atomic_inc(&mp->stats.seq_not_found);
36874+ atomic_inc_unchecked(&mp->stats.seq_not_found);
36875 if (f_ctl & FC_FC_END_SEQ) {
36876 /*
36877 * Update sequence_id based on incoming last
36878@@ -1431,22 +1431,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36879
36880 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
36881 if (!ep) {
36882- atomic_inc(&mp->stats.xid_not_found);
36883+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36884 goto out;
36885 }
36886 if (ep->esb_stat & ESB_ST_COMPLETE) {
36887- atomic_inc(&mp->stats.xid_not_found);
36888+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36889 goto rel;
36890 }
36891 if (ep->rxid == FC_XID_UNKNOWN)
36892 ep->rxid = ntohs(fh->fh_rx_id);
36893 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
36894- atomic_inc(&mp->stats.xid_not_found);
36895+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36896 goto rel;
36897 }
36898 if (ep->did != ntoh24(fh->fh_s_id) &&
36899 ep->did != FC_FID_FLOGI) {
36900- atomic_inc(&mp->stats.xid_not_found);
36901+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36902 goto rel;
36903 }
36904 sof = fr_sof(fp);
36905@@ -1455,7 +1455,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36906 sp->ssb_stat |= SSB_ST_RESP;
36907 sp->id = fh->fh_seq_id;
36908 } else if (sp->id != fh->fh_seq_id) {
36909- atomic_inc(&mp->stats.seq_not_found);
36910+ atomic_inc_unchecked(&mp->stats.seq_not_found);
36911 goto rel;
36912 }
36913
36914@@ -1519,9 +1519,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36915 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
36916
36917 if (!sp)
36918- atomic_inc(&mp->stats.xid_not_found);
36919+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36920 else
36921- atomic_inc(&mp->stats.non_bls_resp);
36922+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
36923
36924 fc_frame_free(fp);
36925 }
36926diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
36927index db9238f..4378ed2 100644
36928--- a/drivers/scsi/libsas/sas_ata.c
36929+++ b/drivers/scsi/libsas/sas_ata.c
36930@@ -368,7 +368,7 @@ static struct ata_port_operations sas_sata_ops = {
36931 .postreset = ata_std_postreset,
36932 .error_handler = ata_std_error_handler,
36933 .post_internal_cmd = sas_ata_post_internal,
36934- .qc_defer = ata_std_qc_defer,
36935+ .qc_defer = ata_std_qc_defer,
36936 .qc_prep = ata_noop_qc_prep,
36937 .qc_issue = sas_ata_qc_issue,
36938 .qc_fill_rtf = sas_ata_qc_fill_rtf,
36939diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
36940index bb4c8e0..f33d849 100644
36941--- a/drivers/scsi/lpfc/lpfc.h
36942+++ b/drivers/scsi/lpfc/lpfc.h
36943@@ -425,7 +425,7 @@ struct lpfc_vport {
36944 struct dentry *debug_nodelist;
36945 struct dentry *vport_debugfs_root;
36946 struct lpfc_debugfs_trc *disc_trc;
36947- atomic_t disc_trc_cnt;
36948+ atomic_unchecked_t disc_trc_cnt;
36949 #endif
36950 uint8_t stat_data_enabled;
36951 uint8_t stat_data_blocked;
36952@@ -835,8 +835,8 @@ struct lpfc_hba {
36953 struct timer_list fabric_block_timer;
36954 unsigned long bit_flags;
36955 #define FABRIC_COMANDS_BLOCKED 0
36956- atomic_t num_rsrc_err;
36957- atomic_t num_cmd_success;
36958+ atomic_unchecked_t num_rsrc_err;
36959+ atomic_unchecked_t num_cmd_success;
36960 unsigned long last_rsrc_error_time;
36961 unsigned long last_ramp_down_time;
36962 unsigned long last_ramp_up_time;
36963@@ -866,7 +866,7 @@ struct lpfc_hba {
36964
36965 struct dentry *debug_slow_ring_trc;
36966 struct lpfc_debugfs_trc *slow_ring_trc;
36967- atomic_t slow_ring_trc_cnt;
36968+ atomic_unchecked_t slow_ring_trc_cnt;
36969 /* iDiag debugfs sub-directory */
36970 struct dentry *idiag_root;
36971 struct dentry *idiag_pci_cfg;
36972diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
36973index 2838259..a07cfb5 100644
36974--- a/drivers/scsi/lpfc/lpfc_debugfs.c
36975+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
36976@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
36977
36978 #include <linux/debugfs.h>
36979
36980-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
36981+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
36982 static unsigned long lpfc_debugfs_start_time = 0L;
36983
36984 /* iDiag */
36985@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
36986 lpfc_debugfs_enable = 0;
36987
36988 len = 0;
36989- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
36990+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
36991 (lpfc_debugfs_max_disc_trc - 1);
36992 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
36993 dtp = vport->disc_trc + i;
36994@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
36995 lpfc_debugfs_enable = 0;
36996
36997 len = 0;
36998- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
36999+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
37000 (lpfc_debugfs_max_slow_ring_trc - 1);
37001 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
37002 dtp = phba->slow_ring_trc + i;
37003@@ -636,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
37004 !vport || !vport->disc_trc)
37005 return;
37006
37007- index = atomic_inc_return(&vport->disc_trc_cnt) &
37008+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
37009 (lpfc_debugfs_max_disc_trc - 1);
37010 dtp = vport->disc_trc + index;
37011 dtp->fmt = fmt;
37012 dtp->data1 = data1;
37013 dtp->data2 = data2;
37014 dtp->data3 = data3;
37015- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
37016+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
37017 dtp->jif = jiffies;
37018 #endif
37019 return;
37020@@ -674,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
37021 !phba || !phba->slow_ring_trc)
37022 return;
37023
37024- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
37025+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
37026 (lpfc_debugfs_max_slow_ring_trc - 1);
37027 dtp = phba->slow_ring_trc + index;
37028 dtp->fmt = fmt;
37029 dtp->data1 = data1;
37030 dtp->data2 = data2;
37031 dtp->data3 = data3;
37032- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
37033+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
37034 dtp->jif = jiffies;
37035 #endif
37036 return;
37037@@ -3986,7 +3986,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
37038 "slow_ring buffer\n");
37039 goto debug_failed;
37040 }
37041- atomic_set(&phba->slow_ring_trc_cnt, 0);
37042+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
37043 memset(phba->slow_ring_trc, 0,
37044 (sizeof(struct lpfc_debugfs_trc) *
37045 lpfc_debugfs_max_slow_ring_trc));
37046@@ -4032,7 +4032,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
37047 "buffer\n");
37048 goto debug_failed;
37049 }
37050- atomic_set(&vport->disc_trc_cnt, 0);
37051+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
37052
37053 snprintf(name, sizeof(name), "discovery_trace");
37054 vport->debug_disc_trc =
37055diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
37056index 55bc4fc..a2a109c 100644
37057--- a/drivers/scsi/lpfc/lpfc_init.c
37058+++ b/drivers/scsi/lpfc/lpfc_init.c
37059@@ -10027,8 +10027,10 @@ lpfc_init(void)
37060 printk(LPFC_COPYRIGHT "\n");
37061
37062 if (lpfc_enable_npiv) {
37063- lpfc_transport_functions.vport_create = lpfc_vport_create;
37064- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
37065+ pax_open_kernel();
37066+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
37067+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
37068+ pax_close_kernel();
37069 }
37070 lpfc_transport_template =
37071 fc_attach_transport(&lpfc_transport_functions);
37072diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
37073index 2e1e54e..1af0a0d 100644
37074--- a/drivers/scsi/lpfc/lpfc_scsi.c
37075+++ b/drivers/scsi/lpfc/lpfc_scsi.c
37076@@ -305,7 +305,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
37077 uint32_t evt_posted;
37078
37079 spin_lock_irqsave(&phba->hbalock, flags);
37080- atomic_inc(&phba->num_rsrc_err);
37081+ atomic_inc_unchecked(&phba->num_rsrc_err);
37082 phba->last_rsrc_error_time = jiffies;
37083
37084 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
37085@@ -346,7 +346,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
37086 unsigned long flags;
37087 struct lpfc_hba *phba = vport->phba;
37088 uint32_t evt_posted;
37089- atomic_inc(&phba->num_cmd_success);
37090+ atomic_inc_unchecked(&phba->num_cmd_success);
37091
37092 if (vport->cfg_lun_queue_depth <= queue_depth)
37093 return;
37094@@ -390,8 +390,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
37095 unsigned long num_rsrc_err, num_cmd_success;
37096 int i;
37097
37098- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
37099- num_cmd_success = atomic_read(&phba->num_cmd_success);
37100+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
37101+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
37102
37103 vports = lpfc_create_vport_work_array(phba);
37104 if (vports != NULL)
37105@@ -411,8 +411,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
37106 }
37107 }
37108 lpfc_destroy_vport_work_array(phba, vports);
37109- atomic_set(&phba->num_rsrc_err, 0);
37110- atomic_set(&phba->num_cmd_success, 0);
37111+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
37112+ atomic_set_unchecked(&phba->num_cmd_success, 0);
37113 }
37114
37115 /**
37116@@ -446,8 +446,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
37117 }
37118 }
37119 lpfc_destroy_vport_work_array(phba, vports);
37120- atomic_set(&phba->num_rsrc_err, 0);
37121- atomic_set(&phba->num_cmd_success, 0);
37122+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
37123+ atomic_set_unchecked(&phba->num_cmd_success, 0);
37124 }
37125
37126 /**
37127diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
37128index 5163edb..7b142bc 100644
37129--- a/drivers/scsi/pmcraid.c
37130+++ b/drivers/scsi/pmcraid.c
37131@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
37132 res->scsi_dev = scsi_dev;
37133 scsi_dev->hostdata = res;
37134 res->change_detected = 0;
37135- atomic_set(&res->read_failures, 0);
37136- atomic_set(&res->write_failures, 0);
37137+ atomic_set_unchecked(&res->read_failures, 0);
37138+ atomic_set_unchecked(&res->write_failures, 0);
37139 rc = 0;
37140 }
37141 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
37142@@ -2676,9 +2676,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
37143
37144 /* If this was a SCSI read/write command keep count of errors */
37145 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
37146- atomic_inc(&res->read_failures);
37147+ atomic_inc_unchecked(&res->read_failures);
37148 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
37149- atomic_inc(&res->write_failures);
37150+ atomic_inc_unchecked(&res->write_failures);
37151
37152 if (!RES_IS_GSCSI(res->cfg_entry) &&
37153 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
37154@@ -3534,7 +3534,7 @@ static int pmcraid_queuecommand_lck(
37155 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
37156 * hrrq_id assigned here in queuecommand
37157 */
37158- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
37159+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
37160 pinstance->num_hrrq;
37161 cmd->cmd_done = pmcraid_io_done;
37162
37163@@ -3859,7 +3859,7 @@ static long pmcraid_ioctl_passthrough(
37164 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
37165 * hrrq_id assigned here in queuecommand
37166 */
37167- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
37168+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
37169 pinstance->num_hrrq;
37170
37171 if (request_size) {
37172@@ -4497,7 +4497,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
37173
37174 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
37175 /* add resources only after host is added into system */
37176- if (!atomic_read(&pinstance->expose_resources))
37177+ if (!atomic_read_unchecked(&pinstance->expose_resources))
37178 return;
37179
37180 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
37181@@ -5331,8 +5331,8 @@ static int __devinit pmcraid_init_instance(
37182 init_waitqueue_head(&pinstance->reset_wait_q);
37183
37184 atomic_set(&pinstance->outstanding_cmds, 0);
37185- atomic_set(&pinstance->last_message_id, 0);
37186- atomic_set(&pinstance->expose_resources, 0);
37187+ atomic_set_unchecked(&pinstance->last_message_id, 0);
37188+ atomic_set_unchecked(&pinstance->expose_resources, 0);
37189
37190 INIT_LIST_HEAD(&pinstance->free_res_q);
37191 INIT_LIST_HEAD(&pinstance->used_res_q);
37192@@ -6047,7 +6047,7 @@ static int __devinit pmcraid_probe(
37193 /* Schedule worker thread to handle CCN and take care of adding and
37194 * removing devices to OS
37195 */
37196- atomic_set(&pinstance->expose_resources, 1);
37197+ atomic_set_unchecked(&pinstance->expose_resources, 1);
37198 schedule_work(&pinstance->worker_q);
37199 return rc;
37200
37201diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
37202index ca496c7..9c791d5 100644
37203--- a/drivers/scsi/pmcraid.h
37204+++ b/drivers/scsi/pmcraid.h
37205@@ -748,7 +748,7 @@ struct pmcraid_instance {
37206 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
37207
37208 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
37209- atomic_t last_message_id;
37210+ atomic_unchecked_t last_message_id;
37211
37212 /* configuration table */
37213 struct pmcraid_config_table *cfg_table;
37214@@ -777,7 +777,7 @@ struct pmcraid_instance {
37215 atomic_t outstanding_cmds;
37216
37217 /* should add/delete resources to mid-layer now ?*/
37218- atomic_t expose_resources;
37219+ atomic_unchecked_t expose_resources;
37220
37221
37222
37223@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
37224 struct pmcraid_config_table_entry_ext cfg_entry_ext;
37225 };
37226 struct scsi_device *scsi_dev; /* Link scsi_device structure */
37227- atomic_t read_failures; /* count of failed READ commands */
37228- atomic_t write_failures; /* count of failed WRITE commands */
37229+ atomic_unchecked_t read_failures; /* count of failed READ commands */
37230+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
37231
37232 /* To indicate add/delete/modify during CCN */
37233 u8 change_detected;
37234diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
37235index fcf052c..a8025a4 100644
37236--- a/drivers/scsi/qla2xxx/qla_def.h
37237+++ b/drivers/scsi/qla2xxx/qla_def.h
37238@@ -2244,7 +2244,7 @@ struct isp_operations {
37239 int (*get_flash_version) (struct scsi_qla_host *, void *);
37240 int (*start_scsi) (srb_t *);
37241 int (*abort_isp) (struct scsi_qla_host *);
37242-};
37243+} __no_const;
37244
37245 /* MSI-X Support *************************************************************/
37246
37247diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
37248index fd5edc6..4906148 100644
37249--- a/drivers/scsi/qla4xxx/ql4_def.h
37250+++ b/drivers/scsi/qla4xxx/ql4_def.h
37251@@ -258,7 +258,7 @@ struct ddb_entry {
37252 * (4000 only) */
37253 atomic_t relogin_timer; /* Max Time to wait for
37254 * relogin to complete */
37255- atomic_t relogin_retry_count; /* Num of times relogin has been
37256+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
37257 * retried */
37258 uint32_t default_time2wait; /* Default Min time between
37259 * relogins (+aens) */
37260diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
37261index 4169c8b..a8b896b 100644
37262--- a/drivers/scsi/qla4xxx/ql4_os.c
37263+++ b/drivers/scsi/qla4xxx/ql4_os.c
37264@@ -2104,12 +2104,12 @@ void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
37265 */
37266 if (!iscsi_is_session_online(cls_sess)) {
37267 /* Reset retry relogin timer */
37268- atomic_inc(&ddb_entry->relogin_retry_count);
37269+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
37270 DEBUG2(ql4_printk(KERN_INFO, ha,
37271 "%s: index[%d] relogin timed out-retrying"
37272 " relogin (%d), retry (%d)\n", __func__,
37273 ddb_entry->fw_ddb_index,
37274- atomic_read(&ddb_entry->relogin_retry_count),
37275+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
37276 ddb_entry->default_time2wait + 4));
37277 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
37278 atomic_set(&ddb_entry->retry_relogin_timer,
37279@@ -3835,7 +3835,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
37280
37281 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
37282 atomic_set(&ddb_entry->relogin_timer, 0);
37283- atomic_set(&ddb_entry->relogin_retry_count, 0);
37284+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
37285
37286 ddb_entry->default_relogin_timeout =
37287 le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
37288diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
37289index 2aeb2e9..46e3925 100644
37290--- a/drivers/scsi/scsi.c
37291+++ b/drivers/scsi/scsi.c
37292@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
37293 unsigned long timeout;
37294 int rtn = 0;
37295
37296- atomic_inc(&cmd->device->iorequest_cnt);
37297+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37298
37299 /* check if the device is still usable */
37300 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
37301diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
37302index f85cfa6..a57c9e8 100644
37303--- a/drivers/scsi/scsi_lib.c
37304+++ b/drivers/scsi/scsi_lib.c
37305@@ -1416,7 +1416,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
37306 shost = sdev->host;
37307 scsi_init_cmd_errh(cmd);
37308 cmd->result = DID_NO_CONNECT << 16;
37309- atomic_inc(&cmd->device->iorequest_cnt);
37310+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37311
37312 /*
37313 * SCSI request completion path will do scsi_device_unbusy(),
37314@@ -1442,9 +1442,9 @@ static void scsi_softirq_done(struct request *rq)
37315
37316 INIT_LIST_HEAD(&cmd->eh_entry);
37317
37318- atomic_inc(&cmd->device->iodone_cnt);
37319+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
37320 if (cmd->result)
37321- atomic_inc(&cmd->device->ioerr_cnt);
37322+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
37323
37324 disposition = scsi_decide_disposition(cmd);
37325 if (disposition != SUCCESS &&
37326diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
37327index 04c2a27..9d8bd66 100644
37328--- a/drivers/scsi/scsi_sysfs.c
37329+++ b/drivers/scsi/scsi_sysfs.c
37330@@ -660,7 +660,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
37331 char *buf) \
37332 { \
37333 struct scsi_device *sdev = to_scsi_device(dev); \
37334- unsigned long long count = atomic_read(&sdev->field); \
37335+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
37336 return snprintf(buf, 20, "0x%llx\n", count); \
37337 } \
37338 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
37339diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
37340index 84a1fdf..693b0d6 100644
37341--- a/drivers/scsi/scsi_tgt_lib.c
37342+++ b/drivers/scsi/scsi_tgt_lib.c
37343@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
37344 int err;
37345
37346 dprintk("%lx %u\n", uaddr, len);
37347- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
37348+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
37349 if (err) {
37350 /*
37351 * TODO: need to fixup sg_tablesize, max_segment_size,
37352diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
37353index 1b21491..1b7f60e 100644
37354--- a/drivers/scsi/scsi_transport_fc.c
37355+++ b/drivers/scsi/scsi_transport_fc.c
37356@@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
37357 * Netlink Infrastructure
37358 */
37359
37360-static atomic_t fc_event_seq;
37361+static atomic_unchecked_t fc_event_seq;
37362
37363 /**
37364 * fc_get_event_number - Obtain the next sequential FC event number
37365@@ -497,7 +497,7 @@ static atomic_t fc_event_seq;
37366 u32
37367 fc_get_event_number(void)
37368 {
37369- return atomic_add_return(1, &fc_event_seq);
37370+ return atomic_add_return_unchecked(1, &fc_event_seq);
37371 }
37372 EXPORT_SYMBOL(fc_get_event_number);
37373
37374@@ -645,7 +645,7 @@ static __init int fc_transport_init(void)
37375 {
37376 int error;
37377
37378- atomic_set(&fc_event_seq, 0);
37379+ atomic_set_unchecked(&fc_event_seq, 0);
37380
37381 error = transport_class_register(&fc_host_class);
37382 if (error)
37383@@ -835,7 +835,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
37384 char *cp;
37385
37386 *val = simple_strtoul(buf, &cp, 0);
37387- if ((*cp && (*cp != '\n')) || (*val < 0))
37388+ if (*cp && (*cp != '\n'))
37389 return -EINVAL;
37390 /*
37391 * Check for overflow; dev_loss_tmo is u32
37392diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
37393index 96029e6..4d77fa0 100644
37394--- a/drivers/scsi/scsi_transport_iscsi.c
37395+++ b/drivers/scsi/scsi_transport_iscsi.c
37396@@ -79,7 +79,7 @@ struct iscsi_internal {
37397 struct transport_container session_cont;
37398 };
37399
37400-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
37401+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
37402 static struct workqueue_struct *iscsi_eh_timer_workq;
37403
37404 static DEFINE_IDA(iscsi_sess_ida);
37405@@ -1062,7 +1062,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
37406 int err;
37407
37408 ihost = shost->shost_data;
37409- session->sid = atomic_add_return(1, &iscsi_session_nr);
37410+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
37411
37412 if (target_id == ISCSI_MAX_TARGET) {
37413 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
37414@@ -2663,7 +2663,7 @@ static __init int iscsi_transport_init(void)
37415 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
37416 ISCSI_TRANSPORT_VERSION);
37417
37418- atomic_set(&iscsi_session_nr, 0);
37419+ atomic_set_unchecked(&iscsi_session_nr, 0);
37420
37421 err = class_register(&iscsi_transport_class);
37422 if (err)
37423diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
37424index 21a045e..ec89e03 100644
37425--- a/drivers/scsi/scsi_transport_srp.c
37426+++ b/drivers/scsi/scsi_transport_srp.c
37427@@ -33,7 +33,7 @@
37428 #include "scsi_transport_srp_internal.h"
37429
37430 struct srp_host_attrs {
37431- atomic_t next_port_id;
37432+ atomic_unchecked_t next_port_id;
37433 };
37434 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
37435
37436@@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
37437 struct Scsi_Host *shost = dev_to_shost(dev);
37438 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
37439
37440- atomic_set(&srp_host->next_port_id, 0);
37441+ atomic_set_unchecked(&srp_host->next_port_id, 0);
37442 return 0;
37443 }
37444
37445@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
37446 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
37447 rport->roles = ids->roles;
37448
37449- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
37450+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
37451 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
37452
37453 transport_setup_device(&rport->dev);
37454diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
37455index 441a1c5..07cece7 100644
37456--- a/drivers/scsi/sg.c
37457+++ b/drivers/scsi/sg.c
37458@@ -1077,7 +1077,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
37459 sdp->disk->disk_name,
37460 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
37461 NULL,
37462- (char *)arg);
37463+ (char __user *)arg);
37464 case BLKTRACESTART:
37465 return blk_trace_startstop(sdp->device->request_queue, 1);
37466 case BLKTRACESTOP:
37467@@ -2312,7 +2312,7 @@ struct sg_proc_leaf {
37468 const struct file_operations * fops;
37469 };
37470
37471-static struct sg_proc_leaf sg_proc_leaf_arr[] = {
37472+static const struct sg_proc_leaf sg_proc_leaf_arr[] = {
37473 {"allow_dio", &adio_fops},
37474 {"debug", &debug_fops},
37475 {"def_reserved_size", &dressz_fops},
37476@@ -2327,7 +2327,7 @@ sg_proc_init(void)
37477 {
37478 int k, mask;
37479 int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
37480- struct sg_proc_leaf * leaf;
37481+ const struct sg_proc_leaf * leaf;
37482
37483 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
37484 if (!sg_proc_sgp)
37485diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
37486index f64250e..1ee3049 100644
37487--- a/drivers/spi/spi-dw-pci.c
37488+++ b/drivers/spi/spi-dw-pci.c
37489@@ -149,7 +149,7 @@ static int spi_resume(struct pci_dev *pdev)
37490 #define spi_resume NULL
37491 #endif
37492
37493-static const struct pci_device_id pci_ids[] __devinitdata = {
37494+static const struct pci_device_id pci_ids[] __devinitconst = {
37495 /* Intel MID platform SPI controller 0 */
37496 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
37497 {},
37498diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
37499index 77eae99..b7cdcc9 100644
37500--- a/drivers/spi/spi.c
37501+++ b/drivers/spi/spi.c
37502@@ -1024,7 +1024,7 @@ int spi_bus_unlock(struct spi_master *master)
37503 EXPORT_SYMBOL_GPL(spi_bus_unlock);
37504
37505 /* portable code must never pass more than 32 bytes */
37506-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
37507+#define SPI_BUFSIZ max(32UL,SMP_CACHE_BYTES)
37508
37509 static u8 *buf;
37510
37511diff --git a/drivers/staging/gma500/power.c b/drivers/staging/gma500/power.c
37512index 436fe97..4082570 100644
37513--- a/drivers/staging/gma500/power.c
37514+++ b/drivers/staging/gma500/power.c
37515@@ -266,7 +266,7 @@ bool gma_power_begin(struct drm_device *dev, bool force_on)
37516 ret = gma_resume_pci(dev->pdev);
37517 if (ret == 0) {
37518 /* FIXME: we want to defer this for Medfield/Oaktrail */
37519- gma_resume_display(dev);
37520+ gma_resume_display(dev->pdev);
37521 psb_irq_preinstall(dev);
37522 psb_irq_postinstall(dev);
37523 pm_runtime_get(&dev->pdev->dev);
37524diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
37525index bafccb3..e3ac78d 100644
37526--- a/drivers/staging/hv/rndis_filter.c
37527+++ b/drivers/staging/hv/rndis_filter.c
37528@@ -42,7 +42,7 @@ struct rndis_device {
37529
37530 enum rndis_device_state state;
37531 bool link_state;
37532- atomic_t new_req_id;
37533+ atomic_unchecked_t new_req_id;
37534
37535 spinlock_t request_lock;
37536 struct list_head req_list;
37537@@ -116,7 +116,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
37538 * template
37539 */
37540 set = &rndis_msg->msg.set_req;
37541- set->req_id = atomic_inc_return(&dev->new_req_id);
37542+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
37543
37544 /* Add to the request list */
37545 spin_lock_irqsave(&dev->request_lock, flags);
37546@@ -646,7 +646,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
37547
37548 /* Setup the rndis set */
37549 halt = &request->request_msg.msg.halt_req;
37550- halt->req_id = atomic_inc_return(&dev->new_req_id);
37551+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
37552
37553 /* Ignore return since this msg is optional. */
37554 rndis_filter_send_request(dev, request);
37555diff --git a/drivers/staging/iio/buffer_generic.h b/drivers/staging/iio/buffer_generic.h
37556index 9e8f010..af9efb56 100644
37557--- a/drivers/staging/iio/buffer_generic.h
37558+++ b/drivers/staging/iio/buffer_generic.h
37559@@ -64,7 +64,7 @@ struct iio_buffer_access_funcs {
37560
37561 int (*is_enabled)(struct iio_buffer *buffer);
37562 int (*enable)(struct iio_buffer *buffer);
37563-};
37564+} __no_const;
37565
37566 /**
37567 * struct iio_buffer_setup_ops - buffer setup related callbacks
37568diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
37569index 8b307b4..a97ac91 100644
37570--- a/drivers/staging/octeon/ethernet-rx.c
37571+++ b/drivers/staging/octeon/ethernet-rx.c
37572@@ -420,11 +420,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37573 /* Increment RX stats for virtual ports */
37574 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
37575 #ifdef CONFIG_64BIT
37576- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
37577- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
37578+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
37579+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
37580 #else
37581- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
37582- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
37583+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
37584+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
37585 #endif
37586 }
37587 netif_receive_skb(skb);
37588@@ -436,9 +436,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37589 dev->name);
37590 */
37591 #ifdef CONFIG_64BIT
37592- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
37593+ atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37594 #else
37595- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
37596+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
37597 #endif
37598 dev_kfree_skb_irq(skb);
37599 }
37600diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
37601index 076f866..2308070 100644
37602--- a/drivers/staging/octeon/ethernet.c
37603+++ b/drivers/staging/octeon/ethernet.c
37604@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
37605 * since the RX tasklet also increments it.
37606 */
37607 #ifdef CONFIG_64BIT
37608- atomic64_add(rx_status.dropped_packets,
37609- (atomic64_t *)&priv->stats.rx_dropped);
37610+ atomic64_add_unchecked(rx_status.dropped_packets,
37611+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37612 #else
37613- atomic_add(rx_status.dropped_packets,
37614- (atomic_t *)&priv->stats.rx_dropped);
37615+ atomic_add_unchecked(rx_status.dropped_packets,
37616+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
37617 #endif
37618 }
37619
37620diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
37621index 7a19555..466456d 100644
37622--- a/drivers/staging/pohmelfs/inode.c
37623+++ b/drivers/staging/pohmelfs/inode.c
37624@@ -1861,7 +1861,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
37625 mutex_init(&psb->mcache_lock);
37626 psb->mcache_root = RB_ROOT;
37627 psb->mcache_timeout = msecs_to_jiffies(5000);
37628- atomic_long_set(&psb->mcache_gen, 0);
37629+ atomic_long_set_unchecked(&psb->mcache_gen, 0);
37630
37631 psb->trans_max_pages = 100;
37632
37633@@ -1876,7 +1876,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
37634 INIT_LIST_HEAD(&psb->crypto_ready_list);
37635 INIT_LIST_HEAD(&psb->crypto_active_list);
37636
37637- atomic_set(&psb->trans_gen, 1);
37638+ atomic_set_unchecked(&psb->trans_gen, 1);
37639 atomic_long_set(&psb->total_inodes, 0);
37640
37641 mutex_init(&psb->state_lock);
37642diff --git a/drivers/staging/pohmelfs/mcache.c b/drivers/staging/pohmelfs/mcache.c
37643index e22665c..a2a9390 100644
37644--- a/drivers/staging/pohmelfs/mcache.c
37645+++ b/drivers/staging/pohmelfs/mcache.c
37646@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_alloc(struct pohmelfs_sb *psb, u64 start
37647 m->data = data;
37648 m->start = start;
37649 m->size = size;
37650- m->gen = atomic_long_inc_return(&psb->mcache_gen);
37651+ m->gen = atomic_long_inc_return_unchecked(&psb->mcache_gen);
37652
37653 mutex_lock(&psb->mcache_lock);
37654 err = pohmelfs_mcache_insert(psb, m);
37655diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h
37656index 985b6b7..7699e05 100644
37657--- a/drivers/staging/pohmelfs/netfs.h
37658+++ b/drivers/staging/pohmelfs/netfs.h
37659@@ -571,14 +571,14 @@ struct pohmelfs_config;
37660 struct pohmelfs_sb {
37661 struct rb_root mcache_root;
37662 struct mutex mcache_lock;
37663- atomic_long_t mcache_gen;
37664+ atomic_long_unchecked_t mcache_gen;
37665 unsigned long mcache_timeout;
37666
37667 unsigned int idx;
37668
37669 unsigned int trans_retries;
37670
37671- atomic_t trans_gen;
37672+ atomic_unchecked_t trans_gen;
37673
37674 unsigned int crypto_attached_size;
37675 unsigned int crypto_align_size;
37676diff --git a/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c
37677index 06c1a74..866eebc 100644
37678--- a/drivers/staging/pohmelfs/trans.c
37679+++ b/drivers/staging/pohmelfs/trans.c
37680@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb)
37681 int err;
37682 struct netfs_cmd *cmd = t->iovec.iov_base;
37683
37684- t->gen = atomic_inc_return(&psb->trans_gen);
37685+ t->gen = atomic_inc_return_unchecked(&psb->trans_gen);
37686
37687 cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
37688 t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
37689diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
37690index c36a140..dd27fda 100644
37691--- a/drivers/staging/rtl8192e/rtllib_module.c
37692+++ b/drivers/staging/rtl8192e/rtllib_module.c
37693@@ -228,6 +228,8 @@ static int show_debug_level(char *page, char **start, off_t offset,
37694 }
37695
37696 static int store_debug_level(struct file *file, const char __user *buffer,
37697+ unsigned long count, void *data) __size_overflow(3);
37698+static int store_debug_level(struct file *file, const char __user *buffer,
37699 unsigned long count, void *data)
37700 {
37701 char buf[] = "0x00000000";
37702diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37703index e3d47bc..85f4d0d 100644
37704--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37705+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37706@@ -250,6 +250,8 @@ static int show_debug_level(char *page, char **start, off_t offset,
37707 }
37708
37709 static int store_debug_level(struct file *file, const char *buffer,
37710+ unsigned long count, void *data) __size_overflow(3);
37711+static int store_debug_level(struct file *file, const char *buffer,
37712 unsigned long count, void *data)
37713 {
37714 char buf[] = "0x00000000";
37715diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
37716index 86308a0..feaa925 100644
37717--- a/drivers/staging/rtl8712/rtl871x_io.h
37718+++ b/drivers/staging/rtl8712/rtl871x_io.h
37719@@ -108,7 +108,7 @@ struct _io_ops {
37720 u8 *pmem);
37721 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
37722 u8 *pmem);
37723-};
37724+} __no_const;
37725
37726 struct io_req {
37727 struct list_head list;
37728diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
37729index c7b5e8b..783d6cb 100644
37730--- a/drivers/staging/sbe-2t3e3/netdev.c
37731+++ b/drivers/staging/sbe-2t3e3/netdev.c
37732@@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
37733 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
37734
37735 if (rlen)
37736- if (copy_to_user(data, &resp, rlen))
37737+ if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
37738 return -EFAULT;
37739
37740 return 0;
37741diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
37742index be21617..0954e45 100644
37743--- a/drivers/staging/usbip/usbip_common.h
37744+++ b/drivers/staging/usbip/usbip_common.h
37745@@ -289,7 +289,7 @@ struct usbip_device {
37746 void (*shutdown)(struct usbip_device *);
37747 void (*reset)(struct usbip_device *);
37748 void (*unusable)(struct usbip_device *);
37749- } eh_ops;
37750+ } __no_const eh_ops;
37751 };
37752
37753 #if 0
37754diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
37755index 88b3298..3783eee 100644
37756--- a/drivers/staging/usbip/vhci.h
37757+++ b/drivers/staging/usbip/vhci.h
37758@@ -88,7 +88,7 @@ struct vhci_hcd {
37759 unsigned resuming:1;
37760 unsigned long re_timeout;
37761
37762- atomic_t seqnum;
37763+ atomic_unchecked_t seqnum;
37764
37765 /*
37766 * NOTE:
37767diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
37768index 2ee97e2..0420b86 100644
37769--- a/drivers/staging/usbip/vhci_hcd.c
37770+++ b/drivers/staging/usbip/vhci_hcd.c
37771@@ -527,7 +527,7 @@ static void vhci_tx_urb(struct urb *urb)
37772 return;
37773 }
37774
37775- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
37776+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
37777 if (priv->seqnum == 0xffff)
37778 dev_info(&urb->dev->dev, "seqnum max\n");
37779
37780@@ -779,7 +779,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
37781 return -ENOMEM;
37782 }
37783
37784- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
37785+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
37786 if (unlink->seqnum == 0xffff)
37787 pr_info("seqnum max\n");
37788
37789@@ -969,7 +969,7 @@ static int vhci_start(struct usb_hcd *hcd)
37790 vdev->rhport = rhport;
37791 }
37792
37793- atomic_set(&vhci->seqnum, 0);
37794+ atomic_set_unchecked(&vhci->seqnum, 0);
37795 spin_lock_init(&vhci->lock);
37796
37797 hcd->power_budget = 0; /* no limit */
37798diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
37799index 3872b8c..fe6d2f4 100644
37800--- a/drivers/staging/usbip/vhci_rx.c
37801+++ b/drivers/staging/usbip/vhci_rx.c
37802@@ -77,7 +77,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
37803 if (!urb) {
37804 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
37805 pr_info("max seqnum %d\n",
37806- atomic_read(&the_controller->seqnum));
37807+ atomic_read_unchecked(&the_controller->seqnum));
37808 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
37809 return;
37810 }
37811diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
37812index 7735027..30eed13 100644
37813--- a/drivers/staging/vt6655/hostap.c
37814+++ b/drivers/staging/vt6655/hostap.c
37815@@ -79,14 +79,13 @@ static int msglevel =MSG_LEVEL_INFO;
37816 *
37817 */
37818
37819+static net_device_ops_no_const apdev_netdev_ops;
37820+
37821 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37822 {
37823 PSDevice apdev_priv;
37824 struct net_device *dev = pDevice->dev;
37825 int ret;
37826- const struct net_device_ops apdev_netdev_ops = {
37827- .ndo_start_xmit = pDevice->tx_80211,
37828- };
37829
37830 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
37831
37832@@ -98,6 +97,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37833 *apdev_priv = *pDevice;
37834 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
37835
37836+ /* only half broken now */
37837+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
37838 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
37839
37840 pDevice->apdev->type = ARPHRD_IEEE80211;
37841diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
37842index 51b5adf..098e320 100644
37843--- a/drivers/staging/vt6656/hostap.c
37844+++ b/drivers/staging/vt6656/hostap.c
37845@@ -80,14 +80,13 @@ static int msglevel =MSG_LEVEL_INFO;
37846 *
37847 */
37848
37849+static net_device_ops_no_const apdev_netdev_ops;
37850+
37851 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37852 {
37853 PSDevice apdev_priv;
37854 struct net_device *dev = pDevice->dev;
37855 int ret;
37856- const struct net_device_ops apdev_netdev_ops = {
37857- .ndo_start_xmit = pDevice->tx_80211,
37858- };
37859
37860 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
37861
37862@@ -99,6 +98,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37863 *apdev_priv = *pDevice;
37864 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
37865
37866+ /* only half broken now */
37867+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
37868 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
37869
37870 pDevice->apdev->type = ARPHRD_IEEE80211;
37871diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
37872index 7843dfd..3db105f 100644
37873--- a/drivers/staging/wlan-ng/hfa384x_usb.c
37874+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
37875@@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
37876
37877 struct usbctlx_completor {
37878 int (*complete) (struct usbctlx_completor *);
37879-};
37880+} __no_const;
37881
37882 static int
37883 hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
37884diff --git a/drivers/staging/zcache/tmem.c b/drivers/staging/zcache/tmem.c
37885index 1ca66ea..76f1343 100644
37886--- a/drivers/staging/zcache/tmem.c
37887+++ b/drivers/staging/zcache/tmem.c
37888@@ -39,7 +39,7 @@
37889 * A tmem host implementation must use this function to register callbacks
37890 * for memory allocation.
37891 */
37892-static struct tmem_hostops tmem_hostops;
37893+static tmem_hostops_no_const tmem_hostops;
37894
37895 static void tmem_objnode_tree_init(void);
37896
37897@@ -53,7 +53,7 @@ void tmem_register_hostops(struct tmem_hostops *m)
37898 * A tmem host implementation must use this function to register
37899 * callbacks for a page-accessible memory (PAM) implementation
37900 */
37901-static struct tmem_pamops tmem_pamops;
37902+static tmem_pamops_no_const tmem_pamops;
37903
37904 void tmem_register_pamops(struct tmem_pamops *m)
37905 {
37906diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h
37907index ed147c4..94fc3c6 100644
37908--- a/drivers/staging/zcache/tmem.h
37909+++ b/drivers/staging/zcache/tmem.h
37910@@ -180,6 +180,7 @@ struct tmem_pamops {
37911 void (*new_obj)(struct tmem_obj *);
37912 int (*replace_in_obj)(void *, struct tmem_obj *);
37913 };
37914+typedef struct tmem_pamops __no_const tmem_pamops_no_const;
37915 extern void tmem_register_pamops(struct tmem_pamops *m);
37916
37917 /* memory allocation methods provided by the host implementation */
37918@@ -189,6 +190,7 @@ struct tmem_hostops {
37919 struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
37920 void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
37921 };
37922+typedef struct tmem_hostops __no_const tmem_hostops_no_const;
37923 extern void tmem_register_hostops(struct tmem_hostops *m);
37924
37925 /* core tmem accessor functions */
37926diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
37927index 0c1d5c73..88e90a8 100644
37928--- a/drivers/target/iscsi/iscsi_target.c
37929+++ b/drivers/target/iscsi/iscsi_target.c
37930@@ -1364,7 +1364,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf)
37931 * outstanding_r2ts reaches zero, go ahead and send the delayed
37932 * TASK_ABORTED status.
37933 */
37934- if (atomic_read(&se_cmd->t_transport_aborted) != 0) {
37935+ if (atomic_read_unchecked(&se_cmd->t_transport_aborted) != 0) {
37936 if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
37937 if (--cmd->outstanding_r2ts < 1) {
37938 iscsit_stop_dataout_timer(cmd);
37939diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
37940index 6845228..df77141 100644
37941--- a/drivers/target/target_core_tmr.c
37942+++ b/drivers/target/target_core_tmr.c
37943@@ -250,7 +250,7 @@ static void core_tmr_drain_task_list(
37944 cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
37945 cmd->t_task_list_num,
37946 atomic_read(&cmd->t_task_cdbs_left),
37947- atomic_read(&cmd->t_task_cdbs_sent),
37948+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
37949 atomic_read(&cmd->t_transport_active),
37950 atomic_read(&cmd->t_transport_stop),
37951 atomic_read(&cmd->t_transport_sent));
37952@@ -281,7 +281,7 @@ static void core_tmr_drain_task_list(
37953 pr_debug("LUN_RESET: got t_transport_active = 1 for"
37954 " task: %p, t_fe_count: %d dev: %p\n", task,
37955 fe_count, dev);
37956- atomic_set(&cmd->t_transport_aborted, 1);
37957+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
37958 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
37959
37960 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
37961@@ -289,7 +289,7 @@ static void core_tmr_drain_task_list(
37962 }
37963 pr_debug("LUN_RESET: Got t_transport_active = 0 for task: %p,"
37964 " t_fe_count: %d dev: %p\n", task, fe_count, dev);
37965- atomic_set(&cmd->t_transport_aborted, 1);
37966+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
37967 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
37968
37969 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
37970diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
37971index e4ddb93..2fc6e0f 100644
37972--- a/drivers/target/target_core_transport.c
37973+++ b/drivers/target/target_core_transport.c
37974@@ -1343,7 +1343,7 @@ struct se_device *transport_add_device_to_core_hba(
37975
37976 dev->queue_depth = dev_limits->queue_depth;
37977 atomic_set(&dev->depth_left, dev->queue_depth);
37978- atomic_set(&dev->dev_ordered_id, 0);
37979+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
37980
37981 se_dev_set_default_attribs(dev, dev_limits);
37982
37983@@ -1530,7 +1530,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
37984 * Used to determine when ORDERED commands should go from
37985 * Dormant to Active status.
37986 */
37987- cmd->se_ordered_id = atomic_inc_return(&cmd->se_dev->dev_ordered_id);
37988+ cmd->se_ordered_id = atomic_inc_return_unchecked(&cmd->se_dev->dev_ordered_id);
37989 smp_mb__after_atomic_inc();
37990 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
37991 cmd->se_ordered_id, cmd->sam_task_attr,
37992@@ -1800,7 +1800,7 @@ static void transport_generic_request_failure(struct se_cmd *cmd)
37993 " t_transport_active: %d t_transport_stop: %d"
37994 " t_transport_sent: %d\n", cmd->t_task_list_num,
37995 atomic_read(&cmd->t_task_cdbs_left),
37996- atomic_read(&cmd->t_task_cdbs_sent),
37997+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
37998 atomic_read(&cmd->t_task_cdbs_ex_left),
37999 atomic_read(&cmd->t_transport_active),
38000 atomic_read(&cmd->t_transport_stop),
38001@@ -2089,9 +2089,9 @@ check_depth:
38002
38003 spin_lock_irqsave(&cmd->t_state_lock, flags);
38004 task->task_flags |= (TF_ACTIVE | TF_SENT);
38005- atomic_inc(&cmd->t_task_cdbs_sent);
38006+ atomic_inc_unchecked(&cmd->t_task_cdbs_sent);
38007
38008- if (atomic_read(&cmd->t_task_cdbs_sent) ==
38009+ if (atomic_read_unchecked(&cmd->t_task_cdbs_sent) ==
38010 cmd->t_task_list_num)
38011 atomic_set(&cmd->t_transport_sent, 1);
38012
38013@@ -4296,7 +4296,7 @@ bool transport_wait_for_tasks(struct se_cmd *cmd)
38014 atomic_set(&cmd->transport_lun_stop, 0);
38015 }
38016 if (!atomic_read(&cmd->t_transport_active) ||
38017- atomic_read(&cmd->t_transport_aborted)) {
38018+ atomic_read_unchecked(&cmd->t_transport_aborted)) {
38019 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
38020 return false;
38021 }
38022@@ -4545,7 +4545,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
38023 {
38024 int ret = 0;
38025
38026- if (atomic_read(&cmd->t_transport_aborted) != 0) {
38027+ if (atomic_read_unchecked(&cmd->t_transport_aborted) != 0) {
38028 if (!send_status ||
38029 (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
38030 return 1;
38031@@ -4582,7 +4582,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
38032 */
38033 if (cmd->data_direction == DMA_TO_DEVICE) {
38034 if (cmd->se_tfo->write_pending_status(cmd) != 0) {
38035- atomic_inc(&cmd->t_transport_aborted);
38036+ atomic_inc_unchecked(&cmd->t_transport_aborted);
38037 smp_mb__after_atomic_inc();
38038 }
38039 }
38040diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
38041index b9040be..e3f5aab 100644
38042--- a/drivers/tty/hvc/hvcs.c
38043+++ b/drivers/tty/hvc/hvcs.c
38044@@ -83,6 +83,7 @@
38045 #include <asm/hvcserver.h>
38046 #include <asm/uaccess.h>
38047 #include <asm/vio.h>
38048+#include <asm/local.h>
38049
38050 /*
38051 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
38052@@ -270,7 +271,7 @@ struct hvcs_struct {
38053 unsigned int index;
38054
38055 struct tty_struct *tty;
38056- int open_count;
38057+ local_t open_count;
38058
38059 /*
38060 * Used to tell the driver kernel_thread what operations need to take
38061@@ -422,7 +423,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
38062
38063 spin_lock_irqsave(&hvcsd->lock, flags);
38064
38065- if (hvcsd->open_count > 0) {
38066+ if (local_read(&hvcsd->open_count) > 0) {
38067 spin_unlock_irqrestore(&hvcsd->lock, flags);
38068 printk(KERN_INFO "HVCS: vterm state unchanged. "
38069 "The hvcs device node is still in use.\n");
38070@@ -1145,7 +1146,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
38071 if ((retval = hvcs_partner_connect(hvcsd)))
38072 goto error_release;
38073
38074- hvcsd->open_count = 1;
38075+ local_set(&hvcsd->open_count, 1);
38076 hvcsd->tty = tty;
38077 tty->driver_data = hvcsd;
38078
38079@@ -1179,7 +1180,7 @@ fast_open:
38080
38081 spin_lock_irqsave(&hvcsd->lock, flags);
38082 kref_get(&hvcsd->kref);
38083- hvcsd->open_count++;
38084+ local_inc(&hvcsd->open_count);
38085 hvcsd->todo_mask |= HVCS_SCHED_READ;
38086 spin_unlock_irqrestore(&hvcsd->lock, flags);
38087
38088@@ -1223,7 +1224,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
38089 hvcsd = tty->driver_data;
38090
38091 spin_lock_irqsave(&hvcsd->lock, flags);
38092- if (--hvcsd->open_count == 0) {
38093+ if (local_dec_and_test(&hvcsd->open_count)) {
38094
38095 vio_disable_interrupts(hvcsd->vdev);
38096
38097@@ -1249,10 +1250,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
38098 free_irq(irq, hvcsd);
38099 kref_put(&hvcsd->kref, destroy_hvcs_struct);
38100 return;
38101- } else if (hvcsd->open_count < 0) {
38102+ } else if (local_read(&hvcsd->open_count) < 0) {
38103 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
38104 " is missmanaged.\n",
38105- hvcsd->vdev->unit_address, hvcsd->open_count);
38106+ hvcsd->vdev->unit_address, local_read(&hvcsd->open_count));
38107 }
38108
38109 spin_unlock_irqrestore(&hvcsd->lock, flags);
38110@@ -1268,7 +1269,7 @@ static void hvcs_hangup(struct tty_struct * tty)
38111
38112 spin_lock_irqsave(&hvcsd->lock, flags);
38113 /* Preserve this so that we know how many kref refs to put */
38114- temp_open_count = hvcsd->open_count;
38115+ temp_open_count = local_read(&hvcsd->open_count);
38116
38117 /*
38118 * Don't kref put inside the spinlock because the destruction
38119@@ -1283,7 +1284,7 @@ static void hvcs_hangup(struct tty_struct * tty)
38120 hvcsd->tty->driver_data = NULL;
38121 hvcsd->tty = NULL;
38122
38123- hvcsd->open_count = 0;
38124+ local_set(&hvcsd->open_count, 0);
38125
38126 /* This will drop any buffered data on the floor which is OK in a hangup
38127 * scenario. */
38128@@ -1354,7 +1355,7 @@ static int hvcs_write(struct tty_struct *tty,
38129 * the middle of a write operation? This is a crummy place to do this
38130 * but we want to keep it all in the spinlock.
38131 */
38132- if (hvcsd->open_count <= 0) {
38133+ if (local_read(&hvcsd->open_count) <= 0) {
38134 spin_unlock_irqrestore(&hvcsd->lock, flags);
38135 return -ENODEV;
38136 }
38137@@ -1428,7 +1429,7 @@ static int hvcs_write_room(struct tty_struct *tty)
38138 {
38139 struct hvcs_struct *hvcsd = tty->driver_data;
38140
38141- if (!hvcsd || hvcsd->open_count <= 0)
38142+ if (!hvcsd || local_read(&hvcsd->open_count) <= 0)
38143 return 0;
38144
38145 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
38146diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
38147index ef92869..f4ebd88 100644
38148--- a/drivers/tty/ipwireless/tty.c
38149+++ b/drivers/tty/ipwireless/tty.c
38150@@ -29,6 +29,7 @@
38151 #include <linux/tty_driver.h>
38152 #include <linux/tty_flip.h>
38153 #include <linux/uaccess.h>
38154+#include <asm/local.h>
38155
38156 #include "tty.h"
38157 #include "network.h"
38158@@ -51,7 +52,7 @@ struct ipw_tty {
38159 int tty_type;
38160 struct ipw_network *network;
38161 struct tty_struct *linux_tty;
38162- int open_count;
38163+ local_t open_count;
38164 unsigned int control_lines;
38165 struct mutex ipw_tty_mutex;
38166 int tx_bytes_queued;
38167@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
38168 mutex_unlock(&tty->ipw_tty_mutex);
38169 return -ENODEV;
38170 }
38171- if (tty->open_count == 0)
38172+ if (local_read(&tty->open_count) == 0)
38173 tty->tx_bytes_queued = 0;
38174
38175- tty->open_count++;
38176+ local_inc(&tty->open_count);
38177
38178 tty->linux_tty = linux_tty;
38179 linux_tty->driver_data = tty;
38180@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
38181
38182 static void do_ipw_close(struct ipw_tty *tty)
38183 {
38184- tty->open_count--;
38185-
38186- if (tty->open_count == 0) {
38187+ if (local_dec_return(&tty->open_count) == 0) {
38188 struct tty_struct *linux_tty = tty->linux_tty;
38189
38190 if (linux_tty != NULL) {
38191@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
38192 return;
38193
38194 mutex_lock(&tty->ipw_tty_mutex);
38195- if (tty->open_count == 0) {
38196+ if (local_read(&tty->open_count) == 0) {
38197 mutex_unlock(&tty->ipw_tty_mutex);
38198 return;
38199 }
38200@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
38201 return;
38202 }
38203
38204- if (!tty->open_count) {
38205+ if (!local_read(&tty->open_count)) {
38206 mutex_unlock(&tty->ipw_tty_mutex);
38207 return;
38208 }
38209@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *linux_tty,
38210 return -ENODEV;
38211
38212 mutex_lock(&tty->ipw_tty_mutex);
38213- if (!tty->open_count) {
38214+ if (!local_read(&tty->open_count)) {
38215 mutex_unlock(&tty->ipw_tty_mutex);
38216 return -EINVAL;
38217 }
38218@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
38219 if (!tty)
38220 return -ENODEV;
38221
38222- if (!tty->open_count)
38223+ if (!local_read(&tty->open_count))
38224 return -EINVAL;
38225
38226 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
38227@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
38228 if (!tty)
38229 return 0;
38230
38231- if (!tty->open_count)
38232+ if (!local_read(&tty->open_count))
38233 return 0;
38234
38235 return tty->tx_bytes_queued;
38236@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
38237 if (!tty)
38238 return -ENODEV;
38239
38240- if (!tty->open_count)
38241+ if (!local_read(&tty->open_count))
38242 return -EINVAL;
38243
38244 return get_control_lines(tty);
38245@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
38246 if (!tty)
38247 return -ENODEV;
38248
38249- if (!tty->open_count)
38250+ if (!local_read(&tty->open_count))
38251 return -EINVAL;
38252
38253 return set_control_lines(tty, set, clear);
38254@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
38255 if (!tty)
38256 return -ENODEV;
38257
38258- if (!tty->open_count)
38259+ if (!local_read(&tty->open_count))
38260 return -EINVAL;
38261
38262 /* FIXME: Exactly how is the tty object locked here .. */
38263@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
38264 against a parallel ioctl etc */
38265 mutex_lock(&ttyj->ipw_tty_mutex);
38266 }
38267- while (ttyj->open_count)
38268+ while (local_read(&ttyj->open_count))
38269 do_ipw_close(ttyj);
38270 ipwireless_disassociate_network_ttys(network,
38271 ttyj->channel_idx);
38272diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
38273index fc7bbba..9527e93 100644
38274--- a/drivers/tty/n_gsm.c
38275+++ b/drivers/tty/n_gsm.c
38276@@ -1629,7 +1629,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
38277 kref_init(&dlci->ref);
38278 mutex_init(&dlci->mutex);
38279 dlci->fifo = &dlci->_fifo;
38280- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
38281+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
38282 kfree(dlci);
38283 return NULL;
38284 }
38285diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
38286index 39d6ab6..eb97f41 100644
38287--- a/drivers/tty/n_tty.c
38288+++ b/drivers/tty/n_tty.c
38289@@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
38290 {
38291 *ops = tty_ldisc_N_TTY;
38292 ops->owner = NULL;
38293- ops->refcount = ops->flags = 0;
38294+ atomic_set(&ops->refcount, 0);
38295+ ops->flags = 0;
38296 }
38297 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
38298diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
38299index e18604b..a7d5a11 100644
38300--- a/drivers/tty/pty.c
38301+++ b/drivers/tty/pty.c
38302@@ -773,8 +773,10 @@ static void __init unix98_pty_init(void)
38303 register_sysctl_table(pty_root_table);
38304
38305 /* Now create the /dev/ptmx special device */
38306+ pax_open_kernel();
38307 tty_default_fops(&ptmx_fops);
38308- ptmx_fops.open = ptmx_open;
38309+ *(void **)&ptmx_fops.open = ptmx_open;
38310+ pax_close_kernel();
38311
38312 cdev_init(&ptmx_cdev, &ptmx_fops);
38313 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
38314diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
38315index 2b42a01..32a2ed3 100644
38316--- a/drivers/tty/serial/kgdboc.c
38317+++ b/drivers/tty/serial/kgdboc.c
38318@@ -24,8 +24,9 @@
38319 #define MAX_CONFIG_LEN 40
38320
38321 static struct kgdb_io kgdboc_io_ops;
38322+static struct kgdb_io kgdboc_io_ops_console;
38323
38324-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
38325+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
38326 static int configured = -1;
38327
38328 static char config[MAX_CONFIG_LEN];
38329@@ -148,6 +149,8 @@ static void cleanup_kgdboc(void)
38330 kgdboc_unregister_kbd();
38331 if (configured == 1)
38332 kgdb_unregister_io_module(&kgdboc_io_ops);
38333+ else if (configured == 2)
38334+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
38335 }
38336
38337 static int configure_kgdboc(void)
38338@@ -157,13 +160,13 @@ static int configure_kgdboc(void)
38339 int err;
38340 char *cptr = config;
38341 struct console *cons;
38342+ int is_console = 0;
38343
38344 err = kgdboc_option_setup(config);
38345 if (err || !strlen(config) || isspace(config[0]))
38346 goto noconfig;
38347
38348 err = -ENODEV;
38349- kgdboc_io_ops.is_console = 0;
38350 kgdb_tty_driver = NULL;
38351
38352 kgdboc_use_kms = 0;
38353@@ -184,7 +187,7 @@ static int configure_kgdboc(void)
38354 int idx;
38355 if (cons->device && cons->device(cons, &idx) == p &&
38356 idx == tty_line) {
38357- kgdboc_io_ops.is_console = 1;
38358+ is_console = 1;
38359 break;
38360 }
38361 cons = cons->next;
38362@@ -194,12 +197,16 @@ static int configure_kgdboc(void)
38363 kgdb_tty_line = tty_line;
38364
38365 do_register:
38366- err = kgdb_register_io_module(&kgdboc_io_ops);
38367+ if (is_console) {
38368+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
38369+ configured = 2;
38370+ } else {
38371+ err = kgdb_register_io_module(&kgdboc_io_ops);
38372+ configured = 1;
38373+ }
38374 if (err)
38375 goto noconfig;
38376
38377- configured = 1;
38378-
38379 return 0;
38380
38381 noconfig:
38382@@ -213,7 +220,7 @@ noconfig:
38383 static int __init init_kgdboc(void)
38384 {
38385 /* Already configured? */
38386- if (configured == 1)
38387+ if (configured >= 1)
38388 return 0;
38389
38390 return configure_kgdboc();
38391@@ -262,7 +269,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
38392 if (config[len - 1] == '\n')
38393 config[len - 1] = '\0';
38394
38395- if (configured == 1)
38396+ if (configured >= 1)
38397 cleanup_kgdboc();
38398
38399 /* Go and configure with the new params. */
38400@@ -302,6 +309,15 @@ static struct kgdb_io kgdboc_io_ops = {
38401 .post_exception = kgdboc_post_exp_handler,
38402 };
38403
38404+static struct kgdb_io kgdboc_io_ops_console = {
38405+ .name = "kgdboc",
38406+ .read_char = kgdboc_get_char,
38407+ .write_char = kgdboc_put_char,
38408+ .pre_exception = kgdboc_pre_exp_handler,
38409+ .post_exception = kgdboc_post_exp_handler,
38410+ .is_console = 1
38411+};
38412+
38413 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
38414 /* This is only available if kgdboc is a built in for early debugging */
38415 static int __init kgdboc_early_init(char *opt)
38416diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
38417index 05085be..67eadb0 100644
38418--- a/drivers/tty/tty_io.c
38419+++ b/drivers/tty/tty_io.c
38420@@ -3240,7 +3240,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
38421
38422 void tty_default_fops(struct file_operations *fops)
38423 {
38424- *fops = tty_fops;
38425+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
38426 }
38427
38428 /*
38429diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
38430index 8e0924f..4204eb4 100644
38431--- a/drivers/tty/tty_ldisc.c
38432+++ b/drivers/tty/tty_ldisc.c
38433@@ -75,7 +75,7 @@ static void put_ldisc(struct tty_ldisc *ld)
38434 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
38435 struct tty_ldisc_ops *ldo = ld->ops;
38436
38437- ldo->refcount--;
38438+ atomic_dec(&ldo->refcount);
38439 module_put(ldo->owner);
38440 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38441
38442@@ -110,7 +110,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
38443 spin_lock_irqsave(&tty_ldisc_lock, flags);
38444 tty_ldiscs[disc] = new_ldisc;
38445 new_ldisc->num = disc;
38446- new_ldisc->refcount = 0;
38447+ atomic_set(&new_ldisc->refcount, 0);
38448 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38449
38450 return ret;
38451@@ -138,7 +138,7 @@ int tty_unregister_ldisc(int disc)
38452 return -EINVAL;
38453
38454 spin_lock_irqsave(&tty_ldisc_lock, flags);
38455- if (tty_ldiscs[disc]->refcount)
38456+ if (atomic_read(&tty_ldiscs[disc]->refcount))
38457 ret = -EBUSY;
38458 else
38459 tty_ldiscs[disc] = NULL;
38460@@ -159,7 +159,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
38461 if (ldops) {
38462 ret = ERR_PTR(-EAGAIN);
38463 if (try_module_get(ldops->owner)) {
38464- ldops->refcount++;
38465+ atomic_inc(&ldops->refcount);
38466 ret = ldops;
38467 }
38468 }
38469@@ -172,7 +172,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
38470 unsigned long flags;
38471
38472 spin_lock_irqsave(&tty_ldisc_lock, flags);
38473- ldops->refcount--;
38474+ atomic_dec(&ldops->refcount);
38475 module_put(ldops->owner);
38476 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38477 }
38478diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
38479index a605549..6bd3c96 100644
38480--- a/drivers/tty/vt/keyboard.c
38481+++ b/drivers/tty/vt/keyboard.c
38482@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
38483 kbd->kbdmode == VC_OFF) &&
38484 value != KVAL(K_SAK))
38485 return; /* SAK is allowed even in raw mode */
38486+
38487+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
38488+ {
38489+ void *func = fn_handler[value];
38490+ if (func == fn_show_state || func == fn_show_ptregs ||
38491+ func == fn_show_mem)
38492+ return;
38493+ }
38494+#endif
38495+
38496 fn_handler[value](vc);
38497 }
38498
38499diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
38500index 65447c5..0526f0a 100644
38501--- a/drivers/tty/vt/vt_ioctl.c
38502+++ b/drivers/tty/vt/vt_ioctl.c
38503@@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
38504 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
38505 return -EFAULT;
38506
38507- if (!capable(CAP_SYS_TTY_CONFIG))
38508- perm = 0;
38509-
38510 switch (cmd) {
38511 case KDGKBENT:
38512 key_map = key_maps[s];
38513@@ -221,6 +218,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
38514 val = (i ? K_HOLE : K_NOSUCHMAP);
38515 return put_user(val, &user_kbe->kb_value);
38516 case KDSKBENT:
38517+ if (!capable(CAP_SYS_TTY_CONFIG))
38518+ perm = 0;
38519+
38520 if (!perm)
38521 return -EPERM;
38522 if (!i && v == K_NOSUCHMAP) {
38523@@ -322,9 +322,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
38524 int i, j, k;
38525 int ret;
38526
38527- if (!capable(CAP_SYS_TTY_CONFIG))
38528- perm = 0;
38529-
38530 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
38531 if (!kbs) {
38532 ret = -ENOMEM;
38533@@ -358,6 +355,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
38534 kfree(kbs);
38535 return ((p && *p) ? -EOVERFLOW : 0);
38536 case KDSKBSENT:
38537+ if (!capable(CAP_SYS_TTY_CONFIG))
38538+ perm = 0;
38539+
38540 if (!perm) {
38541 ret = -EPERM;
38542 goto reterr;
38543diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
38544index a783d53..cb30d94 100644
38545--- a/drivers/uio/uio.c
38546+++ b/drivers/uio/uio.c
38547@@ -25,6 +25,7 @@
38548 #include <linux/kobject.h>
38549 #include <linux/cdev.h>
38550 #include <linux/uio_driver.h>
38551+#include <asm/local.h>
38552
38553 #define UIO_MAX_DEVICES (1U << MINORBITS)
38554
38555@@ -32,10 +33,10 @@ struct uio_device {
38556 struct module *owner;
38557 struct device *dev;
38558 int minor;
38559- atomic_t event;
38560+ atomic_unchecked_t event;
38561 struct fasync_struct *async_queue;
38562 wait_queue_head_t wait;
38563- int vma_count;
38564+ local_t vma_count;
38565 struct uio_info *info;
38566 struct kobject *map_dir;
38567 struct kobject *portio_dir;
38568@@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev,
38569 struct device_attribute *attr, char *buf)
38570 {
38571 struct uio_device *idev = dev_get_drvdata(dev);
38572- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
38573+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
38574 }
38575
38576 static struct device_attribute uio_class_attributes[] = {
38577@@ -408,7 +409,7 @@ void uio_event_notify(struct uio_info *info)
38578 {
38579 struct uio_device *idev = info->uio_dev;
38580
38581- atomic_inc(&idev->event);
38582+ atomic_inc_unchecked(&idev->event);
38583 wake_up_interruptible(&idev->wait);
38584 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
38585 }
38586@@ -461,7 +462,7 @@ static int uio_open(struct inode *inode, struct file *filep)
38587 }
38588
38589 listener->dev = idev;
38590- listener->event_count = atomic_read(&idev->event);
38591+ listener->event_count = atomic_read_unchecked(&idev->event);
38592 filep->private_data = listener;
38593
38594 if (idev->info->open) {
38595@@ -512,7 +513,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
38596 return -EIO;
38597
38598 poll_wait(filep, &idev->wait, wait);
38599- if (listener->event_count != atomic_read(&idev->event))
38600+ if (listener->event_count != atomic_read_unchecked(&idev->event))
38601 return POLLIN | POLLRDNORM;
38602 return 0;
38603 }
38604@@ -537,7 +538,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
38605 do {
38606 set_current_state(TASK_INTERRUPTIBLE);
38607
38608- event_count = atomic_read(&idev->event);
38609+ event_count = atomic_read_unchecked(&idev->event);
38610 if (event_count != listener->event_count) {
38611 if (copy_to_user(buf, &event_count, count))
38612 retval = -EFAULT;
38613@@ -606,13 +607,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
38614 static void uio_vma_open(struct vm_area_struct *vma)
38615 {
38616 struct uio_device *idev = vma->vm_private_data;
38617- idev->vma_count++;
38618+ local_inc(&idev->vma_count);
38619 }
38620
38621 static void uio_vma_close(struct vm_area_struct *vma)
38622 {
38623 struct uio_device *idev = vma->vm_private_data;
38624- idev->vma_count--;
38625+ local_dec(&idev->vma_count);
38626 }
38627
38628 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
38629@@ -821,7 +822,7 @@ int __uio_register_device(struct module *owner,
38630 idev->owner = owner;
38631 idev->info = info;
38632 init_waitqueue_head(&idev->wait);
38633- atomic_set(&idev->event, 0);
38634+ atomic_set_unchecked(&idev->event, 0);
38635
38636 ret = uio_get_minor(idev);
38637 if (ret)
38638diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
38639index a845f8b..4f54072 100644
38640--- a/drivers/usb/atm/cxacru.c
38641+++ b/drivers/usb/atm/cxacru.c
38642@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
38643 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
38644 if (ret < 2)
38645 return -EINVAL;
38646- if (index < 0 || index > 0x7f)
38647+ if (index > 0x7f)
38648 return -EINVAL;
38649 pos += tmp;
38650
38651diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
38652index d3448ca..d2864ca 100644
38653--- a/drivers/usb/atm/usbatm.c
38654+++ b/drivers/usb/atm/usbatm.c
38655@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38656 if (printk_ratelimit())
38657 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
38658 __func__, vpi, vci);
38659- atomic_inc(&vcc->stats->rx_err);
38660+ atomic_inc_unchecked(&vcc->stats->rx_err);
38661 return;
38662 }
38663
38664@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38665 if (length > ATM_MAX_AAL5_PDU) {
38666 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
38667 __func__, length, vcc);
38668- atomic_inc(&vcc->stats->rx_err);
38669+ atomic_inc_unchecked(&vcc->stats->rx_err);
38670 goto out;
38671 }
38672
38673@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38674 if (sarb->len < pdu_length) {
38675 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
38676 __func__, pdu_length, sarb->len, vcc);
38677- atomic_inc(&vcc->stats->rx_err);
38678+ atomic_inc_unchecked(&vcc->stats->rx_err);
38679 goto out;
38680 }
38681
38682 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
38683 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
38684 __func__, vcc);
38685- atomic_inc(&vcc->stats->rx_err);
38686+ atomic_inc_unchecked(&vcc->stats->rx_err);
38687 goto out;
38688 }
38689
38690@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38691 if (printk_ratelimit())
38692 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
38693 __func__, length);
38694- atomic_inc(&vcc->stats->rx_drop);
38695+ atomic_inc_unchecked(&vcc->stats->rx_drop);
38696 goto out;
38697 }
38698
38699@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38700
38701 vcc->push(vcc, skb);
38702
38703- atomic_inc(&vcc->stats->rx);
38704+ atomic_inc_unchecked(&vcc->stats->rx);
38705 out:
38706 skb_trim(sarb, 0);
38707 }
38708@@ -615,7 +615,7 @@ static void usbatm_tx_process(unsigned long data)
38709 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
38710
38711 usbatm_pop(vcc, skb);
38712- atomic_inc(&vcc->stats->tx);
38713+ atomic_inc_unchecked(&vcc->stats->tx);
38714
38715 skb = skb_dequeue(&instance->sndqueue);
38716 }
38717@@ -773,11 +773,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
38718 if (!left--)
38719 return sprintf(page,
38720 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
38721- atomic_read(&atm_dev->stats.aal5.tx),
38722- atomic_read(&atm_dev->stats.aal5.tx_err),
38723- atomic_read(&atm_dev->stats.aal5.rx),
38724- atomic_read(&atm_dev->stats.aal5.rx_err),
38725- atomic_read(&atm_dev->stats.aal5.rx_drop));
38726+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
38727+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
38728+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
38729+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
38730+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
38731
38732 if (!left--) {
38733 if (instance->disconnected)
38734diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
38735index d956965..4179a77 100644
38736--- a/drivers/usb/core/devices.c
38737+++ b/drivers/usb/core/devices.c
38738@@ -126,7 +126,7 @@ static const char format_endpt[] =
38739 * time it gets called.
38740 */
38741 static struct device_connect_event {
38742- atomic_t count;
38743+ atomic_unchecked_t count;
38744 wait_queue_head_t wait;
38745 } device_event = {
38746 .count = ATOMIC_INIT(1),
38747@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
38748
38749 void usbfs_conn_disc_event(void)
38750 {
38751- atomic_add(2, &device_event.count);
38752+ atomic_add_unchecked(2, &device_event.count);
38753 wake_up(&device_event.wait);
38754 }
38755
38756@@ -648,7 +648,7 @@ static unsigned int usb_device_poll(struct file *file,
38757
38758 poll_wait(file, &device_event.wait, wait);
38759
38760- event_count = atomic_read(&device_event.count);
38761+ event_count = atomic_read_unchecked(&device_event.count);
38762 if (file->f_version != event_count) {
38763 file->f_version = event_count;
38764 return POLLIN | POLLRDNORM;
38765diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
38766index 1fc8f12..20647c1 100644
38767--- a/drivers/usb/early/ehci-dbgp.c
38768+++ b/drivers/usb/early/ehci-dbgp.c
38769@@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
38770
38771 #ifdef CONFIG_KGDB
38772 static struct kgdb_io kgdbdbgp_io_ops;
38773-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
38774+static struct kgdb_io kgdbdbgp_io_ops_console;
38775+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
38776 #else
38777 #define dbgp_kgdb_mode (0)
38778 #endif
38779@@ -1035,6 +1036,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
38780 .write_char = kgdbdbgp_write_char,
38781 };
38782
38783+static struct kgdb_io kgdbdbgp_io_ops_console = {
38784+ .name = "kgdbdbgp",
38785+ .read_char = kgdbdbgp_read_char,
38786+ .write_char = kgdbdbgp_write_char,
38787+ .is_console = 1
38788+};
38789+
38790 static int kgdbdbgp_wait_time;
38791
38792 static int __init kgdbdbgp_parse_config(char *str)
38793@@ -1050,8 +1058,10 @@ static int __init kgdbdbgp_parse_config(char *str)
38794 ptr++;
38795 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
38796 }
38797- kgdb_register_io_module(&kgdbdbgp_io_ops);
38798- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
38799+ if (early_dbgp_console.index != -1)
38800+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
38801+ else
38802+ kgdb_register_io_module(&kgdbdbgp_io_ops);
38803
38804 return 0;
38805 }
38806diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
38807index d6bea3e..60b250e 100644
38808--- a/drivers/usb/wusbcore/wa-hc.h
38809+++ b/drivers/usb/wusbcore/wa-hc.h
38810@@ -192,7 +192,7 @@ struct wahc {
38811 struct list_head xfer_delayed_list;
38812 spinlock_t xfer_list_lock;
38813 struct work_struct xfer_work;
38814- atomic_t xfer_id_count;
38815+ atomic_unchecked_t xfer_id_count;
38816 };
38817
38818
38819@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
38820 INIT_LIST_HEAD(&wa->xfer_delayed_list);
38821 spin_lock_init(&wa->xfer_list_lock);
38822 INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
38823- atomic_set(&wa->xfer_id_count, 1);
38824+ atomic_set_unchecked(&wa->xfer_id_count, 1);
38825 }
38826
38827 /**
38828diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
38829index 57c01ab..8a05959 100644
38830--- a/drivers/usb/wusbcore/wa-xfer.c
38831+++ b/drivers/usb/wusbcore/wa-xfer.c
38832@@ -296,7 +296,7 @@ out:
38833 */
38834 static void wa_xfer_id_init(struct wa_xfer *xfer)
38835 {
38836- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
38837+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
38838 }
38839
38840 /*
38841diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
38842index c14c42b..f955cc2 100644
38843--- a/drivers/vhost/vhost.c
38844+++ b/drivers/vhost/vhost.c
38845@@ -629,7 +629,7 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
38846 return 0;
38847 }
38848
38849-static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
38850+static long vhost_set_vring(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
38851 {
38852 struct file *eventfp, *filep = NULL,
38853 *pollstart = NULL, *pollstop = NULL;
38854diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
38855index b0b2ac3..89a4399 100644
38856--- a/drivers/video/aty/aty128fb.c
38857+++ b/drivers/video/aty/aty128fb.c
38858@@ -148,7 +148,7 @@ enum {
38859 };
38860
38861 /* Must match above enum */
38862-static const char *r128_family[] __devinitdata = {
38863+static const char *r128_family[] __devinitconst = {
38864 "AGP",
38865 "PCI",
38866 "PRO AGP",
38867diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
38868index e132157..516db70 100644
38869--- a/drivers/video/backlight/s6e63m0.c
38870+++ b/drivers/video/backlight/s6e63m0.c
38871@@ -690,7 +690,7 @@ static ssize_t s6e63m0_sysfs_store_gamma_mode(struct device *dev,
38872 struct backlight_device *bd = NULL;
38873 int brightness, rc;
38874
38875- rc = strict_strtoul(buf, 0, (unsigned long *)&lcd->gamma_mode);
38876+ rc = kstrtouint(buf, 0, &lcd->gamma_mode);
38877 if (rc < 0)
38878 return rc;
38879
38880diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
38881index 5c3960d..15cf8fc 100644
38882--- a/drivers/video/fbcmap.c
38883+++ b/drivers/video/fbcmap.c
38884@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
38885 rc = -ENODEV;
38886 goto out;
38887 }
38888- if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
38889- !info->fbops->fb_setcmap)) {
38890+ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
38891 rc = -EINVAL;
38892 goto out1;
38893 }
38894diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
38895index ad93629..e020fc3 100644
38896--- a/drivers/video/fbmem.c
38897+++ b/drivers/video/fbmem.c
38898@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
38899 image->dx += image->width + 8;
38900 }
38901 } else if (rotate == FB_ROTATE_UD) {
38902- for (x = 0; x < num && image->dx >= 0; x++) {
38903+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
38904 info->fbops->fb_imageblit(info, image);
38905 image->dx -= image->width + 8;
38906 }
38907@@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
38908 image->dy += image->height + 8;
38909 }
38910 } else if (rotate == FB_ROTATE_CCW) {
38911- for (x = 0; x < num && image->dy >= 0; x++) {
38912+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
38913 info->fbops->fb_imageblit(info, image);
38914 image->dy -= image->height + 8;
38915 }
38916@@ -1143,7 +1143,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
38917 return -EFAULT;
38918 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
38919 return -EINVAL;
38920- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
38921+ if (con2fb.framebuffer >= FB_MAX)
38922 return -EINVAL;
38923 if (!registered_fb[con2fb.framebuffer])
38924 request_module("fb%d", con2fb.framebuffer);
38925diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
38926index 5a5d092..265c5ed 100644
38927--- a/drivers/video/geode/gx1fb_core.c
38928+++ b/drivers/video/geode/gx1fb_core.c
38929@@ -29,7 +29,7 @@ static int crt_option = 1;
38930 static char panel_option[32] = "";
38931
38932 /* Modes relevant to the GX1 (taken from modedb.c) */
38933-static const struct fb_videomode __devinitdata gx1_modedb[] = {
38934+static const struct fb_videomode __devinitconst gx1_modedb[] = {
38935 /* 640x480-60 VESA */
38936 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
38937 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
38938diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
38939index 0fad23f..0e9afa4 100644
38940--- a/drivers/video/gxt4500.c
38941+++ b/drivers/video/gxt4500.c
38942@@ -156,7 +156,7 @@ struct gxt4500_par {
38943 static char *mode_option;
38944
38945 /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
38946-static const struct fb_videomode defaultmode __devinitdata = {
38947+static const struct fb_videomode defaultmode __devinitconst = {
38948 .refresh = 60,
38949 .xres = 1280,
38950 .yres = 1024,
38951@@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
38952 return 0;
38953 }
38954
38955-static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
38956+static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
38957 .id = "IBM GXT4500P",
38958 .type = FB_TYPE_PACKED_PIXELS,
38959 .visual = FB_VISUAL_PSEUDOCOLOR,
38960diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
38961index 7672d2e..b56437f 100644
38962--- a/drivers/video/i810/i810_accel.c
38963+++ b/drivers/video/i810/i810_accel.c
38964@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
38965 }
38966 }
38967 printk("ringbuffer lockup!!!\n");
38968+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
38969 i810_report_error(mmio);
38970 par->dev_flags |= LOCKUP;
38971 info->pixmap.scan_align = 1;
38972diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
38973index 318f6fb..9a389c1 100644
38974--- a/drivers/video/i810/i810_main.c
38975+++ b/drivers/video/i810/i810_main.c
38976@@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
38977 static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
38978
38979 /* PCI */
38980-static const char *i810_pci_list[] __devinitdata = {
38981+static const char *i810_pci_list[] __devinitconst = {
38982 "Intel(R) 810 Framebuffer Device" ,
38983 "Intel(R) 810-DC100 Framebuffer Device" ,
38984 "Intel(R) 810E Framebuffer Device" ,
38985diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
38986index de36693..3c63fc2 100644
38987--- a/drivers/video/jz4740_fb.c
38988+++ b/drivers/video/jz4740_fb.c
38989@@ -136,7 +136,7 @@ struct jzfb {
38990 uint32_t pseudo_palette[16];
38991 };
38992
38993-static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
38994+static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
38995 .id = "JZ4740 FB",
38996 .type = FB_TYPE_PACKED_PIXELS,
38997 .visual = FB_VISUAL_TRUECOLOR,
38998diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
38999index 3c14e43..eafa544 100644
39000--- a/drivers/video/logo/logo_linux_clut224.ppm
39001+++ b/drivers/video/logo/logo_linux_clut224.ppm
39002@@ -1,1604 +1,1123 @@
39003 P3
39004-# Standard 224-color Linux logo
39005 80 80
39006 255
39007- 0 0 0 0 0 0 0 0 0 0 0 0
39008- 0 0 0 0 0 0 0 0 0 0 0 0
39009- 0 0 0 0 0 0 0 0 0 0 0 0
39010- 0 0 0 0 0 0 0 0 0 0 0 0
39011- 0 0 0 0 0 0 0 0 0 0 0 0
39012- 0 0 0 0 0 0 0 0 0 0 0 0
39013- 0 0 0 0 0 0 0 0 0 0 0 0
39014- 0 0 0 0 0 0 0 0 0 0 0 0
39015- 0 0 0 0 0 0 0 0 0 0 0 0
39016- 6 6 6 6 6 6 10 10 10 10 10 10
39017- 10 10 10 6 6 6 6 6 6 6 6 6
39018- 0 0 0 0 0 0 0 0 0 0 0 0
39019- 0 0 0 0 0 0 0 0 0 0 0 0
39020- 0 0 0 0 0 0 0 0 0 0 0 0
39021- 0 0 0 0 0 0 0 0 0 0 0 0
39022- 0 0 0 0 0 0 0 0 0 0 0 0
39023- 0 0 0 0 0 0 0 0 0 0 0 0
39024- 0 0 0 0 0 0 0 0 0 0 0 0
39025- 0 0 0 0 0 0 0 0 0 0 0 0
39026- 0 0 0 0 0 0 0 0 0 0 0 0
39027- 0 0 0 0 0 0 0 0 0 0 0 0
39028- 0 0 0 0 0 0 0 0 0 0 0 0
39029- 0 0 0 0 0 0 0 0 0 0 0 0
39030- 0 0 0 0 0 0 0 0 0 0 0 0
39031- 0 0 0 0 0 0 0 0 0 0 0 0
39032- 0 0 0 0 0 0 0 0 0 0 0 0
39033- 0 0 0 0 0 0 0 0 0 0 0 0
39034- 0 0 0 0 0 0 0 0 0 0 0 0
39035- 0 0 0 6 6 6 10 10 10 14 14 14
39036- 22 22 22 26 26 26 30 30 30 34 34 34
39037- 30 30 30 30 30 30 26 26 26 18 18 18
39038- 14 14 14 10 10 10 6 6 6 0 0 0
39039- 0 0 0 0 0 0 0 0 0 0 0 0
39040- 0 0 0 0 0 0 0 0 0 0 0 0
39041- 0 0 0 0 0 0 0 0 0 0 0 0
39042- 0 0 0 0 0 0 0 0 0 0 0 0
39043- 0 0 0 0 0 0 0 0 0 0 0 0
39044- 0 0 0 0 0 0 0 0 0 0 0 0
39045- 0 0 0 0 0 0 0 0 0 0 0 0
39046- 0 0 0 0 0 0 0 0 0 0 0 0
39047- 0 0 0 0 0 0 0 0 0 0 0 0
39048- 0 0 0 0 0 1 0 0 1 0 0 0
39049- 0 0 0 0 0 0 0 0 0 0 0 0
39050- 0 0 0 0 0 0 0 0 0 0 0 0
39051- 0 0 0 0 0 0 0 0 0 0 0 0
39052- 0 0 0 0 0 0 0 0 0 0 0 0
39053- 0 0 0 0 0 0 0 0 0 0 0 0
39054- 0 0 0 0 0 0 0 0 0 0 0 0
39055- 6 6 6 14 14 14 26 26 26 42 42 42
39056- 54 54 54 66 66 66 78 78 78 78 78 78
39057- 78 78 78 74 74 74 66 66 66 54 54 54
39058- 42 42 42 26 26 26 18 18 18 10 10 10
39059- 6 6 6 0 0 0 0 0 0 0 0 0
39060- 0 0 0 0 0 0 0 0 0 0 0 0
39061- 0 0 0 0 0 0 0 0 0 0 0 0
39062- 0 0 0 0 0 0 0 0 0 0 0 0
39063- 0 0 0 0 0 0 0 0 0 0 0 0
39064- 0 0 0 0 0 0 0 0 0 0 0 0
39065- 0 0 0 0 0 0 0 0 0 0 0 0
39066- 0 0 0 0 0 0 0 0 0 0 0 0
39067- 0 0 0 0 0 0 0 0 0 0 0 0
39068- 0 0 1 0 0 0 0 0 0 0 0 0
39069- 0 0 0 0 0 0 0 0 0 0 0 0
39070- 0 0 0 0 0 0 0 0 0 0 0 0
39071- 0 0 0 0 0 0 0 0 0 0 0 0
39072- 0 0 0 0 0 0 0 0 0 0 0 0
39073- 0 0 0 0 0 0 0 0 0 0 0 0
39074- 0 0 0 0 0 0 0 0 0 10 10 10
39075- 22 22 22 42 42 42 66 66 66 86 86 86
39076- 66 66 66 38 38 38 38 38 38 22 22 22
39077- 26 26 26 34 34 34 54 54 54 66 66 66
39078- 86 86 86 70 70 70 46 46 46 26 26 26
39079- 14 14 14 6 6 6 0 0 0 0 0 0
39080- 0 0 0 0 0 0 0 0 0 0 0 0
39081- 0 0 0 0 0 0 0 0 0 0 0 0
39082- 0 0 0 0 0 0 0 0 0 0 0 0
39083- 0 0 0 0 0 0 0 0 0 0 0 0
39084- 0 0 0 0 0 0 0 0 0 0 0 0
39085- 0 0 0 0 0 0 0 0 0 0 0 0
39086- 0 0 0 0 0 0 0 0 0 0 0 0
39087- 0 0 0 0 0 0 0 0 0 0 0 0
39088- 0 0 1 0 0 1 0 0 1 0 0 0
39089- 0 0 0 0 0 0 0 0 0 0 0 0
39090- 0 0 0 0 0 0 0 0 0 0 0 0
39091- 0 0 0 0 0 0 0 0 0 0 0 0
39092- 0 0 0 0 0 0 0 0 0 0 0 0
39093- 0 0 0 0 0 0 0 0 0 0 0 0
39094- 0 0 0 0 0 0 10 10 10 26 26 26
39095- 50 50 50 82 82 82 58 58 58 6 6 6
39096- 2 2 6 2 2 6 2 2 6 2 2 6
39097- 2 2 6 2 2 6 2 2 6 2 2 6
39098- 6 6 6 54 54 54 86 86 86 66 66 66
39099- 38 38 38 18 18 18 6 6 6 0 0 0
39100- 0 0 0 0 0 0 0 0 0 0 0 0
39101- 0 0 0 0 0 0 0 0 0 0 0 0
39102- 0 0 0 0 0 0 0 0 0 0 0 0
39103- 0 0 0 0 0 0 0 0 0 0 0 0
39104- 0 0 0 0 0 0 0 0 0 0 0 0
39105- 0 0 0 0 0 0 0 0 0 0 0 0
39106- 0 0 0 0 0 0 0 0 0 0 0 0
39107- 0 0 0 0 0 0 0 0 0 0 0 0
39108- 0 0 0 0 0 0 0 0 0 0 0 0
39109- 0 0 0 0 0 0 0 0 0 0 0 0
39110- 0 0 0 0 0 0 0 0 0 0 0 0
39111- 0 0 0 0 0 0 0 0 0 0 0 0
39112- 0 0 0 0 0 0 0 0 0 0 0 0
39113- 0 0 0 0 0 0 0 0 0 0 0 0
39114- 0 0 0 6 6 6 22 22 22 50 50 50
39115- 78 78 78 34 34 34 2 2 6 2 2 6
39116- 2 2 6 2 2 6 2 2 6 2 2 6
39117- 2 2 6 2 2 6 2 2 6 2 2 6
39118- 2 2 6 2 2 6 6 6 6 70 70 70
39119- 78 78 78 46 46 46 22 22 22 6 6 6
39120- 0 0 0 0 0 0 0 0 0 0 0 0
39121- 0 0 0 0 0 0 0 0 0 0 0 0
39122- 0 0 0 0 0 0 0 0 0 0 0 0
39123- 0 0 0 0 0 0 0 0 0 0 0 0
39124- 0 0 0 0 0 0 0 0 0 0 0 0
39125- 0 0 0 0 0 0 0 0 0 0 0 0
39126- 0 0 0 0 0 0 0 0 0 0 0 0
39127- 0 0 0 0 0 0 0 0 0 0 0 0
39128- 0 0 1 0 0 1 0 0 1 0 0 0
39129- 0 0 0 0 0 0 0 0 0 0 0 0
39130- 0 0 0 0 0 0 0 0 0 0 0 0
39131- 0 0 0 0 0 0 0 0 0 0 0 0
39132- 0 0 0 0 0 0 0 0 0 0 0 0
39133- 0 0 0 0 0 0 0 0 0 0 0 0
39134- 6 6 6 18 18 18 42 42 42 82 82 82
39135- 26 26 26 2 2 6 2 2 6 2 2 6
39136- 2 2 6 2 2 6 2 2 6 2 2 6
39137- 2 2 6 2 2 6 2 2 6 14 14 14
39138- 46 46 46 34 34 34 6 6 6 2 2 6
39139- 42 42 42 78 78 78 42 42 42 18 18 18
39140- 6 6 6 0 0 0 0 0 0 0 0 0
39141- 0 0 0 0 0 0 0 0 0 0 0 0
39142- 0 0 0 0 0 0 0 0 0 0 0 0
39143- 0 0 0 0 0 0 0 0 0 0 0 0
39144- 0 0 0 0 0 0 0 0 0 0 0 0
39145- 0 0 0 0 0 0 0 0 0 0 0 0
39146- 0 0 0 0 0 0 0 0 0 0 0 0
39147- 0 0 0 0 0 0 0 0 0 0 0 0
39148- 0 0 1 0 0 0 0 0 1 0 0 0
39149- 0 0 0 0 0 0 0 0 0 0 0 0
39150- 0 0 0 0 0 0 0 0 0 0 0 0
39151- 0 0 0 0 0 0 0 0 0 0 0 0
39152- 0 0 0 0 0 0 0 0 0 0 0 0
39153- 0 0 0 0 0 0 0 0 0 0 0 0
39154- 10 10 10 30 30 30 66 66 66 58 58 58
39155- 2 2 6 2 2 6 2 2 6 2 2 6
39156- 2 2 6 2 2 6 2 2 6 2 2 6
39157- 2 2 6 2 2 6 2 2 6 26 26 26
39158- 86 86 86 101 101 101 46 46 46 10 10 10
39159- 2 2 6 58 58 58 70 70 70 34 34 34
39160- 10 10 10 0 0 0 0 0 0 0 0 0
39161- 0 0 0 0 0 0 0 0 0 0 0 0
39162- 0 0 0 0 0 0 0 0 0 0 0 0
39163- 0 0 0 0 0 0 0 0 0 0 0 0
39164- 0 0 0 0 0 0 0 0 0 0 0 0
39165- 0 0 0 0 0 0 0 0 0 0 0 0
39166- 0 0 0 0 0 0 0 0 0 0 0 0
39167- 0 0 0 0 0 0 0 0 0 0 0 0
39168- 0 0 1 0 0 1 0 0 1 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- 14 14 14 42 42 42 86 86 86 10 10 10
39175- 2 2 6 2 2 6 2 2 6 2 2 6
39176- 2 2 6 2 2 6 2 2 6 2 2 6
39177- 2 2 6 2 2 6 2 2 6 30 30 30
39178- 94 94 94 94 94 94 58 58 58 26 26 26
39179- 2 2 6 6 6 6 78 78 78 54 54 54
39180- 22 22 22 6 6 6 0 0 0 0 0 0
39181- 0 0 0 0 0 0 0 0 0 0 0 0
39182- 0 0 0 0 0 0 0 0 0 0 0 0
39183- 0 0 0 0 0 0 0 0 0 0 0 0
39184- 0 0 0 0 0 0 0 0 0 0 0 0
39185- 0 0 0 0 0 0 0 0 0 0 0 0
39186- 0 0 0 0 0 0 0 0 0 0 0 0
39187- 0 0 0 0 0 0 0 0 0 0 0 0
39188- 0 0 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 0 0 0 0 0 0 0
39193- 0 0 0 0 0 0 0 0 0 6 6 6
39194- 22 22 22 62 62 62 62 62 62 2 2 6
39195- 2 2 6 2 2 6 2 2 6 2 2 6
39196- 2 2 6 2 2 6 2 2 6 2 2 6
39197- 2 2 6 2 2 6 2 2 6 26 26 26
39198- 54 54 54 38 38 38 18 18 18 10 10 10
39199- 2 2 6 2 2 6 34 34 34 82 82 82
39200- 38 38 38 14 14 14 0 0 0 0 0 0
39201- 0 0 0 0 0 0 0 0 0 0 0 0
39202- 0 0 0 0 0 0 0 0 0 0 0 0
39203- 0 0 0 0 0 0 0 0 0 0 0 0
39204- 0 0 0 0 0 0 0 0 0 0 0 0
39205- 0 0 0 0 0 0 0 0 0 0 0 0
39206- 0 0 0 0 0 0 0 0 0 0 0 0
39207- 0 0 0 0 0 0 0 0 0 0 0 0
39208- 0 0 0 0 0 1 0 0 1 0 0 0
39209- 0 0 0 0 0 0 0 0 0 0 0 0
39210- 0 0 0 0 0 0 0 0 0 0 0 0
39211- 0 0 0 0 0 0 0 0 0 0 0 0
39212- 0 0 0 0 0 0 0 0 0 0 0 0
39213- 0 0 0 0 0 0 0 0 0 6 6 6
39214- 30 30 30 78 78 78 30 30 30 2 2 6
39215- 2 2 6 2 2 6 2 2 6 2 2 6
39216- 2 2 6 2 2 6 2 2 6 2 2 6
39217- 2 2 6 2 2 6 2 2 6 10 10 10
39218- 10 10 10 2 2 6 2 2 6 2 2 6
39219- 2 2 6 2 2 6 2 2 6 78 78 78
39220- 50 50 50 18 18 18 6 6 6 0 0 0
39221- 0 0 0 0 0 0 0 0 0 0 0 0
39222- 0 0 0 0 0 0 0 0 0 0 0 0
39223- 0 0 0 0 0 0 0 0 0 0 0 0
39224- 0 0 0 0 0 0 0 0 0 0 0 0
39225- 0 0 0 0 0 0 0 0 0 0 0 0
39226- 0 0 0 0 0 0 0 0 0 0 0 0
39227- 0 0 0 0 0 0 0 0 0 0 0 0
39228- 0 0 1 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 0 0 0 0 0 0 0 0 0 0
39233- 0 0 0 0 0 0 0 0 0 10 10 10
39234- 38 38 38 86 86 86 14 14 14 2 2 6
39235- 2 2 6 2 2 6 2 2 6 2 2 6
39236- 2 2 6 2 2 6 2 2 6 2 2 6
39237- 2 2 6 2 2 6 2 2 6 2 2 6
39238- 2 2 6 2 2 6 2 2 6 2 2 6
39239- 2 2 6 2 2 6 2 2 6 54 54 54
39240- 66 66 66 26 26 26 6 6 6 0 0 0
39241- 0 0 0 0 0 0 0 0 0 0 0 0
39242- 0 0 0 0 0 0 0 0 0 0 0 0
39243- 0 0 0 0 0 0 0 0 0 0 0 0
39244- 0 0 0 0 0 0 0 0 0 0 0 0
39245- 0 0 0 0 0 0 0 0 0 0 0 0
39246- 0 0 0 0 0 0 0 0 0 0 0 0
39247- 0 0 0 0 0 0 0 0 0 0 0 0
39248- 0 0 0 0 0 1 0 0 1 0 0 0
39249- 0 0 0 0 0 0 0 0 0 0 0 0
39250- 0 0 0 0 0 0 0 0 0 0 0 0
39251- 0 0 0 0 0 0 0 0 0 0 0 0
39252- 0 0 0 0 0 0 0 0 0 0 0 0
39253- 0 0 0 0 0 0 0 0 0 14 14 14
39254- 42 42 42 82 82 82 2 2 6 2 2 6
39255- 2 2 6 6 6 6 10 10 10 2 2 6
39256- 2 2 6 2 2 6 2 2 6 2 2 6
39257- 2 2 6 2 2 6 2 2 6 6 6 6
39258- 14 14 14 10 10 10 2 2 6 2 2 6
39259- 2 2 6 2 2 6 2 2 6 18 18 18
39260- 82 82 82 34 34 34 10 10 10 0 0 0
39261- 0 0 0 0 0 0 0 0 0 0 0 0
39262- 0 0 0 0 0 0 0 0 0 0 0 0
39263- 0 0 0 0 0 0 0 0 0 0 0 0
39264- 0 0 0 0 0 0 0 0 0 0 0 0
39265- 0 0 0 0 0 0 0 0 0 0 0 0
39266- 0 0 0 0 0 0 0 0 0 0 0 0
39267- 0 0 0 0 0 0 0 0 0 0 0 0
39268- 0 0 1 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 0 0 0 0 0 0 0 0 0 0
39273- 0 0 0 0 0 0 0 0 0 14 14 14
39274- 46 46 46 86 86 86 2 2 6 2 2 6
39275- 6 6 6 6 6 6 22 22 22 34 34 34
39276- 6 6 6 2 2 6 2 2 6 2 2 6
39277- 2 2 6 2 2 6 18 18 18 34 34 34
39278- 10 10 10 50 50 50 22 22 22 2 2 6
39279- 2 2 6 2 2 6 2 2 6 10 10 10
39280- 86 86 86 42 42 42 14 14 14 0 0 0
39281- 0 0 0 0 0 0 0 0 0 0 0 0
39282- 0 0 0 0 0 0 0 0 0 0 0 0
39283- 0 0 0 0 0 0 0 0 0 0 0 0
39284- 0 0 0 0 0 0 0 0 0 0 0 0
39285- 0 0 0 0 0 0 0 0 0 0 0 0
39286- 0 0 0 0 0 0 0 0 0 0 0 0
39287- 0 0 0 0 0 0 0 0 0 0 0 0
39288- 0 0 1 0 0 1 0 0 1 0 0 0
39289- 0 0 0 0 0 0 0 0 0 0 0 0
39290- 0 0 0 0 0 0 0 0 0 0 0 0
39291- 0 0 0 0 0 0 0 0 0 0 0 0
39292- 0 0 0 0 0 0 0 0 0 0 0 0
39293- 0 0 0 0 0 0 0 0 0 14 14 14
39294- 46 46 46 86 86 86 2 2 6 2 2 6
39295- 38 38 38 116 116 116 94 94 94 22 22 22
39296- 22 22 22 2 2 6 2 2 6 2 2 6
39297- 14 14 14 86 86 86 138 138 138 162 162 162
39298-154 154 154 38 38 38 26 26 26 6 6 6
39299- 2 2 6 2 2 6 2 2 6 2 2 6
39300- 86 86 86 46 46 46 14 14 14 0 0 0
39301- 0 0 0 0 0 0 0 0 0 0 0 0
39302- 0 0 0 0 0 0 0 0 0 0 0 0
39303- 0 0 0 0 0 0 0 0 0 0 0 0
39304- 0 0 0 0 0 0 0 0 0 0 0 0
39305- 0 0 0 0 0 0 0 0 0 0 0 0
39306- 0 0 0 0 0 0 0 0 0 0 0 0
39307- 0 0 0 0 0 0 0 0 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 0 0 0 0 0 0 0 0 0 0
39313- 0 0 0 0 0 0 0 0 0 14 14 14
39314- 46 46 46 86 86 86 2 2 6 14 14 14
39315-134 134 134 198 198 198 195 195 195 116 116 116
39316- 10 10 10 2 2 6 2 2 6 6 6 6
39317-101 98 89 187 187 187 210 210 210 218 218 218
39318-214 214 214 134 134 134 14 14 14 6 6 6
39319- 2 2 6 2 2 6 2 2 6 2 2 6
39320- 86 86 86 50 50 50 18 18 18 6 6 6
39321- 0 0 0 0 0 0 0 0 0 0 0 0
39322- 0 0 0 0 0 0 0 0 0 0 0 0
39323- 0 0 0 0 0 0 0 0 0 0 0 0
39324- 0 0 0 0 0 0 0 0 0 0 0 0
39325- 0 0 0 0 0 0 0 0 0 0 0 0
39326- 0 0 0 0 0 0 0 0 0 0 0 0
39327- 0 0 0 0 0 0 0 0 1 0 0 0
39328- 0 0 1 0 0 1 0 0 1 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 14 14 14
39334- 46 46 46 86 86 86 2 2 6 54 54 54
39335-218 218 218 195 195 195 226 226 226 246 246 246
39336- 58 58 58 2 2 6 2 2 6 30 30 30
39337-210 210 210 253 253 253 174 174 174 123 123 123
39338-221 221 221 234 234 234 74 74 74 2 2 6
39339- 2 2 6 2 2 6 2 2 6 2 2 6
39340- 70 70 70 58 58 58 22 22 22 6 6 6
39341- 0 0 0 0 0 0 0 0 0 0 0 0
39342- 0 0 0 0 0 0 0 0 0 0 0 0
39343- 0 0 0 0 0 0 0 0 0 0 0 0
39344- 0 0 0 0 0 0 0 0 0 0 0 0
39345- 0 0 0 0 0 0 0 0 0 0 0 0
39346- 0 0 0 0 0 0 0 0 0 0 0 0
39347- 0 0 0 0 0 0 0 0 0 0 0 0
39348- 0 0 0 0 0 0 0 0 0 0 0 0
39349- 0 0 0 0 0 0 0 0 0 0 0 0
39350- 0 0 0 0 0 0 0 0 0 0 0 0
39351- 0 0 0 0 0 0 0 0 0 0 0 0
39352- 0 0 0 0 0 0 0 0 0 0 0 0
39353- 0 0 0 0 0 0 0 0 0 14 14 14
39354- 46 46 46 82 82 82 2 2 6 106 106 106
39355-170 170 170 26 26 26 86 86 86 226 226 226
39356-123 123 123 10 10 10 14 14 14 46 46 46
39357-231 231 231 190 190 190 6 6 6 70 70 70
39358- 90 90 90 238 238 238 158 158 158 2 2 6
39359- 2 2 6 2 2 6 2 2 6 2 2 6
39360- 70 70 70 58 58 58 22 22 22 6 6 6
39361- 0 0 0 0 0 0 0 0 0 0 0 0
39362- 0 0 0 0 0 0 0 0 0 0 0 0
39363- 0 0 0 0 0 0 0 0 0 0 0 0
39364- 0 0 0 0 0 0 0 0 0 0 0 0
39365- 0 0 0 0 0 0 0 0 0 0 0 0
39366- 0 0 0 0 0 0 0 0 0 0 0 0
39367- 0 0 0 0 0 0 0 0 1 0 0 0
39368- 0 0 1 0 0 1 0 0 1 0 0 0
39369- 0 0 0 0 0 0 0 0 0 0 0 0
39370- 0 0 0 0 0 0 0 0 0 0 0 0
39371- 0 0 0 0 0 0 0 0 0 0 0 0
39372- 0 0 0 0 0 0 0 0 0 0 0 0
39373- 0 0 0 0 0 0 0 0 0 14 14 14
39374- 42 42 42 86 86 86 6 6 6 116 116 116
39375-106 106 106 6 6 6 70 70 70 149 149 149
39376-128 128 128 18 18 18 38 38 38 54 54 54
39377-221 221 221 106 106 106 2 2 6 14 14 14
39378- 46 46 46 190 190 190 198 198 198 2 2 6
39379- 2 2 6 2 2 6 2 2 6 2 2 6
39380- 74 74 74 62 62 62 22 22 22 6 6 6
39381- 0 0 0 0 0 0 0 0 0 0 0 0
39382- 0 0 0 0 0 0 0 0 0 0 0 0
39383- 0 0 0 0 0 0 0 0 0 0 0 0
39384- 0 0 0 0 0 0 0 0 0 0 0 0
39385- 0 0 0 0 0 0 0 0 0 0 0 0
39386- 0 0 0 0 0 0 0 0 0 0 0 0
39387- 0 0 0 0 0 0 0 0 1 0 0 0
39388- 0 0 1 0 0 0 0 0 1 0 0 0
39389- 0 0 0 0 0 0 0 0 0 0 0 0
39390- 0 0 0 0 0 0 0 0 0 0 0 0
39391- 0 0 0 0 0 0 0 0 0 0 0 0
39392- 0 0 0 0 0 0 0 0 0 0 0 0
39393- 0 0 0 0 0 0 0 0 0 14 14 14
39394- 42 42 42 94 94 94 14 14 14 101 101 101
39395-128 128 128 2 2 6 18 18 18 116 116 116
39396-118 98 46 121 92 8 121 92 8 98 78 10
39397-162 162 162 106 106 106 2 2 6 2 2 6
39398- 2 2 6 195 195 195 195 195 195 6 6 6
39399- 2 2 6 2 2 6 2 2 6 2 2 6
39400- 74 74 74 62 62 62 22 22 22 6 6 6
39401- 0 0 0 0 0 0 0 0 0 0 0 0
39402- 0 0 0 0 0 0 0 0 0 0 0 0
39403- 0 0 0 0 0 0 0 0 0 0 0 0
39404- 0 0 0 0 0 0 0 0 0 0 0 0
39405- 0 0 0 0 0 0 0 0 0 0 0 0
39406- 0 0 0 0 0 0 0 0 0 0 0 0
39407- 0 0 0 0 0 0 0 0 1 0 0 1
39408- 0 0 1 0 0 0 0 0 1 0 0 0
39409- 0 0 0 0 0 0 0 0 0 0 0 0
39410- 0 0 0 0 0 0 0 0 0 0 0 0
39411- 0 0 0 0 0 0 0 0 0 0 0 0
39412- 0 0 0 0 0 0 0 0 0 0 0 0
39413- 0 0 0 0 0 0 0 0 0 10 10 10
39414- 38 38 38 90 90 90 14 14 14 58 58 58
39415-210 210 210 26 26 26 54 38 6 154 114 10
39416-226 170 11 236 186 11 225 175 15 184 144 12
39417-215 174 15 175 146 61 37 26 9 2 2 6
39418- 70 70 70 246 246 246 138 138 138 2 2 6
39419- 2 2 6 2 2 6 2 2 6 2 2 6
39420- 70 70 70 66 66 66 26 26 26 6 6 6
39421- 0 0 0 0 0 0 0 0 0 0 0 0
39422- 0 0 0 0 0 0 0 0 0 0 0 0
39423- 0 0 0 0 0 0 0 0 0 0 0 0
39424- 0 0 0 0 0 0 0 0 0 0 0 0
39425- 0 0 0 0 0 0 0 0 0 0 0 0
39426- 0 0 0 0 0 0 0 0 0 0 0 0
39427- 0 0 0 0 0 0 0 0 0 0 0 0
39428- 0 0 0 0 0 0 0 0 0 0 0 0
39429- 0 0 0 0 0 0 0 0 0 0 0 0
39430- 0 0 0 0 0 0 0 0 0 0 0 0
39431- 0 0 0 0 0 0 0 0 0 0 0 0
39432- 0 0 0 0 0 0 0 0 0 0 0 0
39433- 0 0 0 0 0 0 0 0 0 10 10 10
39434- 38 38 38 86 86 86 14 14 14 10 10 10
39435-195 195 195 188 164 115 192 133 9 225 175 15
39436-239 182 13 234 190 10 232 195 16 232 200 30
39437-245 207 45 241 208 19 232 195 16 184 144 12
39438-218 194 134 211 206 186 42 42 42 2 2 6
39439- 2 2 6 2 2 6 2 2 6 2 2 6
39440- 50 50 50 74 74 74 30 30 30 6 6 6
39441- 0 0 0 0 0 0 0 0 0 0 0 0
39442- 0 0 0 0 0 0 0 0 0 0 0 0
39443- 0 0 0 0 0 0 0 0 0 0 0 0
39444- 0 0 0 0 0 0 0 0 0 0 0 0
39445- 0 0 0 0 0 0 0 0 0 0 0 0
39446- 0 0 0 0 0 0 0 0 0 0 0 0
39447- 0 0 0 0 0 0 0 0 0 0 0 0
39448- 0 0 0 0 0 0 0 0 0 0 0 0
39449- 0 0 0 0 0 0 0 0 0 0 0 0
39450- 0 0 0 0 0 0 0 0 0 0 0 0
39451- 0 0 0 0 0 0 0 0 0 0 0 0
39452- 0 0 0 0 0 0 0 0 0 0 0 0
39453- 0 0 0 0 0 0 0 0 0 10 10 10
39454- 34 34 34 86 86 86 14 14 14 2 2 6
39455-121 87 25 192 133 9 219 162 10 239 182 13
39456-236 186 11 232 195 16 241 208 19 244 214 54
39457-246 218 60 246 218 38 246 215 20 241 208 19
39458-241 208 19 226 184 13 121 87 25 2 2 6
39459- 2 2 6 2 2 6 2 2 6 2 2 6
39460- 50 50 50 82 82 82 34 34 34 10 10 10
39461- 0 0 0 0 0 0 0 0 0 0 0 0
39462- 0 0 0 0 0 0 0 0 0 0 0 0
39463- 0 0 0 0 0 0 0 0 0 0 0 0
39464- 0 0 0 0 0 0 0 0 0 0 0 0
39465- 0 0 0 0 0 0 0 0 0 0 0 0
39466- 0 0 0 0 0 0 0 0 0 0 0 0
39467- 0 0 0 0 0 0 0 0 0 0 0 0
39468- 0 0 0 0 0 0 0 0 0 0 0 0
39469- 0 0 0 0 0 0 0 0 0 0 0 0
39470- 0 0 0 0 0 0 0 0 0 0 0 0
39471- 0 0 0 0 0 0 0 0 0 0 0 0
39472- 0 0 0 0 0 0 0 0 0 0 0 0
39473- 0 0 0 0 0 0 0 0 0 10 10 10
39474- 34 34 34 82 82 82 30 30 30 61 42 6
39475-180 123 7 206 145 10 230 174 11 239 182 13
39476-234 190 10 238 202 15 241 208 19 246 218 74
39477-246 218 38 246 215 20 246 215 20 246 215 20
39478-226 184 13 215 174 15 184 144 12 6 6 6
39479- 2 2 6 2 2 6 2 2 6 2 2 6
39480- 26 26 26 94 94 94 42 42 42 14 14 14
39481- 0 0 0 0 0 0 0 0 0 0 0 0
39482- 0 0 0 0 0 0 0 0 0 0 0 0
39483- 0 0 0 0 0 0 0 0 0 0 0 0
39484- 0 0 0 0 0 0 0 0 0 0 0 0
39485- 0 0 0 0 0 0 0 0 0 0 0 0
39486- 0 0 0 0 0 0 0 0 0 0 0 0
39487- 0 0 0 0 0 0 0 0 0 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 10 10 10
39494- 30 30 30 78 78 78 50 50 50 104 69 6
39495-192 133 9 216 158 10 236 178 12 236 186 11
39496-232 195 16 241 208 19 244 214 54 245 215 43
39497-246 215 20 246 215 20 241 208 19 198 155 10
39498-200 144 11 216 158 10 156 118 10 2 2 6
39499- 2 2 6 2 2 6 2 2 6 2 2 6
39500- 6 6 6 90 90 90 54 54 54 18 18 18
39501- 6 6 6 0 0 0 0 0 0 0 0 0
39502- 0 0 0 0 0 0 0 0 0 0 0 0
39503- 0 0 0 0 0 0 0 0 0 0 0 0
39504- 0 0 0 0 0 0 0 0 0 0 0 0
39505- 0 0 0 0 0 0 0 0 0 0 0 0
39506- 0 0 0 0 0 0 0 0 0 0 0 0
39507- 0 0 0 0 0 0 0 0 0 0 0 0
39508- 0 0 0 0 0 0 0 0 0 0 0 0
39509- 0 0 0 0 0 0 0 0 0 0 0 0
39510- 0 0 0 0 0 0 0 0 0 0 0 0
39511- 0 0 0 0 0 0 0 0 0 0 0 0
39512- 0 0 0 0 0 0 0 0 0 0 0 0
39513- 0 0 0 0 0 0 0 0 0 10 10 10
39514- 30 30 30 78 78 78 46 46 46 22 22 22
39515-137 92 6 210 162 10 239 182 13 238 190 10
39516-238 202 15 241 208 19 246 215 20 246 215 20
39517-241 208 19 203 166 17 185 133 11 210 150 10
39518-216 158 10 210 150 10 102 78 10 2 2 6
39519- 6 6 6 54 54 54 14 14 14 2 2 6
39520- 2 2 6 62 62 62 74 74 74 30 30 30
39521- 10 10 10 0 0 0 0 0 0 0 0 0
39522- 0 0 0 0 0 0 0 0 0 0 0 0
39523- 0 0 0 0 0 0 0 0 0 0 0 0
39524- 0 0 0 0 0 0 0 0 0 0 0 0
39525- 0 0 0 0 0 0 0 0 0 0 0 0
39526- 0 0 0 0 0 0 0 0 0 0 0 0
39527- 0 0 0 0 0 0 0 0 0 0 0 0
39528- 0 0 0 0 0 0 0 0 0 0 0 0
39529- 0 0 0 0 0 0 0 0 0 0 0 0
39530- 0 0 0 0 0 0 0 0 0 0 0 0
39531- 0 0 0 0 0 0 0 0 0 0 0 0
39532- 0 0 0 0 0 0 0 0 0 0 0 0
39533- 0 0 0 0 0 0 0 0 0 10 10 10
39534- 34 34 34 78 78 78 50 50 50 6 6 6
39535- 94 70 30 139 102 15 190 146 13 226 184 13
39536-232 200 30 232 195 16 215 174 15 190 146 13
39537-168 122 10 192 133 9 210 150 10 213 154 11
39538-202 150 34 182 157 106 101 98 89 2 2 6
39539- 2 2 6 78 78 78 116 116 116 58 58 58
39540- 2 2 6 22 22 22 90 90 90 46 46 46
39541- 18 18 18 6 6 6 0 0 0 0 0 0
39542- 0 0 0 0 0 0 0 0 0 0 0 0
39543- 0 0 0 0 0 0 0 0 0 0 0 0
39544- 0 0 0 0 0 0 0 0 0 0 0 0
39545- 0 0 0 0 0 0 0 0 0 0 0 0
39546- 0 0 0 0 0 0 0 0 0 0 0 0
39547- 0 0 0 0 0 0 0 0 0 0 0 0
39548- 0 0 0 0 0 0 0 0 0 0 0 0
39549- 0 0 0 0 0 0 0 0 0 0 0 0
39550- 0 0 0 0 0 0 0 0 0 0 0 0
39551- 0 0 0 0 0 0 0 0 0 0 0 0
39552- 0 0 0 0 0 0 0 0 0 0 0 0
39553- 0 0 0 0 0 0 0 0 0 10 10 10
39554- 38 38 38 86 86 86 50 50 50 6 6 6
39555-128 128 128 174 154 114 156 107 11 168 122 10
39556-198 155 10 184 144 12 197 138 11 200 144 11
39557-206 145 10 206 145 10 197 138 11 188 164 115
39558-195 195 195 198 198 198 174 174 174 14 14 14
39559- 2 2 6 22 22 22 116 116 116 116 116 116
39560- 22 22 22 2 2 6 74 74 74 70 70 70
39561- 30 30 30 10 10 10 0 0 0 0 0 0
39562- 0 0 0 0 0 0 0 0 0 0 0 0
39563- 0 0 0 0 0 0 0 0 0 0 0 0
39564- 0 0 0 0 0 0 0 0 0 0 0 0
39565- 0 0 0 0 0 0 0 0 0 0 0 0
39566- 0 0 0 0 0 0 0 0 0 0 0 0
39567- 0 0 0 0 0 0 0 0 0 0 0 0
39568- 0 0 0 0 0 0 0 0 0 0 0 0
39569- 0 0 0 0 0 0 0 0 0 0 0 0
39570- 0 0 0 0 0 0 0 0 0 0 0 0
39571- 0 0 0 0 0 0 0 0 0 0 0 0
39572- 0 0 0 0 0 0 0 0 0 0 0 0
39573- 0 0 0 0 0 0 6 6 6 18 18 18
39574- 50 50 50 101 101 101 26 26 26 10 10 10
39575-138 138 138 190 190 190 174 154 114 156 107 11
39576-197 138 11 200 144 11 197 138 11 192 133 9
39577-180 123 7 190 142 34 190 178 144 187 187 187
39578-202 202 202 221 221 221 214 214 214 66 66 66
39579- 2 2 6 2 2 6 50 50 50 62 62 62
39580- 6 6 6 2 2 6 10 10 10 90 90 90
39581- 50 50 50 18 18 18 6 6 6 0 0 0
39582- 0 0 0 0 0 0 0 0 0 0 0 0
39583- 0 0 0 0 0 0 0 0 0 0 0 0
39584- 0 0 0 0 0 0 0 0 0 0 0 0
39585- 0 0 0 0 0 0 0 0 0 0 0 0
39586- 0 0 0 0 0 0 0 0 0 0 0 0
39587- 0 0 0 0 0 0 0 0 0 0 0 0
39588- 0 0 0 0 0 0 0 0 0 0 0 0
39589- 0 0 0 0 0 0 0 0 0 0 0 0
39590- 0 0 0 0 0 0 0 0 0 0 0 0
39591- 0 0 0 0 0 0 0 0 0 0 0 0
39592- 0 0 0 0 0 0 0 0 0 0 0 0
39593- 0 0 0 0 0 0 10 10 10 34 34 34
39594- 74 74 74 74 74 74 2 2 6 6 6 6
39595-144 144 144 198 198 198 190 190 190 178 166 146
39596-154 121 60 156 107 11 156 107 11 168 124 44
39597-174 154 114 187 187 187 190 190 190 210 210 210
39598-246 246 246 253 253 253 253 253 253 182 182 182
39599- 6 6 6 2 2 6 2 2 6 2 2 6
39600- 2 2 6 2 2 6 2 2 6 62 62 62
39601- 74 74 74 34 34 34 14 14 14 0 0 0
39602- 0 0 0 0 0 0 0 0 0 0 0 0
39603- 0 0 0 0 0 0 0 0 0 0 0 0
39604- 0 0 0 0 0 0 0 0 0 0 0 0
39605- 0 0 0 0 0 0 0 0 0 0 0 0
39606- 0 0 0 0 0 0 0 0 0 0 0 0
39607- 0 0 0 0 0 0 0 0 0 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 10 10 10 22 22 22 54 54 54
39614- 94 94 94 18 18 18 2 2 6 46 46 46
39615-234 234 234 221 221 221 190 190 190 190 190 190
39616-190 190 190 187 187 187 187 187 187 190 190 190
39617-190 190 190 195 195 195 214 214 214 242 242 242
39618-253 253 253 253 253 253 253 253 253 253 253 253
39619- 82 82 82 2 2 6 2 2 6 2 2 6
39620- 2 2 6 2 2 6 2 2 6 14 14 14
39621- 86 86 86 54 54 54 22 22 22 6 6 6
39622- 0 0 0 0 0 0 0 0 0 0 0 0
39623- 0 0 0 0 0 0 0 0 0 0 0 0
39624- 0 0 0 0 0 0 0 0 0 0 0 0
39625- 0 0 0 0 0 0 0 0 0 0 0 0
39626- 0 0 0 0 0 0 0 0 0 0 0 0
39627- 0 0 0 0 0 0 0 0 0 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- 6 6 6 18 18 18 46 46 46 90 90 90
39634- 46 46 46 18 18 18 6 6 6 182 182 182
39635-253 253 253 246 246 246 206 206 206 190 190 190
39636-190 190 190 190 190 190 190 190 190 190 190 190
39637-206 206 206 231 231 231 250 250 250 253 253 253
39638-253 253 253 253 253 253 253 253 253 253 253 253
39639-202 202 202 14 14 14 2 2 6 2 2 6
39640- 2 2 6 2 2 6 2 2 6 2 2 6
39641- 42 42 42 86 86 86 42 42 42 18 18 18
39642- 6 6 6 0 0 0 0 0 0 0 0 0
39643- 0 0 0 0 0 0 0 0 0 0 0 0
39644- 0 0 0 0 0 0 0 0 0 0 0 0
39645- 0 0 0 0 0 0 0 0 0 0 0 0
39646- 0 0 0 0 0 0 0 0 0 0 0 0
39647- 0 0 0 0 0 0 0 0 0 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 6 6 6
39653- 14 14 14 38 38 38 74 74 74 66 66 66
39654- 2 2 6 6 6 6 90 90 90 250 250 250
39655-253 253 253 253 253 253 238 238 238 198 198 198
39656-190 190 190 190 190 190 195 195 195 221 221 221
39657-246 246 246 253 253 253 253 253 253 253 253 253
39658-253 253 253 253 253 253 253 253 253 253 253 253
39659-253 253 253 82 82 82 2 2 6 2 2 6
39660- 2 2 6 2 2 6 2 2 6 2 2 6
39661- 2 2 6 78 78 78 70 70 70 34 34 34
39662- 14 14 14 6 6 6 0 0 0 0 0 0
39663- 0 0 0 0 0 0 0 0 0 0 0 0
39664- 0 0 0 0 0 0 0 0 0 0 0 0
39665- 0 0 0 0 0 0 0 0 0 0 0 0
39666- 0 0 0 0 0 0 0 0 0 0 0 0
39667- 0 0 0 0 0 0 0 0 0 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 14 14 14
39673- 34 34 34 66 66 66 78 78 78 6 6 6
39674- 2 2 6 18 18 18 218 218 218 253 253 253
39675-253 253 253 253 253 253 253 253 253 246 246 246
39676-226 226 226 231 231 231 246 246 246 253 253 253
39677-253 253 253 253 253 253 253 253 253 253 253 253
39678-253 253 253 253 253 253 253 253 253 253 253 253
39679-253 253 253 178 178 178 2 2 6 2 2 6
39680- 2 2 6 2 2 6 2 2 6 2 2 6
39681- 2 2 6 18 18 18 90 90 90 62 62 62
39682- 30 30 30 10 10 10 0 0 0 0 0 0
39683- 0 0 0 0 0 0 0 0 0 0 0 0
39684- 0 0 0 0 0 0 0 0 0 0 0 0
39685- 0 0 0 0 0 0 0 0 0 0 0 0
39686- 0 0 0 0 0 0 0 0 0 0 0 0
39687- 0 0 0 0 0 0 0 0 0 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 10 10 10 26 26 26
39693- 58 58 58 90 90 90 18 18 18 2 2 6
39694- 2 2 6 110 110 110 253 253 253 253 253 253
39695-253 253 253 253 253 253 253 253 253 253 253 253
39696-250 250 250 253 253 253 253 253 253 253 253 253
39697-253 253 253 253 253 253 253 253 253 253 253 253
39698-253 253 253 253 253 253 253 253 253 253 253 253
39699-253 253 253 231 231 231 18 18 18 2 2 6
39700- 2 2 6 2 2 6 2 2 6 2 2 6
39701- 2 2 6 2 2 6 18 18 18 94 94 94
39702- 54 54 54 26 26 26 10 10 10 0 0 0
39703- 0 0 0 0 0 0 0 0 0 0 0 0
39704- 0 0 0 0 0 0 0 0 0 0 0 0
39705- 0 0 0 0 0 0 0 0 0 0 0 0
39706- 0 0 0 0 0 0 0 0 0 0 0 0
39707- 0 0 0 0 0 0 0 0 0 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 6 6 6 22 22 22 50 50 50
39713- 90 90 90 26 26 26 2 2 6 2 2 6
39714- 14 14 14 195 195 195 250 250 250 253 253 253
39715-253 253 253 253 253 253 253 253 253 253 253 253
39716-253 253 253 253 253 253 253 253 253 253 253 253
39717-253 253 253 253 253 253 253 253 253 253 253 253
39718-253 253 253 253 253 253 253 253 253 253 253 253
39719-250 250 250 242 242 242 54 54 54 2 2 6
39720- 2 2 6 2 2 6 2 2 6 2 2 6
39721- 2 2 6 2 2 6 2 2 6 38 38 38
39722- 86 86 86 50 50 50 22 22 22 6 6 6
39723- 0 0 0 0 0 0 0 0 0 0 0 0
39724- 0 0 0 0 0 0 0 0 0 0 0 0
39725- 0 0 0 0 0 0 0 0 0 0 0 0
39726- 0 0 0 0 0 0 0 0 0 0 0 0
39727- 0 0 0 0 0 0 0 0 0 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- 6 6 6 14 14 14 38 38 38 82 82 82
39733- 34 34 34 2 2 6 2 2 6 2 2 6
39734- 42 42 42 195 195 195 246 246 246 253 253 253
39735-253 253 253 253 253 253 253 253 253 250 250 250
39736-242 242 242 242 242 242 250 250 250 253 253 253
39737-253 253 253 253 253 253 253 253 253 253 253 253
39738-253 253 253 250 250 250 246 246 246 238 238 238
39739-226 226 226 231 231 231 101 101 101 6 6 6
39740- 2 2 6 2 2 6 2 2 6 2 2 6
39741- 2 2 6 2 2 6 2 2 6 2 2 6
39742- 38 38 38 82 82 82 42 42 42 14 14 14
39743- 6 6 6 0 0 0 0 0 0 0 0 0
39744- 0 0 0 0 0 0 0 0 0 0 0 0
39745- 0 0 0 0 0 0 0 0 0 0 0 0
39746- 0 0 0 0 0 0 0 0 0 0 0 0
39747- 0 0 0 0 0 0 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- 10 10 10 26 26 26 62 62 62 66 66 66
39753- 2 2 6 2 2 6 2 2 6 6 6 6
39754- 70 70 70 170 170 170 206 206 206 234 234 234
39755-246 246 246 250 250 250 250 250 250 238 238 238
39756-226 226 226 231 231 231 238 238 238 250 250 250
39757-250 250 250 250 250 250 246 246 246 231 231 231
39758-214 214 214 206 206 206 202 202 202 202 202 202
39759-198 198 198 202 202 202 182 182 182 18 18 18
39760- 2 2 6 2 2 6 2 2 6 2 2 6
39761- 2 2 6 2 2 6 2 2 6 2 2 6
39762- 2 2 6 62 62 62 66 66 66 30 30 30
39763- 10 10 10 0 0 0 0 0 0 0 0 0
39764- 0 0 0 0 0 0 0 0 0 0 0 0
39765- 0 0 0 0 0 0 0 0 0 0 0 0
39766- 0 0 0 0 0 0 0 0 0 0 0 0
39767- 0 0 0 0 0 0 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- 14 14 14 42 42 42 82 82 82 18 18 18
39773- 2 2 6 2 2 6 2 2 6 10 10 10
39774- 94 94 94 182 182 182 218 218 218 242 242 242
39775-250 250 250 253 253 253 253 253 253 250 250 250
39776-234 234 234 253 253 253 253 253 253 253 253 253
39777-253 253 253 253 253 253 253 253 253 246 246 246
39778-238 238 238 226 226 226 210 210 210 202 202 202
39779-195 195 195 195 195 195 210 210 210 158 158 158
39780- 6 6 6 14 14 14 50 50 50 14 14 14
39781- 2 2 6 2 2 6 2 2 6 2 2 6
39782- 2 2 6 6 6 6 86 86 86 46 46 46
39783- 18 18 18 6 6 6 0 0 0 0 0 0
39784- 0 0 0 0 0 0 0 0 0 0 0 0
39785- 0 0 0 0 0 0 0 0 0 0 0 0
39786- 0 0 0 0 0 0 0 0 0 0 0 0
39787- 0 0 0 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 6 6 6
39792- 22 22 22 54 54 54 70 70 70 2 2 6
39793- 2 2 6 10 10 10 2 2 6 22 22 22
39794-166 166 166 231 231 231 250 250 250 253 253 253
39795-253 253 253 253 253 253 253 253 253 250 250 250
39796-242 242 242 253 253 253 253 253 253 253 253 253
39797-253 253 253 253 253 253 253 253 253 253 253 253
39798-253 253 253 253 253 253 253 253 253 246 246 246
39799-231 231 231 206 206 206 198 198 198 226 226 226
39800- 94 94 94 2 2 6 6 6 6 38 38 38
39801- 30 30 30 2 2 6 2 2 6 2 2 6
39802- 2 2 6 2 2 6 62 62 62 66 66 66
39803- 26 26 26 10 10 10 0 0 0 0 0 0
39804- 0 0 0 0 0 0 0 0 0 0 0 0
39805- 0 0 0 0 0 0 0 0 0 0 0 0
39806- 0 0 0 0 0 0 0 0 0 0 0 0
39807- 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 10 10 10
39812- 30 30 30 74 74 74 50 50 50 2 2 6
39813- 26 26 26 26 26 26 2 2 6 106 106 106
39814-238 238 238 253 253 253 253 253 253 253 253 253
39815-253 253 253 253 253 253 253 253 253 253 253 253
39816-253 253 253 253 253 253 253 253 253 253 253 253
39817-253 253 253 253 253 253 253 253 253 253 253 253
39818-253 253 253 253 253 253 253 253 253 253 253 253
39819-253 253 253 246 246 246 218 218 218 202 202 202
39820-210 210 210 14 14 14 2 2 6 2 2 6
39821- 30 30 30 22 22 22 2 2 6 2 2 6
39822- 2 2 6 2 2 6 18 18 18 86 86 86
39823- 42 42 42 14 14 14 0 0 0 0 0 0
39824- 0 0 0 0 0 0 0 0 0 0 0 0
39825- 0 0 0 0 0 0 0 0 0 0 0 0
39826- 0 0 0 0 0 0 0 0 0 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 14 14 14
39832- 42 42 42 90 90 90 22 22 22 2 2 6
39833- 42 42 42 2 2 6 18 18 18 218 218 218
39834-253 253 253 253 253 253 253 253 253 253 253 253
39835-253 253 253 253 253 253 253 253 253 253 253 253
39836-253 253 253 253 253 253 253 253 253 253 253 253
39837-253 253 253 253 253 253 253 253 253 253 253 253
39838-253 253 253 253 253 253 253 253 253 253 253 253
39839-253 253 253 253 253 253 250 250 250 221 221 221
39840-218 218 218 101 101 101 2 2 6 14 14 14
39841- 18 18 18 38 38 38 10 10 10 2 2 6
39842- 2 2 6 2 2 6 2 2 6 78 78 78
39843- 58 58 58 22 22 22 6 6 6 0 0 0
39844- 0 0 0 0 0 0 0 0 0 0 0 0
39845- 0 0 0 0 0 0 0 0 0 0 0 0
39846- 0 0 0 0 0 0 0 0 0 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 6 6 6 18 18 18
39852- 54 54 54 82 82 82 2 2 6 26 26 26
39853- 22 22 22 2 2 6 123 123 123 253 253 253
39854-253 253 253 253 253 253 253 253 253 253 253 253
39855-253 253 253 253 253 253 253 253 253 253 253 253
39856-253 253 253 253 253 253 253 253 253 253 253 253
39857-253 253 253 253 253 253 253 253 253 253 253 253
39858-253 253 253 253 253 253 253 253 253 253 253 253
39859-253 253 253 253 253 253 253 253 253 250 250 250
39860-238 238 238 198 198 198 6 6 6 38 38 38
39861- 58 58 58 26 26 26 38 38 38 2 2 6
39862- 2 2 6 2 2 6 2 2 6 46 46 46
39863- 78 78 78 30 30 30 10 10 10 0 0 0
39864- 0 0 0 0 0 0 0 0 0 0 0 0
39865- 0 0 0 0 0 0 0 0 0 0 0 0
39866- 0 0 0 0 0 0 0 0 0 0 0 0
39867- 0 0 0 0 0 0 0 0 0 0 0 0
39868- 0 0 0 0 0 0 0 0 0 0 0 0
39869- 0 0 0 0 0 0 0 0 0 0 0 0
39870- 0 0 0 0 0 0 0 0 0 0 0 0
39871- 0 0 0 0 0 0 10 10 10 30 30 30
39872- 74 74 74 58 58 58 2 2 6 42 42 42
39873- 2 2 6 22 22 22 231 231 231 253 253 253
39874-253 253 253 253 253 253 253 253 253 253 253 253
39875-253 253 253 253 253 253 253 253 253 250 250 250
39876-253 253 253 253 253 253 253 253 253 253 253 253
39877-253 253 253 253 253 253 253 253 253 253 253 253
39878-253 253 253 253 253 253 253 253 253 253 253 253
39879-253 253 253 253 253 253 253 253 253 253 253 253
39880-253 253 253 246 246 246 46 46 46 38 38 38
39881- 42 42 42 14 14 14 38 38 38 14 14 14
39882- 2 2 6 2 2 6 2 2 6 6 6 6
39883- 86 86 86 46 46 46 14 14 14 0 0 0
39884- 0 0 0 0 0 0 0 0 0 0 0 0
39885- 0 0 0 0 0 0 0 0 0 0 0 0
39886- 0 0 0 0 0 0 0 0 0 0 0 0
39887- 0 0 0 0 0 0 0 0 0 0 0 0
39888- 0 0 0 0 0 0 0 0 0 0 0 0
39889- 0 0 0 0 0 0 0 0 0 0 0 0
39890- 0 0 0 0 0 0 0 0 0 0 0 0
39891- 0 0 0 6 6 6 14 14 14 42 42 42
39892- 90 90 90 18 18 18 18 18 18 26 26 26
39893- 2 2 6 116 116 116 253 253 253 253 253 253
39894-253 253 253 253 253 253 253 253 253 253 253 253
39895-253 253 253 253 253 253 250 250 250 238 238 238
39896-253 253 253 253 253 253 253 253 253 253 253 253
39897-253 253 253 253 253 253 253 253 253 253 253 253
39898-253 253 253 253 253 253 253 253 253 253 253 253
39899-253 253 253 253 253 253 253 253 253 253 253 253
39900-253 253 253 253 253 253 94 94 94 6 6 6
39901- 2 2 6 2 2 6 10 10 10 34 34 34
39902- 2 2 6 2 2 6 2 2 6 2 2 6
39903- 74 74 74 58 58 58 22 22 22 6 6 6
39904- 0 0 0 0 0 0 0 0 0 0 0 0
39905- 0 0 0 0 0 0 0 0 0 0 0 0
39906- 0 0 0 0 0 0 0 0 0 0 0 0
39907- 0 0 0 0 0 0 0 0 0 0 0 0
39908- 0 0 0 0 0 0 0 0 0 0 0 0
39909- 0 0 0 0 0 0 0 0 0 0 0 0
39910- 0 0 0 0 0 0 0 0 0 0 0 0
39911- 0 0 0 10 10 10 26 26 26 66 66 66
39912- 82 82 82 2 2 6 38 38 38 6 6 6
39913- 14 14 14 210 210 210 253 253 253 253 253 253
39914-253 253 253 253 253 253 253 253 253 253 253 253
39915-253 253 253 253 253 253 246 246 246 242 242 242
39916-253 253 253 253 253 253 253 253 253 253 253 253
39917-253 253 253 253 253 253 253 253 253 253 253 253
39918-253 253 253 253 253 253 253 253 253 253 253 253
39919-253 253 253 253 253 253 253 253 253 253 253 253
39920-253 253 253 253 253 253 144 144 144 2 2 6
39921- 2 2 6 2 2 6 2 2 6 46 46 46
39922- 2 2 6 2 2 6 2 2 6 2 2 6
39923- 42 42 42 74 74 74 30 30 30 10 10 10
39924- 0 0 0 0 0 0 0 0 0 0 0 0
39925- 0 0 0 0 0 0 0 0 0 0 0 0
39926- 0 0 0 0 0 0 0 0 0 0 0 0
39927- 0 0 0 0 0 0 0 0 0 0 0 0
39928- 0 0 0 0 0 0 0 0 0 0 0 0
39929- 0 0 0 0 0 0 0 0 0 0 0 0
39930- 0 0 0 0 0 0 0 0 0 0 0 0
39931- 6 6 6 14 14 14 42 42 42 90 90 90
39932- 26 26 26 6 6 6 42 42 42 2 2 6
39933- 74 74 74 250 250 250 253 253 253 253 253 253
39934-253 253 253 253 253 253 253 253 253 253 253 253
39935-253 253 253 253 253 253 242 242 242 242 242 242
39936-253 253 253 253 253 253 253 253 253 253 253 253
39937-253 253 253 253 253 253 253 253 253 253 253 253
39938-253 253 253 253 253 253 253 253 253 253 253 253
39939-253 253 253 253 253 253 253 253 253 253 253 253
39940-253 253 253 253 253 253 182 182 182 2 2 6
39941- 2 2 6 2 2 6 2 2 6 46 46 46
39942- 2 2 6 2 2 6 2 2 6 2 2 6
39943- 10 10 10 86 86 86 38 38 38 10 10 10
39944- 0 0 0 0 0 0 0 0 0 0 0 0
39945- 0 0 0 0 0 0 0 0 0 0 0 0
39946- 0 0 0 0 0 0 0 0 0 0 0 0
39947- 0 0 0 0 0 0 0 0 0 0 0 0
39948- 0 0 0 0 0 0 0 0 0 0 0 0
39949- 0 0 0 0 0 0 0 0 0 0 0 0
39950- 0 0 0 0 0 0 0 0 0 0 0 0
39951- 10 10 10 26 26 26 66 66 66 82 82 82
39952- 2 2 6 22 22 22 18 18 18 2 2 6
39953-149 149 149 253 253 253 253 253 253 253 253 253
39954-253 253 253 253 253 253 253 253 253 253 253 253
39955-253 253 253 253 253 253 234 234 234 242 242 242
39956-253 253 253 253 253 253 253 253 253 253 253 253
39957-253 253 253 253 253 253 253 253 253 253 253 253
39958-253 253 253 253 253 253 253 253 253 253 253 253
39959-253 253 253 253 253 253 253 253 253 253 253 253
39960-253 253 253 253 253 253 206 206 206 2 2 6
39961- 2 2 6 2 2 6 2 2 6 38 38 38
39962- 2 2 6 2 2 6 2 2 6 2 2 6
39963- 6 6 6 86 86 86 46 46 46 14 14 14
39964- 0 0 0 0 0 0 0 0 0 0 0 0
39965- 0 0 0 0 0 0 0 0 0 0 0 0
39966- 0 0 0 0 0 0 0 0 0 0 0 0
39967- 0 0 0 0 0 0 0 0 0 0 0 0
39968- 0 0 0 0 0 0 0 0 0 0 0 0
39969- 0 0 0 0 0 0 0 0 0 0 0 0
39970- 0 0 0 0 0 0 0 0 0 6 6 6
39971- 18 18 18 46 46 46 86 86 86 18 18 18
39972- 2 2 6 34 34 34 10 10 10 6 6 6
39973-210 210 210 253 253 253 253 253 253 253 253 253
39974-253 253 253 253 253 253 253 253 253 253 253 253
39975-253 253 253 253 253 253 234 234 234 242 242 242
39976-253 253 253 253 253 253 253 253 253 253 253 253
39977-253 253 253 253 253 253 253 253 253 253 253 253
39978-253 253 253 253 253 253 253 253 253 253 253 253
39979-253 253 253 253 253 253 253 253 253 253 253 253
39980-253 253 253 253 253 253 221 221 221 6 6 6
39981- 2 2 6 2 2 6 6 6 6 30 30 30
39982- 2 2 6 2 2 6 2 2 6 2 2 6
39983- 2 2 6 82 82 82 54 54 54 18 18 18
39984- 6 6 6 0 0 0 0 0 0 0 0 0
39985- 0 0 0 0 0 0 0 0 0 0 0 0
39986- 0 0 0 0 0 0 0 0 0 0 0 0
39987- 0 0 0 0 0 0 0 0 0 0 0 0
39988- 0 0 0 0 0 0 0 0 0 0 0 0
39989- 0 0 0 0 0 0 0 0 0 0 0 0
39990- 0 0 0 0 0 0 0 0 0 10 10 10
39991- 26 26 26 66 66 66 62 62 62 2 2 6
39992- 2 2 6 38 38 38 10 10 10 26 26 26
39993-238 238 238 253 253 253 253 253 253 253 253 253
39994-253 253 253 253 253 253 253 253 253 253 253 253
39995-253 253 253 253 253 253 231 231 231 238 238 238
39996-253 253 253 253 253 253 253 253 253 253 253 253
39997-253 253 253 253 253 253 253 253 253 253 253 253
39998-253 253 253 253 253 253 253 253 253 253 253 253
39999-253 253 253 253 253 253 253 253 253 253 253 253
40000-253 253 253 253 253 253 231 231 231 6 6 6
40001- 2 2 6 2 2 6 10 10 10 30 30 30
40002- 2 2 6 2 2 6 2 2 6 2 2 6
40003- 2 2 6 66 66 66 58 58 58 22 22 22
40004- 6 6 6 0 0 0 0 0 0 0 0 0
40005- 0 0 0 0 0 0 0 0 0 0 0 0
40006- 0 0 0 0 0 0 0 0 0 0 0 0
40007- 0 0 0 0 0 0 0 0 0 0 0 0
40008- 0 0 0 0 0 0 0 0 0 0 0 0
40009- 0 0 0 0 0 0 0 0 0 0 0 0
40010- 0 0 0 0 0 0 0 0 0 10 10 10
40011- 38 38 38 78 78 78 6 6 6 2 2 6
40012- 2 2 6 46 46 46 14 14 14 42 42 42
40013-246 246 246 253 253 253 253 253 253 253 253 253
40014-253 253 253 253 253 253 253 253 253 253 253 253
40015-253 253 253 253 253 253 231 231 231 242 242 242
40016-253 253 253 253 253 253 253 253 253 253 253 253
40017-253 253 253 253 253 253 253 253 253 253 253 253
40018-253 253 253 253 253 253 253 253 253 253 253 253
40019-253 253 253 253 253 253 253 253 253 253 253 253
40020-253 253 253 253 253 253 234 234 234 10 10 10
40021- 2 2 6 2 2 6 22 22 22 14 14 14
40022- 2 2 6 2 2 6 2 2 6 2 2 6
40023- 2 2 6 66 66 66 62 62 62 22 22 22
40024- 6 6 6 0 0 0 0 0 0 0 0 0
40025- 0 0 0 0 0 0 0 0 0 0 0 0
40026- 0 0 0 0 0 0 0 0 0 0 0 0
40027- 0 0 0 0 0 0 0 0 0 0 0 0
40028- 0 0 0 0 0 0 0 0 0 0 0 0
40029- 0 0 0 0 0 0 0 0 0 0 0 0
40030- 0 0 0 0 0 0 6 6 6 18 18 18
40031- 50 50 50 74 74 74 2 2 6 2 2 6
40032- 14 14 14 70 70 70 34 34 34 62 62 62
40033-250 250 250 253 253 253 253 253 253 253 253 253
40034-253 253 253 253 253 253 253 253 253 253 253 253
40035-253 253 253 253 253 253 231 231 231 246 246 246
40036-253 253 253 253 253 253 253 253 253 253 253 253
40037-253 253 253 253 253 253 253 253 253 253 253 253
40038-253 253 253 253 253 253 253 253 253 253 253 253
40039-253 253 253 253 253 253 253 253 253 253 253 253
40040-253 253 253 253 253 253 234 234 234 14 14 14
40041- 2 2 6 2 2 6 30 30 30 2 2 6
40042- 2 2 6 2 2 6 2 2 6 2 2 6
40043- 2 2 6 66 66 66 62 62 62 22 22 22
40044- 6 6 6 0 0 0 0 0 0 0 0 0
40045- 0 0 0 0 0 0 0 0 0 0 0 0
40046- 0 0 0 0 0 0 0 0 0 0 0 0
40047- 0 0 0 0 0 0 0 0 0 0 0 0
40048- 0 0 0 0 0 0 0 0 0 0 0 0
40049- 0 0 0 0 0 0 0 0 0 0 0 0
40050- 0 0 0 0 0 0 6 6 6 18 18 18
40051- 54 54 54 62 62 62 2 2 6 2 2 6
40052- 2 2 6 30 30 30 46 46 46 70 70 70
40053-250 250 250 253 253 253 253 253 253 253 253 253
40054-253 253 253 253 253 253 253 253 253 253 253 253
40055-253 253 253 253 253 253 231 231 231 246 246 246
40056-253 253 253 253 253 253 253 253 253 253 253 253
40057-253 253 253 253 253 253 253 253 253 253 253 253
40058-253 253 253 253 253 253 253 253 253 253 253 253
40059-253 253 253 253 253 253 253 253 253 253 253 253
40060-253 253 253 253 253 253 226 226 226 10 10 10
40061- 2 2 6 6 6 6 30 30 30 2 2 6
40062- 2 2 6 2 2 6 2 2 6 2 2 6
40063- 2 2 6 66 66 66 58 58 58 22 22 22
40064- 6 6 6 0 0 0 0 0 0 0 0 0
40065- 0 0 0 0 0 0 0 0 0 0 0 0
40066- 0 0 0 0 0 0 0 0 0 0 0 0
40067- 0 0 0 0 0 0 0 0 0 0 0 0
40068- 0 0 0 0 0 0 0 0 0 0 0 0
40069- 0 0 0 0 0 0 0 0 0 0 0 0
40070- 0 0 0 0 0 0 6 6 6 22 22 22
40071- 58 58 58 62 62 62 2 2 6 2 2 6
40072- 2 2 6 2 2 6 30 30 30 78 78 78
40073-250 250 250 253 253 253 253 253 253 253 253 253
40074-253 253 253 253 253 253 253 253 253 253 253 253
40075-253 253 253 253 253 253 231 231 231 246 246 246
40076-253 253 253 253 253 253 253 253 253 253 253 253
40077-253 253 253 253 253 253 253 253 253 253 253 253
40078-253 253 253 253 253 253 253 253 253 253 253 253
40079-253 253 253 253 253 253 253 253 253 253 253 253
40080-253 253 253 253 253 253 206 206 206 2 2 6
40081- 22 22 22 34 34 34 18 14 6 22 22 22
40082- 26 26 26 18 18 18 6 6 6 2 2 6
40083- 2 2 6 82 82 82 54 54 54 18 18 18
40084- 6 6 6 0 0 0 0 0 0 0 0 0
40085- 0 0 0 0 0 0 0 0 0 0 0 0
40086- 0 0 0 0 0 0 0 0 0 0 0 0
40087- 0 0 0 0 0 0 0 0 0 0 0 0
40088- 0 0 0 0 0 0 0 0 0 0 0 0
40089- 0 0 0 0 0 0 0 0 0 0 0 0
40090- 0 0 0 0 0 0 6 6 6 26 26 26
40091- 62 62 62 106 106 106 74 54 14 185 133 11
40092-210 162 10 121 92 8 6 6 6 62 62 62
40093-238 238 238 253 253 253 253 253 253 253 253 253
40094-253 253 253 253 253 253 253 253 253 253 253 253
40095-253 253 253 253 253 253 231 231 231 246 246 246
40096-253 253 253 253 253 253 253 253 253 253 253 253
40097-253 253 253 253 253 253 253 253 253 253 253 253
40098-253 253 253 253 253 253 253 253 253 253 253 253
40099-253 253 253 253 253 253 253 253 253 253 253 253
40100-253 253 253 253 253 253 158 158 158 18 18 18
40101- 14 14 14 2 2 6 2 2 6 2 2 6
40102- 6 6 6 18 18 18 66 66 66 38 38 38
40103- 6 6 6 94 94 94 50 50 50 18 18 18
40104- 6 6 6 0 0 0 0 0 0 0 0 0
40105- 0 0 0 0 0 0 0 0 0 0 0 0
40106- 0 0 0 0 0 0 0 0 0 0 0 0
40107- 0 0 0 0 0 0 0 0 0 0 0 0
40108- 0 0 0 0 0 0 0 0 0 0 0 0
40109- 0 0 0 0 0 0 0 0 0 6 6 6
40110- 10 10 10 10 10 10 18 18 18 38 38 38
40111- 78 78 78 142 134 106 216 158 10 242 186 14
40112-246 190 14 246 190 14 156 118 10 10 10 10
40113- 90 90 90 238 238 238 253 253 253 253 253 253
40114-253 253 253 253 253 253 253 253 253 253 253 253
40115-253 253 253 253 253 253 231 231 231 250 250 250
40116-253 253 253 253 253 253 253 253 253 253 253 253
40117-253 253 253 253 253 253 253 253 253 253 253 253
40118-253 253 253 253 253 253 253 253 253 253 253 253
40119-253 253 253 253 253 253 253 253 253 246 230 190
40120-238 204 91 238 204 91 181 142 44 37 26 9
40121- 2 2 6 2 2 6 2 2 6 2 2 6
40122- 2 2 6 2 2 6 38 38 38 46 46 46
40123- 26 26 26 106 106 106 54 54 54 18 18 18
40124- 6 6 6 0 0 0 0 0 0 0 0 0
40125- 0 0 0 0 0 0 0 0 0 0 0 0
40126- 0 0 0 0 0 0 0 0 0 0 0 0
40127- 0 0 0 0 0 0 0 0 0 0 0 0
40128- 0 0 0 0 0 0 0 0 0 0 0 0
40129- 0 0 0 6 6 6 14 14 14 22 22 22
40130- 30 30 30 38 38 38 50 50 50 70 70 70
40131-106 106 106 190 142 34 226 170 11 242 186 14
40132-246 190 14 246 190 14 246 190 14 154 114 10
40133- 6 6 6 74 74 74 226 226 226 253 253 253
40134-253 253 253 253 253 253 253 253 253 253 253 253
40135-253 253 253 253 253 253 231 231 231 250 250 250
40136-253 253 253 253 253 253 253 253 253 253 253 253
40137-253 253 253 253 253 253 253 253 253 253 253 253
40138-253 253 253 253 253 253 253 253 253 253 253 253
40139-253 253 253 253 253 253 253 253 253 228 184 62
40140-241 196 14 241 208 19 232 195 16 38 30 10
40141- 2 2 6 2 2 6 2 2 6 2 2 6
40142- 2 2 6 6 6 6 30 30 30 26 26 26
40143-203 166 17 154 142 90 66 66 66 26 26 26
40144- 6 6 6 0 0 0 0 0 0 0 0 0
40145- 0 0 0 0 0 0 0 0 0 0 0 0
40146- 0 0 0 0 0 0 0 0 0 0 0 0
40147- 0 0 0 0 0 0 0 0 0 0 0 0
40148- 0 0 0 0 0 0 0 0 0 0 0 0
40149- 6 6 6 18 18 18 38 38 38 58 58 58
40150- 78 78 78 86 86 86 101 101 101 123 123 123
40151-175 146 61 210 150 10 234 174 13 246 186 14
40152-246 190 14 246 190 14 246 190 14 238 190 10
40153-102 78 10 2 2 6 46 46 46 198 198 198
40154-253 253 253 253 253 253 253 253 253 253 253 253
40155-253 253 253 253 253 253 234 234 234 242 242 242
40156-253 253 253 253 253 253 253 253 253 253 253 253
40157-253 253 253 253 253 253 253 253 253 253 253 253
40158-253 253 253 253 253 253 253 253 253 253 253 253
40159-253 253 253 253 253 253 253 253 253 224 178 62
40160-242 186 14 241 196 14 210 166 10 22 18 6
40161- 2 2 6 2 2 6 2 2 6 2 2 6
40162- 2 2 6 2 2 6 6 6 6 121 92 8
40163-238 202 15 232 195 16 82 82 82 34 34 34
40164- 10 10 10 0 0 0 0 0 0 0 0 0
40165- 0 0 0 0 0 0 0 0 0 0 0 0
40166- 0 0 0 0 0 0 0 0 0 0 0 0
40167- 0 0 0 0 0 0 0 0 0 0 0 0
40168- 0 0 0 0 0 0 0 0 0 0 0 0
40169- 14 14 14 38 38 38 70 70 70 154 122 46
40170-190 142 34 200 144 11 197 138 11 197 138 11
40171-213 154 11 226 170 11 242 186 14 246 190 14
40172-246 190 14 246 190 14 246 190 14 246 190 14
40173-225 175 15 46 32 6 2 2 6 22 22 22
40174-158 158 158 250 250 250 253 253 253 253 253 253
40175-253 253 253 253 253 253 253 253 253 253 253 253
40176-253 253 253 253 253 253 253 253 253 253 253 253
40177-253 253 253 253 253 253 253 253 253 253 253 253
40178-253 253 253 253 253 253 253 253 253 253 253 253
40179-253 253 253 250 250 250 242 242 242 224 178 62
40180-239 182 13 236 186 11 213 154 11 46 32 6
40181- 2 2 6 2 2 6 2 2 6 2 2 6
40182- 2 2 6 2 2 6 61 42 6 225 175 15
40183-238 190 10 236 186 11 112 100 78 42 42 42
40184- 14 14 14 0 0 0 0 0 0 0 0 0
40185- 0 0 0 0 0 0 0 0 0 0 0 0
40186- 0 0 0 0 0 0 0 0 0 0 0 0
40187- 0 0 0 0 0 0 0 0 0 0 0 0
40188- 0 0 0 0 0 0 0 0 0 6 6 6
40189- 22 22 22 54 54 54 154 122 46 213 154 11
40190-226 170 11 230 174 11 226 170 11 226 170 11
40191-236 178 12 242 186 14 246 190 14 246 190 14
40192-246 190 14 246 190 14 246 190 14 246 190 14
40193-241 196 14 184 144 12 10 10 10 2 2 6
40194- 6 6 6 116 116 116 242 242 242 253 253 253
40195-253 253 253 253 253 253 253 253 253 253 253 253
40196-253 253 253 253 253 253 253 253 253 253 253 253
40197-253 253 253 253 253 253 253 253 253 253 253 253
40198-253 253 253 253 253 253 253 253 253 253 253 253
40199-253 253 253 231 231 231 198 198 198 214 170 54
40200-236 178 12 236 178 12 210 150 10 137 92 6
40201- 18 14 6 2 2 6 2 2 6 2 2 6
40202- 6 6 6 70 47 6 200 144 11 236 178 12
40203-239 182 13 239 182 13 124 112 88 58 58 58
40204- 22 22 22 6 6 6 0 0 0 0 0 0
40205- 0 0 0 0 0 0 0 0 0 0 0 0
40206- 0 0 0 0 0 0 0 0 0 0 0 0
40207- 0 0 0 0 0 0 0 0 0 0 0 0
40208- 0 0 0 0 0 0 0 0 0 10 10 10
40209- 30 30 30 70 70 70 180 133 36 226 170 11
40210-239 182 13 242 186 14 242 186 14 246 186 14
40211-246 190 14 246 190 14 246 190 14 246 190 14
40212-246 190 14 246 190 14 246 190 14 246 190 14
40213-246 190 14 232 195 16 98 70 6 2 2 6
40214- 2 2 6 2 2 6 66 66 66 221 221 221
40215-253 253 253 253 253 253 253 253 253 253 253 253
40216-253 253 253 253 253 253 253 253 253 253 253 253
40217-253 253 253 253 253 253 253 253 253 253 253 253
40218-253 253 253 253 253 253 253 253 253 253 253 253
40219-253 253 253 206 206 206 198 198 198 214 166 58
40220-230 174 11 230 174 11 216 158 10 192 133 9
40221-163 110 8 116 81 8 102 78 10 116 81 8
40222-167 114 7 197 138 11 226 170 11 239 182 13
40223-242 186 14 242 186 14 162 146 94 78 78 78
40224- 34 34 34 14 14 14 6 6 6 0 0 0
40225- 0 0 0 0 0 0 0 0 0 0 0 0
40226- 0 0 0 0 0 0 0 0 0 0 0 0
40227- 0 0 0 0 0 0 0 0 0 0 0 0
40228- 0 0 0 0 0 0 0 0 0 6 6 6
40229- 30 30 30 78 78 78 190 142 34 226 170 11
40230-239 182 13 246 190 14 246 190 14 246 190 14
40231-246 190 14 246 190 14 246 190 14 246 190 14
40232-246 190 14 246 190 14 246 190 14 246 190 14
40233-246 190 14 241 196 14 203 166 17 22 18 6
40234- 2 2 6 2 2 6 2 2 6 38 38 38
40235-218 218 218 253 253 253 253 253 253 253 253 253
40236-253 253 253 253 253 253 253 253 253 253 253 253
40237-253 253 253 253 253 253 253 253 253 253 253 253
40238-253 253 253 253 253 253 253 253 253 253 253 253
40239-250 250 250 206 206 206 198 198 198 202 162 69
40240-226 170 11 236 178 12 224 166 10 210 150 10
40241-200 144 11 197 138 11 192 133 9 197 138 11
40242-210 150 10 226 170 11 242 186 14 246 190 14
40243-246 190 14 246 186 14 225 175 15 124 112 88
40244- 62 62 62 30 30 30 14 14 14 6 6 6
40245- 0 0 0 0 0 0 0 0 0 0 0 0
40246- 0 0 0 0 0 0 0 0 0 0 0 0
40247- 0 0 0 0 0 0 0 0 0 0 0 0
40248- 0 0 0 0 0 0 0 0 0 10 10 10
40249- 30 30 30 78 78 78 174 135 50 224 166 10
40250-239 182 13 246 190 14 246 190 14 246 190 14
40251-246 190 14 246 190 14 246 190 14 246 190 14
40252-246 190 14 246 190 14 246 190 14 246 190 14
40253-246 190 14 246 190 14 241 196 14 139 102 15
40254- 2 2 6 2 2 6 2 2 6 2 2 6
40255- 78 78 78 250 250 250 253 253 253 253 253 253
40256-253 253 253 253 253 253 253 253 253 253 253 253
40257-253 253 253 253 253 253 253 253 253 253 253 253
40258-253 253 253 253 253 253 253 253 253 253 253 253
40259-250 250 250 214 214 214 198 198 198 190 150 46
40260-219 162 10 236 178 12 234 174 13 224 166 10
40261-216 158 10 213 154 11 213 154 11 216 158 10
40262-226 170 11 239 182 13 246 190 14 246 190 14
40263-246 190 14 246 190 14 242 186 14 206 162 42
40264-101 101 101 58 58 58 30 30 30 14 14 14
40265- 6 6 6 0 0 0 0 0 0 0 0 0
40266- 0 0 0 0 0 0 0 0 0 0 0 0
40267- 0 0 0 0 0 0 0 0 0 0 0 0
40268- 0 0 0 0 0 0 0 0 0 10 10 10
40269- 30 30 30 74 74 74 174 135 50 216 158 10
40270-236 178 12 246 190 14 246 190 14 246 190 14
40271-246 190 14 246 190 14 246 190 14 246 190 14
40272-246 190 14 246 190 14 246 190 14 246 190 14
40273-246 190 14 246 190 14 241 196 14 226 184 13
40274- 61 42 6 2 2 6 2 2 6 2 2 6
40275- 22 22 22 238 238 238 253 253 253 253 253 253
40276-253 253 253 253 253 253 253 253 253 253 253 253
40277-253 253 253 253 253 253 253 253 253 253 253 253
40278-253 253 253 253 253 253 253 253 253 253 253 253
40279-253 253 253 226 226 226 187 187 187 180 133 36
40280-216 158 10 236 178 12 239 182 13 236 178 12
40281-230 174 11 226 170 11 226 170 11 230 174 11
40282-236 178 12 242 186 14 246 190 14 246 190 14
40283-246 190 14 246 190 14 246 186 14 239 182 13
40284-206 162 42 106 106 106 66 66 66 34 34 34
40285- 14 14 14 6 6 6 0 0 0 0 0 0
40286- 0 0 0 0 0 0 0 0 0 0 0 0
40287- 0 0 0 0 0 0 0 0 0 0 0 0
40288- 0 0 0 0 0 0 0 0 0 6 6 6
40289- 26 26 26 70 70 70 163 133 67 213 154 11
40290-236 178 12 246 190 14 246 190 14 246 190 14
40291-246 190 14 246 190 14 246 190 14 246 190 14
40292-246 190 14 246 190 14 246 190 14 246 190 14
40293-246 190 14 246 190 14 246 190 14 241 196 14
40294-190 146 13 18 14 6 2 2 6 2 2 6
40295- 46 46 46 246 246 246 253 253 253 253 253 253
40296-253 253 253 253 253 253 253 253 253 253 253 253
40297-253 253 253 253 253 253 253 253 253 253 253 253
40298-253 253 253 253 253 253 253 253 253 253 253 253
40299-253 253 253 221 221 221 86 86 86 156 107 11
40300-216 158 10 236 178 12 242 186 14 246 186 14
40301-242 186 14 239 182 13 239 182 13 242 186 14
40302-242 186 14 246 186 14 246 190 14 246 190 14
40303-246 190 14 246 190 14 246 190 14 246 190 14
40304-242 186 14 225 175 15 142 122 72 66 66 66
40305- 30 30 30 10 10 10 0 0 0 0 0 0
40306- 0 0 0 0 0 0 0 0 0 0 0 0
40307- 0 0 0 0 0 0 0 0 0 0 0 0
40308- 0 0 0 0 0 0 0 0 0 6 6 6
40309- 26 26 26 70 70 70 163 133 67 210 150 10
40310-236 178 12 246 190 14 246 190 14 246 190 14
40311-246 190 14 246 190 14 246 190 14 246 190 14
40312-246 190 14 246 190 14 246 190 14 246 190 14
40313-246 190 14 246 190 14 246 190 14 246 190 14
40314-232 195 16 121 92 8 34 34 34 106 106 106
40315-221 221 221 253 253 253 253 253 253 253 253 253
40316-253 253 253 253 253 253 253 253 253 253 253 253
40317-253 253 253 253 253 253 253 253 253 253 253 253
40318-253 253 253 253 253 253 253 253 253 253 253 253
40319-242 242 242 82 82 82 18 14 6 163 110 8
40320-216 158 10 236 178 12 242 186 14 246 190 14
40321-246 190 14 246 190 14 246 190 14 246 190 14
40322-246 190 14 246 190 14 246 190 14 246 190 14
40323-246 190 14 246 190 14 246 190 14 246 190 14
40324-246 190 14 246 190 14 242 186 14 163 133 67
40325- 46 46 46 18 18 18 6 6 6 0 0 0
40326- 0 0 0 0 0 0 0 0 0 0 0 0
40327- 0 0 0 0 0 0 0 0 0 0 0 0
40328- 0 0 0 0 0 0 0 0 0 10 10 10
40329- 30 30 30 78 78 78 163 133 67 210 150 10
40330-236 178 12 246 186 14 246 190 14 246 190 14
40331-246 190 14 246 190 14 246 190 14 246 190 14
40332-246 190 14 246 190 14 246 190 14 246 190 14
40333-246 190 14 246 190 14 246 190 14 246 190 14
40334-241 196 14 215 174 15 190 178 144 253 253 253
40335-253 253 253 253 253 253 253 253 253 253 253 253
40336-253 253 253 253 253 253 253 253 253 253 253 253
40337-253 253 253 253 253 253 253 253 253 253 253 253
40338-253 253 253 253 253 253 253 253 253 218 218 218
40339- 58 58 58 2 2 6 22 18 6 167 114 7
40340-216 158 10 236 178 12 246 186 14 246 190 14
40341-246 190 14 246 190 14 246 190 14 246 190 14
40342-246 190 14 246 190 14 246 190 14 246 190 14
40343-246 190 14 246 190 14 246 190 14 246 190 14
40344-246 190 14 246 186 14 242 186 14 190 150 46
40345- 54 54 54 22 22 22 6 6 6 0 0 0
40346- 0 0 0 0 0 0 0 0 0 0 0 0
40347- 0 0 0 0 0 0 0 0 0 0 0 0
40348- 0 0 0 0 0 0 0 0 0 14 14 14
40349- 38 38 38 86 86 86 180 133 36 213 154 11
40350-236 178 12 246 186 14 246 190 14 246 190 14
40351-246 190 14 246 190 14 246 190 14 246 190 14
40352-246 190 14 246 190 14 246 190 14 246 190 14
40353-246 190 14 246 190 14 246 190 14 246 190 14
40354-246 190 14 232 195 16 190 146 13 214 214 214
40355-253 253 253 253 253 253 253 253 253 253 253 253
40356-253 253 253 253 253 253 253 253 253 253 253 253
40357-253 253 253 253 253 253 253 253 253 253 253 253
40358-253 253 253 250 250 250 170 170 170 26 26 26
40359- 2 2 6 2 2 6 37 26 9 163 110 8
40360-219 162 10 239 182 13 246 186 14 246 190 14
40361-246 190 14 246 190 14 246 190 14 246 190 14
40362-246 190 14 246 190 14 246 190 14 246 190 14
40363-246 190 14 246 190 14 246 190 14 246 190 14
40364-246 186 14 236 178 12 224 166 10 142 122 72
40365- 46 46 46 18 18 18 6 6 6 0 0 0
40366- 0 0 0 0 0 0 0 0 0 0 0 0
40367- 0 0 0 0 0 0 0 0 0 0 0 0
40368- 0 0 0 0 0 0 6 6 6 18 18 18
40369- 50 50 50 109 106 95 192 133 9 224 166 10
40370-242 186 14 246 190 14 246 190 14 246 190 14
40371-246 190 14 246 190 14 246 190 14 246 190 14
40372-246 190 14 246 190 14 246 190 14 246 190 14
40373-246 190 14 246 190 14 246 190 14 246 190 14
40374-242 186 14 226 184 13 210 162 10 142 110 46
40375-226 226 226 253 253 253 253 253 253 253 253 253
40376-253 253 253 253 253 253 253 253 253 253 253 253
40377-253 253 253 253 253 253 253 253 253 253 253 253
40378-198 198 198 66 66 66 2 2 6 2 2 6
40379- 2 2 6 2 2 6 50 34 6 156 107 11
40380-219 162 10 239 182 13 246 186 14 246 190 14
40381-246 190 14 246 190 14 246 190 14 246 190 14
40382-246 190 14 246 190 14 246 190 14 246 190 14
40383-246 190 14 246 190 14 246 190 14 242 186 14
40384-234 174 13 213 154 11 154 122 46 66 66 66
40385- 30 30 30 10 10 10 0 0 0 0 0 0
40386- 0 0 0 0 0 0 0 0 0 0 0 0
40387- 0 0 0 0 0 0 0 0 0 0 0 0
40388- 0 0 0 0 0 0 6 6 6 22 22 22
40389- 58 58 58 154 121 60 206 145 10 234 174 13
40390-242 186 14 246 186 14 246 190 14 246 190 14
40391-246 190 14 246 190 14 246 190 14 246 190 14
40392-246 190 14 246 190 14 246 190 14 246 190 14
40393-246 190 14 246 190 14 246 190 14 246 190 14
40394-246 186 14 236 178 12 210 162 10 163 110 8
40395- 61 42 6 138 138 138 218 218 218 250 250 250
40396-253 253 253 253 253 253 253 253 253 250 250 250
40397-242 242 242 210 210 210 144 144 144 66 66 66
40398- 6 6 6 2 2 6 2 2 6 2 2 6
40399- 2 2 6 2 2 6 61 42 6 163 110 8
40400-216 158 10 236 178 12 246 190 14 246 190 14
40401-246 190 14 246 190 14 246 190 14 246 190 14
40402-246 190 14 246 190 14 246 190 14 246 190 14
40403-246 190 14 239 182 13 230 174 11 216 158 10
40404-190 142 34 124 112 88 70 70 70 38 38 38
40405- 18 18 18 6 6 6 0 0 0 0 0 0
40406- 0 0 0 0 0 0 0 0 0 0 0 0
40407- 0 0 0 0 0 0 0 0 0 0 0 0
40408- 0 0 0 0 0 0 6 6 6 22 22 22
40409- 62 62 62 168 124 44 206 145 10 224 166 10
40410-236 178 12 239 182 13 242 186 14 242 186 14
40411-246 186 14 246 190 14 246 190 14 246 190 14
40412-246 190 14 246 190 14 246 190 14 246 190 14
40413-246 190 14 246 190 14 246 190 14 246 190 14
40414-246 190 14 236 178 12 216 158 10 175 118 6
40415- 80 54 7 2 2 6 6 6 6 30 30 30
40416- 54 54 54 62 62 62 50 50 50 38 38 38
40417- 14 14 14 2 2 6 2 2 6 2 2 6
40418- 2 2 6 2 2 6 2 2 6 2 2 6
40419- 2 2 6 6 6 6 80 54 7 167 114 7
40420-213 154 11 236 178 12 246 190 14 246 190 14
40421-246 190 14 246 190 14 246 190 14 246 190 14
40422-246 190 14 242 186 14 239 182 13 239 182 13
40423-230 174 11 210 150 10 174 135 50 124 112 88
40424- 82 82 82 54 54 54 34 34 34 18 18 18
40425- 6 6 6 0 0 0 0 0 0 0 0 0
40426- 0 0 0 0 0 0 0 0 0 0 0 0
40427- 0 0 0 0 0 0 0 0 0 0 0 0
40428- 0 0 0 0 0 0 6 6 6 18 18 18
40429- 50 50 50 158 118 36 192 133 9 200 144 11
40430-216 158 10 219 162 10 224 166 10 226 170 11
40431-230 174 11 236 178 12 239 182 13 239 182 13
40432-242 186 14 246 186 14 246 190 14 246 190 14
40433-246 190 14 246 190 14 246 190 14 246 190 14
40434-246 186 14 230 174 11 210 150 10 163 110 8
40435-104 69 6 10 10 10 2 2 6 2 2 6
40436- 2 2 6 2 2 6 2 2 6 2 2 6
40437- 2 2 6 2 2 6 2 2 6 2 2 6
40438- 2 2 6 2 2 6 2 2 6 2 2 6
40439- 2 2 6 6 6 6 91 60 6 167 114 7
40440-206 145 10 230 174 11 242 186 14 246 190 14
40441-246 190 14 246 190 14 246 186 14 242 186 14
40442-239 182 13 230 174 11 224 166 10 213 154 11
40443-180 133 36 124 112 88 86 86 86 58 58 58
40444- 38 38 38 22 22 22 10 10 10 6 6 6
40445- 0 0 0 0 0 0 0 0 0 0 0 0
40446- 0 0 0 0 0 0 0 0 0 0 0 0
40447- 0 0 0 0 0 0 0 0 0 0 0 0
40448- 0 0 0 0 0 0 0 0 0 14 14 14
40449- 34 34 34 70 70 70 138 110 50 158 118 36
40450-167 114 7 180 123 7 192 133 9 197 138 11
40451-200 144 11 206 145 10 213 154 11 219 162 10
40452-224 166 10 230 174 11 239 182 13 242 186 14
40453-246 186 14 246 186 14 246 186 14 246 186 14
40454-239 182 13 216 158 10 185 133 11 152 99 6
40455-104 69 6 18 14 6 2 2 6 2 2 6
40456- 2 2 6 2 2 6 2 2 6 2 2 6
40457- 2 2 6 2 2 6 2 2 6 2 2 6
40458- 2 2 6 2 2 6 2 2 6 2 2 6
40459- 2 2 6 6 6 6 80 54 7 152 99 6
40460-192 133 9 219 162 10 236 178 12 239 182 13
40461-246 186 14 242 186 14 239 182 13 236 178 12
40462-224 166 10 206 145 10 192 133 9 154 121 60
40463- 94 94 94 62 62 62 42 42 42 22 22 22
40464- 14 14 14 6 6 6 0 0 0 0 0 0
40465- 0 0 0 0 0 0 0 0 0 0 0 0
40466- 0 0 0 0 0 0 0 0 0 0 0 0
40467- 0 0 0 0 0 0 0 0 0 0 0 0
40468- 0 0 0 0 0 0 0 0 0 6 6 6
40469- 18 18 18 34 34 34 58 58 58 78 78 78
40470-101 98 89 124 112 88 142 110 46 156 107 11
40471-163 110 8 167 114 7 175 118 6 180 123 7
40472-185 133 11 197 138 11 210 150 10 219 162 10
40473-226 170 11 236 178 12 236 178 12 234 174 13
40474-219 162 10 197 138 11 163 110 8 130 83 6
40475- 91 60 6 10 10 10 2 2 6 2 2 6
40476- 18 18 18 38 38 38 38 38 38 38 38 38
40477- 38 38 38 38 38 38 38 38 38 38 38 38
40478- 38 38 38 38 38 38 26 26 26 2 2 6
40479- 2 2 6 6 6 6 70 47 6 137 92 6
40480-175 118 6 200 144 11 219 162 10 230 174 11
40481-234 174 13 230 174 11 219 162 10 210 150 10
40482-192 133 9 163 110 8 124 112 88 82 82 82
40483- 50 50 50 30 30 30 14 14 14 6 6 6
40484- 0 0 0 0 0 0 0 0 0 0 0 0
40485- 0 0 0 0 0 0 0 0 0 0 0 0
40486- 0 0 0 0 0 0 0 0 0 0 0 0
40487- 0 0 0 0 0 0 0 0 0 0 0 0
40488- 0 0 0 0 0 0 0 0 0 0 0 0
40489- 6 6 6 14 14 14 22 22 22 34 34 34
40490- 42 42 42 58 58 58 74 74 74 86 86 86
40491-101 98 89 122 102 70 130 98 46 121 87 25
40492-137 92 6 152 99 6 163 110 8 180 123 7
40493-185 133 11 197 138 11 206 145 10 200 144 11
40494-180 123 7 156 107 11 130 83 6 104 69 6
40495- 50 34 6 54 54 54 110 110 110 101 98 89
40496- 86 86 86 82 82 82 78 78 78 78 78 78
40497- 78 78 78 78 78 78 78 78 78 78 78 78
40498- 78 78 78 82 82 82 86 86 86 94 94 94
40499-106 106 106 101 101 101 86 66 34 124 80 6
40500-156 107 11 180 123 7 192 133 9 200 144 11
40501-206 145 10 200 144 11 192 133 9 175 118 6
40502-139 102 15 109 106 95 70 70 70 42 42 42
40503- 22 22 22 10 10 10 0 0 0 0 0 0
40504- 0 0 0 0 0 0 0 0 0 0 0 0
40505- 0 0 0 0 0 0 0 0 0 0 0 0
40506- 0 0 0 0 0 0 0 0 0 0 0 0
40507- 0 0 0 0 0 0 0 0 0 0 0 0
40508- 0 0 0 0 0 0 0 0 0 0 0 0
40509- 0 0 0 0 0 0 6 6 6 10 10 10
40510- 14 14 14 22 22 22 30 30 30 38 38 38
40511- 50 50 50 62 62 62 74 74 74 90 90 90
40512-101 98 89 112 100 78 121 87 25 124 80 6
40513-137 92 6 152 99 6 152 99 6 152 99 6
40514-138 86 6 124 80 6 98 70 6 86 66 30
40515-101 98 89 82 82 82 58 58 58 46 46 46
40516- 38 38 38 34 34 34 34 34 34 34 34 34
40517- 34 34 34 34 34 34 34 34 34 34 34 34
40518- 34 34 34 34 34 34 38 38 38 42 42 42
40519- 54 54 54 82 82 82 94 86 76 91 60 6
40520-134 86 6 156 107 11 167 114 7 175 118 6
40521-175 118 6 167 114 7 152 99 6 121 87 25
40522-101 98 89 62 62 62 34 34 34 18 18 18
40523- 6 6 6 0 0 0 0 0 0 0 0 0
40524- 0 0 0 0 0 0 0 0 0 0 0 0
40525- 0 0 0 0 0 0 0 0 0 0 0 0
40526- 0 0 0 0 0 0 0 0 0 0 0 0
40527- 0 0 0 0 0 0 0 0 0 0 0 0
40528- 0 0 0 0 0 0 0 0 0 0 0 0
40529- 0 0 0 0 0 0 0 0 0 0 0 0
40530- 0 0 0 6 6 6 6 6 6 10 10 10
40531- 18 18 18 22 22 22 30 30 30 42 42 42
40532- 50 50 50 66 66 66 86 86 86 101 98 89
40533-106 86 58 98 70 6 104 69 6 104 69 6
40534-104 69 6 91 60 6 82 62 34 90 90 90
40535- 62 62 62 38 38 38 22 22 22 14 14 14
40536- 10 10 10 10 10 10 10 10 10 10 10 10
40537- 10 10 10 10 10 10 6 6 6 10 10 10
40538- 10 10 10 10 10 10 10 10 10 14 14 14
40539- 22 22 22 42 42 42 70 70 70 89 81 66
40540- 80 54 7 104 69 6 124 80 6 137 92 6
40541-134 86 6 116 81 8 100 82 52 86 86 86
40542- 58 58 58 30 30 30 14 14 14 6 6 6
40543- 0 0 0 0 0 0 0 0 0 0 0 0
40544- 0 0 0 0 0 0 0 0 0 0 0 0
40545- 0 0 0 0 0 0 0 0 0 0 0 0
40546- 0 0 0 0 0 0 0 0 0 0 0 0
40547- 0 0 0 0 0 0 0 0 0 0 0 0
40548- 0 0 0 0 0 0 0 0 0 0 0 0
40549- 0 0 0 0 0 0 0 0 0 0 0 0
40550- 0 0 0 0 0 0 0 0 0 0 0 0
40551- 0 0 0 6 6 6 10 10 10 14 14 14
40552- 18 18 18 26 26 26 38 38 38 54 54 54
40553- 70 70 70 86 86 86 94 86 76 89 81 66
40554- 89 81 66 86 86 86 74 74 74 50 50 50
40555- 30 30 30 14 14 14 6 6 6 0 0 0
40556- 0 0 0 0 0 0 0 0 0 0 0 0
40557- 0 0 0 0 0 0 0 0 0 0 0 0
40558- 0 0 0 0 0 0 0 0 0 0 0 0
40559- 6 6 6 18 18 18 34 34 34 58 58 58
40560- 82 82 82 89 81 66 89 81 66 89 81 66
40561- 94 86 66 94 86 76 74 74 74 50 50 50
40562- 26 26 26 14 14 14 6 6 6 0 0 0
40563- 0 0 0 0 0 0 0 0 0 0 0 0
40564- 0 0 0 0 0 0 0 0 0 0 0 0
40565- 0 0 0 0 0 0 0 0 0 0 0 0
40566- 0 0 0 0 0 0 0 0 0 0 0 0
40567- 0 0 0 0 0 0 0 0 0 0 0 0
40568- 0 0 0 0 0 0 0 0 0 0 0 0
40569- 0 0 0 0 0 0 0 0 0 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- 6 6 6 6 6 6 14 14 14 18 18 18
40573- 30 30 30 38 38 38 46 46 46 54 54 54
40574- 50 50 50 42 42 42 30 30 30 18 18 18
40575- 10 10 10 0 0 0 0 0 0 0 0 0
40576- 0 0 0 0 0 0 0 0 0 0 0 0
40577- 0 0 0 0 0 0 0 0 0 0 0 0
40578- 0 0 0 0 0 0 0 0 0 0 0 0
40579- 0 0 0 6 6 6 14 14 14 26 26 26
40580- 38 38 38 50 50 50 58 58 58 58 58 58
40581- 54 54 54 42 42 42 30 30 30 18 18 18
40582- 10 10 10 0 0 0 0 0 0 0 0 0
40583- 0 0 0 0 0 0 0 0 0 0 0 0
40584- 0 0 0 0 0 0 0 0 0 0 0 0
40585- 0 0 0 0 0 0 0 0 0 0 0 0
40586- 0 0 0 0 0 0 0 0 0 0 0 0
40587- 0 0 0 0 0 0 0 0 0 0 0 0
40588- 0 0 0 0 0 0 0 0 0 0 0 0
40589- 0 0 0 0 0 0 0 0 0 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 6 6 6
40593- 6 6 6 10 10 10 14 14 14 18 18 18
40594- 18 18 18 14 14 14 10 10 10 6 6 6
40595- 0 0 0 0 0 0 0 0 0 0 0 0
40596- 0 0 0 0 0 0 0 0 0 0 0 0
40597- 0 0 0 0 0 0 0 0 0 0 0 0
40598- 0 0 0 0 0 0 0 0 0 0 0 0
40599- 0 0 0 0 0 0 0 0 0 6 6 6
40600- 14 14 14 18 18 18 22 22 22 22 22 22
40601- 18 18 18 14 14 14 10 10 10 6 6 6
40602- 0 0 0 0 0 0 0 0 0 0 0 0
40603- 0 0 0 0 0 0 0 0 0 0 0 0
40604- 0 0 0 0 0 0 0 0 0 0 0 0
40605- 0 0 0 0 0 0 0 0 0 0 0 0
40606- 0 0 0 0 0 0 0 0 0 0 0 0
40607+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40608+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40609+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40610+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40611+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40612+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40613+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40614+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40615+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40616+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40617+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40618+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40619+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40620+4 4 4 4 4 4
40621+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40622+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40623+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40624+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40625+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40626+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40627+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40628+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40629+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40630+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40631+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40632+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40633+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40634+4 4 4 4 4 4
40635+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40636+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40637+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40638+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40639+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40640+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40641+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40642+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40643+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40644+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40645+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40646+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40647+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40648+4 4 4 4 4 4
40649+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40650+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40651+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40652+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40653+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40654+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40655+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40656+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40657+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40658+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40659+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40660+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40661+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40662+4 4 4 4 4 4
40663+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40664+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40665+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40666+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40667+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40668+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40669+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40670+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40671+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40672+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40673+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40674+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40675+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40676+4 4 4 4 4 4
40677+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40678+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40679+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40680+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40681+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40682+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40683+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40684+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40685+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40686+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40687+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40688+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40689+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40690+4 4 4 4 4 4
40691+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40692+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40693+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40694+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40695+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
40696+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
40697+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40698+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40699+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40700+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
40701+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40702+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
40703+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40704+4 4 4 4 4 4
40705+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40706+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40707+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40708+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40709+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
40710+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
40711+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40712+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40713+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40714+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
40715+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
40716+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
40717+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40718+4 4 4 4 4 4
40719+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40720+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40721+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40722+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40723+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
40724+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
40725+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40726+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40727+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40728+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
40729+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
40730+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
40731+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
40732+4 4 4 4 4 4
40733+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40734+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40735+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40736+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
40737+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
40738+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
40739+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
40740+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40741+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
40742+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
40743+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
40744+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
40745+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
40746+4 4 4 4 4 4
40747+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40748+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40749+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40750+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
40751+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
40752+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
40753+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
40754+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
40755+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
40756+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
40757+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
40758+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
40759+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
40760+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 5 5 5
40764+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
40765+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
40766+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
40767+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
40768+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
40769+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
40770+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
40771+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
40772+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
40773+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
40774+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 5 5 5 3 3 3
40778+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
40779+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
40780+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
40781+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
40782+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
40783+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
40784+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
40785+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
40786+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
40787+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
40788+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 2 2 2 0 0 0 4 0 0
40792+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
40793+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
40794+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
40795+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
40796+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
40797+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
40798+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
40799+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
40800+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
40801+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
40802+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 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
40806+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
40807+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
40808+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
40809+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
40810+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
40811+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
40812+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
40813+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
40814+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
40815+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40816+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+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
40820+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
40821+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
40822+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
40823+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
40824+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
40825+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
40826+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
40827+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
40828+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
40829+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
40830+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 3 3 3 0 0 0
40833+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
40834+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
40835+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
40836+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
40837+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
40838+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
40839+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
40840+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
40841+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
40842+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
40843+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
40844+4 4 4 4 4 4
40845+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40846+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
40847+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
40848+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
40849+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
40850+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
40851+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
40852+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
40853+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
40854+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
40855+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
40856+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
40857+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
40858+0 0 0 4 4 4
40859+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
40860+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
40861+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
40862+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
40863+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
40864+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
40865+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
40866+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
40867+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
40868+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
40869+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
40870+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
40871+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
40872+2 0 0 0 0 0
40873+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
40874+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
40875+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
40876+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
40877+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
40878+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
40879+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
40880+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
40881+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
40882+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
40883+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
40884+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
40885+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
40886+37 38 37 0 0 0
40887+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
40888+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
40889+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
40890+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
40891+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
40892+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
40893+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
40894+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
40895+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
40896+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
40897+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
40898+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
40899+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
40900+85 115 134 4 0 0
40901+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
40902+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
40903+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
40904+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
40905+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
40906+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
40907+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
40908+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
40909+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
40910+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
40911+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
40912+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
40913+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
40914+60 73 81 4 0 0
40915+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
40916+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
40917+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
40918+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
40919+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
40920+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
40921+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
40922+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
40923+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
40924+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
40925+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
40926+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
40927+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
40928+16 19 21 4 0 0
40929+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
40930+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
40931+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
40932+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
40933+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
40934+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
40935+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
40936+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
40937+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
40938+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
40939+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
40940+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
40941+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
40942+4 0 0 4 3 3
40943+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
40944+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
40945+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
40946+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
40947+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
40948+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
40949+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
40950+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
40951+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
40952+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
40953+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
40954+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
40955+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
40956+3 2 2 4 4 4
40957+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
40958+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
40959+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
40960+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
40961+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
40962+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
40963+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
40964+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
40965+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
40966+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
40967+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
40968+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
40969+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
40970+4 4 4 4 4 4
40971+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
40972+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
40973+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
40974+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
40975+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
40976+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
40977+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
40978+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
40979+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
40980+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
40981+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
40982+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
40983+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
40984+4 4 4 4 4 4
40985+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
40986+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
40987+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
40988+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
40989+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
40990+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
40991+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
40992+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
40993+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
40994+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
40995+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
40996+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
40997+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
40998+5 5 5 5 5 5
40999+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
41000+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
41001+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
41002+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
41003+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
41004+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41005+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
41006+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
41007+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
41008+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
41009+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
41010+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
41011+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
41012+5 5 5 4 4 4
41013+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
41014+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
41015+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
41016+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
41017+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41018+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
41019+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
41020+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
41021+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
41022+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
41023+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
41024+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
41025+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41026+4 4 4 4 4 4
41027+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
41028+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
41029+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
41030+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
41031+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
41032+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41033+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41034+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
41035+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
41036+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
41037+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
41038+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
41039+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41040+4 4 4 4 4 4
41041+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
41042+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
41043+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
41044+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
41045+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41046+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
41047+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
41048+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
41049+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
41050+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
41051+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
41052+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41053+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41054+4 4 4 4 4 4
41055+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
41056+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
41057+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
41058+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
41059+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41060+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41061+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41062+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
41063+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
41064+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
41065+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
41066+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41067+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41068+4 4 4 4 4 4
41069+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
41070+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
41071+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
41072+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
41073+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41074+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
41075+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
41076+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
41077+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
41078+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
41079+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41080+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41081+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41082+4 4 4 4 4 4
41083+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
41084+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
41085+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
41086+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
41087+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41088+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
41089+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
41090+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
41091+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
41092+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
41093+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
41094+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41095+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41096+4 4 4 4 4 4
41097+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
41098+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
41099+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
41100+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
41101+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41102+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
41103+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
41104+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
41105+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
41106+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
41107+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
41108+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41109+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41110+4 4 4 4 4 4
41111+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
41112+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
41113+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
41114+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
41115+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
41116+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
41117+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
41118+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
41119+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
41120+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
41121+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41122+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41123+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41124+4 4 4 4 4 4
41125+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
41126+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
41127+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
41128+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
41129+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41130+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
41131+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
41132+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
41133+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
41134+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
41135+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41136+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41137+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41138+4 4 4 4 4 4
41139+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
41140+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
41141+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
41142+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
41143+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41144+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
41145+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
41146+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
41147+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
41148+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
41149+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41150+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41151+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41152+4 4 4 4 4 4
41153+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
41154+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
41155+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
41156+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
41157+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41158+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
41159+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
41160+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
41161+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
41162+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41163+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41164+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41165+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41166+4 4 4 4 4 4
41167+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
41168+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
41169+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
41170+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
41171+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
41172+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
41173+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
41174+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
41175+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41176+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41177+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41178+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41179+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41180+4 4 4 4 4 4
41181+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
41182+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
41183+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
41184+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
41185+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41186+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
41187+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
41188+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
41189+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41190+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41191+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41192+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41193+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41194+4 4 4 4 4 4
41195+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
41196+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
41197+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41198+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
41199+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
41200+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
41201+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
41202+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
41203+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41204+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41205+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41206+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41207+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41208+4 4 4 4 4 4
41209+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
41210+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
41211+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41212+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
41213+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
41214+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
41215+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
41216+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
41217+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
41218+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41219+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41220+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41221+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41222+4 4 4 4 4 4
41223+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41224+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
41225+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41226+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
41227+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
41228+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
41229+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
41230+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
41231+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41232+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41233+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41234+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41235+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41236+4 4 4 4 4 4
41237+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
41238+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
41239+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41240+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
41241+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
41242+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
41243+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
41244+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
41245+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
41246+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41247+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41248+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41249+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41250+4 4 4 4 4 4
41251+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41252+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
41253+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
41254+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
41255+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
41256+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
41257+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
41258+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
41259+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41260+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41261+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41262+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41263+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41264+4 4 4 4 4 4
41265+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41266+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
41267+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41268+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
41269+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
41270+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
41271+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
41272+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
41273+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41274+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41275+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41276+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41277+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41278+4 4 4 4 4 4
41279+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41280+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
41281+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
41282+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
41283+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
41284+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
41285+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41286+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
41287+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41288+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41289+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41290+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41291+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41292+4 4 4 4 4 4
41293+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41294+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
41295+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
41296+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41297+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
41298+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
41299+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41300+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
41301+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41302+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41303+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41304+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41305+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41306+4 4 4 4 4 4
41307+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41308+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
41309+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
41310+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
41311+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
41312+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
41313+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
41314+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
41315+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
41316+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41317+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41318+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41319+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41320+4 4 4 4 4 4
41321+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41322+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
41323+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
41324+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
41325+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
41326+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
41327+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
41328+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
41329+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
41330+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41331+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41332+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41333+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41334+4 4 4 4 4 4
41335+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
41336+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
41337+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
41338+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
41339+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41340+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
41341+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
41342+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
41343+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
41344+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41345+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41346+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41347+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41348+4 4 4 4 4 4
41349+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41350+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
41351+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
41352+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
41353+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
41354+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
41355+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
41356+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
41357+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
41358+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41359+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41360+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41361+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41362+4 4 4 4 4 4
41363+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
41364+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
41365+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
41366+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
41367+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
41368+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
41369+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
41370+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
41371+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
41372+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
41373+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41374+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41375+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41376+4 4 4 4 4 4
41377+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
41378+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41379+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
41380+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
41381+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
41382+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
41383+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
41384+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
41385+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
41386+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
41387+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41388+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41389+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41390+4 4 4 4 4 4
41391+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
41392+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41393+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
41394+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
41395+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
41396+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
41397+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41398+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
41399+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
41400+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
41401+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41402+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41403+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41404+4 4 4 4 4 4
41405+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
41406+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
41407+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
41408+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
41409+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
41410+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
41411+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
41412+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
41413+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
41414+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
41415+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41416+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41417+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41418+4 4 4 4 4 4
41419+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
41420+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
41421+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41422+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
41423+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
41424+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
41425+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
41426+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
41427+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
41428+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
41429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41431+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41432+4 4 4 4 4 4
41433+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41434+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
41435+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
41436+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
41437+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
41438+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
41439+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
41440+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
41441+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
41442+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41444+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41445+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41446+4 4 4 4 4 4
41447+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
41448+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
41449+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
41450+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
41451+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
41452+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
41453+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
41454+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
41455+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
41456+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
41457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41458+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41459+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41460+4 4 4 4 4 4
41461+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
41462+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
41463+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
41464+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
41465+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
41466+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
41467+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
41468+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
41469+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
41470+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41472+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41473+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41474+4 4 4 4 4 4
41475+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
41476+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41477+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
41478+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41479+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
41480+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
41481+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
41482+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
41483+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
41484+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41486+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41487+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41488+4 4 4 4 4 4
41489+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
41490+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
41491+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
41492+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
41493+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
41494+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
41495+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
41496+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
41497+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
41498+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41499+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41500+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41501+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41502+4 4 4 4 4 4
41503+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
41504+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
41505+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
41506+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
41507+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
41508+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
41509+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
41510+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
41511+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41514+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41515+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41516+4 4 4 4 4 4
41517+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
41518+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
41519+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
41520+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
41521+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
41522+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
41523+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
41524+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
41525+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41528+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41529+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41530+4 4 4 4 4 4
41531+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
41532+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
41533+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
41534+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
41535+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
41536+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
41537+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
41538+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41539+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41540+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41541+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41542+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41543+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41544+4 4 4 4 4 4
41545+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41546+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
41547+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41548+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
41549+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
41550+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
41551+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
41552+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
41553+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41554+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41555+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41556+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41557+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41558+4 4 4 4 4 4
41559+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41560+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
41561+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
41562+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
41563+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
41564+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
41565+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
41566+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
41567+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41568+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41569+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41570+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41571+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41572+4 4 4 4 4 4
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 5 5 5 5 5 5 5 5 5
41575+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
41576+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
41577+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
41578+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
41579+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
41580+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41581+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41582+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41583+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41584+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41585+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41586+4 4 4 4 4 4
41587+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41588+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41589+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
41590+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
41591+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
41592+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
41593+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
41594+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41595+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41596+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41597+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41598+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41599+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41600+4 4 4 4 4 4
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 5 5 5
41604+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41605+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
41606+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
41607+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
41608+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41609+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41610+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41611+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41612+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41613+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41614+4 4 4 4 4 4
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 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
41619+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
41620+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
41621+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
41622+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41623+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41624+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41625+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41626+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41627+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41628+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 5 5 5 4 3 3 5 5 5 6 6 6
41633+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41634+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
41635+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
41636+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41637+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41638+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41639+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41640+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41641+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41642+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 4 4 4 5 5 5 4 3 3 5 5 5
41647+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
41648+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
41649+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
41650+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41651+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41652+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41653+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41654+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41655+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41656+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 4 4 4 4 4 4 4 4 4 5 5 5
41661+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
41662+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41663+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41664+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41665+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41666+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41667+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41668+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
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 4 4 4 4 4 4 4 4 4 4 4 4
41675+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
41676+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
41677+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
41678+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41679+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41680+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41681+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41682+4 4 4 4 4 4 4 4 4 4 4 4 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
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 4 4 4 4 4 4 4 4 4 4 4 4
41689+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
41690+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
41691+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41692+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41693+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41694+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41695+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41696+4 4 4 4 4 4 4 4 4 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
41699+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41700+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41701+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41702+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41703+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
41704+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
41705+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41706+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41707+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41708+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41709+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41710+4 4 4 4 4 4 4 4 4 4 4 4 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
41713+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41714+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41715+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41716+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41717+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
41718+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
41719+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41720+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41721+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41722+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41723+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41724+4 4 4 4 4 4 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
41727diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
41728index 3473e75..c930142 100644
41729--- a/drivers/video/udlfb.c
41730+++ b/drivers/video/udlfb.c
41731@@ -619,11 +619,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
41732 dlfb_urb_completion(urb);
41733
41734 error:
41735- atomic_add(bytes_sent, &dev->bytes_sent);
41736- atomic_add(bytes_identical, &dev->bytes_identical);
41737- atomic_add(width*height*2, &dev->bytes_rendered);
41738+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
41739+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
41740+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
41741 end_cycles = get_cycles();
41742- atomic_add(((unsigned int) ((end_cycles - start_cycles)
41743+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
41744 >> 10)), /* Kcycles */
41745 &dev->cpu_kcycles_used);
41746
41747@@ -744,11 +744,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
41748 dlfb_urb_completion(urb);
41749
41750 error:
41751- atomic_add(bytes_sent, &dev->bytes_sent);
41752- atomic_add(bytes_identical, &dev->bytes_identical);
41753- atomic_add(bytes_rendered, &dev->bytes_rendered);
41754+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
41755+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
41756+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
41757 end_cycles = get_cycles();
41758- atomic_add(((unsigned int) ((end_cycles - start_cycles)
41759+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
41760 >> 10)), /* Kcycles */
41761 &dev->cpu_kcycles_used);
41762 }
41763@@ -1368,7 +1368,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
41764 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41765 struct dlfb_data *dev = fb_info->par;
41766 return snprintf(buf, PAGE_SIZE, "%u\n",
41767- atomic_read(&dev->bytes_rendered));
41768+ atomic_read_unchecked(&dev->bytes_rendered));
41769 }
41770
41771 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
41772@@ -1376,7 +1376,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
41773 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41774 struct dlfb_data *dev = fb_info->par;
41775 return snprintf(buf, PAGE_SIZE, "%u\n",
41776- atomic_read(&dev->bytes_identical));
41777+ atomic_read_unchecked(&dev->bytes_identical));
41778 }
41779
41780 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
41781@@ -1384,7 +1384,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
41782 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41783 struct dlfb_data *dev = fb_info->par;
41784 return snprintf(buf, PAGE_SIZE, "%u\n",
41785- atomic_read(&dev->bytes_sent));
41786+ atomic_read_unchecked(&dev->bytes_sent));
41787 }
41788
41789 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
41790@@ -1392,7 +1392,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
41791 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41792 struct dlfb_data *dev = fb_info->par;
41793 return snprintf(buf, PAGE_SIZE, "%u\n",
41794- atomic_read(&dev->cpu_kcycles_used));
41795+ atomic_read_unchecked(&dev->cpu_kcycles_used));
41796 }
41797
41798 static ssize_t edid_show(
41799@@ -1449,10 +1449,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
41800 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41801 struct dlfb_data *dev = fb_info->par;
41802
41803- atomic_set(&dev->bytes_rendered, 0);
41804- atomic_set(&dev->bytes_identical, 0);
41805- atomic_set(&dev->bytes_sent, 0);
41806- atomic_set(&dev->cpu_kcycles_used, 0);
41807+ atomic_set_unchecked(&dev->bytes_rendered, 0);
41808+ atomic_set_unchecked(&dev->bytes_identical, 0);
41809+ atomic_set_unchecked(&dev->bytes_sent, 0);
41810+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
41811
41812 return count;
41813 }
41814diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
41815index 7f8472c..9842e87 100644
41816--- a/drivers/video/uvesafb.c
41817+++ b/drivers/video/uvesafb.c
41818@@ -19,6 +19,7 @@
41819 #include <linux/io.h>
41820 #include <linux/mutex.h>
41821 #include <linux/slab.h>
41822+#include <linux/moduleloader.h>
41823 #include <video/edid.h>
41824 #include <video/uvesafb.h>
41825 #ifdef CONFIG_X86
41826@@ -121,7 +122,7 @@ static int uvesafb_helper_start(void)
41827 NULL,
41828 };
41829
41830- return call_usermodehelper(v86d_path, argv, envp, 1);
41831+ return call_usermodehelper(v86d_path, argv, envp, UMH_WAIT_PROC);
41832 }
41833
41834 /*
41835@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
41836 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
41837 par->pmi_setpal = par->ypan = 0;
41838 } else {
41839+
41840+#ifdef CONFIG_PAX_KERNEXEC
41841+#ifdef CONFIG_MODULES
41842+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
41843+#endif
41844+ if (!par->pmi_code) {
41845+ par->pmi_setpal = par->ypan = 0;
41846+ return 0;
41847+ }
41848+#endif
41849+
41850 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
41851 + task->t.regs.edi);
41852+
41853+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41854+ pax_open_kernel();
41855+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
41856+ pax_close_kernel();
41857+
41858+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
41859+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
41860+#else
41861 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
41862 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
41863+#endif
41864+
41865 printk(KERN_INFO "uvesafb: protected mode interface info at "
41866 "%04x:%04x\n",
41867 (u16)task->t.regs.es, (u16)task->t.regs.edi);
41868@@ -1821,6 +1844,11 @@ out:
41869 if (par->vbe_modes)
41870 kfree(par->vbe_modes);
41871
41872+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41873+ if (par->pmi_code)
41874+ module_free_exec(NULL, par->pmi_code);
41875+#endif
41876+
41877 framebuffer_release(info);
41878 return err;
41879 }
41880@@ -1847,6 +1875,12 @@ static int uvesafb_remove(struct platform_device *dev)
41881 kfree(par->vbe_state_orig);
41882 if (par->vbe_state_saved)
41883 kfree(par->vbe_state_saved);
41884+
41885+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41886+ if (par->pmi_code)
41887+ module_free_exec(NULL, par->pmi_code);
41888+#endif
41889+
41890 }
41891
41892 framebuffer_release(info);
41893diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
41894index 501b340..86bd4cf 100644
41895--- a/drivers/video/vesafb.c
41896+++ b/drivers/video/vesafb.c
41897@@ -9,6 +9,7 @@
41898 */
41899
41900 #include <linux/module.h>
41901+#include <linux/moduleloader.h>
41902 #include <linux/kernel.h>
41903 #include <linux/errno.h>
41904 #include <linux/string.h>
41905@@ -52,8 +53,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */
41906 static int vram_total __initdata; /* Set total amount of memory */
41907 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
41908 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
41909-static void (*pmi_start)(void) __read_mostly;
41910-static void (*pmi_pal) (void) __read_mostly;
41911+static void (*pmi_start)(void) __read_only;
41912+static void (*pmi_pal) (void) __read_only;
41913 static int depth __read_mostly;
41914 static int vga_compat __read_mostly;
41915 /* --------------------------------------------------------------------- */
41916@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
41917 unsigned int size_vmode;
41918 unsigned int size_remap;
41919 unsigned int size_total;
41920+ void *pmi_code = NULL;
41921
41922 if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
41923 return -ENODEV;
41924@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
41925 size_remap = size_total;
41926 vesafb_fix.smem_len = size_remap;
41927
41928-#ifndef __i386__
41929- screen_info.vesapm_seg = 0;
41930-#endif
41931-
41932 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
41933 printk(KERN_WARNING
41934 "vesafb: cannot reserve video memory at 0x%lx\n",
41935@@ -307,9 +305,21 @@ static int __init vesafb_probe(struct platform_device *dev)
41936 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
41937 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
41938
41939+#ifdef __i386__
41940+
41941+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41942+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
41943+ if (!pmi_code)
41944+#elif !defined(CONFIG_PAX_KERNEXEC)
41945+ if (0)
41946+#endif
41947+
41948+#endif
41949+ screen_info.vesapm_seg = 0;
41950+
41951 if (screen_info.vesapm_seg) {
41952- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
41953- screen_info.vesapm_seg,screen_info.vesapm_off);
41954+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
41955+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
41956 }
41957
41958 if (screen_info.vesapm_seg < 0xc000)
41959@@ -317,9 +327,25 @@ static int __init vesafb_probe(struct platform_device *dev)
41960
41961 if (ypan || pmi_setpal) {
41962 unsigned short *pmi_base;
41963+
41964 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
41965- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
41966- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
41967+
41968+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41969+ pax_open_kernel();
41970+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
41971+#else
41972+ pmi_code = pmi_base;
41973+#endif
41974+
41975+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
41976+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
41977+
41978+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41979+ pmi_start = ktva_ktla(pmi_start);
41980+ pmi_pal = ktva_ktla(pmi_pal);
41981+ pax_close_kernel();
41982+#endif
41983+
41984 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
41985 if (pmi_base[3]) {
41986 printk(KERN_INFO "vesafb: pmi: ports = ");
41987@@ -488,6 +514,11 @@ static int __init vesafb_probe(struct platform_device *dev)
41988 info->node, info->fix.id);
41989 return 0;
41990 err:
41991+
41992+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41993+ module_free_exec(NULL, pmi_code);
41994+#endif
41995+
41996 if (info->screen_base)
41997 iounmap(info->screen_base);
41998 framebuffer_release(info);
41999diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
42000index 88714ae..16c2e11 100644
42001--- a/drivers/video/via/via_clock.h
42002+++ b/drivers/video/via/via_clock.h
42003@@ -56,7 +56,7 @@ struct via_clock {
42004
42005 void (*set_engine_pll_state)(u8 state);
42006 void (*set_engine_pll)(struct via_pll_config config);
42007-};
42008+} __no_const;
42009
42010
42011 static inline u32 get_pll_internal_frequency(u32 ref_freq,
42012diff --git a/drivers/xen/xen-pciback/conf_space.h b/drivers/xen/xen-pciback/conf_space.h
42013index e56c934..fc22f4b 100644
42014--- a/drivers/xen/xen-pciback/conf_space.h
42015+++ b/drivers/xen/xen-pciback/conf_space.h
42016@@ -44,15 +44,15 @@ struct config_field {
42017 struct {
42018 conf_dword_write write;
42019 conf_dword_read read;
42020- } dw;
42021+ } __no_const dw;
42022 struct {
42023 conf_word_write write;
42024 conf_word_read read;
42025- } w;
42026+ } __no_const w;
42027 struct {
42028 conf_byte_write write;
42029 conf_byte_read read;
42030- } b;
42031+ } __no_const b;
42032 } u;
42033 struct list_head list;
42034 };
42035diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
42036index 879ed88..bc03a01 100644
42037--- a/fs/9p/vfs_inode.c
42038+++ b/fs/9p/vfs_inode.c
42039@@ -1286,7 +1286,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
42040 void
42041 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
42042 {
42043- char *s = nd_get_link(nd);
42044+ const char *s = nd_get_link(nd);
42045
42046 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
42047 IS_ERR(s) ? "<error>" : s);
42048diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
42049index 79e2ca7..5828ad1 100644
42050--- a/fs/Kconfig.binfmt
42051+++ b/fs/Kconfig.binfmt
42052@@ -86,7 +86,7 @@ config HAVE_AOUT
42053
42054 config BINFMT_AOUT
42055 tristate "Kernel support for a.out and ECOFF binaries"
42056- depends on HAVE_AOUT
42057+ depends on HAVE_AOUT && BROKEN
42058 ---help---
42059 A.out (Assembler.OUTput) is a set of formats for libraries and
42060 executables used in the earliest versions of UNIX. Linux used
42061diff --git a/fs/aio.c b/fs/aio.c
42062index 67e4b90..86cb1d5 100644
42063--- a/fs/aio.c
42064+++ b/fs/aio.c
42065@@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx *ctx)
42066 size += sizeof(struct io_event) * nr_events;
42067 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
42068
42069- if (nr_pages < 0)
42070+ if (nr_pages <= 0)
42071 return -EINVAL;
42072
42073 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
42074@@ -228,12 +228,6 @@ static void __put_ioctx(struct kioctx *ctx)
42075 call_rcu(&ctx->rcu_head, ctx_rcu_free);
42076 }
42077
42078-static inline void get_ioctx(struct kioctx *kioctx)
42079-{
42080- BUG_ON(atomic_read(&kioctx->users) <= 0);
42081- atomic_inc(&kioctx->users);
42082-}
42083-
42084 static inline int try_get_ioctx(struct kioctx *kioctx)
42085 {
42086 return atomic_inc_not_zero(&kioctx->users);
42087@@ -273,7 +267,7 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
42088 mm = ctx->mm = current->mm;
42089 atomic_inc(&mm->mm_count);
42090
42091- atomic_set(&ctx->users, 1);
42092+ atomic_set(&ctx->users, 2);
42093 spin_lock_init(&ctx->ctx_lock);
42094 spin_lock_init(&ctx->ring_info.ring_lock);
42095 init_waitqueue_head(&ctx->wait);
42096@@ -609,11 +603,16 @@ static void aio_fput_routine(struct work_struct *data)
42097 fput(req->ki_filp);
42098
42099 /* Link the iocb into the context's free list */
42100+ rcu_read_lock();
42101 spin_lock_irq(&ctx->ctx_lock);
42102 really_put_req(ctx, req);
42103+ /*
42104+ * at that point ctx might've been killed, but actual
42105+ * freeing is RCU'd
42106+ */
42107 spin_unlock_irq(&ctx->ctx_lock);
42108+ rcu_read_unlock();
42109
42110- put_ioctx(ctx);
42111 spin_lock_irq(&fput_lock);
42112 }
42113 spin_unlock_irq(&fput_lock);
42114@@ -644,7 +643,6 @@ static int __aio_put_req(struct kioctx *ctx, struct kiocb *req)
42115 * this function will be executed w/out any aio kthread wakeup.
42116 */
42117 if (unlikely(!fput_atomic(req->ki_filp))) {
42118- get_ioctx(ctx);
42119 spin_lock(&fput_lock);
42120 list_add(&req->ki_list, &fput_head);
42121 spin_unlock(&fput_lock);
42122@@ -1338,10 +1336,10 @@ SYSCALL_DEFINE2(io_setup, unsigned, nr_events, aio_context_t __user *, ctxp)
42123 ret = PTR_ERR(ioctx);
42124 if (!IS_ERR(ioctx)) {
42125 ret = put_user(ioctx->user_id, ctxp);
42126- if (!ret)
42127+ if (!ret) {
42128+ put_ioctx(ioctx);
42129 return 0;
42130-
42131- get_ioctx(ioctx); /* io_destroy() expects us to hold a ref */
42132+ }
42133 io_destroy(ioctx);
42134 }
42135
42136@@ -1463,22 +1461,27 @@ static ssize_t aio_fsync(struct kiocb *iocb)
42137 static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
42138 {
42139 ssize_t ret;
42140+ struct iovec iovstack;
42141
42142 #ifdef CONFIG_COMPAT
42143 if (compat)
42144 ret = compat_rw_copy_check_uvector(type,
42145 (struct compat_iovec __user *)kiocb->ki_buf,
42146- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
42147+ kiocb->ki_nbytes, 1, &iovstack,
42148 &kiocb->ki_iovec, 1);
42149 else
42150 #endif
42151 ret = rw_copy_check_uvector(type,
42152 (struct iovec __user *)kiocb->ki_buf,
42153- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
42154+ kiocb->ki_nbytes, 1, &iovstack,
42155 &kiocb->ki_iovec, 1);
42156 if (ret < 0)
42157 goto out;
42158
42159+ if (kiocb->ki_iovec == &iovstack) {
42160+ kiocb->ki_inline_vec = iovstack;
42161+ kiocb->ki_iovec = &kiocb->ki_inline_vec;
42162+ }
42163 kiocb->ki_nr_segs = kiocb->ki_nbytes;
42164 kiocb->ki_cur_seg = 0;
42165 /* ki_nbytes/left now reflect bytes instead of segs */
42166diff --git a/fs/attr.c b/fs/attr.c
42167index 7ee7ba4..0c61a60 100644
42168--- a/fs/attr.c
42169+++ b/fs/attr.c
42170@@ -99,6 +99,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
42171 unsigned long limit;
42172
42173 limit = rlimit(RLIMIT_FSIZE);
42174+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
42175 if (limit != RLIM_INFINITY && offset > limit)
42176 goto out_sig;
42177 if (offset > inode->i_sb->s_maxbytes)
42178diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
42179index 6861f61..a25f010 100644
42180--- a/fs/autofs4/waitq.c
42181+++ b/fs/autofs4/waitq.c
42182@@ -60,7 +60,7 @@ static int autofs4_write(struct file *file, const void *addr, int bytes)
42183 {
42184 unsigned long sigpipe, flags;
42185 mm_segment_t fs;
42186- const char *data = (const char *)addr;
42187+ const char __user *data = (const char __force_user *)addr;
42188 ssize_t wr = 0;
42189
42190 /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
42191diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
42192index 8342ca6..82fd192 100644
42193--- a/fs/befs/linuxvfs.c
42194+++ b/fs/befs/linuxvfs.c
42195@@ -503,7 +503,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
42196 {
42197 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
42198 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
42199- char *link = nd_get_link(nd);
42200+ const char *link = nd_get_link(nd);
42201 if (!IS_ERR(link))
42202 kfree(link);
42203 }
42204diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
42205index a6395bd..f1e376a 100644
42206--- a/fs/binfmt_aout.c
42207+++ b/fs/binfmt_aout.c
42208@@ -16,6 +16,7 @@
42209 #include <linux/string.h>
42210 #include <linux/fs.h>
42211 #include <linux/file.h>
42212+#include <linux/security.h>
42213 #include <linux/stat.h>
42214 #include <linux/fcntl.h>
42215 #include <linux/ptrace.h>
42216@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredump_params *cprm)
42217 #endif
42218 # define START_STACK(u) ((void __user *)u.start_stack)
42219
42220+ memset(&dump, 0, sizeof(dump));
42221+
42222 fs = get_fs();
42223 set_fs(KERNEL_DS);
42224 has_dumped = 1;
42225@@ -97,10 +100,12 @@ static int aout_core_dump(struct coredump_params *cprm)
42226
42227 /* If the size of the dump file exceeds the rlimit, then see what would happen
42228 if we wrote the stack, but not the data area. */
42229+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
42230 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
42231 dump.u_dsize = 0;
42232
42233 /* Make sure we have enough room to write the stack and data areas. */
42234+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
42235 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
42236 dump.u_ssize = 0;
42237
42238@@ -234,6 +239,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42239 rlim = rlimit(RLIMIT_DATA);
42240 if (rlim >= RLIM_INFINITY)
42241 rlim = ~0;
42242+
42243+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
42244 if (ex.a_data + ex.a_bss > rlim)
42245 return -ENOMEM;
42246
42247@@ -259,9 +266,37 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42248 current->mm->free_area_cache = current->mm->mmap_base;
42249 current->mm->cached_hole_size = 0;
42250
42251+ retval = setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT);
42252+ if (retval < 0) {
42253+ /* Someone check-me: is this error path enough? */
42254+ send_sig(SIGKILL, current, 0);
42255+ return retval;
42256+ }
42257+
42258 install_exec_creds(bprm);
42259 current->flags &= ~PF_FORKNOEXEC;
42260
42261+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42262+ current->mm->pax_flags = 0UL;
42263+#endif
42264+
42265+#ifdef CONFIG_PAX_PAGEEXEC
42266+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
42267+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
42268+
42269+#ifdef CONFIG_PAX_EMUTRAMP
42270+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
42271+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
42272+#endif
42273+
42274+#ifdef CONFIG_PAX_MPROTECT
42275+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
42276+ current->mm->pax_flags |= MF_PAX_MPROTECT;
42277+#endif
42278+
42279+ }
42280+#endif
42281+
42282 if (N_MAGIC(ex) == OMAGIC) {
42283 unsigned long text_addr, map_size;
42284 loff_t pos;
42285@@ -334,7 +369,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42286
42287 down_write(&current->mm->mmap_sem);
42288 error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
42289- PROT_READ | PROT_WRITE | PROT_EXEC,
42290+ PROT_READ | PROT_WRITE,
42291 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
42292 fd_offset + ex.a_text);
42293 up_write(&current->mm->mmap_sem);
42294@@ -352,13 +387,6 @@ beyond_if:
42295 return retval;
42296 }
42297
42298- retval = setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT);
42299- if (retval < 0) {
42300- /* Someone check-me: is this error path enough? */
42301- send_sig(SIGKILL, current, 0);
42302- return retval;
42303- }
42304-
42305 current->mm->start_stack =
42306 (unsigned long) create_aout_tables((char __user *) bprm->p, bprm);
42307 #ifdef __alpha__
42308diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
42309index 6ff96c6..dbf63ee 100644
42310--- a/fs/binfmt_elf.c
42311+++ b/fs/binfmt_elf.c
42312@@ -32,6 +32,7 @@
42313 #include <linux/elf.h>
42314 #include <linux/utsname.h>
42315 #include <linux/coredump.h>
42316+#include <linux/xattr.h>
42317 #include <asm/uaccess.h>
42318 #include <asm/param.h>
42319 #include <asm/page.h>
42320@@ -51,6 +52,10 @@ static int elf_core_dump(struct coredump_params *cprm);
42321 #define elf_core_dump NULL
42322 #endif
42323
42324+#ifdef CONFIG_PAX_MPROTECT
42325+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
42326+#endif
42327+
42328 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
42329 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
42330 #else
42331@@ -70,6 +75,11 @@ static struct linux_binfmt elf_format = {
42332 .load_binary = load_elf_binary,
42333 .load_shlib = load_elf_library,
42334 .core_dump = elf_core_dump,
42335+
42336+#ifdef CONFIG_PAX_MPROTECT
42337+ .handle_mprotect= elf_handle_mprotect,
42338+#endif
42339+
42340 .min_coredump = ELF_EXEC_PAGESIZE,
42341 };
42342
42343@@ -77,6 +87,8 @@ static struct linux_binfmt elf_format = {
42344
42345 static int set_brk(unsigned long start, unsigned long end)
42346 {
42347+ unsigned long e = end;
42348+
42349 start = ELF_PAGEALIGN(start);
42350 end = ELF_PAGEALIGN(end);
42351 if (end > start) {
42352@@ -87,7 +99,7 @@ static int set_brk(unsigned long start, unsigned long end)
42353 if (BAD_ADDR(addr))
42354 return addr;
42355 }
42356- current->mm->start_brk = current->mm->brk = end;
42357+ current->mm->start_brk = current->mm->brk = e;
42358 return 0;
42359 }
42360
42361@@ -148,12 +160,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42362 elf_addr_t __user *u_rand_bytes;
42363 const char *k_platform = ELF_PLATFORM;
42364 const char *k_base_platform = ELF_BASE_PLATFORM;
42365- unsigned char k_rand_bytes[16];
42366+ u32 k_rand_bytes[4];
42367 int items;
42368 elf_addr_t *elf_info;
42369 int ei_index = 0;
42370 const struct cred *cred = current_cred();
42371 struct vm_area_struct *vma;
42372+ unsigned long saved_auxv[AT_VECTOR_SIZE];
42373
42374 /*
42375 * In some cases (e.g. Hyper-Threading), we want to avoid L1
42376@@ -195,8 +208,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42377 * Generate 16 random bytes for userspace PRNG seeding.
42378 */
42379 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
42380- u_rand_bytes = (elf_addr_t __user *)
42381- STACK_ALLOC(p, sizeof(k_rand_bytes));
42382+ srandom32(k_rand_bytes[0] ^ random32());
42383+ srandom32(k_rand_bytes[1] ^ random32());
42384+ srandom32(k_rand_bytes[2] ^ random32());
42385+ srandom32(k_rand_bytes[3] ^ random32());
42386+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
42387+ u_rand_bytes = (elf_addr_t __user *) p;
42388 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
42389 return -EFAULT;
42390
42391@@ -308,9 +325,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42392 return -EFAULT;
42393 current->mm->env_end = p;
42394
42395+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
42396+
42397 /* Put the elf_info on the stack in the right place. */
42398 sp = (elf_addr_t __user *)envp + 1;
42399- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
42400+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
42401 return -EFAULT;
42402 return 0;
42403 }
42404@@ -381,10 +400,10 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42405 {
42406 struct elf_phdr *elf_phdata;
42407 struct elf_phdr *eppnt;
42408- unsigned long load_addr = 0;
42409+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
42410 int load_addr_set = 0;
42411 unsigned long last_bss = 0, elf_bss = 0;
42412- unsigned long error = ~0UL;
42413+ unsigned long error = -EINVAL;
42414 unsigned long total_size;
42415 int retval, i, size;
42416
42417@@ -430,6 +449,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42418 goto out_close;
42419 }
42420
42421+#ifdef CONFIG_PAX_SEGMEXEC
42422+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
42423+ pax_task_size = SEGMEXEC_TASK_SIZE;
42424+#endif
42425+
42426 eppnt = elf_phdata;
42427 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
42428 if (eppnt->p_type == PT_LOAD) {
42429@@ -473,8 +497,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42430 k = load_addr + eppnt->p_vaddr;
42431 if (BAD_ADDR(k) ||
42432 eppnt->p_filesz > eppnt->p_memsz ||
42433- eppnt->p_memsz > TASK_SIZE ||
42434- TASK_SIZE - eppnt->p_memsz < k) {
42435+ eppnt->p_memsz > pax_task_size ||
42436+ pax_task_size - eppnt->p_memsz < k) {
42437 error = -ENOMEM;
42438 goto out_close;
42439 }
42440@@ -528,6 +552,351 @@ out:
42441 return error;
42442 }
42443
42444+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
42445+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
42446+{
42447+ unsigned long pax_flags = 0UL;
42448+
42449+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42450+
42451+#ifdef CONFIG_PAX_PAGEEXEC
42452+ if (elf_phdata->p_flags & PF_PAGEEXEC)
42453+ pax_flags |= MF_PAX_PAGEEXEC;
42454+#endif
42455+
42456+#ifdef CONFIG_PAX_SEGMEXEC
42457+ if (elf_phdata->p_flags & PF_SEGMEXEC)
42458+ pax_flags |= MF_PAX_SEGMEXEC;
42459+#endif
42460+
42461+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42462+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42463+ if ((__supported_pte_mask & _PAGE_NX))
42464+ pax_flags &= ~MF_PAX_SEGMEXEC;
42465+ else
42466+ pax_flags &= ~MF_PAX_PAGEEXEC;
42467+ }
42468+#endif
42469+
42470+#ifdef CONFIG_PAX_EMUTRAMP
42471+ if (elf_phdata->p_flags & PF_EMUTRAMP)
42472+ pax_flags |= MF_PAX_EMUTRAMP;
42473+#endif
42474+
42475+#ifdef CONFIG_PAX_MPROTECT
42476+ if (elf_phdata->p_flags & PF_MPROTECT)
42477+ pax_flags |= MF_PAX_MPROTECT;
42478+#endif
42479+
42480+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42481+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
42482+ pax_flags |= MF_PAX_RANDMMAP;
42483+#endif
42484+
42485+#endif
42486+
42487+ return pax_flags;
42488+}
42489+
42490+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
42491+{
42492+ unsigned long pax_flags = 0UL;
42493+
42494+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42495+
42496+#ifdef CONFIG_PAX_PAGEEXEC
42497+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
42498+ pax_flags |= MF_PAX_PAGEEXEC;
42499+#endif
42500+
42501+#ifdef CONFIG_PAX_SEGMEXEC
42502+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
42503+ pax_flags |= MF_PAX_SEGMEXEC;
42504+#endif
42505+
42506+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42507+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42508+ if ((__supported_pte_mask & _PAGE_NX))
42509+ pax_flags &= ~MF_PAX_SEGMEXEC;
42510+ else
42511+ pax_flags &= ~MF_PAX_PAGEEXEC;
42512+ }
42513+#endif
42514+
42515+#ifdef CONFIG_PAX_EMUTRAMP
42516+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
42517+ pax_flags |= MF_PAX_EMUTRAMP;
42518+#endif
42519+
42520+#ifdef CONFIG_PAX_MPROTECT
42521+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
42522+ pax_flags |= MF_PAX_MPROTECT;
42523+#endif
42524+
42525+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42526+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
42527+ pax_flags |= MF_PAX_RANDMMAP;
42528+#endif
42529+
42530+#endif
42531+
42532+ return pax_flags;
42533+}
42534+
42535+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
42536+{
42537+ unsigned long pax_flags = 0UL;
42538+
42539+#ifdef CONFIG_PAX_EI_PAX
42540+
42541+#ifdef CONFIG_PAX_PAGEEXEC
42542+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
42543+ pax_flags |= MF_PAX_PAGEEXEC;
42544+#endif
42545+
42546+#ifdef CONFIG_PAX_SEGMEXEC
42547+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
42548+ pax_flags |= MF_PAX_SEGMEXEC;
42549+#endif
42550+
42551+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42552+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42553+ if ((__supported_pte_mask & _PAGE_NX))
42554+ pax_flags &= ~MF_PAX_SEGMEXEC;
42555+ else
42556+ pax_flags &= ~MF_PAX_PAGEEXEC;
42557+ }
42558+#endif
42559+
42560+#ifdef CONFIG_PAX_EMUTRAMP
42561+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
42562+ pax_flags |= MF_PAX_EMUTRAMP;
42563+#endif
42564+
42565+#ifdef CONFIG_PAX_MPROTECT
42566+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
42567+ pax_flags |= MF_PAX_MPROTECT;
42568+#endif
42569+
42570+#ifdef CONFIG_PAX_ASLR
42571+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
42572+ pax_flags |= MF_PAX_RANDMMAP;
42573+#endif
42574+
42575+#else
42576+
42577+#ifdef CONFIG_PAX_PAGEEXEC
42578+ pax_flags |= MF_PAX_PAGEEXEC;
42579+#endif
42580+
42581+#ifdef CONFIG_PAX_MPROTECT
42582+ pax_flags |= MF_PAX_MPROTECT;
42583+#endif
42584+
42585+#ifdef CONFIG_PAX_RANDMMAP
42586+ pax_flags |= MF_PAX_RANDMMAP;
42587+#endif
42588+
42589+#ifdef CONFIG_PAX_SEGMEXEC
42590+ if (!(pax_flags & MF_PAX_PAGEEXEC) || !(__supported_pte_mask & _PAGE_NX)) {
42591+ pax_flags &= ~MF_PAX_PAGEEXEC;
42592+ pax_flags |= MF_PAX_SEGMEXEC;
42593+ }
42594+#endif
42595+
42596+#endif
42597+
42598+ return pax_flags;
42599+}
42600+
42601+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
42602+{
42603+
42604+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42605+ unsigned long i;
42606+
42607+ for (i = 0UL; i < elf_ex->e_phnum; i++)
42608+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
42609+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
42610+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
42611+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
42612+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
42613+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
42614+ return ~0UL;
42615+
42616+#ifdef CONFIG_PAX_SOFTMODE
42617+ if (pax_softmode)
42618+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
42619+ else
42620+#endif
42621+
42622+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
42623+ break;
42624+ }
42625+#endif
42626+
42627+ return ~0UL;
42628+}
42629+
42630+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
42631+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
42632+{
42633+ unsigned long pax_flags = 0UL;
42634+
42635+#ifdef CONFIG_PAX_PAGEEXEC
42636+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
42637+ pax_flags |= MF_PAX_PAGEEXEC;
42638+#endif
42639+
42640+#ifdef CONFIG_PAX_SEGMEXEC
42641+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
42642+ pax_flags |= MF_PAX_SEGMEXEC;
42643+#endif
42644+
42645+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42646+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42647+ if ((__supported_pte_mask & _PAGE_NX))
42648+ pax_flags &= ~MF_PAX_SEGMEXEC;
42649+ else
42650+ pax_flags &= ~MF_PAX_PAGEEXEC;
42651+ }
42652+#endif
42653+
42654+#ifdef CONFIG_PAX_EMUTRAMP
42655+ if (pax_flags_softmode & MF_PAX_EMUTRAMP)
42656+ pax_flags |= MF_PAX_EMUTRAMP;
42657+#endif
42658+
42659+#ifdef CONFIG_PAX_MPROTECT
42660+ if (pax_flags_softmode & MF_PAX_MPROTECT)
42661+ pax_flags |= MF_PAX_MPROTECT;
42662+#endif
42663+
42664+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42665+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
42666+ pax_flags |= MF_PAX_RANDMMAP;
42667+#endif
42668+
42669+ return pax_flags;
42670+}
42671+
42672+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
42673+{
42674+ unsigned long pax_flags = 0UL;
42675+
42676+#ifdef CONFIG_PAX_PAGEEXEC
42677+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
42678+ pax_flags |= MF_PAX_PAGEEXEC;
42679+#endif
42680+
42681+#ifdef CONFIG_PAX_SEGMEXEC
42682+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
42683+ pax_flags |= MF_PAX_SEGMEXEC;
42684+#endif
42685+
42686+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42687+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42688+ if ((__supported_pte_mask & _PAGE_NX))
42689+ pax_flags &= ~MF_PAX_SEGMEXEC;
42690+ else
42691+ pax_flags &= ~MF_PAX_PAGEEXEC;
42692+ }
42693+#endif
42694+
42695+#ifdef CONFIG_PAX_EMUTRAMP
42696+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
42697+ pax_flags |= MF_PAX_EMUTRAMP;
42698+#endif
42699+
42700+#ifdef CONFIG_PAX_MPROTECT
42701+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
42702+ pax_flags |= MF_PAX_MPROTECT;
42703+#endif
42704+
42705+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42706+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
42707+ pax_flags |= MF_PAX_RANDMMAP;
42708+#endif
42709+
42710+ return pax_flags;
42711+}
42712+#endif
42713+
42714+static unsigned long pax_parse_xattr_pax(struct file * const file)
42715+{
42716+
42717+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
42718+ ssize_t xattr_size, i;
42719+ unsigned char xattr_value[5];
42720+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
42721+
42722+ xattr_size = vfs_getxattr(file->f_path.dentry, XATTR_NAME_PAX_FLAGS, xattr_value, sizeof xattr_value);
42723+ if (xattr_size <= 0)
42724+ return ~0UL;
42725+
42726+ for (i = 0; i < xattr_size; i++)
42727+ switch (xattr_value[i]) {
42728+ default:
42729+ return ~0UL;
42730+
42731+#define parse_flag(option1, option2, flag) \
42732+ case option1: \
42733+ pax_flags_hardmode |= MF_PAX_##flag; \
42734+ break; \
42735+ case option2: \
42736+ pax_flags_softmode |= MF_PAX_##flag; \
42737+ break;
42738+
42739+ parse_flag('p', 'P', PAGEEXEC);
42740+ parse_flag('e', 'E', EMUTRAMP);
42741+ parse_flag('m', 'M', MPROTECT);
42742+ parse_flag('r', 'R', RANDMMAP);
42743+ parse_flag('s', 'S', SEGMEXEC);
42744+
42745+#undef parse_flag
42746+ }
42747+
42748+ if (pax_flags_hardmode & pax_flags_softmode)
42749+ return ~0UL;
42750+
42751+#ifdef CONFIG_PAX_SOFTMODE
42752+ if (pax_softmode)
42753+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
42754+ else
42755+#endif
42756+
42757+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
42758+#else
42759+ return ~0UL;
42760+#endif
42761+
42762+}
42763+
42764+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
42765+{
42766+ unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
42767+
42768+ pax_flags = pax_parse_ei_pax(elf_ex);
42769+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
42770+ xattr_pax_flags = pax_parse_xattr_pax(file);
42771+
42772+ if (pt_pax_flags == ~0UL)
42773+ pt_pax_flags = xattr_pax_flags;
42774+ else if (xattr_pax_flags == ~0UL)
42775+ xattr_pax_flags = pt_pax_flags;
42776+ if (pt_pax_flags != xattr_pax_flags)
42777+ return -EINVAL;
42778+ if (pt_pax_flags != ~0UL)
42779+ pax_flags = pt_pax_flags;
42780+
42781+ if (0 > pax_check_flags(&pax_flags))
42782+ return -EINVAL;
42783+
42784+ current->mm->pax_flags = pax_flags;
42785+ return 0;
42786+}
42787+#endif
42788+
42789 /*
42790 * These are the functions used to load ELF style executables and shared
42791 * libraries. There is no binary dependent code anywhere else.
42792@@ -544,6 +913,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
42793 {
42794 unsigned int random_variable = 0;
42795
42796+#ifdef CONFIG_PAX_RANDUSTACK
42797+ if (randomize_va_space)
42798+ return stack_top - current->mm->delta_stack;
42799+#endif
42800+
42801 if ((current->flags & PF_RANDOMIZE) &&
42802 !(current->personality & ADDR_NO_RANDOMIZE)) {
42803 random_variable = get_random_int() & STACK_RND_MASK;
42804@@ -562,7 +936,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42805 unsigned long load_addr = 0, load_bias = 0;
42806 int load_addr_set = 0;
42807 char * elf_interpreter = NULL;
42808- unsigned long error;
42809+ unsigned long error = 0;
42810 struct elf_phdr *elf_ppnt, *elf_phdata;
42811 unsigned long elf_bss, elf_brk;
42812 int retval, i;
42813@@ -572,11 +946,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42814 unsigned long start_code, end_code, start_data, end_data;
42815 unsigned long reloc_func_desc __maybe_unused = 0;
42816 int executable_stack = EXSTACK_DEFAULT;
42817- unsigned long def_flags = 0;
42818 struct {
42819 struct elfhdr elf_ex;
42820 struct elfhdr interp_elf_ex;
42821 } *loc;
42822+ unsigned long pax_task_size = TASK_SIZE;
42823
42824 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
42825 if (!loc) {
42826@@ -713,11 +1087,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42827
42828 /* OK, This is the point of no return */
42829 current->flags &= ~PF_FORKNOEXEC;
42830- current->mm->def_flags = def_flags;
42831+
42832+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42833+ current->mm->pax_flags = 0UL;
42834+#endif
42835+
42836+#ifdef CONFIG_PAX_DLRESOLVE
42837+ current->mm->call_dl_resolve = 0UL;
42838+#endif
42839+
42840+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
42841+ current->mm->call_syscall = 0UL;
42842+#endif
42843+
42844+#ifdef CONFIG_PAX_ASLR
42845+ current->mm->delta_mmap = 0UL;
42846+ current->mm->delta_stack = 0UL;
42847+#endif
42848+
42849+ current->mm->def_flags = 0;
42850+
42851+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
42852+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
42853+ send_sig(SIGKILL, current, 0);
42854+ goto out_free_dentry;
42855+ }
42856+#endif
42857+
42858+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
42859+ pax_set_initial_flags(bprm);
42860+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
42861+ if (pax_set_initial_flags_func)
42862+ (pax_set_initial_flags_func)(bprm);
42863+#endif
42864+
42865+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
42866+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
42867+ current->mm->context.user_cs_limit = PAGE_SIZE;
42868+ current->mm->def_flags |= VM_PAGEEXEC;
42869+ }
42870+#endif
42871+
42872+#ifdef CONFIG_PAX_SEGMEXEC
42873+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
42874+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
42875+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
42876+ pax_task_size = SEGMEXEC_TASK_SIZE;
42877+ current->mm->def_flags |= VM_NOHUGEPAGE;
42878+ }
42879+#endif
42880+
42881+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
42882+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42883+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
42884+ put_cpu();
42885+ }
42886+#endif
42887
42888 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
42889 may depend on the personality. */
42890 SET_PERSONALITY(loc->elf_ex);
42891+
42892+#ifdef CONFIG_PAX_ASLR
42893+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
42894+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
42895+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
42896+ }
42897+#endif
42898+
42899+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
42900+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42901+ executable_stack = EXSTACK_DISABLE_X;
42902+ current->personality &= ~READ_IMPLIES_EXEC;
42903+ } else
42904+#endif
42905+
42906 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
42907 current->personality |= READ_IMPLIES_EXEC;
42908
42909@@ -808,6 +1252,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42910 #else
42911 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
42912 #endif
42913+
42914+#ifdef CONFIG_PAX_RANDMMAP
42915+ /* PaX: randomize base address at the default exe base if requested */
42916+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
42917+#ifdef CONFIG_SPARC64
42918+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
42919+#else
42920+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
42921+#endif
42922+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
42923+ elf_flags |= MAP_FIXED;
42924+ }
42925+#endif
42926+
42927 }
42928
42929 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
42930@@ -840,9 +1298,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42931 * allowed task size. Note that p_filesz must always be
42932 * <= p_memsz so it is only necessary to check p_memsz.
42933 */
42934- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
42935- elf_ppnt->p_memsz > TASK_SIZE ||
42936- TASK_SIZE - elf_ppnt->p_memsz < k) {
42937+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
42938+ elf_ppnt->p_memsz > pax_task_size ||
42939+ pax_task_size - elf_ppnt->p_memsz < k) {
42940 /* set_brk can never work. Avoid overflows. */
42941 send_sig(SIGKILL, current, 0);
42942 retval = -EINVAL;
42943@@ -870,6 +1328,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42944 start_data += load_bias;
42945 end_data += load_bias;
42946
42947+#ifdef CONFIG_PAX_RANDMMAP
42948+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
42949+ elf_brk += PAGE_SIZE + ((pax_get_random_long() & ~PAGE_MASK) << 4);
42950+#endif
42951+
42952 /* Calling set_brk effectively mmaps the pages that we need
42953 * for the bss and break sections. We must do this before
42954 * mapping in the interpreter, to make sure it doesn't wind
42955@@ -881,9 +1344,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42956 goto out_free_dentry;
42957 }
42958 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
42959- send_sig(SIGSEGV, current, 0);
42960- retval = -EFAULT; /* Nobody gets to see this, but.. */
42961- goto out_free_dentry;
42962+ /*
42963+ * This bss-zeroing can fail if the ELF
42964+ * file specifies odd protections. So
42965+ * we don't check the return value
42966+ */
42967 }
42968
42969 if (elf_interpreter) {
42970@@ -1098,7 +1563,7 @@ out:
42971 * Decide what to dump of a segment, part, all or none.
42972 */
42973 static unsigned long vma_dump_size(struct vm_area_struct *vma,
42974- unsigned long mm_flags)
42975+ unsigned long mm_flags, long signr)
42976 {
42977 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
42978
42979@@ -1132,7 +1597,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
42980 if (vma->vm_file == NULL)
42981 return 0;
42982
42983- if (FILTER(MAPPED_PRIVATE))
42984+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
42985 goto whole;
42986
42987 /*
42988@@ -1354,9 +1819,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
42989 {
42990 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
42991 int i = 0;
42992- do
42993+ do {
42994 i += 2;
42995- while (auxv[i - 2] != AT_NULL);
42996+ } while (auxv[i - 2] != AT_NULL);
42997 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
42998 }
42999
43000@@ -1862,14 +2327,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
43001 }
43002
43003 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
43004- unsigned long mm_flags)
43005+ struct coredump_params *cprm)
43006 {
43007 struct vm_area_struct *vma;
43008 size_t size = 0;
43009
43010 for (vma = first_vma(current, gate_vma); vma != NULL;
43011 vma = next_vma(vma, gate_vma))
43012- size += vma_dump_size(vma, mm_flags);
43013+ size += vma_dump_size(vma, cprm->mm_flags, cprm->signr);
43014 return size;
43015 }
43016
43017@@ -1963,7 +2428,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43018
43019 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
43020
43021- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
43022+ offset += elf_core_vma_data_size(gate_vma, cprm);
43023 offset += elf_core_extra_data_size();
43024 e_shoff = offset;
43025
43026@@ -1977,10 +2442,12 @@ static int elf_core_dump(struct coredump_params *cprm)
43027 offset = dataoff;
43028
43029 size += sizeof(*elf);
43030+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
43031 if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
43032 goto end_coredump;
43033
43034 size += sizeof(*phdr4note);
43035+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
43036 if (size > cprm->limit
43037 || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
43038 goto end_coredump;
43039@@ -1994,7 +2461,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43040 phdr.p_offset = offset;
43041 phdr.p_vaddr = vma->vm_start;
43042 phdr.p_paddr = 0;
43043- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
43044+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->signr);
43045 phdr.p_memsz = vma->vm_end - vma->vm_start;
43046 offset += phdr.p_filesz;
43047 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
43048@@ -2005,6 +2472,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43049 phdr.p_align = ELF_EXEC_PAGESIZE;
43050
43051 size += sizeof(phdr);
43052+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
43053 if (size > cprm->limit
43054 || !dump_write(cprm->file, &phdr, sizeof(phdr)))
43055 goto end_coredump;
43056@@ -2029,7 +2497,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43057 unsigned long addr;
43058 unsigned long end;
43059
43060- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
43061+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->signr);
43062
43063 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
43064 struct page *page;
43065@@ -2038,6 +2506,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43066 page = get_dump_page(addr);
43067 if (page) {
43068 void *kaddr = kmap(page);
43069+ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
43070 stop = ((size += PAGE_SIZE) > cprm->limit) ||
43071 !dump_write(cprm->file, kaddr,
43072 PAGE_SIZE);
43073@@ -2055,6 +2524,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43074
43075 if (e_phnum == PN_XNUM) {
43076 size += sizeof(*shdr4extnum);
43077+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
43078 if (size > cprm->limit
43079 || !dump_write(cprm->file, shdr4extnum,
43080 sizeof(*shdr4extnum)))
43081@@ -2075,6 +2545,97 @@ out:
43082
43083 #endif /* CONFIG_ELF_CORE */
43084
43085+#ifdef CONFIG_PAX_MPROTECT
43086+/* PaX: non-PIC ELF libraries need relocations on their executable segments
43087+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
43088+ * we'll remove VM_MAYWRITE for good on RELRO segments.
43089+ *
43090+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
43091+ * basis because we want to allow the common case and not the special ones.
43092+ */
43093+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
43094+{
43095+ struct elfhdr elf_h;
43096+ struct elf_phdr elf_p;
43097+ unsigned long i;
43098+ unsigned long oldflags;
43099+ bool is_textrel_rw, is_textrel_rx, is_relro;
43100+
43101+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT))
43102+ return;
43103+
43104+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
43105+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
43106+
43107+#ifdef CONFIG_PAX_ELFRELOCS
43108+ /* possible TEXTREL */
43109+ is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
43110+ 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);
43111+#else
43112+ is_textrel_rw = false;
43113+ is_textrel_rx = false;
43114+#endif
43115+
43116+ /* possible RELRO */
43117+ is_relro = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
43118+
43119+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
43120+ return;
43121+
43122+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
43123+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
43124+
43125+#ifdef CONFIG_PAX_ETEXECRELOCS
43126+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
43127+#else
43128+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
43129+#endif
43130+
43131+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
43132+ !elf_check_arch(&elf_h) ||
43133+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
43134+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
43135+ return;
43136+
43137+ for (i = 0UL; i < elf_h.e_phnum; i++) {
43138+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
43139+ return;
43140+ switch (elf_p.p_type) {
43141+ case PT_DYNAMIC:
43142+ if (!is_textrel_rw && !is_textrel_rx)
43143+ continue;
43144+ i = 0UL;
43145+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
43146+ elf_dyn dyn;
43147+
43148+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
43149+ return;
43150+ if (dyn.d_tag == DT_NULL)
43151+ return;
43152+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
43153+ gr_log_textrel(vma);
43154+ if (is_textrel_rw)
43155+ vma->vm_flags |= VM_MAYWRITE;
43156+ else
43157+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
43158+ vma->vm_flags &= ~VM_MAYWRITE;
43159+ return;
43160+ }
43161+ i++;
43162+ }
43163+ return;
43164+
43165+ case PT_GNU_RELRO:
43166+ if (!is_relro)
43167+ continue;
43168+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
43169+ vma->vm_flags &= ~VM_MAYWRITE;
43170+ return;
43171+ }
43172+ }
43173+}
43174+#endif
43175+
43176 static int __init init_elf_binfmt(void)
43177 {
43178 return register_binfmt(&elf_format);
43179diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
43180index 1bffbe0..c8c283e 100644
43181--- a/fs/binfmt_flat.c
43182+++ b/fs/binfmt_flat.c
43183@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_binprm * bprm,
43184 realdatastart = (unsigned long) -ENOMEM;
43185 printk("Unable to allocate RAM for process data, errno %d\n",
43186 (int)-realdatastart);
43187+ down_write(&current->mm->mmap_sem);
43188 do_munmap(current->mm, textpos, text_len);
43189+ up_write(&current->mm->mmap_sem);
43190 ret = realdatastart;
43191 goto err;
43192 }
43193@@ -591,8 +593,10 @@ static int load_flat_file(struct linux_binprm * bprm,
43194 }
43195 if (IS_ERR_VALUE(result)) {
43196 printk("Unable to read data+bss, errno %d\n", (int)-result);
43197+ down_write(&current->mm->mmap_sem);
43198 do_munmap(current->mm, textpos, text_len);
43199 do_munmap(current->mm, realdatastart, len);
43200+ up_write(&current->mm->mmap_sem);
43201 ret = result;
43202 goto err;
43203 }
43204@@ -661,8 +665,10 @@ static int load_flat_file(struct linux_binprm * bprm,
43205 }
43206 if (IS_ERR_VALUE(result)) {
43207 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
43208+ down_write(&current->mm->mmap_sem);
43209 do_munmap(current->mm, textpos, text_len + data_len + extra +
43210 MAX_SHARED_LIBS * sizeof(unsigned long));
43211+ up_write(&current->mm->mmap_sem);
43212 ret = result;
43213 goto err;
43214 }
43215diff --git a/fs/bio.c b/fs/bio.c
43216index b1fe82c..84da0a9 100644
43217--- a/fs/bio.c
43218+++ b/fs/bio.c
43219@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
43220 const int read = bio_data_dir(bio) == READ;
43221 struct bio_map_data *bmd = bio->bi_private;
43222 int i;
43223- char *p = bmd->sgvecs[0].iov_base;
43224+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
43225
43226 __bio_for_each_segment(bvec, bio, i, 0) {
43227 char *addr = page_address(bvec->bv_page);
43228diff --git a/fs/block_dev.c b/fs/block_dev.c
43229index b07f1da..9efcb92 100644
43230--- a/fs/block_dev.c
43231+++ b/fs/block_dev.c
43232@@ -681,7 +681,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
43233 else if (bdev->bd_contains == bdev)
43234 return true; /* is a whole device which isn't held */
43235
43236- else if (whole->bd_holder == bd_may_claim)
43237+ else if (whole->bd_holder == (void *)bd_may_claim)
43238 return true; /* is a partition of a device that is being partitioned */
43239 else if (whole->bd_holder != NULL)
43240 return false; /* is a partition of a held device */
43241diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
43242index dede441..f2a2507 100644
43243--- a/fs/btrfs/ctree.c
43244+++ b/fs/btrfs/ctree.c
43245@@ -488,9 +488,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
43246 free_extent_buffer(buf);
43247 add_root_to_dirty_list(root);
43248 } else {
43249- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
43250- parent_start = parent->start;
43251- else
43252+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
43253+ if (parent)
43254+ parent_start = parent->start;
43255+ else
43256+ parent_start = 0;
43257+ } else
43258 parent_start = 0;
43259
43260 WARN_ON(trans->transid != btrfs_header_generation(parent));
43261diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
43262index fd1a06d..6e9033d 100644
43263--- a/fs/btrfs/inode.c
43264+++ b/fs/btrfs/inode.c
43265@@ -6895,7 +6895,7 @@ fail:
43266 return -ENOMEM;
43267 }
43268
43269-static int btrfs_getattr(struct vfsmount *mnt,
43270+int btrfs_getattr(struct vfsmount *mnt,
43271 struct dentry *dentry, struct kstat *stat)
43272 {
43273 struct inode *inode = dentry->d_inode;
43274@@ -6909,6 +6909,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
43275 return 0;
43276 }
43277
43278+EXPORT_SYMBOL(btrfs_getattr);
43279+
43280+dev_t get_btrfs_dev_from_inode(struct inode *inode)
43281+{
43282+ return BTRFS_I(inode)->root->anon_dev;
43283+}
43284+EXPORT_SYMBOL(get_btrfs_dev_from_inode);
43285+
43286 /*
43287 * If a file is moved, it will inherit the cow and compression flags of the new
43288 * directory.
43289diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
43290index c04f02c..f5c9e2e 100644
43291--- a/fs/btrfs/ioctl.c
43292+++ b/fs/btrfs/ioctl.c
43293@@ -2733,9 +2733,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
43294 for (i = 0; i < num_types; i++) {
43295 struct btrfs_space_info *tmp;
43296
43297+ /* Don't copy in more than we allocated */
43298 if (!slot_count)
43299 break;
43300
43301+ slot_count--;
43302+
43303 info = NULL;
43304 rcu_read_lock();
43305 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
43306@@ -2757,15 +2760,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
43307 memcpy(dest, &space, sizeof(space));
43308 dest++;
43309 space_args.total_spaces++;
43310- slot_count--;
43311 }
43312- if (!slot_count)
43313- break;
43314 }
43315 up_read(&info->groups_sem);
43316 }
43317
43318- user_dest = (struct btrfs_ioctl_space_info *)
43319+ user_dest = (struct btrfs_ioctl_space_info __user *)
43320 (arg + sizeof(struct btrfs_ioctl_space_args));
43321
43322 if (copy_to_user(user_dest, dest_orig, alloc_size))
43323diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
43324index cfb5543..1ae7347 100644
43325--- a/fs/btrfs/relocation.c
43326+++ b/fs/btrfs/relocation.c
43327@@ -1244,7 +1244,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
43328 }
43329 spin_unlock(&rc->reloc_root_tree.lock);
43330
43331- BUG_ON((struct btrfs_root *)node->data != root);
43332+ BUG_ON(!node || (struct btrfs_root *)node->data != root);
43333
43334 if (!del) {
43335 spin_lock(&rc->reloc_root_tree.lock);
43336diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
43337index 622f469..e8d2d55 100644
43338--- a/fs/cachefiles/bind.c
43339+++ b/fs/cachefiles/bind.c
43340@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
43341 args);
43342
43343 /* start by checking things over */
43344- ASSERT(cache->fstop_percent >= 0 &&
43345- cache->fstop_percent < cache->fcull_percent &&
43346+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
43347 cache->fcull_percent < cache->frun_percent &&
43348 cache->frun_percent < 100);
43349
43350- ASSERT(cache->bstop_percent >= 0 &&
43351- cache->bstop_percent < cache->bcull_percent &&
43352+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
43353 cache->bcull_percent < cache->brun_percent &&
43354 cache->brun_percent < 100);
43355
43356diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
43357index 0a1467b..6a53245 100644
43358--- a/fs/cachefiles/daemon.c
43359+++ b/fs/cachefiles/daemon.c
43360@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
43361 if (n > buflen)
43362 return -EMSGSIZE;
43363
43364- if (copy_to_user(_buffer, buffer, n) != 0)
43365+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
43366 return -EFAULT;
43367
43368 return n;
43369@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
43370 if (test_bit(CACHEFILES_DEAD, &cache->flags))
43371 return -EIO;
43372
43373- if (datalen < 0 || datalen > PAGE_SIZE - 1)
43374+ if (datalen > PAGE_SIZE - 1)
43375 return -EOPNOTSUPP;
43376
43377 /* drag the command string into the kernel so we can parse it */
43378@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
43379 if (args[0] != '%' || args[1] != '\0')
43380 return -EINVAL;
43381
43382- if (fstop < 0 || fstop >= cache->fcull_percent)
43383+ if (fstop >= cache->fcull_percent)
43384 return cachefiles_daemon_range_error(cache, args);
43385
43386 cache->fstop_percent = fstop;
43387@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
43388 if (args[0] != '%' || args[1] != '\0')
43389 return -EINVAL;
43390
43391- if (bstop < 0 || bstop >= cache->bcull_percent)
43392+ if (bstop >= cache->bcull_percent)
43393 return cachefiles_daemon_range_error(cache, args);
43394
43395 cache->bstop_percent = bstop;
43396diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
43397index bd6bc1b..b627b53 100644
43398--- a/fs/cachefiles/internal.h
43399+++ b/fs/cachefiles/internal.h
43400@@ -57,7 +57,7 @@ struct cachefiles_cache {
43401 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
43402 struct rb_root active_nodes; /* active nodes (can't be culled) */
43403 rwlock_t active_lock; /* lock for active_nodes */
43404- atomic_t gravecounter; /* graveyard uniquifier */
43405+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
43406 unsigned frun_percent; /* when to stop culling (% files) */
43407 unsigned fcull_percent; /* when to start culling (% files) */
43408 unsigned fstop_percent; /* when to stop allocating (% files) */
43409@@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
43410 * proc.c
43411 */
43412 #ifdef CONFIG_CACHEFILES_HISTOGRAM
43413-extern atomic_t cachefiles_lookup_histogram[HZ];
43414-extern atomic_t cachefiles_mkdir_histogram[HZ];
43415-extern atomic_t cachefiles_create_histogram[HZ];
43416+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43417+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43418+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
43419
43420 extern int __init cachefiles_proc_init(void);
43421 extern void cachefiles_proc_cleanup(void);
43422 static inline
43423-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
43424+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
43425 {
43426 unsigned long jif = jiffies - start_jif;
43427 if (jif >= HZ)
43428 jif = HZ - 1;
43429- atomic_inc(&histogram[jif]);
43430+ atomic_inc_unchecked(&histogram[jif]);
43431 }
43432
43433 #else
43434diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
43435index a0358c2..d6137f2 100644
43436--- a/fs/cachefiles/namei.c
43437+++ b/fs/cachefiles/namei.c
43438@@ -318,7 +318,7 @@ try_again:
43439 /* first step is to make up a grave dentry in the graveyard */
43440 sprintf(nbuffer, "%08x%08x",
43441 (uint32_t) get_seconds(),
43442- (uint32_t) atomic_inc_return(&cache->gravecounter));
43443+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
43444
43445 /* do the multiway lock magic */
43446 trap = lock_rename(cache->graveyard, dir);
43447diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
43448index eccd339..4c1d995 100644
43449--- a/fs/cachefiles/proc.c
43450+++ b/fs/cachefiles/proc.c
43451@@ -14,9 +14,9 @@
43452 #include <linux/seq_file.h>
43453 #include "internal.h"
43454
43455-atomic_t cachefiles_lookup_histogram[HZ];
43456-atomic_t cachefiles_mkdir_histogram[HZ];
43457-atomic_t cachefiles_create_histogram[HZ];
43458+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43459+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43460+atomic_unchecked_t cachefiles_create_histogram[HZ];
43461
43462 /*
43463 * display the latency histogram
43464@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
43465 return 0;
43466 default:
43467 index = (unsigned long) v - 3;
43468- x = atomic_read(&cachefiles_lookup_histogram[index]);
43469- y = atomic_read(&cachefiles_mkdir_histogram[index]);
43470- z = atomic_read(&cachefiles_create_histogram[index]);
43471+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
43472+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
43473+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
43474 if (x == 0 && y == 0 && z == 0)
43475 return 0;
43476
43477diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
43478index 0e3c092..818480e 100644
43479--- a/fs/cachefiles/rdwr.c
43480+++ b/fs/cachefiles/rdwr.c
43481@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
43482 old_fs = get_fs();
43483 set_fs(KERNEL_DS);
43484 ret = file->f_op->write(
43485- file, (const void __user *) data, len, &pos);
43486+ file, (const void __force_user *) data, len, &pos);
43487 set_fs(old_fs);
43488 kunmap(page);
43489 if (ret != len)
43490diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
43491index 9895400..fa40a7d 100644
43492--- a/fs/ceph/dir.c
43493+++ b/fs/ceph/dir.c
43494@@ -244,7 +244,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
43495 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
43496 struct ceph_mds_client *mdsc = fsc->mdsc;
43497 unsigned frag = fpos_frag(filp->f_pos);
43498- int off = fpos_off(filp->f_pos);
43499+ unsigned int off = fpos_off(filp->f_pos);
43500 int err;
43501 u32 ftype;
43502 struct ceph_mds_reply_info_parsed *rinfo;
43503diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c
43504index cfd1ce3..6b13a74 100644
43505--- a/fs/cifs/asn1.c
43506+++ b/fs/cifs/asn1.c
43507@@ -416,6 +416,9 @@ asn1_subid_decode(struct asn1_ctx *ctx, unsigned long *subid)
43508
43509 static int
43510 asn1_oid_decode(struct asn1_ctx *ctx,
43511+ unsigned char *eoc, unsigned long **oid, unsigned int *len) __size_overflow(2);
43512+static int
43513+asn1_oid_decode(struct asn1_ctx *ctx,
43514 unsigned char *eoc, unsigned long **oid, unsigned int *len)
43515 {
43516 unsigned long subid;
43517diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
43518index 84e8c07..6170d31 100644
43519--- a/fs/cifs/cifs_debug.c
43520+++ b/fs/cifs/cifs_debug.c
43521@@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
43522
43523 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
43524 #ifdef CONFIG_CIFS_STATS2
43525- atomic_set(&totBufAllocCount, 0);
43526- atomic_set(&totSmBufAllocCount, 0);
43527+ atomic_set_unchecked(&totBufAllocCount, 0);
43528+ atomic_set_unchecked(&totSmBufAllocCount, 0);
43529 #endif /* CONFIG_CIFS_STATS2 */
43530 spin_lock(&cifs_tcp_ses_lock);
43531 list_for_each(tmp1, &cifs_tcp_ses_list) {
43532@@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(struct file *file,
43533 tcon = list_entry(tmp3,
43534 struct cifs_tcon,
43535 tcon_list);
43536- atomic_set(&tcon->num_smbs_sent, 0);
43537- atomic_set(&tcon->num_writes, 0);
43538- atomic_set(&tcon->num_reads, 0);
43539- atomic_set(&tcon->num_oplock_brks, 0);
43540- atomic_set(&tcon->num_opens, 0);
43541- atomic_set(&tcon->num_posixopens, 0);
43542- atomic_set(&tcon->num_posixmkdirs, 0);
43543- atomic_set(&tcon->num_closes, 0);
43544- atomic_set(&tcon->num_deletes, 0);
43545- atomic_set(&tcon->num_mkdirs, 0);
43546- atomic_set(&tcon->num_rmdirs, 0);
43547- atomic_set(&tcon->num_renames, 0);
43548- atomic_set(&tcon->num_t2renames, 0);
43549- atomic_set(&tcon->num_ffirst, 0);
43550- atomic_set(&tcon->num_fnext, 0);
43551- atomic_set(&tcon->num_fclose, 0);
43552- atomic_set(&tcon->num_hardlinks, 0);
43553- atomic_set(&tcon->num_symlinks, 0);
43554- atomic_set(&tcon->num_locks, 0);
43555+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
43556+ atomic_set_unchecked(&tcon->num_writes, 0);
43557+ atomic_set_unchecked(&tcon->num_reads, 0);
43558+ atomic_set_unchecked(&tcon->num_oplock_brks, 0);
43559+ atomic_set_unchecked(&tcon->num_opens, 0);
43560+ atomic_set_unchecked(&tcon->num_posixopens, 0);
43561+ atomic_set_unchecked(&tcon->num_posixmkdirs, 0);
43562+ atomic_set_unchecked(&tcon->num_closes, 0);
43563+ atomic_set_unchecked(&tcon->num_deletes, 0);
43564+ atomic_set_unchecked(&tcon->num_mkdirs, 0);
43565+ atomic_set_unchecked(&tcon->num_rmdirs, 0);
43566+ atomic_set_unchecked(&tcon->num_renames, 0);
43567+ atomic_set_unchecked(&tcon->num_t2renames, 0);
43568+ atomic_set_unchecked(&tcon->num_ffirst, 0);
43569+ atomic_set_unchecked(&tcon->num_fnext, 0);
43570+ atomic_set_unchecked(&tcon->num_fclose, 0);
43571+ atomic_set_unchecked(&tcon->num_hardlinks, 0);
43572+ atomic_set_unchecked(&tcon->num_symlinks, 0);
43573+ atomic_set_unchecked(&tcon->num_locks, 0);
43574 }
43575 }
43576 }
43577@@ -327,8 +327,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
43578 smBufAllocCount.counter, cifs_min_small);
43579 #ifdef CONFIG_CIFS_STATS2
43580 seq_printf(m, "Total Large %d Small %d Allocations\n",
43581- atomic_read(&totBufAllocCount),
43582- atomic_read(&totSmBufAllocCount));
43583+ atomic_read_unchecked(&totBufAllocCount),
43584+ atomic_read_unchecked(&totSmBufAllocCount));
43585 #endif /* CONFIG_CIFS_STATS2 */
43586
43587 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
43588@@ -357,41 +357,41 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
43589 if (tcon->need_reconnect)
43590 seq_puts(m, "\tDISCONNECTED ");
43591 seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
43592- atomic_read(&tcon->num_smbs_sent),
43593- atomic_read(&tcon->num_oplock_brks));
43594+ atomic_read_unchecked(&tcon->num_smbs_sent),
43595+ atomic_read_unchecked(&tcon->num_oplock_brks));
43596 seq_printf(m, "\nReads: %d Bytes: %lld",
43597- atomic_read(&tcon->num_reads),
43598+ atomic_read_unchecked(&tcon->num_reads),
43599 (long long)(tcon->bytes_read));
43600 seq_printf(m, "\nWrites: %d Bytes: %lld",
43601- atomic_read(&tcon->num_writes),
43602+ atomic_read_unchecked(&tcon->num_writes),
43603 (long long)(tcon->bytes_written));
43604 seq_printf(m, "\nFlushes: %d",
43605- atomic_read(&tcon->num_flushes));
43606+ atomic_read_unchecked(&tcon->num_flushes));
43607 seq_printf(m, "\nLocks: %d HardLinks: %d "
43608 "Symlinks: %d",
43609- atomic_read(&tcon->num_locks),
43610- atomic_read(&tcon->num_hardlinks),
43611- atomic_read(&tcon->num_symlinks));
43612+ atomic_read_unchecked(&tcon->num_locks),
43613+ atomic_read_unchecked(&tcon->num_hardlinks),
43614+ atomic_read_unchecked(&tcon->num_symlinks));
43615 seq_printf(m, "\nOpens: %d Closes: %d "
43616 "Deletes: %d",
43617- atomic_read(&tcon->num_opens),
43618- atomic_read(&tcon->num_closes),
43619- atomic_read(&tcon->num_deletes));
43620+ atomic_read_unchecked(&tcon->num_opens),
43621+ atomic_read_unchecked(&tcon->num_closes),
43622+ atomic_read_unchecked(&tcon->num_deletes));
43623 seq_printf(m, "\nPosix Opens: %d "
43624 "Posix Mkdirs: %d",
43625- atomic_read(&tcon->num_posixopens),
43626- atomic_read(&tcon->num_posixmkdirs));
43627+ atomic_read_unchecked(&tcon->num_posixopens),
43628+ atomic_read_unchecked(&tcon->num_posixmkdirs));
43629 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
43630- atomic_read(&tcon->num_mkdirs),
43631- atomic_read(&tcon->num_rmdirs));
43632+ atomic_read_unchecked(&tcon->num_mkdirs),
43633+ atomic_read_unchecked(&tcon->num_rmdirs));
43634 seq_printf(m, "\nRenames: %d T2 Renames %d",
43635- atomic_read(&tcon->num_renames),
43636- atomic_read(&tcon->num_t2renames));
43637+ atomic_read_unchecked(&tcon->num_renames),
43638+ atomic_read_unchecked(&tcon->num_t2renames));
43639 seq_printf(m, "\nFindFirst: %d FNext %d "
43640 "FClose %d",
43641- atomic_read(&tcon->num_ffirst),
43642- atomic_read(&tcon->num_fnext),
43643- atomic_read(&tcon->num_fclose));
43644+ atomic_read_unchecked(&tcon->num_ffirst),
43645+ atomic_read_unchecked(&tcon->num_fnext),
43646+ atomic_read_unchecked(&tcon->num_fclose));
43647 }
43648 }
43649 }
43650diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
43651index 8f1fe32..38f9e27 100644
43652--- a/fs/cifs/cifsfs.c
43653+++ b/fs/cifs/cifsfs.c
43654@@ -989,7 +989,7 @@ cifs_init_request_bufs(void)
43655 cifs_req_cachep = kmem_cache_create("cifs_request",
43656 CIFSMaxBufSize +
43657 MAX_CIFS_HDR_SIZE, 0,
43658- SLAB_HWCACHE_ALIGN, NULL);
43659+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
43660 if (cifs_req_cachep == NULL)
43661 return -ENOMEM;
43662
43663@@ -1016,7 +1016,7 @@ cifs_init_request_bufs(void)
43664 efficient to alloc 1 per page off the slab compared to 17K (5page)
43665 alloc of large cifs buffers even when page debugging is on */
43666 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
43667- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
43668+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
43669 NULL);
43670 if (cifs_sm_req_cachep == NULL) {
43671 mempool_destroy(cifs_req_poolp);
43672@@ -1101,8 +1101,8 @@ init_cifs(void)
43673 atomic_set(&bufAllocCount, 0);
43674 atomic_set(&smBufAllocCount, 0);
43675 #ifdef CONFIG_CIFS_STATS2
43676- atomic_set(&totBufAllocCount, 0);
43677- atomic_set(&totSmBufAllocCount, 0);
43678+ atomic_set_unchecked(&totBufAllocCount, 0);
43679+ atomic_set_unchecked(&totSmBufAllocCount, 0);
43680 #endif /* CONFIG_CIFS_STATS2 */
43681
43682 atomic_set(&midCount, 0);
43683diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
43684index 8238aa1..0347196 100644
43685--- a/fs/cifs/cifsglob.h
43686+++ b/fs/cifs/cifsglob.h
43687@@ -392,28 +392,28 @@ struct cifs_tcon {
43688 __u16 Flags; /* optional support bits */
43689 enum statusEnum tidStatus;
43690 #ifdef CONFIG_CIFS_STATS
43691- atomic_t num_smbs_sent;
43692- atomic_t num_writes;
43693- atomic_t num_reads;
43694- atomic_t num_flushes;
43695- atomic_t num_oplock_brks;
43696- atomic_t num_opens;
43697- atomic_t num_closes;
43698- atomic_t num_deletes;
43699- atomic_t num_mkdirs;
43700- atomic_t num_posixopens;
43701- atomic_t num_posixmkdirs;
43702- atomic_t num_rmdirs;
43703- atomic_t num_renames;
43704- atomic_t num_t2renames;
43705- atomic_t num_ffirst;
43706- atomic_t num_fnext;
43707- atomic_t num_fclose;
43708- atomic_t num_hardlinks;
43709- atomic_t num_symlinks;
43710- atomic_t num_locks;
43711- atomic_t num_acl_get;
43712- atomic_t num_acl_set;
43713+ atomic_unchecked_t num_smbs_sent;
43714+ atomic_unchecked_t num_writes;
43715+ atomic_unchecked_t num_reads;
43716+ atomic_unchecked_t num_flushes;
43717+ atomic_unchecked_t num_oplock_brks;
43718+ atomic_unchecked_t num_opens;
43719+ atomic_unchecked_t num_closes;
43720+ atomic_unchecked_t num_deletes;
43721+ atomic_unchecked_t num_mkdirs;
43722+ atomic_unchecked_t num_posixopens;
43723+ atomic_unchecked_t num_posixmkdirs;
43724+ atomic_unchecked_t num_rmdirs;
43725+ atomic_unchecked_t num_renames;
43726+ atomic_unchecked_t num_t2renames;
43727+ atomic_unchecked_t num_ffirst;
43728+ atomic_unchecked_t num_fnext;
43729+ atomic_unchecked_t num_fclose;
43730+ atomic_unchecked_t num_hardlinks;
43731+ atomic_unchecked_t num_symlinks;
43732+ atomic_unchecked_t num_locks;
43733+ atomic_unchecked_t num_acl_get;
43734+ atomic_unchecked_t num_acl_set;
43735 #ifdef CONFIG_CIFS_STATS2
43736 unsigned long long time_writes;
43737 unsigned long long time_reads;
43738@@ -628,7 +628,7 @@ convert_delimiter(char *path, char delim)
43739 }
43740
43741 #ifdef CONFIG_CIFS_STATS
43742-#define cifs_stats_inc atomic_inc
43743+#define cifs_stats_inc atomic_inc_unchecked
43744
43745 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
43746 unsigned int bytes)
43747@@ -985,8 +985,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
43748 /* Various Debug counters */
43749 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
43750 #ifdef CONFIG_CIFS_STATS2
43751-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
43752-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
43753+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
43754+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
43755 #endif
43756 GLOBAL_EXTERN atomic_t smBufAllocCount;
43757 GLOBAL_EXTERN atomic_t midCount;
43758diff --git a/fs/cifs/link.c b/fs/cifs/link.c
43759index 6b0e064..94e6c3c 100644
43760--- a/fs/cifs/link.c
43761+++ b/fs/cifs/link.c
43762@@ -600,7 +600,7 @@ symlink_exit:
43763
43764 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
43765 {
43766- char *p = nd_get_link(nd);
43767+ const char *p = nd_get_link(nd);
43768 if (!IS_ERR(p))
43769 kfree(p);
43770 }
43771diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
43772index 703ef5c..2a44ed5 100644
43773--- a/fs/cifs/misc.c
43774+++ b/fs/cifs/misc.c
43775@@ -156,7 +156,7 @@ cifs_buf_get(void)
43776 memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
43777 atomic_inc(&bufAllocCount);
43778 #ifdef CONFIG_CIFS_STATS2
43779- atomic_inc(&totBufAllocCount);
43780+ atomic_inc_unchecked(&totBufAllocCount);
43781 #endif /* CONFIG_CIFS_STATS2 */
43782 }
43783
43784@@ -191,7 +191,7 @@ cifs_small_buf_get(void)
43785 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
43786 atomic_inc(&smBufAllocCount);
43787 #ifdef CONFIG_CIFS_STATS2
43788- atomic_inc(&totSmBufAllocCount);
43789+ atomic_inc_unchecked(&totSmBufAllocCount);
43790 #endif /* CONFIG_CIFS_STATS2 */
43791
43792 }
43793diff --git a/fs/coda/cache.c b/fs/coda/cache.c
43794index 6901578..d402eb5 100644
43795--- a/fs/coda/cache.c
43796+++ b/fs/coda/cache.c
43797@@ -24,7 +24,7 @@
43798 #include "coda_linux.h"
43799 #include "coda_cache.h"
43800
43801-static atomic_t permission_epoch = ATOMIC_INIT(0);
43802+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
43803
43804 /* replace or extend an acl cache hit */
43805 void coda_cache_enter(struct inode *inode, int mask)
43806@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
43807 struct coda_inode_info *cii = ITOC(inode);
43808
43809 spin_lock(&cii->c_lock);
43810- cii->c_cached_epoch = atomic_read(&permission_epoch);
43811+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
43812 if (cii->c_uid != current_fsuid()) {
43813 cii->c_uid = current_fsuid();
43814 cii->c_cached_perm = mask;
43815@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
43816 {
43817 struct coda_inode_info *cii = ITOC(inode);
43818 spin_lock(&cii->c_lock);
43819- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
43820+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
43821 spin_unlock(&cii->c_lock);
43822 }
43823
43824 /* remove all acl caches */
43825 void coda_cache_clear_all(struct super_block *sb)
43826 {
43827- atomic_inc(&permission_epoch);
43828+ atomic_inc_unchecked(&permission_epoch);
43829 }
43830
43831
43832@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
43833 spin_lock(&cii->c_lock);
43834 hit = (mask & cii->c_cached_perm) == mask &&
43835 cii->c_uid == current_fsuid() &&
43836- cii->c_cached_epoch == atomic_read(&permission_epoch);
43837+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
43838 spin_unlock(&cii->c_lock);
43839
43840 return hit;
43841diff --git a/fs/compat.c b/fs/compat.c
43842index c987875..08771ca 100644
43843--- a/fs/compat.c
43844+++ b/fs/compat.c
43845@@ -132,8 +132,8 @@ asmlinkage long compat_sys_utimes(const char __user *filename, struct compat_tim
43846 static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
43847 {
43848 compat_ino_t ino = stat->ino;
43849- typeof(ubuf->st_uid) uid = 0;
43850- typeof(ubuf->st_gid) gid = 0;
43851+ typeof(((struct compat_stat *)0)->st_uid) uid = 0;
43852+ typeof(((struct compat_stat *)0)->st_gid) gid = 0;
43853 int err;
43854
43855 SET_UID(uid, stat->uid);
43856@@ -504,7 +504,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
43857
43858 set_fs(KERNEL_DS);
43859 /* The __user pointer cast is valid because of the set_fs() */
43860- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
43861+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
43862 set_fs(oldfs);
43863 /* truncating is ok because it's a user address */
43864 if (!ret)
43865@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
43866 goto out;
43867
43868 ret = -EINVAL;
43869- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
43870+ if (nr_segs > UIO_MAXIOV)
43871 goto out;
43872 if (nr_segs > fast_segs) {
43873 ret = -ENOMEM;
43874@@ -845,6 +845,7 @@ struct compat_old_linux_dirent {
43875
43876 struct compat_readdir_callback {
43877 struct compat_old_linux_dirent __user *dirent;
43878+ struct file * file;
43879 int result;
43880 };
43881
43882@@ -862,6 +863,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
43883 buf->result = -EOVERFLOW;
43884 return -EOVERFLOW;
43885 }
43886+
43887+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
43888+ return 0;
43889+
43890 buf->result++;
43891 dirent = buf->dirent;
43892 if (!access_ok(VERIFY_WRITE, dirent,
43893@@ -894,6 +899,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
43894
43895 buf.result = 0;
43896 buf.dirent = dirent;
43897+ buf.file = file;
43898
43899 error = vfs_readdir(file, compat_fillonedir, &buf);
43900 if (buf.result)
43901@@ -914,6 +920,7 @@ struct compat_linux_dirent {
43902 struct compat_getdents_callback {
43903 struct compat_linux_dirent __user *current_dir;
43904 struct compat_linux_dirent __user *previous;
43905+ struct file * file;
43906 int count;
43907 int error;
43908 };
43909@@ -935,6 +942,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
43910 buf->error = -EOVERFLOW;
43911 return -EOVERFLOW;
43912 }
43913+
43914+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
43915+ return 0;
43916+
43917 dirent = buf->previous;
43918 if (dirent) {
43919 if (__put_user(offset, &dirent->d_off))
43920@@ -982,6 +993,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
43921 buf.previous = NULL;
43922 buf.count = count;
43923 buf.error = 0;
43924+ buf.file = file;
43925
43926 error = vfs_readdir(file, compat_filldir, &buf);
43927 if (error >= 0)
43928@@ -1003,6 +1015,7 @@ out:
43929 struct compat_getdents_callback64 {
43930 struct linux_dirent64 __user *current_dir;
43931 struct linux_dirent64 __user *previous;
43932+ struct file * file;
43933 int count;
43934 int error;
43935 };
43936@@ -1019,6 +1032,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
43937 buf->error = -EINVAL; /* only used if we fail.. */
43938 if (reclen > buf->count)
43939 return -EINVAL;
43940+
43941+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
43942+ return 0;
43943+
43944 dirent = buf->previous;
43945
43946 if (dirent) {
43947@@ -1070,13 +1087,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
43948 buf.previous = NULL;
43949 buf.count = count;
43950 buf.error = 0;
43951+ buf.file = file;
43952
43953 error = vfs_readdir(file, compat_filldir64, &buf);
43954 if (error >= 0)
43955 error = buf.error;
43956 lastdirent = buf.previous;
43957 if (lastdirent) {
43958- typeof(lastdirent->d_off) d_off = file->f_pos;
43959+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
43960 if (__put_user_unaligned(d_off, &lastdirent->d_off))
43961 error = -EFAULT;
43962 else
43963diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
43964index 112e45a..b59845b 100644
43965--- a/fs/compat_binfmt_elf.c
43966+++ b/fs/compat_binfmt_elf.c
43967@@ -30,11 +30,13 @@
43968 #undef elf_phdr
43969 #undef elf_shdr
43970 #undef elf_note
43971+#undef elf_dyn
43972 #undef elf_addr_t
43973 #define elfhdr elf32_hdr
43974 #define elf_phdr elf32_phdr
43975 #define elf_shdr elf32_shdr
43976 #define elf_note elf32_note
43977+#define elf_dyn Elf32_Dyn
43978 #define elf_addr_t Elf32_Addr
43979
43980 /*
43981diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
43982index 51352de..93292ff 100644
43983--- a/fs/compat_ioctl.c
43984+++ b/fs/compat_ioctl.c
43985@@ -210,6 +210,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd,
43986
43987 err = get_user(palp, &up->palette);
43988 err |= get_user(length, &up->length);
43989+ if (err)
43990+ return -EFAULT;
43991
43992 up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
43993 err = put_user(compat_ptr(palp), &up_native->palette);
43994@@ -621,7 +623,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
43995 return -EFAULT;
43996 if (__get_user(udata, &ss32->iomem_base))
43997 return -EFAULT;
43998- ss.iomem_base = compat_ptr(udata);
43999+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
44000 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
44001 __get_user(ss.port_high, &ss32->port_high))
44002 return -EFAULT;
44003@@ -796,7 +798,7 @@ static int compat_ioctl_preallocate(struct file *file,
44004 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
44005 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
44006 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
44007- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
44008+ copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
44009 return -EFAULT;
44010
44011 return ioctl_preallocate(file, p);
44012@@ -1644,8 +1646,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
44013 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
44014 {
44015 unsigned int a, b;
44016- a = *(unsigned int *)p;
44017- b = *(unsigned int *)q;
44018+ a = *(const unsigned int *)p;
44019+ b = *(const unsigned int *)q;
44020 if (a > b)
44021 return 1;
44022 if (a < b)
44023diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
44024index 9a37a9b..35792b6 100644
44025--- a/fs/configfs/dir.c
44026+++ b/fs/configfs/dir.c
44027@@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
44028 }
44029 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
44030 struct configfs_dirent *next;
44031- const char * name;
44032+ const unsigned char * name;
44033+ char d_name[sizeof(next->s_dentry->d_iname)];
44034 int len;
44035 struct inode *inode = NULL;
44036
44037@@ -1585,7 +1586,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
44038 continue;
44039
44040 name = configfs_get_name(next);
44041- len = strlen(name);
44042+ if (next->s_dentry && name == next->s_dentry->d_iname) {
44043+ len = next->s_dentry->d_name.len;
44044+ memcpy(d_name, name, len);
44045+ name = d_name;
44046+ } else
44047+ len = strlen(name);
44048
44049 /*
44050 * We'll have a dentry and an inode for
44051diff --git a/fs/dcache.c b/fs/dcache.c
44052index f7908ae..920a680 100644
44053--- a/fs/dcache.c
44054+++ b/fs/dcache.c
44055@@ -3042,7 +3042,7 @@ void __init vfs_caches_init(unsigned long mempages)
44056 mempages -= reserve;
44057
44058 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
44059- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
44060+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY, NULL);
44061
44062 dcache_init();
44063 inode_init();
44064diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
44065index f3a257d..715ac0f 100644
44066--- a/fs/debugfs/inode.c
44067+++ b/fs/debugfs/inode.c
44068@@ -261,7 +261,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
44069 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
44070 {
44071 return debugfs_create_file(name,
44072+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
44073+ S_IFDIR | S_IRWXU,
44074+#else
44075 S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
44076+#endif
44077 parent, NULL, NULL);
44078 }
44079 EXPORT_SYMBOL_GPL(debugfs_create_dir);
44080diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
44081index af11098..81e3bbe 100644
44082--- a/fs/ecryptfs/inode.c
44083+++ b/fs/ecryptfs/inode.c
44084@@ -691,7 +691,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
44085 old_fs = get_fs();
44086 set_fs(get_ds());
44087 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
44088- (char __user *)lower_buf,
44089+ (char __force_user *)lower_buf,
44090 lower_bufsiz);
44091 set_fs(old_fs);
44092 if (rc < 0)
44093@@ -737,7 +737,7 @@ static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd)
44094 }
44095 old_fs = get_fs();
44096 set_fs(get_ds());
44097- rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
44098+ rc = dentry->d_inode->i_op->readlink(dentry, (char __force_user *)buf, len);
44099 set_fs(old_fs);
44100 if (rc < 0) {
44101 kfree(buf);
44102@@ -752,7 +752,7 @@ out:
44103 static void
44104 ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
44105 {
44106- char *buf = nd_get_link(nd);
44107+ const char *buf = nd_get_link(nd);
44108 if (!IS_ERR(buf)) {
44109 /* Free the char* */
44110 kfree(buf);
44111diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
44112index 0dc5a3d..d3cdeea 100644
44113--- a/fs/ecryptfs/miscdev.c
44114+++ b/fs/ecryptfs/miscdev.c
44115@@ -328,7 +328,7 @@ check_list:
44116 goto out_unlock_msg_ctx;
44117 i = 5;
44118 if (msg_ctx->msg) {
44119- if (copy_to_user(&buf[i], packet_length, packet_length_size))
44120+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
44121 goto out_unlock_msg_ctx;
44122 i += packet_length_size;
44123 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
44124diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
44125index 608c1c3..7d040a8 100644
44126--- a/fs/ecryptfs/read_write.c
44127+++ b/fs/ecryptfs/read_write.c
44128@@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,
44129 return -EIO;
44130 fs_save = get_fs();
44131 set_fs(get_ds());
44132- rc = vfs_write(lower_file, data, size, &offset);
44133+ rc = vfs_write(lower_file, (const char __force_user *)data, size, &offset);
44134 set_fs(fs_save);
44135 mark_inode_dirty_sync(ecryptfs_inode);
44136 return rc;
44137@@ -244,7 +244,7 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,
44138 return -EIO;
44139 fs_save = get_fs();
44140 set_fs(get_ds());
44141- rc = vfs_read(lower_file, data, size, &offset);
44142+ rc = vfs_read(lower_file, (char __force_user *)data, size, &offset);
44143 set_fs(fs_save);
44144 return rc;
44145 }
44146diff --git a/fs/exec.c b/fs/exec.c
44147index 3625464..ff895b9 100644
44148--- a/fs/exec.c
44149+++ b/fs/exec.c
44150@@ -55,12 +55,28 @@
44151 #include <linux/pipe_fs_i.h>
44152 #include <linux/oom.h>
44153 #include <linux/compat.h>
44154+#include <linux/random.h>
44155+#include <linux/seq_file.h>
44156+
44157+#ifdef CONFIG_PAX_REFCOUNT
44158+#include <linux/kallsyms.h>
44159+#include <linux/kdebug.h>
44160+#endif
44161
44162 #include <asm/uaccess.h>
44163 #include <asm/mmu_context.h>
44164 #include <asm/tlb.h>
44165 #include "internal.h"
44166
44167+#ifndef CONFIG_PAX_HAVE_ACL_FLAGS
44168+void __weak pax_set_initial_flags(struct linux_binprm *bprm) {}
44169+#endif
44170+
44171+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
44172+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
44173+EXPORT_SYMBOL(pax_set_initial_flags_func);
44174+#endif
44175+
44176 int core_uses_pid;
44177 char core_pattern[CORENAME_MAX_SIZE] = "core";
44178 unsigned int core_pipe_limit;
44179@@ -70,7 +86,7 @@ struct core_name {
44180 char *corename;
44181 int used, size;
44182 };
44183-static atomic_t call_count = ATOMIC_INIT(1);
44184+static atomic_unchecked_t call_count = ATOMIC_INIT(1);
44185
44186 /* The maximal length of core_pattern is also specified in sysctl.c */
44187
44188@@ -188,18 +204,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
44189 int write)
44190 {
44191 struct page *page;
44192- int ret;
44193
44194-#ifdef CONFIG_STACK_GROWSUP
44195- if (write) {
44196- ret = expand_downwards(bprm->vma, pos);
44197- if (ret < 0)
44198- return NULL;
44199- }
44200-#endif
44201- ret = get_user_pages(current, bprm->mm, pos,
44202- 1, write, 1, &page, NULL);
44203- if (ret <= 0)
44204+ if (0 > expand_downwards(bprm->vma, pos))
44205+ return NULL;
44206+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
44207 return NULL;
44208
44209 if (write) {
44210@@ -215,6 +223,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
44211 if (size <= ARG_MAX)
44212 return page;
44213
44214+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44215+ // only allow 512KB for argv+env on suid/sgid binaries
44216+ // to prevent easy ASLR exhaustion
44217+ if (((bprm->cred->euid != current_euid()) ||
44218+ (bprm->cred->egid != current_egid())) &&
44219+ (size > (512 * 1024))) {
44220+ put_page(page);
44221+ return NULL;
44222+ }
44223+#endif
44224+
44225 /*
44226 * Limit to 1/4-th the stack size for the argv+env strings.
44227 * This ensures that:
44228@@ -274,6 +293,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
44229 vma->vm_end = STACK_TOP_MAX;
44230 vma->vm_start = vma->vm_end - PAGE_SIZE;
44231 vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
44232+
44233+#ifdef CONFIG_PAX_SEGMEXEC
44234+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
44235+#endif
44236+
44237 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
44238 INIT_LIST_HEAD(&vma->anon_vma_chain);
44239
44240@@ -288,6 +312,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
44241 mm->stack_vm = mm->total_vm = 1;
44242 up_write(&mm->mmap_sem);
44243 bprm->p = vma->vm_end - sizeof(void *);
44244+
44245+#ifdef CONFIG_PAX_RANDUSTACK
44246+ if (randomize_va_space)
44247+ bprm->p ^= random32() & ~PAGE_MASK;
44248+#endif
44249+
44250 return 0;
44251 err:
44252 up_write(&mm->mmap_sem);
44253@@ -396,19 +426,7 @@ err:
44254 return err;
44255 }
44256
44257-struct user_arg_ptr {
44258-#ifdef CONFIG_COMPAT
44259- bool is_compat;
44260-#endif
44261- union {
44262- const char __user *const __user *native;
44263-#ifdef CONFIG_COMPAT
44264- compat_uptr_t __user *compat;
44265-#endif
44266- } ptr;
44267-};
44268-
44269-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44270+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44271 {
44272 const char __user *native;
44273
44274@@ -417,14 +435,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44275 compat_uptr_t compat;
44276
44277 if (get_user(compat, argv.ptr.compat + nr))
44278- return ERR_PTR(-EFAULT);
44279+ return (const char __force_user *)ERR_PTR(-EFAULT);
44280
44281 return compat_ptr(compat);
44282 }
44283 #endif
44284
44285 if (get_user(native, argv.ptr.native + nr))
44286- return ERR_PTR(-EFAULT);
44287+ return (const char __force_user *)ERR_PTR(-EFAULT);
44288
44289 return native;
44290 }
44291@@ -443,7 +461,7 @@ static int count(struct user_arg_ptr argv, int max)
44292 if (!p)
44293 break;
44294
44295- if (IS_ERR(p))
44296+ if (IS_ERR((const char __force_kernel *)p))
44297 return -EFAULT;
44298
44299 if (i++ >= max)
44300@@ -477,7 +495,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
44301
44302 ret = -EFAULT;
44303 str = get_user_arg_ptr(argv, argc);
44304- if (IS_ERR(str))
44305+ if (IS_ERR((const char __force_kernel *)str))
44306 goto out;
44307
44308 len = strnlen_user(str, MAX_ARG_STRLEN);
44309@@ -559,7 +577,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
44310 int r;
44311 mm_segment_t oldfs = get_fs();
44312 struct user_arg_ptr argv = {
44313- .ptr.native = (const char __user *const __user *)__argv,
44314+ .ptr.native = (const char __force_user *const __force_user *)__argv,
44315 };
44316
44317 set_fs(KERNEL_DS);
44318@@ -594,7 +612,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
44319 unsigned long new_end = old_end - shift;
44320 struct mmu_gather tlb;
44321
44322- BUG_ON(new_start > new_end);
44323+ if (new_start >= new_end || new_start < mmap_min_addr)
44324+ return -ENOMEM;
44325
44326 /*
44327 * ensure there are no vmas between where we want to go
44328@@ -603,6 +622,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
44329 if (vma != find_vma(mm, new_start))
44330 return -EFAULT;
44331
44332+#ifdef CONFIG_PAX_SEGMEXEC
44333+ BUG_ON(pax_find_mirror_vma(vma));
44334+#endif
44335+
44336 /*
44337 * cover the whole range: [new_start, old_end)
44338 */
44339@@ -683,10 +706,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
44340 stack_top = arch_align_stack(stack_top);
44341 stack_top = PAGE_ALIGN(stack_top);
44342
44343- if (unlikely(stack_top < mmap_min_addr) ||
44344- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
44345- return -ENOMEM;
44346-
44347 stack_shift = vma->vm_end - stack_top;
44348
44349 bprm->p -= stack_shift;
44350@@ -698,8 +717,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
44351 bprm->exec -= stack_shift;
44352
44353 down_write(&mm->mmap_sem);
44354+
44355+ /* Move stack pages down in memory. */
44356+ if (stack_shift) {
44357+ ret = shift_arg_pages(vma, stack_shift);
44358+ if (ret)
44359+ goto out_unlock;
44360+ }
44361+
44362 vm_flags = VM_STACK_FLAGS;
44363
44364+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44365+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
44366+ vm_flags &= ~VM_EXEC;
44367+
44368+#ifdef CONFIG_PAX_MPROTECT
44369+ if (mm->pax_flags & MF_PAX_MPROTECT)
44370+ vm_flags &= ~VM_MAYEXEC;
44371+#endif
44372+
44373+ }
44374+#endif
44375+
44376 /*
44377 * Adjust stack execute permissions; explicitly enable for
44378 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
44379@@ -718,13 +757,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
44380 goto out_unlock;
44381 BUG_ON(prev != vma);
44382
44383- /* Move stack pages down in memory. */
44384- if (stack_shift) {
44385- ret = shift_arg_pages(vma, stack_shift);
44386- if (ret)
44387- goto out_unlock;
44388- }
44389-
44390 /* mprotect_fixup is overkill to remove the temporary stack flags */
44391 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
44392
44393@@ -805,7 +837,7 @@ int kernel_read(struct file *file, loff_t offset,
44394 old_fs = get_fs();
44395 set_fs(get_ds());
44396 /* The cast to a user pointer is valid due to the set_fs() */
44397- result = vfs_read(file, (void __user *)addr, count, &pos);
44398+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
44399 set_fs(old_fs);
44400 return result;
44401 }
44402@@ -1067,6 +1099,21 @@ void set_task_comm(struct task_struct *tsk, char *buf)
44403 perf_event_comm(tsk);
44404 }
44405
44406+static void filename_to_taskname(char *tcomm, const char *fn, unsigned int len)
44407+{
44408+ int i, ch;
44409+
44410+ /* Copies the binary name from after last slash */
44411+ for (i = 0; (ch = *(fn++)) != '\0';) {
44412+ if (ch == '/')
44413+ i = 0; /* overwrite what we wrote */
44414+ else
44415+ if (i < len - 1)
44416+ tcomm[i++] = ch;
44417+ }
44418+ tcomm[i] = '\0';
44419+}
44420+
44421 int flush_old_exec(struct linux_binprm * bprm)
44422 {
44423 int retval;
44424@@ -1081,6 +1128,7 @@ int flush_old_exec(struct linux_binprm * bprm)
44425
44426 set_mm_exe_file(bprm->mm, bprm->file);
44427
44428+ filename_to_taskname(bprm->tcomm, bprm->filename, sizeof(bprm->tcomm));
44429 /*
44430 * Release all of the old mmap stuff
44431 */
44432@@ -1112,10 +1160,6 @@ EXPORT_SYMBOL(would_dump);
44433
44434 void setup_new_exec(struct linux_binprm * bprm)
44435 {
44436- int i, ch;
44437- const char *name;
44438- char tcomm[sizeof(current->comm)];
44439-
44440 arch_pick_mmap_layout(current->mm);
44441
44442 /* This is the point of no return */
44443@@ -1126,18 +1170,7 @@ void setup_new_exec(struct linux_binprm * bprm)
44444 else
44445 set_dumpable(current->mm, suid_dumpable);
44446
44447- name = bprm->filename;
44448-
44449- /* Copies the binary name from after last slash */
44450- for (i=0; (ch = *(name++)) != '\0';) {
44451- if (ch == '/')
44452- i = 0; /* overwrite what we wrote */
44453- else
44454- if (i < (sizeof(tcomm) - 1))
44455- tcomm[i++] = ch;
44456- }
44457- tcomm[i] = '\0';
44458- set_task_comm(current, tcomm);
44459+ set_task_comm(current, bprm->tcomm);
44460
44461 /* Set the new mm task size. We have to do that late because it may
44462 * depend on TIF_32BIT which is only updated in flush_thread() on
44463@@ -1247,7 +1280,7 @@ int check_unsafe_exec(struct linux_binprm *bprm)
44464 }
44465 rcu_read_unlock();
44466
44467- if (p->fs->users > n_fs) {
44468+ if (atomic_read(&p->fs->users) > n_fs) {
44469 bprm->unsafe |= LSM_UNSAFE_SHARE;
44470 } else {
44471 res = -EAGAIN;
44472@@ -1442,6 +1475,28 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
44473
44474 EXPORT_SYMBOL(search_binary_handler);
44475
44476+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44477+static DEFINE_PER_CPU(u64, exec_counter);
44478+static int __init init_exec_counters(void)
44479+{
44480+ unsigned int cpu;
44481+
44482+ for_each_possible_cpu(cpu) {
44483+ per_cpu(exec_counter, cpu) = (u64)cpu;
44484+ }
44485+
44486+ return 0;
44487+}
44488+early_initcall(init_exec_counters);
44489+static inline void increment_exec_counter(void)
44490+{
44491+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
44492+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
44493+}
44494+#else
44495+static inline void increment_exec_counter(void) {}
44496+#endif
44497+
44498 /*
44499 * sys_execve() executes a new program.
44500 */
44501@@ -1450,6 +1505,11 @@ static int do_execve_common(const char *filename,
44502 struct user_arg_ptr envp,
44503 struct pt_regs *regs)
44504 {
44505+#ifdef CONFIG_GRKERNSEC
44506+ struct file *old_exec_file;
44507+ struct acl_subject_label *old_acl;
44508+ struct rlimit old_rlim[RLIM_NLIMITS];
44509+#endif
44510 struct linux_binprm *bprm;
44511 struct file *file;
44512 struct files_struct *displaced;
44513@@ -1457,6 +1517,8 @@ static int do_execve_common(const char *filename,
44514 int retval;
44515 const struct cred *cred = current_cred();
44516
44517+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
44518+
44519 /*
44520 * We move the actual failure in case of RLIMIT_NPROC excess from
44521 * set*uid() to execve() because too many poorly written programs
44522@@ -1497,12 +1559,27 @@ static int do_execve_common(const char *filename,
44523 if (IS_ERR(file))
44524 goto out_unmark;
44525
44526+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
44527+ retval = -EPERM;
44528+ goto out_file;
44529+ }
44530+
44531 sched_exec();
44532
44533 bprm->file = file;
44534 bprm->filename = filename;
44535 bprm->interp = filename;
44536
44537+ if (gr_process_user_ban()) {
44538+ retval = -EPERM;
44539+ goto out_file;
44540+ }
44541+
44542+ if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
44543+ retval = -EACCES;
44544+ goto out_file;
44545+ }
44546+
44547 retval = bprm_mm_init(bprm);
44548 if (retval)
44549 goto out_file;
44550@@ -1519,24 +1596,65 @@ static int do_execve_common(const char *filename,
44551 if (retval < 0)
44552 goto out;
44553
44554+#ifdef CONFIG_GRKERNSEC
44555+ old_acl = current->acl;
44556+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
44557+ old_exec_file = current->exec_file;
44558+ get_file(file);
44559+ current->exec_file = file;
44560+#endif
44561+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44562+ /* limit suid stack to 8MB
44563+ we saved the old limits above and will restore them if this exec fails
44564+ */
44565+ if (((bprm->cred->euid != current_euid()) || (bprm->cred->egid != current_egid())) &&
44566+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
44567+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
44568+#endif
44569+
44570+ if (!gr_tpe_allow(file)) {
44571+ retval = -EACCES;
44572+ goto out_fail;
44573+ }
44574+
44575+ if (gr_check_crash_exec(file)) {
44576+ retval = -EACCES;
44577+ goto out_fail;
44578+ }
44579+
44580+ retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
44581+ bprm->unsafe);
44582+ if (retval < 0)
44583+ goto out_fail;
44584+
44585 retval = copy_strings_kernel(1, &bprm->filename, bprm);
44586 if (retval < 0)
44587- goto out;
44588+ goto out_fail;
44589
44590 bprm->exec = bprm->p;
44591 retval = copy_strings(bprm->envc, envp, bprm);
44592 if (retval < 0)
44593- goto out;
44594+ goto out_fail;
44595
44596 retval = copy_strings(bprm->argc, argv, bprm);
44597 if (retval < 0)
44598- goto out;
44599+ goto out_fail;
44600+
44601+ gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
44602+
44603+ gr_handle_exec_args(bprm, argv);
44604
44605 retval = search_binary_handler(bprm,regs);
44606 if (retval < 0)
44607- goto out;
44608+ goto out_fail;
44609+#ifdef CONFIG_GRKERNSEC
44610+ if (old_exec_file)
44611+ fput(old_exec_file);
44612+#endif
44613
44614 /* execve succeeded */
44615+
44616+ increment_exec_counter();
44617 current->fs->in_exec = 0;
44618 current->in_execve = 0;
44619 acct_update_integrals(current);
44620@@ -1545,6 +1663,14 @@ static int do_execve_common(const char *filename,
44621 put_files_struct(displaced);
44622 return retval;
44623
44624+out_fail:
44625+#ifdef CONFIG_GRKERNSEC
44626+ current->acl = old_acl;
44627+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
44628+ fput(current->exec_file);
44629+ current->exec_file = old_exec_file;
44630+#endif
44631+
44632 out:
44633 if (bprm->mm) {
44634 acct_arg_size(bprm, 0);
44635@@ -1618,7 +1744,7 @@ static int expand_corename(struct core_name *cn)
44636 {
44637 char *old_corename = cn->corename;
44638
44639- cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count);
44640+ cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count);
44641 cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
44642
44643 if (!cn->corename) {
44644@@ -1715,7 +1841,7 @@ static int format_corename(struct core_name *cn, long signr)
44645 int pid_in_pattern = 0;
44646 int err = 0;
44647
44648- cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count);
44649+ cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count);
44650 cn->corename = kmalloc(cn->size, GFP_KERNEL);
44651 cn->used = 0;
44652
44653@@ -1812,6 +1938,228 @@ out:
44654 return ispipe;
44655 }
44656
44657+int pax_check_flags(unsigned long *flags)
44658+{
44659+ int retval = 0;
44660+
44661+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
44662+ if (*flags & MF_PAX_SEGMEXEC)
44663+ {
44664+ *flags &= ~MF_PAX_SEGMEXEC;
44665+ retval = -EINVAL;
44666+ }
44667+#endif
44668+
44669+ if ((*flags & MF_PAX_PAGEEXEC)
44670+
44671+#ifdef CONFIG_PAX_PAGEEXEC
44672+ && (*flags & MF_PAX_SEGMEXEC)
44673+#endif
44674+
44675+ )
44676+ {
44677+ *flags &= ~MF_PAX_PAGEEXEC;
44678+ retval = -EINVAL;
44679+ }
44680+
44681+ if ((*flags & MF_PAX_MPROTECT)
44682+
44683+#ifdef CONFIG_PAX_MPROTECT
44684+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44685+#endif
44686+
44687+ )
44688+ {
44689+ *flags &= ~MF_PAX_MPROTECT;
44690+ retval = -EINVAL;
44691+ }
44692+
44693+ if ((*flags & MF_PAX_EMUTRAMP)
44694+
44695+#ifdef CONFIG_PAX_EMUTRAMP
44696+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44697+#endif
44698+
44699+ )
44700+ {
44701+ *flags &= ~MF_PAX_EMUTRAMP;
44702+ retval = -EINVAL;
44703+ }
44704+
44705+ return retval;
44706+}
44707+
44708+EXPORT_SYMBOL(pax_check_flags);
44709+
44710+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44711+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
44712+{
44713+ struct task_struct *tsk = current;
44714+ struct mm_struct *mm = current->mm;
44715+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
44716+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
44717+ char *path_exec = NULL;
44718+ char *path_fault = NULL;
44719+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
44720+
44721+ if (buffer_exec && buffer_fault) {
44722+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
44723+
44724+ down_read(&mm->mmap_sem);
44725+ vma = mm->mmap;
44726+ while (vma && (!vma_exec || !vma_fault)) {
44727+ if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
44728+ vma_exec = vma;
44729+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
44730+ vma_fault = vma;
44731+ vma = vma->vm_next;
44732+ }
44733+ if (vma_exec) {
44734+ path_exec = d_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
44735+ if (IS_ERR(path_exec))
44736+ path_exec = "<path too long>";
44737+ else {
44738+ path_exec = mangle_path(buffer_exec, path_exec, "\t\n\\");
44739+ if (path_exec) {
44740+ *path_exec = 0;
44741+ path_exec = buffer_exec;
44742+ } else
44743+ path_exec = "<path too long>";
44744+ }
44745+ }
44746+ if (vma_fault) {
44747+ start = vma_fault->vm_start;
44748+ end = vma_fault->vm_end;
44749+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
44750+ if (vma_fault->vm_file) {
44751+ path_fault = d_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
44752+ if (IS_ERR(path_fault))
44753+ path_fault = "<path too long>";
44754+ else {
44755+ path_fault = mangle_path(buffer_fault, path_fault, "\t\n\\");
44756+ if (path_fault) {
44757+ *path_fault = 0;
44758+ path_fault = buffer_fault;
44759+ } else
44760+ path_fault = "<path too long>";
44761+ }
44762+ } else
44763+ path_fault = "<anonymous mapping>";
44764+ }
44765+ up_read(&mm->mmap_sem);
44766+ }
44767+ if (tsk->signal->curr_ip)
44768+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
44769+ else
44770+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
44771+ printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
44772+ "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
44773+ task_uid(tsk), task_euid(tsk), pc, sp);
44774+ free_page((unsigned long)buffer_exec);
44775+ free_page((unsigned long)buffer_fault);
44776+ pax_report_insns(regs, pc, sp);
44777+ do_coredump(SIGKILL, SIGKILL, regs);
44778+}
44779+#endif
44780+
44781+#ifdef CONFIG_PAX_REFCOUNT
44782+void pax_report_refcount_overflow(struct pt_regs *regs)
44783+{
44784+ if (current->signal->curr_ip)
44785+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44786+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
44787+ else
44788+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44789+ current->comm, task_pid_nr(current), current_uid(), current_euid());
44790+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
44791+ show_regs(regs);
44792+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
44793+}
44794+#endif
44795+
44796+#ifdef CONFIG_PAX_USERCOPY
44797+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
44798+int object_is_on_stack(const void *obj, unsigned long len)
44799+{
44800+ const void * const stack = task_stack_page(current);
44801+ const void * const stackend = stack + THREAD_SIZE;
44802+
44803+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44804+ const void *frame = NULL;
44805+ const void *oldframe;
44806+#endif
44807+
44808+ if (obj + len < obj)
44809+ return -1;
44810+
44811+ if (obj + len <= stack || stackend <= obj)
44812+ return 0;
44813+
44814+ if (obj < stack || stackend < obj + len)
44815+ return -1;
44816+
44817+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44818+ oldframe = __builtin_frame_address(1);
44819+ if (oldframe)
44820+ frame = __builtin_frame_address(2);
44821+ /*
44822+ low ----------------------------------------------> high
44823+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
44824+ ^----------------^
44825+ allow copies only within here
44826+ */
44827+ while (stack <= frame && frame < stackend) {
44828+ /* if obj + len extends past the last frame, this
44829+ check won't pass and the next frame will be 0,
44830+ causing us to bail out and correctly report
44831+ the copy as invalid
44832+ */
44833+ if (obj + len <= frame)
44834+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
44835+ oldframe = frame;
44836+ frame = *(const void * const *)frame;
44837+ }
44838+ return -1;
44839+#else
44840+ return 1;
44841+#endif
44842+}
44843+
44844+__noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
44845+{
44846+ if (current->signal->curr_ip)
44847+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44848+ &current->signal->curr_ip, to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44849+ else
44850+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44851+ to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44852+ dump_stack();
44853+ gr_handle_kernel_exploit();
44854+ do_group_exit(SIGKILL);
44855+}
44856+#endif
44857+
44858+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
44859+void pax_track_stack(void)
44860+{
44861+ unsigned long sp = (unsigned long)&sp;
44862+ if (sp < current_thread_info()->lowest_stack &&
44863+ sp > (unsigned long)task_stack_page(current))
44864+ current_thread_info()->lowest_stack = sp;
44865+}
44866+EXPORT_SYMBOL(pax_track_stack);
44867+#endif
44868+
44869+#ifdef CONFIG_PAX_SIZE_OVERFLOW
44870+void report_size_overflow(const char *file, unsigned int line, const char *func)
44871+{
44872+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u\n", func, file, line);
44873+ dump_stack();
44874+ do_group_exit(SIGKILL);
44875+}
44876+EXPORT_SYMBOL(report_size_overflow);
44877+#endif
44878+
44879 static int zap_process(struct task_struct *start, int exit_code)
44880 {
44881 struct task_struct *t;
44882@@ -2023,17 +2371,17 @@ static void wait_for_dump_helpers(struct file *file)
44883 pipe = file->f_path.dentry->d_inode->i_pipe;
44884
44885 pipe_lock(pipe);
44886- pipe->readers++;
44887- pipe->writers--;
44888+ atomic_inc(&pipe->readers);
44889+ atomic_dec(&pipe->writers);
44890
44891- while ((pipe->readers > 1) && (!signal_pending(current))) {
44892+ while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
44893 wake_up_interruptible_sync(&pipe->wait);
44894 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
44895 pipe_wait(pipe);
44896 }
44897
44898- pipe->readers--;
44899- pipe->writers++;
44900+ atomic_dec(&pipe->readers);
44901+ atomic_inc(&pipe->writers);
44902 pipe_unlock(pipe);
44903
44904 }
44905@@ -2094,7 +2442,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44906 int retval = 0;
44907 int flag = 0;
44908 int ispipe;
44909- static atomic_t core_dump_count = ATOMIC_INIT(0);
44910+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
44911 struct coredump_params cprm = {
44912 .signr = signr,
44913 .regs = regs,
44914@@ -2109,6 +2457,9 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44915
44916 audit_core_dumps(signr);
44917
44918+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
44919+ gr_handle_brute_attach(current, cprm.mm_flags);
44920+
44921 binfmt = mm->binfmt;
44922 if (!binfmt || !binfmt->core_dump)
44923 goto fail;
44924@@ -2176,7 +2527,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44925 }
44926 cprm.limit = RLIM_INFINITY;
44927
44928- dump_count = atomic_inc_return(&core_dump_count);
44929+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
44930 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
44931 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
44932 task_tgid_vnr(current), current->comm);
44933@@ -2203,6 +2554,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44934 } else {
44935 struct inode *inode;
44936
44937+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
44938+
44939 if (cprm.limit < binfmt->min_coredump)
44940 goto fail_unlock;
44941
44942@@ -2246,7 +2599,7 @@ close_fail:
44943 filp_close(cprm.file, NULL);
44944 fail_dropcount:
44945 if (ispipe)
44946- atomic_dec(&core_dump_count);
44947+ atomic_dec_unchecked(&core_dump_count);
44948 fail_unlock:
44949 kfree(cn.corename);
44950 fail_corename:
44951@@ -2265,7 +2618,7 @@ fail:
44952 */
44953 int dump_write(struct file *file, const void *addr, int nr)
44954 {
44955- return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;
44956+ return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
44957 }
44958 EXPORT_SYMBOL(dump_write);
44959
44960diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
44961index a8cbe1b..fed04cb 100644
44962--- a/fs/ext2/balloc.c
44963+++ b/fs/ext2/balloc.c
44964@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
44965
44966 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
44967 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
44968- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
44969+ if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
44970 sbi->s_resuid != current_fsuid() &&
44971 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
44972 return 0;
44973diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
44974index a203892..4e64db5 100644
44975--- a/fs/ext3/balloc.c
44976+++ b/fs/ext3/balloc.c
44977@@ -1446,9 +1446,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
44978
44979 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
44980 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
44981- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
44982+ if (free_blocks < root_blocks + 1 &&
44983 !use_reservation && sbi->s_resuid != current_fsuid() &&
44984- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
44985+ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)) &&
44986+ !capable_nolog(CAP_SYS_RESOURCE)) {
44987 return 0;
44988 }
44989 return 1;
44990diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
44991index 12ccacd..a6035fce0 100644
44992--- a/fs/ext4/balloc.c
44993+++ b/fs/ext4/balloc.c
44994@@ -436,8 +436,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
44995 /* Hm, nope. Are (enough) root reserved clusters available? */
44996 if (sbi->s_resuid == current_fsuid() ||
44997 ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
44998- capable(CAP_SYS_RESOURCE) ||
44999- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
45000+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
45001+ capable_nolog(CAP_SYS_RESOURCE)) {
45002
45003 if (free_clusters >= (nclusters + dirty_clusters))
45004 return 1;
45005diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
45006index 5b0e26a..0aa002d 100644
45007--- a/fs/ext4/ext4.h
45008+++ b/fs/ext4/ext4.h
45009@@ -1208,19 +1208,19 @@ struct ext4_sb_info {
45010 unsigned long s_mb_last_start;
45011
45012 /* stats for buddy allocator */
45013- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
45014- atomic_t s_bal_success; /* we found long enough chunks */
45015- atomic_t s_bal_allocated; /* in blocks */
45016- atomic_t s_bal_ex_scanned; /* total extents scanned */
45017- atomic_t s_bal_goals; /* goal hits */
45018- atomic_t s_bal_breaks; /* too long searches */
45019- atomic_t s_bal_2orders; /* 2^order hits */
45020+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
45021+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
45022+ atomic_unchecked_t s_bal_allocated; /* in blocks */
45023+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
45024+ atomic_unchecked_t s_bal_goals; /* goal hits */
45025+ atomic_unchecked_t s_bal_breaks; /* too long searches */
45026+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
45027 spinlock_t s_bal_lock;
45028 unsigned long s_mb_buddies_generated;
45029 unsigned long long s_mb_generation_time;
45030- atomic_t s_mb_lost_chunks;
45031- atomic_t s_mb_preallocated;
45032- atomic_t s_mb_discarded;
45033+ atomic_unchecked_t s_mb_lost_chunks;
45034+ atomic_unchecked_t s_mb_preallocated;
45035+ atomic_unchecked_t s_mb_discarded;
45036 atomic_t s_lock_busy;
45037
45038 /* locality groups */
45039diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
45040index e2d8be8..c7f0ce9 100644
45041--- a/fs/ext4/mballoc.c
45042+++ b/fs/ext4/mballoc.c
45043@@ -1794,7 +1794,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
45044 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
45045
45046 if (EXT4_SB(sb)->s_mb_stats)
45047- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
45048+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
45049
45050 break;
45051 }
45052@@ -2088,7 +2088,7 @@ repeat:
45053 ac->ac_status = AC_STATUS_CONTINUE;
45054 ac->ac_flags |= EXT4_MB_HINT_FIRST;
45055 cr = 3;
45056- atomic_inc(&sbi->s_mb_lost_chunks);
45057+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
45058 goto repeat;
45059 }
45060 }
45061@@ -2592,25 +2592,25 @@ int ext4_mb_release(struct super_block *sb)
45062 if (sbi->s_mb_stats) {
45063 ext4_msg(sb, KERN_INFO,
45064 "mballoc: %u blocks %u reqs (%u success)",
45065- atomic_read(&sbi->s_bal_allocated),
45066- atomic_read(&sbi->s_bal_reqs),
45067- atomic_read(&sbi->s_bal_success));
45068+ atomic_read_unchecked(&sbi->s_bal_allocated),
45069+ atomic_read_unchecked(&sbi->s_bal_reqs),
45070+ atomic_read_unchecked(&sbi->s_bal_success));
45071 ext4_msg(sb, KERN_INFO,
45072 "mballoc: %u extents scanned, %u goal hits, "
45073 "%u 2^N hits, %u breaks, %u lost",
45074- atomic_read(&sbi->s_bal_ex_scanned),
45075- atomic_read(&sbi->s_bal_goals),
45076- atomic_read(&sbi->s_bal_2orders),
45077- atomic_read(&sbi->s_bal_breaks),
45078- atomic_read(&sbi->s_mb_lost_chunks));
45079+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
45080+ atomic_read_unchecked(&sbi->s_bal_goals),
45081+ atomic_read_unchecked(&sbi->s_bal_2orders),
45082+ atomic_read_unchecked(&sbi->s_bal_breaks),
45083+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
45084 ext4_msg(sb, KERN_INFO,
45085 "mballoc: %lu generated and it took %Lu",
45086 sbi->s_mb_buddies_generated,
45087 sbi->s_mb_generation_time);
45088 ext4_msg(sb, KERN_INFO,
45089 "mballoc: %u preallocated, %u discarded",
45090- atomic_read(&sbi->s_mb_preallocated),
45091- atomic_read(&sbi->s_mb_discarded));
45092+ atomic_read_unchecked(&sbi->s_mb_preallocated),
45093+ atomic_read_unchecked(&sbi->s_mb_discarded));
45094 }
45095
45096 free_percpu(sbi->s_locality_groups);
45097@@ -3096,16 +3096,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
45098 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
45099
45100 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
45101- atomic_inc(&sbi->s_bal_reqs);
45102- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
45103+ atomic_inc_unchecked(&sbi->s_bal_reqs);
45104+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
45105 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
45106- atomic_inc(&sbi->s_bal_success);
45107- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
45108+ atomic_inc_unchecked(&sbi->s_bal_success);
45109+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
45110 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
45111 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
45112- atomic_inc(&sbi->s_bal_goals);
45113+ atomic_inc_unchecked(&sbi->s_bal_goals);
45114 if (ac->ac_found > sbi->s_mb_max_to_scan)
45115- atomic_inc(&sbi->s_bal_breaks);
45116+ atomic_inc_unchecked(&sbi->s_bal_breaks);
45117 }
45118
45119 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
45120@@ -3509,7 +3509,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
45121 trace_ext4_mb_new_inode_pa(ac, pa);
45122
45123 ext4_mb_use_inode_pa(ac, pa);
45124- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
45125+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
45126
45127 ei = EXT4_I(ac->ac_inode);
45128 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
45129@@ -3569,7 +3569,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
45130 trace_ext4_mb_new_group_pa(ac, pa);
45131
45132 ext4_mb_use_group_pa(ac, pa);
45133- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
45134+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
45135
45136 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
45137 lg = ac->ac_lg;
45138@@ -3658,7 +3658,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
45139 * from the bitmap and continue.
45140 */
45141 }
45142- atomic_add(free, &sbi->s_mb_discarded);
45143+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
45144
45145 return err;
45146 }
45147@@ -3676,7 +3676,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
45148 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
45149 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
45150 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
45151- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
45152+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
45153 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
45154
45155 return 0;
45156diff --git a/fs/fcntl.c b/fs/fcntl.c
45157index 22764c7..86372c9 100644
45158--- a/fs/fcntl.c
45159+++ b/fs/fcntl.c
45160@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
45161 if (err)
45162 return err;
45163
45164+ if (gr_handle_chroot_fowner(pid, type))
45165+ return -ENOENT;
45166+ if (gr_check_protected_task_fowner(pid, type))
45167+ return -EACCES;
45168+
45169 f_modown(filp, pid, type, force);
45170 return 0;
45171 }
45172@@ -266,7 +271,7 @@ pid_t f_getown(struct file *filp)
45173
45174 static int f_setown_ex(struct file *filp, unsigned long arg)
45175 {
45176- struct f_owner_ex * __user owner_p = (void * __user)arg;
45177+ struct f_owner_ex __user *owner_p = (void __user *)arg;
45178 struct f_owner_ex owner;
45179 struct pid *pid;
45180 int type;
45181@@ -306,7 +311,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
45182
45183 static int f_getown_ex(struct file *filp, unsigned long arg)
45184 {
45185- struct f_owner_ex * __user owner_p = (void * __user)arg;
45186+ struct f_owner_ex __user *owner_p = (void __user *)arg;
45187 struct f_owner_ex owner;
45188 int ret = 0;
45189
45190@@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
45191 switch (cmd) {
45192 case F_DUPFD:
45193 case F_DUPFD_CLOEXEC:
45194+ gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
45195 if (arg >= rlimit(RLIMIT_NOFILE))
45196 break;
45197 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
45198diff --git a/fs/fifo.c b/fs/fifo.c
45199index b1a524d..4ee270e 100644
45200--- a/fs/fifo.c
45201+++ b/fs/fifo.c
45202@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
45203 */
45204 filp->f_op = &read_pipefifo_fops;
45205 pipe->r_counter++;
45206- if (pipe->readers++ == 0)
45207+ if (atomic_inc_return(&pipe->readers) == 1)
45208 wake_up_partner(inode);
45209
45210- if (!pipe->writers) {
45211+ if (!atomic_read(&pipe->writers)) {
45212 if ((filp->f_flags & O_NONBLOCK)) {
45213 /* suppress POLLHUP until we have
45214 * seen a writer */
45215@@ -81,15 +81,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
45216 * errno=ENXIO when there is no process reading the FIFO.
45217 */
45218 ret = -ENXIO;
45219- if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
45220+ if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
45221 goto err;
45222
45223 filp->f_op = &write_pipefifo_fops;
45224 pipe->w_counter++;
45225- if (!pipe->writers++)
45226+ if (atomic_inc_return(&pipe->writers) == 1)
45227 wake_up_partner(inode);
45228
45229- if (!pipe->readers) {
45230+ if (!atomic_read(&pipe->readers)) {
45231 wait_for_partner(inode, &pipe->r_counter);
45232 if (signal_pending(current))
45233 goto err_wr;
45234@@ -105,11 +105,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
45235 */
45236 filp->f_op = &rdwr_pipefifo_fops;
45237
45238- pipe->readers++;
45239- pipe->writers++;
45240+ atomic_inc(&pipe->readers);
45241+ atomic_inc(&pipe->writers);
45242 pipe->r_counter++;
45243 pipe->w_counter++;
45244- if (pipe->readers == 1 || pipe->writers == 1)
45245+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
45246 wake_up_partner(inode);
45247 break;
45248
45249@@ -123,19 +123,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
45250 return 0;
45251
45252 err_rd:
45253- if (!--pipe->readers)
45254+ if (atomic_dec_and_test(&pipe->readers))
45255 wake_up_interruptible(&pipe->wait);
45256 ret = -ERESTARTSYS;
45257 goto err;
45258
45259 err_wr:
45260- if (!--pipe->writers)
45261+ if (atomic_dec_and_test(&pipe->writers))
45262 wake_up_interruptible(&pipe->wait);
45263 ret = -ERESTARTSYS;
45264 goto err;
45265
45266 err:
45267- if (!pipe->readers && !pipe->writers)
45268+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
45269 free_pipe_info(inode);
45270
45271 err_nocleanup:
45272diff --git a/fs/file.c b/fs/file.c
45273index 4c6992d..104cdea 100644
45274--- a/fs/file.c
45275+++ b/fs/file.c
45276@@ -15,6 +15,7 @@
45277 #include <linux/slab.h>
45278 #include <linux/vmalloc.h>
45279 #include <linux/file.h>
45280+#include <linux/security.h>
45281 #include <linux/fdtable.h>
45282 #include <linux/bitops.h>
45283 #include <linux/interrupt.h>
45284@@ -254,6 +255,7 @@ int expand_files(struct files_struct *files, int nr)
45285 * N.B. For clone tasks sharing a files structure, this test
45286 * will limit the total number of files that can be opened.
45287 */
45288+ gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
45289 if (nr >= rlimit(RLIMIT_NOFILE))
45290 return -EMFILE;
45291
45292diff --git a/fs/filesystems.c b/fs/filesystems.c
45293index 0845f84..7b4ebef 100644
45294--- a/fs/filesystems.c
45295+++ b/fs/filesystems.c
45296@@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(const char *name)
45297 int len = dot ? dot - name : strlen(name);
45298
45299 fs = __get_fs_type(name, len);
45300+
45301+#ifdef CONFIG_GRKERNSEC_MODHARDEN
45302+ if (!fs && (___request_module(true, "grsec_modharden_fs", "%.*s", len, name) == 0))
45303+#else
45304 if (!fs && (request_module("%.*s", len, name) == 0))
45305+#endif
45306 fs = __get_fs_type(name, len);
45307
45308 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
45309diff --git a/fs/fs_struct.c b/fs/fs_struct.c
45310index 78b519c..a8b4979 100644
45311--- a/fs/fs_struct.c
45312+++ b/fs/fs_struct.c
45313@@ -4,6 +4,7 @@
45314 #include <linux/path.h>
45315 #include <linux/slab.h>
45316 #include <linux/fs_struct.h>
45317+#include <linux/grsecurity.h>
45318 #include "internal.h"
45319
45320 static inline void path_get_longterm(struct path *path)
45321@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
45322 old_root = fs->root;
45323 fs->root = *path;
45324 path_get_longterm(path);
45325+ gr_set_chroot_entries(current, path);
45326 write_seqcount_end(&fs->seq);
45327 spin_unlock(&fs->lock);
45328 if (old_root.dentry)
45329@@ -74,6 +76,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
45330 && fs->root.mnt == old_root->mnt) {
45331 path_get_longterm(new_root);
45332 fs->root = *new_root;
45333+ gr_set_chroot_entries(p, new_root);
45334 count++;
45335 }
45336 if (fs->pwd.dentry == old_root->dentry
45337@@ -109,7 +112,8 @@ void exit_fs(struct task_struct *tsk)
45338 spin_lock(&fs->lock);
45339 write_seqcount_begin(&fs->seq);
45340 tsk->fs = NULL;
45341- kill = !--fs->users;
45342+ gr_clear_chroot_entries(tsk);
45343+ kill = !atomic_dec_return(&fs->users);
45344 write_seqcount_end(&fs->seq);
45345 spin_unlock(&fs->lock);
45346 task_unlock(tsk);
45347@@ -123,7 +127,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
45348 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
45349 /* We don't need to lock fs - think why ;-) */
45350 if (fs) {
45351- fs->users = 1;
45352+ atomic_set(&fs->users, 1);
45353 fs->in_exec = 0;
45354 spin_lock_init(&fs->lock);
45355 seqcount_init(&fs->seq);
45356@@ -132,6 +136,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
45357 spin_lock(&old->lock);
45358 fs->root = old->root;
45359 path_get_longterm(&fs->root);
45360+ /* instead of calling gr_set_chroot_entries here,
45361+ we call it from every caller of this function
45362+ */
45363 fs->pwd = old->pwd;
45364 path_get_longterm(&fs->pwd);
45365 spin_unlock(&old->lock);
45366@@ -150,8 +157,9 @@ int unshare_fs_struct(void)
45367
45368 task_lock(current);
45369 spin_lock(&fs->lock);
45370- kill = !--fs->users;
45371+ kill = !atomic_dec_return(&fs->users);
45372 current->fs = new_fs;
45373+ gr_set_chroot_entries(current, &new_fs->root);
45374 spin_unlock(&fs->lock);
45375 task_unlock(current);
45376
45377@@ -164,13 +172,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
45378
45379 int current_umask(void)
45380 {
45381- return current->fs->umask;
45382+ return current->fs->umask | gr_acl_umask();
45383 }
45384 EXPORT_SYMBOL(current_umask);
45385
45386 /* to be mentioned only in INIT_TASK */
45387 struct fs_struct init_fs = {
45388- .users = 1,
45389+ .users = ATOMIC_INIT(1),
45390 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
45391 .seq = SEQCNT_ZERO,
45392 .umask = 0022,
45393@@ -186,12 +194,13 @@ void daemonize_fs_struct(void)
45394 task_lock(current);
45395
45396 spin_lock(&init_fs.lock);
45397- init_fs.users++;
45398+ atomic_inc(&init_fs.users);
45399 spin_unlock(&init_fs.lock);
45400
45401 spin_lock(&fs->lock);
45402 current->fs = &init_fs;
45403- kill = !--fs->users;
45404+ gr_set_chroot_entries(current, &current->fs->root);
45405+ kill = !atomic_dec_return(&fs->users);
45406 spin_unlock(&fs->lock);
45407
45408 task_unlock(current);
45409diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
45410index 9905350..02eaec4 100644
45411--- a/fs/fscache/cookie.c
45412+++ b/fs/fscache/cookie.c
45413@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
45414 parent ? (char *) parent->def->name : "<no-parent>",
45415 def->name, netfs_data);
45416
45417- fscache_stat(&fscache_n_acquires);
45418+ fscache_stat_unchecked(&fscache_n_acquires);
45419
45420 /* if there's no parent cookie, then we don't create one here either */
45421 if (!parent) {
45422- fscache_stat(&fscache_n_acquires_null);
45423+ fscache_stat_unchecked(&fscache_n_acquires_null);
45424 _leave(" [no parent]");
45425 return NULL;
45426 }
45427@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
45428 /* allocate and initialise a cookie */
45429 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
45430 if (!cookie) {
45431- fscache_stat(&fscache_n_acquires_oom);
45432+ fscache_stat_unchecked(&fscache_n_acquires_oom);
45433 _leave(" [ENOMEM]");
45434 return NULL;
45435 }
45436@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
45437
45438 switch (cookie->def->type) {
45439 case FSCACHE_COOKIE_TYPE_INDEX:
45440- fscache_stat(&fscache_n_cookie_index);
45441+ fscache_stat_unchecked(&fscache_n_cookie_index);
45442 break;
45443 case FSCACHE_COOKIE_TYPE_DATAFILE:
45444- fscache_stat(&fscache_n_cookie_data);
45445+ fscache_stat_unchecked(&fscache_n_cookie_data);
45446 break;
45447 default:
45448- fscache_stat(&fscache_n_cookie_special);
45449+ fscache_stat_unchecked(&fscache_n_cookie_special);
45450 break;
45451 }
45452
45453@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
45454 if (fscache_acquire_non_index_cookie(cookie) < 0) {
45455 atomic_dec(&parent->n_children);
45456 __fscache_cookie_put(cookie);
45457- fscache_stat(&fscache_n_acquires_nobufs);
45458+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
45459 _leave(" = NULL");
45460 return NULL;
45461 }
45462 }
45463
45464- fscache_stat(&fscache_n_acquires_ok);
45465+ fscache_stat_unchecked(&fscache_n_acquires_ok);
45466 _leave(" = %p", cookie);
45467 return cookie;
45468 }
45469@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
45470 cache = fscache_select_cache_for_object(cookie->parent);
45471 if (!cache) {
45472 up_read(&fscache_addremove_sem);
45473- fscache_stat(&fscache_n_acquires_no_cache);
45474+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
45475 _leave(" = -ENOMEDIUM [no cache]");
45476 return -ENOMEDIUM;
45477 }
45478@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct fscache_cache *cache,
45479 object = cache->ops->alloc_object(cache, cookie);
45480 fscache_stat_d(&fscache_n_cop_alloc_object);
45481 if (IS_ERR(object)) {
45482- fscache_stat(&fscache_n_object_no_alloc);
45483+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
45484 ret = PTR_ERR(object);
45485 goto error;
45486 }
45487
45488- fscache_stat(&fscache_n_object_alloc);
45489+ fscache_stat_unchecked(&fscache_n_object_alloc);
45490
45491 object->debug_id = atomic_inc_return(&fscache_object_debug_id);
45492
45493@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
45494 struct fscache_object *object;
45495 struct hlist_node *_p;
45496
45497- fscache_stat(&fscache_n_updates);
45498+ fscache_stat_unchecked(&fscache_n_updates);
45499
45500 if (!cookie) {
45501- fscache_stat(&fscache_n_updates_null);
45502+ fscache_stat_unchecked(&fscache_n_updates_null);
45503 _leave(" [no cookie]");
45504 return;
45505 }
45506@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
45507 struct fscache_object *object;
45508 unsigned long event;
45509
45510- fscache_stat(&fscache_n_relinquishes);
45511+ fscache_stat_unchecked(&fscache_n_relinquishes);
45512 if (retire)
45513- fscache_stat(&fscache_n_relinquishes_retire);
45514+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
45515
45516 if (!cookie) {
45517- fscache_stat(&fscache_n_relinquishes_null);
45518+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
45519 _leave(" [no cookie]");
45520 return;
45521 }
45522@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
45523
45524 /* wait for the cookie to finish being instantiated (or to fail) */
45525 if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
45526- fscache_stat(&fscache_n_relinquishes_waitcrt);
45527+ fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
45528 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
45529 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
45530 }
45531diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
45532index f6aad48..88dcf26 100644
45533--- a/fs/fscache/internal.h
45534+++ b/fs/fscache/internal.h
45535@@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
45536 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
45537 extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
45538
45539-extern atomic_t fscache_n_op_pend;
45540-extern atomic_t fscache_n_op_run;
45541-extern atomic_t fscache_n_op_enqueue;
45542-extern atomic_t fscache_n_op_deferred_release;
45543-extern atomic_t fscache_n_op_release;
45544-extern atomic_t fscache_n_op_gc;
45545-extern atomic_t fscache_n_op_cancelled;
45546-extern atomic_t fscache_n_op_rejected;
45547+extern atomic_unchecked_t fscache_n_op_pend;
45548+extern atomic_unchecked_t fscache_n_op_run;
45549+extern atomic_unchecked_t fscache_n_op_enqueue;
45550+extern atomic_unchecked_t fscache_n_op_deferred_release;
45551+extern atomic_unchecked_t fscache_n_op_release;
45552+extern atomic_unchecked_t fscache_n_op_gc;
45553+extern atomic_unchecked_t fscache_n_op_cancelled;
45554+extern atomic_unchecked_t fscache_n_op_rejected;
45555
45556-extern atomic_t fscache_n_attr_changed;
45557-extern atomic_t fscache_n_attr_changed_ok;
45558-extern atomic_t fscache_n_attr_changed_nobufs;
45559-extern atomic_t fscache_n_attr_changed_nomem;
45560-extern atomic_t fscache_n_attr_changed_calls;
45561+extern atomic_unchecked_t fscache_n_attr_changed;
45562+extern atomic_unchecked_t fscache_n_attr_changed_ok;
45563+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
45564+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
45565+extern atomic_unchecked_t fscache_n_attr_changed_calls;
45566
45567-extern atomic_t fscache_n_allocs;
45568-extern atomic_t fscache_n_allocs_ok;
45569-extern atomic_t fscache_n_allocs_wait;
45570-extern atomic_t fscache_n_allocs_nobufs;
45571-extern atomic_t fscache_n_allocs_intr;
45572-extern atomic_t fscache_n_allocs_object_dead;
45573-extern atomic_t fscache_n_alloc_ops;
45574-extern atomic_t fscache_n_alloc_op_waits;
45575+extern atomic_unchecked_t fscache_n_allocs;
45576+extern atomic_unchecked_t fscache_n_allocs_ok;
45577+extern atomic_unchecked_t fscache_n_allocs_wait;
45578+extern atomic_unchecked_t fscache_n_allocs_nobufs;
45579+extern atomic_unchecked_t fscache_n_allocs_intr;
45580+extern atomic_unchecked_t fscache_n_allocs_object_dead;
45581+extern atomic_unchecked_t fscache_n_alloc_ops;
45582+extern atomic_unchecked_t fscache_n_alloc_op_waits;
45583
45584-extern atomic_t fscache_n_retrievals;
45585-extern atomic_t fscache_n_retrievals_ok;
45586-extern atomic_t fscache_n_retrievals_wait;
45587-extern atomic_t fscache_n_retrievals_nodata;
45588-extern atomic_t fscache_n_retrievals_nobufs;
45589-extern atomic_t fscache_n_retrievals_intr;
45590-extern atomic_t fscache_n_retrievals_nomem;
45591-extern atomic_t fscache_n_retrievals_object_dead;
45592-extern atomic_t fscache_n_retrieval_ops;
45593-extern atomic_t fscache_n_retrieval_op_waits;
45594+extern atomic_unchecked_t fscache_n_retrievals;
45595+extern atomic_unchecked_t fscache_n_retrievals_ok;
45596+extern atomic_unchecked_t fscache_n_retrievals_wait;
45597+extern atomic_unchecked_t fscache_n_retrievals_nodata;
45598+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
45599+extern atomic_unchecked_t fscache_n_retrievals_intr;
45600+extern atomic_unchecked_t fscache_n_retrievals_nomem;
45601+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
45602+extern atomic_unchecked_t fscache_n_retrieval_ops;
45603+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
45604
45605-extern atomic_t fscache_n_stores;
45606-extern atomic_t fscache_n_stores_ok;
45607-extern atomic_t fscache_n_stores_again;
45608-extern atomic_t fscache_n_stores_nobufs;
45609-extern atomic_t fscache_n_stores_oom;
45610-extern atomic_t fscache_n_store_ops;
45611-extern atomic_t fscache_n_store_calls;
45612-extern atomic_t fscache_n_store_pages;
45613-extern atomic_t fscache_n_store_radix_deletes;
45614-extern atomic_t fscache_n_store_pages_over_limit;
45615+extern atomic_unchecked_t fscache_n_stores;
45616+extern atomic_unchecked_t fscache_n_stores_ok;
45617+extern atomic_unchecked_t fscache_n_stores_again;
45618+extern atomic_unchecked_t fscache_n_stores_nobufs;
45619+extern atomic_unchecked_t fscache_n_stores_oom;
45620+extern atomic_unchecked_t fscache_n_store_ops;
45621+extern atomic_unchecked_t fscache_n_store_calls;
45622+extern atomic_unchecked_t fscache_n_store_pages;
45623+extern atomic_unchecked_t fscache_n_store_radix_deletes;
45624+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
45625
45626-extern atomic_t fscache_n_store_vmscan_not_storing;
45627-extern atomic_t fscache_n_store_vmscan_gone;
45628-extern atomic_t fscache_n_store_vmscan_busy;
45629-extern atomic_t fscache_n_store_vmscan_cancelled;
45630+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
45631+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
45632+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
45633+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
45634
45635-extern atomic_t fscache_n_marks;
45636-extern atomic_t fscache_n_uncaches;
45637+extern atomic_unchecked_t fscache_n_marks;
45638+extern atomic_unchecked_t fscache_n_uncaches;
45639
45640-extern atomic_t fscache_n_acquires;
45641-extern atomic_t fscache_n_acquires_null;
45642-extern atomic_t fscache_n_acquires_no_cache;
45643-extern atomic_t fscache_n_acquires_ok;
45644-extern atomic_t fscache_n_acquires_nobufs;
45645-extern atomic_t fscache_n_acquires_oom;
45646+extern atomic_unchecked_t fscache_n_acquires;
45647+extern atomic_unchecked_t fscache_n_acquires_null;
45648+extern atomic_unchecked_t fscache_n_acquires_no_cache;
45649+extern atomic_unchecked_t fscache_n_acquires_ok;
45650+extern atomic_unchecked_t fscache_n_acquires_nobufs;
45651+extern atomic_unchecked_t fscache_n_acquires_oom;
45652
45653-extern atomic_t fscache_n_updates;
45654-extern atomic_t fscache_n_updates_null;
45655-extern atomic_t fscache_n_updates_run;
45656+extern atomic_unchecked_t fscache_n_updates;
45657+extern atomic_unchecked_t fscache_n_updates_null;
45658+extern atomic_unchecked_t fscache_n_updates_run;
45659
45660-extern atomic_t fscache_n_relinquishes;
45661-extern atomic_t fscache_n_relinquishes_null;
45662-extern atomic_t fscache_n_relinquishes_waitcrt;
45663-extern atomic_t fscache_n_relinquishes_retire;
45664+extern atomic_unchecked_t fscache_n_relinquishes;
45665+extern atomic_unchecked_t fscache_n_relinquishes_null;
45666+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
45667+extern atomic_unchecked_t fscache_n_relinquishes_retire;
45668
45669-extern atomic_t fscache_n_cookie_index;
45670-extern atomic_t fscache_n_cookie_data;
45671-extern atomic_t fscache_n_cookie_special;
45672+extern atomic_unchecked_t fscache_n_cookie_index;
45673+extern atomic_unchecked_t fscache_n_cookie_data;
45674+extern atomic_unchecked_t fscache_n_cookie_special;
45675
45676-extern atomic_t fscache_n_object_alloc;
45677-extern atomic_t fscache_n_object_no_alloc;
45678-extern atomic_t fscache_n_object_lookups;
45679-extern atomic_t fscache_n_object_lookups_negative;
45680-extern atomic_t fscache_n_object_lookups_positive;
45681-extern atomic_t fscache_n_object_lookups_timed_out;
45682-extern atomic_t fscache_n_object_created;
45683-extern atomic_t fscache_n_object_avail;
45684-extern atomic_t fscache_n_object_dead;
45685+extern atomic_unchecked_t fscache_n_object_alloc;
45686+extern atomic_unchecked_t fscache_n_object_no_alloc;
45687+extern atomic_unchecked_t fscache_n_object_lookups;
45688+extern atomic_unchecked_t fscache_n_object_lookups_negative;
45689+extern atomic_unchecked_t fscache_n_object_lookups_positive;
45690+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
45691+extern atomic_unchecked_t fscache_n_object_created;
45692+extern atomic_unchecked_t fscache_n_object_avail;
45693+extern atomic_unchecked_t fscache_n_object_dead;
45694
45695-extern atomic_t fscache_n_checkaux_none;
45696-extern atomic_t fscache_n_checkaux_okay;
45697-extern atomic_t fscache_n_checkaux_update;
45698-extern atomic_t fscache_n_checkaux_obsolete;
45699+extern atomic_unchecked_t fscache_n_checkaux_none;
45700+extern atomic_unchecked_t fscache_n_checkaux_okay;
45701+extern atomic_unchecked_t fscache_n_checkaux_update;
45702+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
45703
45704 extern atomic_t fscache_n_cop_alloc_object;
45705 extern atomic_t fscache_n_cop_lookup_object;
45706@@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t *stat)
45707 atomic_inc(stat);
45708 }
45709
45710+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
45711+{
45712+ atomic_inc_unchecked(stat);
45713+}
45714+
45715 static inline void fscache_stat_d(atomic_t *stat)
45716 {
45717 atomic_dec(stat);
45718@@ -267,6 +272,7 @@ extern const struct file_operations fscache_stats_fops;
45719
45720 #define __fscache_stat(stat) (NULL)
45721 #define fscache_stat(stat) do {} while (0)
45722+#define fscache_stat_unchecked(stat) do {} while (0)
45723 #define fscache_stat_d(stat) do {} while (0)
45724 #endif
45725
45726diff --git a/fs/fscache/object.c b/fs/fscache/object.c
45727index b6b897c..0ffff9c 100644
45728--- a/fs/fscache/object.c
45729+++ b/fs/fscache/object.c
45730@@ -128,7 +128,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45731 /* update the object metadata on disk */
45732 case FSCACHE_OBJECT_UPDATING:
45733 clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
45734- fscache_stat(&fscache_n_updates_run);
45735+ fscache_stat_unchecked(&fscache_n_updates_run);
45736 fscache_stat(&fscache_n_cop_update_object);
45737 object->cache->ops->update_object(object);
45738 fscache_stat_d(&fscache_n_cop_update_object);
45739@@ -217,7 +217,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45740 spin_lock(&object->lock);
45741 object->state = FSCACHE_OBJECT_DEAD;
45742 spin_unlock(&object->lock);
45743- fscache_stat(&fscache_n_object_dead);
45744+ fscache_stat_unchecked(&fscache_n_object_dead);
45745 goto terminal_transit;
45746
45747 /* handle the parent cache of this object being withdrawn from
45748@@ -232,7 +232,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45749 spin_lock(&object->lock);
45750 object->state = FSCACHE_OBJECT_DEAD;
45751 spin_unlock(&object->lock);
45752- fscache_stat(&fscache_n_object_dead);
45753+ fscache_stat_unchecked(&fscache_n_object_dead);
45754 goto terminal_transit;
45755
45756 /* complain about the object being woken up once it is
45757@@ -461,7 +461,7 @@ static void fscache_lookup_object(struct fscache_object *object)
45758 parent->cookie->def->name, cookie->def->name,
45759 object->cache->tag->name);
45760
45761- fscache_stat(&fscache_n_object_lookups);
45762+ fscache_stat_unchecked(&fscache_n_object_lookups);
45763 fscache_stat(&fscache_n_cop_lookup_object);
45764 ret = object->cache->ops->lookup_object(object);
45765 fscache_stat_d(&fscache_n_cop_lookup_object);
45766@@ -472,7 +472,7 @@ static void fscache_lookup_object(struct fscache_object *object)
45767 if (ret == -ETIMEDOUT) {
45768 /* probably stuck behind another object, so move this one to
45769 * the back of the queue */
45770- fscache_stat(&fscache_n_object_lookups_timed_out);
45771+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
45772 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45773 }
45774
45775@@ -495,7 +495,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
45776
45777 spin_lock(&object->lock);
45778 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45779- fscache_stat(&fscache_n_object_lookups_negative);
45780+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
45781
45782 /* transit here to allow write requests to begin stacking up
45783 * and read requests to begin returning ENODATA */
45784@@ -541,7 +541,7 @@ void fscache_obtained_object(struct fscache_object *object)
45785 * result, in which case there may be data available */
45786 spin_lock(&object->lock);
45787 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45788- fscache_stat(&fscache_n_object_lookups_positive);
45789+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
45790
45791 clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
45792
45793@@ -555,7 +555,7 @@ void fscache_obtained_object(struct fscache_object *object)
45794 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45795 } else {
45796 ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
45797- fscache_stat(&fscache_n_object_created);
45798+ fscache_stat_unchecked(&fscache_n_object_created);
45799
45800 object->state = FSCACHE_OBJECT_AVAILABLE;
45801 spin_unlock(&object->lock);
45802@@ -602,7 +602,7 @@ static void fscache_object_available(struct fscache_object *object)
45803 fscache_enqueue_dependents(object);
45804
45805 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
45806- fscache_stat(&fscache_n_object_avail);
45807+ fscache_stat_unchecked(&fscache_n_object_avail);
45808
45809 _leave("");
45810 }
45811@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
45812 enum fscache_checkaux result;
45813
45814 if (!object->cookie->def->check_aux) {
45815- fscache_stat(&fscache_n_checkaux_none);
45816+ fscache_stat_unchecked(&fscache_n_checkaux_none);
45817 return FSCACHE_CHECKAUX_OKAY;
45818 }
45819
45820@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
45821 switch (result) {
45822 /* entry okay as is */
45823 case FSCACHE_CHECKAUX_OKAY:
45824- fscache_stat(&fscache_n_checkaux_okay);
45825+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
45826 break;
45827
45828 /* entry requires update */
45829 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
45830- fscache_stat(&fscache_n_checkaux_update);
45831+ fscache_stat_unchecked(&fscache_n_checkaux_update);
45832 break;
45833
45834 /* entry requires deletion */
45835 case FSCACHE_CHECKAUX_OBSOLETE:
45836- fscache_stat(&fscache_n_checkaux_obsolete);
45837+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
45838 break;
45839
45840 default:
45841diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
45842index 30afdfa..2256596 100644
45843--- a/fs/fscache/operation.c
45844+++ b/fs/fscache/operation.c
45845@@ -17,7 +17,7 @@
45846 #include <linux/slab.h>
45847 #include "internal.h"
45848
45849-atomic_t fscache_op_debug_id;
45850+atomic_unchecked_t fscache_op_debug_id;
45851 EXPORT_SYMBOL(fscache_op_debug_id);
45852
45853 /**
45854@@ -38,7 +38,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
45855 ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
45856 ASSERTCMP(atomic_read(&op->usage), >, 0);
45857
45858- fscache_stat(&fscache_n_op_enqueue);
45859+ fscache_stat_unchecked(&fscache_n_op_enqueue);
45860 switch (op->flags & FSCACHE_OP_TYPE) {
45861 case FSCACHE_OP_ASYNC:
45862 _debug("queue async");
45863@@ -69,7 +69,7 @@ static void fscache_run_op(struct fscache_object *object,
45864 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
45865 if (op->processor)
45866 fscache_enqueue_operation(op);
45867- fscache_stat(&fscache_n_op_run);
45868+ fscache_stat_unchecked(&fscache_n_op_run);
45869 }
45870
45871 /*
45872@@ -98,11 +98,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
45873 if (object->n_ops > 1) {
45874 atomic_inc(&op->usage);
45875 list_add_tail(&op->pend_link, &object->pending_ops);
45876- fscache_stat(&fscache_n_op_pend);
45877+ fscache_stat_unchecked(&fscache_n_op_pend);
45878 } else if (!list_empty(&object->pending_ops)) {
45879 atomic_inc(&op->usage);
45880 list_add_tail(&op->pend_link, &object->pending_ops);
45881- fscache_stat(&fscache_n_op_pend);
45882+ fscache_stat_unchecked(&fscache_n_op_pend);
45883 fscache_start_operations(object);
45884 } else {
45885 ASSERTCMP(object->n_in_progress, ==, 0);
45886@@ -118,7 +118,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
45887 object->n_exclusive++; /* reads and writes must wait */
45888 atomic_inc(&op->usage);
45889 list_add_tail(&op->pend_link, &object->pending_ops);
45890- fscache_stat(&fscache_n_op_pend);
45891+ fscache_stat_unchecked(&fscache_n_op_pend);
45892 ret = 0;
45893 } else {
45894 /* not allowed to submit ops in any other state */
45895@@ -203,11 +203,11 @@ int fscache_submit_op(struct fscache_object *object,
45896 if (object->n_exclusive > 0) {
45897 atomic_inc(&op->usage);
45898 list_add_tail(&op->pend_link, &object->pending_ops);
45899- fscache_stat(&fscache_n_op_pend);
45900+ fscache_stat_unchecked(&fscache_n_op_pend);
45901 } else if (!list_empty(&object->pending_ops)) {
45902 atomic_inc(&op->usage);
45903 list_add_tail(&op->pend_link, &object->pending_ops);
45904- fscache_stat(&fscache_n_op_pend);
45905+ fscache_stat_unchecked(&fscache_n_op_pend);
45906 fscache_start_operations(object);
45907 } else {
45908 ASSERTCMP(object->n_exclusive, ==, 0);
45909@@ -219,12 +219,12 @@ int fscache_submit_op(struct fscache_object *object,
45910 object->n_ops++;
45911 atomic_inc(&op->usage);
45912 list_add_tail(&op->pend_link, &object->pending_ops);
45913- fscache_stat(&fscache_n_op_pend);
45914+ fscache_stat_unchecked(&fscache_n_op_pend);
45915 ret = 0;
45916 } else if (object->state == FSCACHE_OBJECT_DYING ||
45917 object->state == FSCACHE_OBJECT_LC_DYING ||
45918 object->state == FSCACHE_OBJECT_WITHDRAWING) {
45919- fscache_stat(&fscache_n_op_rejected);
45920+ fscache_stat_unchecked(&fscache_n_op_rejected);
45921 ret = -ENOBUFS;
45922 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
45923 fscache_report_unexpected_submission(object, op, ostate);
45924@@ -294,7 +294,7 @@ int fscache_cancel_op(struct fscache_operation *op)
45925
45926 ret = -EBUSY;
45927 if (!list_empty(&op->pend_link)) {
45928- fscache_stat(&fscache_n_op_cancelled);
45929+ fscache_stat_unchecked(&fscache_n_op_cancelled);
45930 list_del_init(&op->pend_link);
45931 object->n_ops--;
45932 if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
45933@@ -331,7 +331,7 @@ void fscache_put_operation(struct fscache_operation *op)
45934 if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
45935 BUG();
45936
45937- fscache_stat(&fscache_n_op_release);
45938+ fscache_stat_unchecked(&fscache_n_op_release);
45939
45940 if (op->release) {
45941 op->release(op);
45942@@ -348,7 +348,7 @@ void fscache_put_operation(struct fscache_operation *op)
45943 * lock, and defer it otherwise */
45944 if (!spin_trylock(&object->lock)) {
45945 _debug("defer put");
45946- fscache_stat(&fscache_n_op_deferred_release);
45947+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
45948
45949 cache = object->cache;
45950 spin_lock(&cache->op_gc_list_lock);
45951@@ -410,7 +410,7 @@ void fscache_operation_gc(struct work_struct *work)
45952
45953 _debug("GC DEFERRED REL OBJ%x OP%x",
45954 object->debug_id, op->debug_id);
45955- fscache_stat(&fscache_n_op_gc);
45956+ fscache_stat_unchecked(&fscache_n_op_gc);
45957
45958 ASSERTCMP(atomic_read(&op->usage), ==, 0);
45959
45960diff --git a/fs/fscache/page.c b/fs/fscache/page.c
45961index 3f7a59b..cf196cc 100644
45962--- a/fs/fscache/page.c
45963+++ b/fs/fscache/page.c
45964@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
45965 val = radix_tree_lookup(&cookie->stores, page->index);
45966 if (!val) {
45967 rcu_read_unlock();
45968- fscache_stat(&fscache_n_store_vmscan_not_storing);
45969+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
45970 __fscache_uncache_page(cookie, page);
45971 return true;
45972 }
45973@@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
45974 spin_unlock(&cookie->stores_lock);
45975
45976 if (xpage) {
45977- fscache_stat(&fscache_n_store_vmscan_cancelled);
45978- fscache_stat(&fscache_n_store_radix_deletes);
45979+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
45980+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
45981 ASSERTCMP(xpage, ==, page);
45982 } else {
45983- fscache_stat(&fscache_n_store_vmscan_gone);
45984+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
45985 }
45986
45987 wake_up_bit(&cookie->flags, 0);
45988@@ -107,7 +107,7 @@ page_busy:
45989 /* we might want to wait here, but that could deadlock the allocator as
45990 * the work threads writing to the cache may all end up sleeping
45991 * on memory allocation */
45992- fscache_stat(&fscache_n_store_vmscan_busy);
45993+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
45994 return false;
45995 }
45996 EXPORT_SYMBOL(__fscache_maybe_release_page);
45997@@ -131,7 +131,7 @@ static void fscache_end_page_write(struct fscache_object *object,
45998 FSCACHE_COOKIE_STORING_TAG);
45999 if (!radix_tree_tag_get(&cookie->stores, page->index,
46000 FSCACHE_COOKIE_PENDING_TAG)) {
46001- fscache_stat(&fscache_n_store_radix_deletes);
46002+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
46003 xpage = radix_tree_delete(&cookie->stores, page->index);
46004 }
46005 spin_unlock(&cookie->stores_lock);
46006@@ -152,7 +152,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
46007
46008 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
46009
46010- fscache_stat(&fscache_n_attr_changed_calls);
46011+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
46012
46013 if (fscache_object_is_active(object)) {
46014 fscache_stat(&fscache_n_cop_attr_changed);
46015@@ -177,11 +177,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
46016
46017 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46018
46019- fscache_stat(&fscache_n_attr_changed);
46020+ fscache_stat_unchecked(&fscache_n_attr_changed);
46021
46022 op = kzalloc(sizeof(*op), GFP_KERNEL);
46023 if (!op) {
46024- fscache_stat(&fscache_n_attr_changed_nomem);
46025+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
46026 _leave(" = -ENOMEM");
46027 return -ENOMEM;
46028 }
46029@@ -199,7 +199,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
46030 if (fscache_submit_exclusive_op(object, op) < 0)
46031 goto nobufs;
46032 spin_unlock(&cookie->lock);
46033- fscache_stat(&fscache_n_attr_changed_ok);
46034+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
46035 fscache_put_operation(op);
46036 _leave(" = 0");
46037 return 0;
46038@@ -207,7 +207,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
46039 nobufs:
46040 spin_unlock(&cookie->lock);
46041 kfree(op);
46042- fscache_stat(&fscache_n_attr_changed_nobufs);
46043+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
46044 _leave(" = %d", -ENOBUFS);
46045 return -ENOBUFS;
46046 }
46047@@ -243,7 +243,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
46048 /* allocate a retrieval operation and attempt to submit it */
46049 op = kzalloc(sizeof(*op), GFP_NOIO);
46050 if (!op) {
46051- fscache_stat(&fscache_n_retrievals_nomem);
46052+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
46053 return NULL;
46054 }
46055
46056@@ -271,13 +271,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
46057 return 0;
46058 }
46059
46060- fscache_stat(&fscache_n_retrievals_wait);
46061+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
46062
46063 jif = jiffies;
46064 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
46065 fscache_wait_bit_interruptible,
46066 TASK_INTERRUPTIBLE) != 0) {
46067- fscache_stat(&fscache_n_retrievals_intr);
46068+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
46069 _leave(" = -ERESTARTSYS");
46070 return -ERESTARTSYS;
46071 }
46072@@ -295,8 +295,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
46073 */
46074 static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
46075 struct fscache_retrieval *op,
46076- atomic_t *stat_op_waits,
46077- atomic_t *stat_object_dead)
46078+ atomic_unchecked_t *stat_op_waits,
46079+ atomic_unchecked_t *stat_object_dead)
46080 {
46081 int ret;
46082
46083@@ -304,7 +304,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
46084 goto check_if_dead;
46085
46086 _debug(">>> WT");
46087- fscache_stat(stat_op_waits);
46088+ fscache_stat_unchecked(stat_op_waits);
46089 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
46090 fscache_wait_bit_interruptible,
46091 TASK_INTERRUPTIBLE) < 0) {
46092@@ -321,7 +321,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
46093
46094 check_if_dead:
46095 if (unlikely(fscache_object_is_dead(object))) {
46096- fscache_stat(stat_object_dead);
46097+ fscache_stat_unchecked(stat_object_dead);
46098 return -ENOBUFS;
46099 }
46100 return 0;
46101@@ -348,7 +348,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
46102
46103 _enter("%p,%p,,,", cookie, page);
46104
46105- fscache_stat(&fscache_n_retrievals);
46106+ fscache_stat_unchecked(&fscache_n_retrievals);
46107
46108 if (hlist_empty(&cookie->backing_objects))
46109 goto nobufs;
46110@@ -381,7 +381,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
46111 goto nobufs_unlock;
46112 spin_unlock(&cookie->lock);
46113
46114- fscache_stat(&fscache_n_retrieval_ops);
46115+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
46116
46117 /* pin the netfs read context in case we need to do the actual netfs
46118 * read because we've encountered a cache read failure */
46119@@ -411,15 +411,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
46120
46121 error:
46122 if (ret == -ENOMEM)
46123- fscache_stat(&fscache_n_retrievals_nomem);
46124+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
46125 else if (ret == -ERESTARTSYS)
46126- fscache_stat(&fscache_n_retrievals_intr);
46127+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
46128 else if (ret == -ENODATA)
46129- fscache_stat(&fscache_n_retrievals_nodata);
46130+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
46131 else if (ret < 0)
46132- fscache_stat(&fscache_n_retrievals_nobufs);
46133+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46134 else
46135- fscache_stat(&fscache_n_retrievals_ok);
46136+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
46137
46138 fscache_put_retrieval(op);
46139 _leave(" = %d", ret);
46140@@ -429,7 +429,7 @@ nobufs_unlock:
46141 spin_unlock(&cookie->lock);
46142 kfree(op);
46143 nobufs:
46144- fscache_stat(&fscache_n_retrievals_nobufs);
46145+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46146 _leave(" = -ENOBUFS");
46147 return -ENOBUFS;
46148 }
46149@@ -467,7 +467,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
46150
46151 _enter("%p,,%d,,,", cookie, *nr_pages);
46152
46153- fscache_stat(&fscache_n_retrievals);
46154+ fscache_stat_unchecked(&fscache_n_retrievals);
46155
46156 if (hlist_empty(&cookie->backing_objects))
46157 goto nobufs;
46158@@ -497,7 +497,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
46159 goto nobufs_unlock;
46160 spin_unlock(&cookie->lock);
46161
46162- fscache_stat(&fscache_n_retrieval_ops);
46163+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
46164
46165 /* pin the netfs read context in case we need to do the actual netfs
46166 * read because we've encountered a cache read failure */
46167@@ -527,15 +527,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
46168
46169 error:
46170 if (ret == -ENOMEM)
46171- fscache_stat(&fscache_n_retrievals_nomem);
46172+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
46173 else if (ret == -ERESTARTSYS)
46174- fscache_stat(&fscache_n_retrievals_intr);
46175+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
46176 else if (ret == -ENODATA)
46177- fscache_stat(&fscache_n_retrievals_nodata);
46178+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
46179 else if (ret < 0)
46180- fscache_stat(&fscache_n_retrievals_nobufs);
46181+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46182 else
46183- fscache_stat(&fscache_n_retrievals_ok);
46184+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
46185
46186 fscache_put_retrieval(op);
46187 _leave(" = %d", ret);
46188@@ -545,7 +545,7 @@ nobufs_unlock:
46189 spin_unlock(&cookie->lock);
46190 kfree(op);
46191 nobufs:
46192- fscache_stat(&fscache_n_retrievals_nobufs);
46193+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46194 _leave(" = -ENOBUFS");
46195 return -ENOBUFS;
46196 }
46197@@ -569,7 +569,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46198
46199 _enter("%p,%p,,,", cookie, page);
46200
46201- fscache_stat(&fscache_n_allocs);
46202+ fscache_stat_unchecked(&fscache_n_allocs);
46203
46204 if (hlist_empty(&cookie->backing_objects))
46205 goto nobufs;
46206@@ -595,7 +595,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46207 goto nobufs_unlock;
46208 spin_unlock(&cookie->lock);
46209
46210- fscache_stat(&fscache_n_alloc_ops);
46211+ fscache_stat_unchecked(&fscache_n_alloc_ops);
46212
46213 ret = fscache_wait_for_retrieval_activation(
46214 object, op,
46215@@ -611,11 +611,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46216
46217 error:
46218 if (ret == -ERESTARTSYS)
46219- fscache_stat(&fscache_n_allocs_intr);
46220+ fscache_stat_unchecked(&fscache_n_allocs_intr);
46221 else if (ret < 0)
46222- fscache_stat(&fscache_n_allocs_nobufs);
46223+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
46224 else
46225- fscache_stat(&fscache_n_allocs_ok);
46226+ fscache_stat_unchecked(&fscache_n_allocs_ok);
46227
46228 fscache_put_retrieval(op);
46229 _leave(" = %d", ret);
46230@@ -625,7 +625,7 @@ nobufs_unlock:
46231 spin_unlock(&cookie->lock);
46232 kfree(op);
46233 nobufs:
46234- fscache_stat(&fscache_n_allocs_nobufs);
46235+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
46236 _leave(" = -ENOBUFS");
46237 return -ENOBUFS;
46238 }
46239@@ -666,7 +666,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46240
46241 spin_lock(&cookie->stores_lock);
46242
46243- fscache_stat(&fscache_n_store_calls);
46244+ fscache_stat_unchecked(&fscache_n_store_calls);
46245
46246 /* find a page to store */
46247 page = NULL;
46248@@ -677,7 +677,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46249 page = results[0];
46250 _debug("gang %d [%lx]", n, page->index);
46251 if (page->index > op->store_limit) {
46252- fscache_stat(&fscache_n_store_pages_over_limit);
46253+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
46254 goto superseded;
46255 }
46256
46257@@ -689,7 +689,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46258 spin_unlock(&cookie->stores_lock);
46259 spin_unlock(&object->lock);
46260
46261- fscache_stat(&fscache_n_store_pages);
46262+ fscache_stat_unchecked(&fscache_n_store_pages);
46263 fscache_stat(&fscache_n_cop_write_page);
46264 ret = object->cache->ops->write_page(op, page);
46265 fscache_stat_d(&fscache_n_cop_write_page);
46266@@ -757,7 +757,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46267 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46268 ASSERT(PageFsCache(page));
46269
46270- fscache_stat(&fscache_n_stores);
46271+ fscache_stat_unchecked(&fscache_n_stores);
46272
46273 op = kzalloc(sizeof(*op), GFP_NOIO);
46274 if (!op)
46275@@ -808,7 +808,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46276 spin_unlock(&cookie->stores_lock);
46277 spin_unlock(&object->lock);
46278
46279- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
46280+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
46281 op->store_limit = object->store_limit;
46282
46283 if (fscache_submit_op(object, &op->op) < 0)
46284@@ -816,8 +816,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46285
46286 spin_unlock(&cookie->lock);
46287 radix_tree_preload_end();
46288- fscache_stat(&fscache_n_store_ops);
46289- fscache_stat(&fscache_n_stores_ok);
46290+ fscache_stat_unchecked(&fscache_n_store_ops);
46291+ fscache_stat_unchecked(&fscache_n_stores_ok);
46292
46293 /* the work queue now carries its own ref on the object */
46294 fscache_put_operation(&op->op);
46295@@ -825,14 +825,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46296 return 0;
46297
46298 already_queued:
46299- fscache_stat(&fscache_n_stores_again);
46300+ fscache_stat_unchecked(&fscache_n_stores_again);
46301 already_pending:
46302 spin_unlock(&cookie->stores_lock);
46303 spin_unlock(&object->lock);
46304 spin_unlock(&cookie->lock);
46305 radix_tree_preload_end();
46306 kfree(op);
46307- fscache_stat(&fscache_n_stores_ok);
46308+ fscache_stat_unchecked(&fscache_n_stores_ok);
46309 _leave(" = 0");
46310 return 0;
46311
46312@@ -851,14 +851,14 @@ nobufs:
46313 spin_unlock(&cookie->lock);
46314 radix_tree_preload_end();
46315 kfree(op);
46316- fscache_stat(&fscache_n_stores_nobufs);
46317+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
46318 _leave(" = -ENOBUFS");
46319 return -ENOBUFS;
46320
46321 nomem_free:
46322 kfree(op);
46323 nomem:
46324- fscache_stat(&fscache_n_stores_oom);
46325+ fscache_stat_unchecked(&fscache_n_stores_oom);
46326 _leave(" = -ENOMEM");
46327 return -ENOMEM;
46328 }
46329@@ -876,7 +876,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
46330 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46331 ASSERTCMP(page, !=, NULL);
46332
46333- fscache_stat(&fscache_n_uncaches);
46334+ fscache_stat_unchecked(&fscache_n_uncaches);
46335
46336 /* cache withdrawal may beat us to it */
46337 if (!PageFsCache(page))
46338@@ -929,7 +929,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op,
46339 unsigned long loop;
46340
46341 #ifdef CONFIG_FSCACHE_STATS
46342- atomic_add(pagevec->nr, &fscache_n_marks);
46343+ atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
46344 #endif
46345
46346 for (loop = 0; loop < pagevec->nr; loop++) {
46347diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
46348index 4765190..2a067f2 100644
46349--- a/fs/fscache/stats.c
46350+++ b/fs/fscache/stats.c
46351@@ -18,95 +18,95 @@
46352 /*
46353 * operation counters
46354 */
46355-atomic_t fscache_n_op_pend;
46356-atomic_t fscache_n_op_run;
46357-atomic_t fscache_n_op_enqueue;
46358-atomic_t fscache_n_op_requeue;
46359-atomic_t fscache_n_op_deferred_release;
46360-atomic_t fscache_n_op_release;
46361-atomic_t fscache_n_op_gc;
46362-atomic_t fscache_n_op_cancelled;
46363-atomic_t fscache_n_op_rejected;
46364+atomic_unchecked_t fscache_n_op_pend;
46365+atomic_unchecked_t fscache_n_op_run;
46366+atomic_unchecked_t fscache_n_op_enqueue;
46367+atomic_unchecked_t fscache_n_op_requeue;
46368+atomic_unchecked_t fscache_n_op_deferred_release;
46369+atomic_unchecked_t fscache_n_op_release;
46370+atomic_unchecked_t fscache_n_op_gc;
46371+atomic_unchecked_t fscache_n_op_cancelled;
46372+atomic_unchecked_t fscache_n_op_rejected;
46373
46374-atomic_t fscache_n_attr_changed;
46375-atomic_t fscache_n_attr_changed_ok;
46376-atomic_t fscache_n_attr_changed_nobufs;
46377-atomic_t fscache_n_attr_changed_nomem;
46378-atomic_t fscache_n_attr_changed_calls;
46379+atomic_unchecked_t fscache_n_attr_changed;
46380+atomic_unchecked_t fscache_n_attr_changed_ok;
46381+atomic_unchecked_t fscache_n_attr_changed_nobufs;
46382+atomic_unchecked_t fscache_n_attr_changed_nomem;
46383+atomic_unchecked_t fscache_n_attr_changed_calls;
46384
46385-atomic_t fscache_n_allocs;
46386-atomic_t fscache_n_allocs_ok;
46387-atomic_t fscache_n_allocs_wait;
46388-atomic_t fscache_n_allocs_nobufs;
46389-atomic_t fscache_n_allocs_intr;
46390-atomic_t fscache_n_allocs_object_dead;
46391-atomic_t fscache_n_alloc_ops;
46392-atomic_t fscache_n_alloc_op_waits;
46393+atomic_unchecked_t fscache_n_allocs;
46394+atomic_unchecked_t fscache_n_allocs_ok;
46395+atomic_unchecked_t fscache_n_allocs_wait;
46396+atomic_unchecked_t fscache_n_allocs_nobufs;
46397+atomic_unchecked_t fscache_n_allocs_intr;
46398+atomic_unchecked_t fscache_n_allocs_object_dead;
46399+atomic_unchecked_t fscache_n_alloc_ops;
46400+atomic_unchecked_t fscache_n_alloc_op_waits;
46401
46402-atomic_t fscache_n_retrievals;
46403-atomic_t fscache_n_retrievals_ok;
46404-atomic_t fscache_n_retrievals_wait;
46405-atomic_t fscache_n_retrievals_nodata;
46406-atomic_t fscache_n_retrievals_nobufs;
46407-atomic_t fscache_n_retrievals_intr;
46408-atomic_t fscache_n_retrievals_nomem;
46409-atomic_t fscache_n_retrievals_object_dead;
46410-atomic_t fscache_n_retrieval_ops;
46411-atomic_t fscache_n_retrieval_op_waits;
46412+atomic_unchecked_t fscache_n_retrievals;
46413+atomic_unchecked_t fscache_n_retrievals_ok;
46414+atomic_unchecked_t fscache_n_retrievals_wait;
46415+atomic_unchecked_t fscache_n_retrievals_nodata;
46416+atomic_unchecked_t fscache_n_retrievals_nobufs;
46417+atomic_unchecked_t fscache_n_retrievals_intr;
46418+atomic_unchecked_t fscache_n_retrievals_nomem;
46419+atomic_unchecked_t fscache_n_retrievals_object_dead;
46420+atomic_unchecked_t fscache_n_retrieval_ops;
46421+atomic_unchecked_t fscache_n_retrieval_op_waits;
46422
46423-atomic_t fscache_n_stores;
46424-atomic_t fscache_n_stores_ok;
46425-atomic_t fscache_n_stores_again;
46426-atomic_t fscache_n_stores_nobufs;
46427-atomic_t fscache_n_stores_oom;
46428-atomic_t fscache_n_store_ops;
46429-atomic_t fscache_n_store_calls;
46430-atomic_t fscache_n_store_pages;
46431-atomic_t fscache_n_store_radix_deletes;
46432-atomic_t fscache_n_store_pages_over_limit;
46433+atomic_unchecked_t fscache_n_stores;
46434+atomic_unchecked_t fscache_n_stores_ok;
46435+atomic_unchecked_t fscache_n_stores_again;
46436+atomic_unchecked_t fscache_n_stores_nobufs;
46437+atomic_unchecked_t fscache_n_stores_oom;
46438+atomic_unchecked_t fscache_n_store_ops;
46439+atomic_unchecked_t fscache_n_store_calls;
46440+atomic_unchecked_t fscache_n_store_pages;
46441+atomic_unchecked_t fscache_n_store_radix_deletes;
46442+atomic_unchecked_t fscache_n_store_pages_over_limit;
46443
46444-atomic_t fscache_n_store_vmscan_not_storing;
46445-atomic_t fscache_n_store_vmscan_gone;
46446-atomic_t fscache_n_store_vmscan_busy;
46447-atomic_t fscache_n_store_vmscan_cancelled;
46448+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
46449+atomic_unchecked_t fscache_n_store_vmscan_gone;
46450+atomic_unchecked_t fscache_n_store_vmscan_busy;
46451+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
46452
46453-atomic_t fscache_n_marks;
46454-atomic_t fscache_n_uncaches;
46455+atomic_unchecked_t fscache_n_marks;
46456+atomic_unchecked_t fscache_n_uncaches;
46457
46458-atomic_t fscache_n_acquires;
46459-atomic_t fscache_n_acquires_null;
46460-atomic_t fscache_n_acquires_no_cache;
46461-atomic_t fscache_n_acquires_ok;
46462-atomic_t fscache_n_acquires_nobufs;
46463-atomic_t fscache_n_acquires_oom;
46464+atomic_unchecked_t fscache_n_acquires;
46465+atomic_unchecked_t fscache_n_acquires_null;
46466+atomic_unchecked_t fscache_n_acquires_no_cache;
46467+atomic_unchecked_t fscache_n_acquires_ok;
46468+atomic_unchecked_t fscache_n_acquires_nobufs;
46469+atomic_unchecked_t fscache_n_acquires_oom;
46470
46471-atomic_t fscache_n_updates;
46472-atomic_t fscache_n_updates_null;
46473-atomic_t fscache_n_updates_run;
46474+atomic_unchecked_t fscache_n_updates;
46475+atomic_unchecked_t fscache_n_updates_null;
46476+atomic_unchecked_t fscache_n_updates_run;
46477
46478-atomic_t fscache_n_relinquishes;
46479-atomic_t fscache_n_relinquishes_null;
46480-atomic_t fscache_n_relinquishes_waitcrt;
46481-atomic_t fscache_n_relinquishes_retire;
46482+atomic_unchecked_t fscache_n_relinquishes;
46483+atomic_unchecked_t fscache_n_relinquishes_null;
46484+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
46485+atomic_unchecked_t fscache_n_relinquishes_retire;
46486
46487-atomic_t fscache_n_cookie_index;
46488-atomic_t fscache_n_cookie_data;
46489-atomic_t fscache_n_cookie_special;
46490+atomic_unchecked_t fscache_n_cookie_index;
46491+atomic_unchecked_t fscache_n_cookie_data;
46492+atomic_unchecked_t fscache_n_cookie_special;
46493
46494-atomic_t fscache_n_object_alloc;
46495-atomic_t fscache_n_object_no_alloc;
46496-atomic_t fscache_n_object_lookups;
46497-atomic_t fscache_n_object_lookups_negative;
46498-atomic_t fscache_n_object_lookups_positive;
46499-atomic_t fscache_n_object_lookups_timed_out;
46500-atomic_t fscache_n_object_created;
46501-atomic_t fscache_n_object_avail;
46502-atomic_t fscache_n_object_dead;
46503+atomic_unchecked_t fscache_n_object_alloc;
46504+atomic_unchecked_t fscache_n_object_no_alloc;
46505+atomic_unchecked_t fscache_n_object_lookups;
46506+atomic_unchecked_t fscache_n_object_lookups_negative;
46507+atomic_unchecked_t fscache_n_object_lookups_positive;
46508+atomic_unchecked_t fscache_n_object_lookups_timed_out;
46509+atomic_unchecked_t fscache_n_object_created;
46510+atomic_unchecked_t fscache_n_object_avail;
46511+atomic_unchecked_t fscache_n_object_dead;
46512
46513-atomic_t fscache_n_checkaux_none;
46514-atomic_t fscache_n_checkaux_okay;
46515-atomic_t fscache_n_checkaux_update;
46516-atomic_t fscache_n_checkaux_obsolete;
46517+atomic_unchecked_t fscache_n_checkaux_none;
46518+atomic_unchecked_t fscache_n_checkaux_okay;
46519+atomic_unchecked_t fscache_n_checkaux_update;
46520+atomic_unchecked_t fscache_n_checkaux_obsolete;
46521
46522 atomic_t fscache_n_cop_alloc_object;
46523 atomic_t fscache_n_cop_lookup_object;
46524@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v)
46525 seq_puts(m, "FS-Cache statistics\n");
46526
46527 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
46528- atomic_read(&fscache_n_cookie_index),
46529- atomic_read(&fscache_n_cookie_data),
46530- atomic_read(&fscache_n_cookie_special));
46531+ atomic_read_unchecked(&fscache_n_cookie_index),
46532+ atomic_read_unchecked(&fscache_n_cookie_data),
46533+ atomic_read_unchecked(&fscache_n_cookie_special));
46534
46535 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
46536- atomic_read(&fscache_n_object_alloc),
46537- atomic_read(&fscache_n_object_no_alloc),
46538- atomic_read(&fscache_n_object_avail),
46539- atomic_read(&fscache_n_object_dead));
46540+ atomic_read_unchecked(&fscache_n_object_alloc),
46541+ atomic_read_unchecked(&fscache_n_object_no_alloc),
46542+ atomic_read_unchecked(&fscache_n_object_avail),
46543+ atomic_read_unchecked(&fscache_n_object_dead));
46544 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
46545- atomic_read(&fscache_n_checkaux_none),
46546- atomic_read(&fscache_n_checkaux_okay),
46547- atomic_read(&fscache_n_checkaux_update),
46548- atomic_read(&fscache_n_checkaux_obsolete));
46549+ atomic_read_unchecked(&fscache_n_checkaux_none),
46550+ atomic_read_unchecked(&fscache_n_checkaux_okay),
46551+ atomic_read_unchecked(&fscache_n_checkaux_update),
46552+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
46553
46554 seq_printf(m, "Pages : mrk=%u unc=%u\n",
46555- atomic_read(&fscache_n_marks),
46556- atomic_read(&fscache_n_uncaches));
46557+ atomic_read_unchecked(&fscache_n_marks),
46558+ atomic_read_unchecked(&fscache_n_uncaches));
46559
46560 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
46561 " oom=%u\n",
46562- atomic_read(&fscache_n_acquires),
46563- atomic_read(&fscache_n_acquires_null),
46564- atomic_read(&fscache_n_acquires_no_cache),
46565- atomic_read(&fscache_n_acquires_ok),
46566- atomic_read(&fscache_n_acquires_nobufs),
46567- atomic_read(&fscache_n_acquires_oom));
46568+ atomic_read_unchecked(&fscache_n_acquires),
46569+ atomic_read_unchecked(&fscache_n_acquires_null),
46570+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
46571+ atomic_read_unchecked(&fscache_n_acquires_ok),
46572+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
46573+ atomic_read_unchecked(&fscache_n_acquires_oom));
46574
46575 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
46576- atomic_read(&fscache_n_object_lookups),
46577- atomic_read(&fscache_n_object_lookups_negative),
46578- atomic_read(&fscache_n_object_lookups_positive),
46579- atomic_read(&fscache_n_object_created),
46580- atomic_read(&fscache_n_object_lookups_timed_out));
46581+ atomic_read_unchecked(&fscache_n_object_lookups),
46582+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
46583+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
46584+ atomic_read_unchecked(&fscache_n_object_created),
46585+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
46586
46587 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
46588- atomic_read(&fscache_n_updates),
46589- atomic_read(&fscache_n_updates_null),
46590- atomic_read(&fscache_n_updates_run));
46591+ atomic_read_unchecked(&fscache_n_updates),
46592+ atomic_read_unchecked(&fscache_n_updates_null),
46593+ atomic_read_unchecked(&fscache_n_updates_run));
46594
46595 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
46596- atomic_read(&fscache_n_relinquishes),
46597- atomic_read(&fscache_n_relinquishes_null),
46598- atomic_read(&fscache_n_relinquishes_waitcrt),
46599- atomic_read(&fscache_n_relinquishes_retire));
46600+ atomic_read_unchecked(&fscache_n_relinquishes),
46601+ atomic_read_unchecked(&fscache_n_relinquishes_null),
46602+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
46603+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
46604
46605 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
46606- atomic_read(&fscache_n_attr_changed),
46607- atomic_read(&fscache_n_attr_changed_ok),
46608- atomic_read(&fscache_n_attr_changed_nobufs),
46609- atomic_read(&fscache_n_attr_changed_nomem),
46610- atomic_read(&fscache_n_attr_changed_calls));
46611+ atomic_read_unchecked(&fscache_n_attr_changed),
46612+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
46613+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
46614+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
46615+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
46616
46617 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
46618- atomic_read(&fscache_n_allocs),
46619- atomic_read(&fscache_n_allocs_ok),
46620- atomic_read(&fscache_n_allocs_wait),
46621- atomic_read(&fscache_n_allocs_nobufs),
46622- atomic_read(&fscache_n_allocs_intr));
46623+ atomic_read_unchecked(&fscache_n_allocs),
46624+ atomic_read_unchecked(&fscache_n_allocs_ok),
46625+ atomic_read_unchecked(&fscache_n_allocs_wait),
46626+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
46627+ atomic_read_unchecked(&fscache_n_allocs_intr));
46628 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
46629- atomic_read(&fscache_n_alloc_ops),
46630- atomic_read(&fscache_n_alloc_op_waits),
46631- atomic_read(&fscache_n_allocs_object_dead));
46632+ atomic_read_unchecked(&fscache_n_alloc_ops),
46633+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
46634+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
46635
46636 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
46637 " int=%u oom=%u\n",
46638- atomic_read(&fscache_n_retrievals),
46639- atomic_read(&fscache_n_retrievals_ok),
46640- atomic_read(&fscache_n_retrievals_wait),
46641- atomic_read(&fscache_n_retrievals_nodata),
46642- atomic_read(&fscache_n_retrievals_nobufs),
46643- atomic_read(&fscache_n_retrievals_intr),
46644- atomic_read(&fscache_n_retrievals_nomem));
46645+ atomic_read_unchecked(&fscache_n_retrievals),
46646+ atomic_read_unchecked(&fscache_n_retrievals_ok),
46647+ atomic_read_unchecked(&fscache_n_retrievals_wait),
46648+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
46649+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
46650+ atomic_read_unchecked(&fscache_n_retrievals_intr),
46651+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
46652 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
46653- atomic_read(&fscache_n_retrieval_ops),
46654- atomic_read(&fscache_n_retrieval_op_waits),
46655- atomic_read(&fscache_n_retrievals_object_dead));
46656+ atomic_read_unchecked(&fscache_n_retrieval_ops),
46657+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
46658+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
46659
46660 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
46661- atomic_read(&fscache_n_stores),
46662- atomic_read(&fscache_n_stores_ok),
46663- atomic_read(&fscache_n_stores_again),
46664- atomic_read(&fscache_n_stores_nobufs),
46665- atomic_read(&fscache_n_stores_oom));
46666+ atomic_read_unchecked(&fscache_n_stores),
46667+ atomic_read_unchecked(&fscache_n_stores_ok),
46668+ atomic_read_unchecked(&fscache_n_stores_again),
46669+ atomic_read_unchecked(&fscache_n_stores_nobufs),
46670+ atomic_read_unchecked(&fscache_n_stores_oom));
46671 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
46672- atomic_read(&fscache_n_store_ops),
46673- atomic_read(&fscache_n_store_calls),
46674- atomic_read(&fscache_n_store_pages),
46675- atomic_read(&fscache_n_store_radix_deletes),
46676- atomic_read(&fscache_n_store_pages_over_limit));
46677+ atomic_read_unchecked(&fscache_n_store_ops),
46678+ atomic_read_unchecked(&fscache_n_store_calls),
46679+ atomic_read_unchecked(&fscache_n_store_pages),
46680+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
46681+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
46682
46683 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
46684- atomic_read(&fscache_n_store_vmscan_not_storing),
46685- atomic_read(&fscache_n_store_vmscan_gone),
46686- atomic_read(&fscache_n_store_vmscan_busy),
46687- atomic_read(&fscache_n_store_vmscan_cancelled));
46688+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
46689+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
46690+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
46691+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
46692
46693 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
46694- atomic_read(&fscache_n_op_pend),
46695- atomic_read(&fscache_n_op_run),
46696- atomic_read(&fscache_n_op_enqueue),
46697- atomic_read(&fscache_n_op_cancelled),
46698- atomic_read(&fscache_n_op_rejected));
46699+ atomic_read_unchecked(&fscache_n_op_pend),
46700+ atomic_read_unchecked(&fscache_n_op_run),
46701+ atomic_read_unchecked(&fscache_n_op_enqueue),
46702+ atomic_read_unchecked(&fscache_n_op_cancelled),
46703+ atomic_read_unchecked(&fscache_n_op_rejected));
46704 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
46705- atomic_read(&fscache_n_op_deferred_release),
46706- atomic_read(&fscache_n_op_release),
46707- atomic_read(&fscache_n_op_gc));
46708+ atomic_read_unchecked(&fscache_n_op_deferred_release),
46709+ atomic_read_unchecked(&fscache_n_op_release),
46710+ atomic_read_unchecked(&fscache_n_op_gc));
46711
46712 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
46713 atomic_read(&fscache_n_cop_alloc_object),
46714diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
46715index 3426521..3b75162 100644
46716--- a/fs/fuse/cuse.c
46717+++ b/fs/fuse/cuse.c
46718@@ -587,10 +587,12 @@ static int __init cuse_init(void)
46719 INIT_LIST_HEAD(&cuse_conntbl[i]);
46720
46721 /* inherit and extend fuse_dev_operations */
46722- cuse_channel_fops = fuse_dev_operations;
46723- cuse_channel_fops.owner = THIS_MODULE;
46724- cuse_channel_fops.open = cuse_channel_open;
46725- cuse_channel_fops.release = cuse_channel_release;
46726+ pax_open_kernel();
46727+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
46728+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
46729+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
46730+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
46731+ pax_close_kernel();
46732
46733 cuse_class = class_create(THIS_MODULE, "cuse");
46734 if (IS_ERR(cuse_class))
46735diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
46736index 2aaf3ea..8e50863 100644
46737--- a/fs/fuse/dev.c
46738+++ b/fs/fuse/dev.c
46739@@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
46740 ret = 0;
46741 pipe_lock(pipe);
46742
46743- if (!pipe->readers) {
46744+ if (!atomic_read(&pipe->readers)) {
46745 send_sig(SIGPIPE, current, 0);
46746 if (!ret)
46747 ret = -EPIPE;
46748diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
46749index 9f63e49..d8a64c0 100644
46750--- a/fs/fuse/dir.c
46751+++ b/fs/fuse/dir.c
46752@@ -1147,7 +1147,7 @@ static char *read_link(struct dentry *dentry)
46753 return link;
46754 }
46755
46756-static void free_link(char *link)
46757+static void free_link(const char *link)
46758 {
46759 if (!IS_ERR(link))
46760 free_page((unsigned long) link);
46761diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
46762index cfd4959..a780959 100644
46763--- a/fs/gfs2/inode.c
46764+++ b/fs/gfs2/inode.c
46765@@ -1490,7 +1490,7 @@ out:
46766
46767 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
46768 {
46769- char *s = nd_get_link(nd);
46770+ const char *s = nd_get_link(nd);
46771 if (!IS_ERR(s))
46772 kfree(s);
46773 }
46774diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
46775index 0be5a78..9cfb853 100644
46776--- a/fs/hugetlbfs/inode.c
46777+++ b/fs/hugetlbfs/inode.c
46778@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs_fs_type = {
46779 .kill_sb = kill_litter_super,
46780 };
46781
46782-static struct vfsmount *hugetlbfs_vfsmount;
46783+struct vfsmount *hugetlbfs_vfsmount;
46784
46785 static int can_do_hugetlb_shm(void)
46786 {
46787diff --git a/fs/inode.c b/fs/inode.c
46788index ee4e66b..9a39f9c 100644
46789--- a/fs/inode.c
46790+++ b/fs/inode.c
46791@@ -787,8 +787,8 @@ unsigned int get_next_ino(void)
46792
46793 #ifdef CONFIG_SMP
46794 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
46795- static atomic_t shared_last_ino;
46796- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
46797+ static atomic_unchecked_t shared_last_ino;
46798+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
46799
46800 res = next - LAST_INO_BATCH;
46801 }
46802@@ -855,8 +855,7 @@ void lockdep_annotate_inode_mutex_key(struct inode *inode)
46803 struct file_system_type *type = inode->i_sb->s_type;
46804
46805 /* Set new key only if filesystem hasn't already changed it */
46806- if (!lockdep_match_class(&inode->i_mutex,
46807- &type->i_mutex_key)) {
46808+ if (lockdep_match_class(&inode->i_mutex, &type->i_mutex_key)) {
46809 /*
46810 * ensure nobody is actually holding i_mutex
46811 */
46812@@ -883,6 +882,7 @@ void unlock_new_inode(struct inode *inode)
46813 spin_lock(&inode->i_lock);
46814 WARN_ON(!(inode->i_state & I_NEW));
46815 inode->i_state &= ~I_NEW;
46816+ smp_mb();
46817 wake_up_bit(&inode->i_state, __I_NEW);
46818 spin_unlock(&inode->i_lock);
46819 }
46820diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
46821index e513f19..2ab1351 100644
46822--- a/fs/jffs2/erase.c
46823+++ b/fs/jffs2/erase.c
46824@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
46825 struct jffs2_unknown_node marker = {
46826 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
46827 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
46828- .totlen = cpu_to_je32(c->cleanmarker_size)
46829+ .totlen = cpu_to_je32(c->cleanmarker_size),
46830+ .hdr_crc = cpu_to_je32(0)
46831 };
46832
46833 jffs2_prealloc_raw_node_refs(c, jeb, 1);
46834diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
46835index b09e51d..e482afa 100644
46836--- a/fs/jffs2/wbuf.c
46837+++ b/fs/jffs2/wbuf.c
46838@@ -1011,7 +1011,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
46839 {
46840 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
46841 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
46842- .totlen = constant_cpu_to_je32(8)
46843+ .totlen = constant_cpu_to_je32(8),
46844+ .hdr_crc = constant_cpu_to_je32(0)
46845 };
46846
46847 /*
46848diff --git a/fs/jfs/super.c b/fs/jfs/super.c
46849index a44eff0..462e07d 100644
46850--- a/fs/jfs/super.c
46851+++ b/fs/jfs/super.c
46852@@ -802,7 +802,7 @@ static int __init init_jfs_fs(void)
46853
46854 jfs_inode_cachep =
46855 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
46856- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
46857+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
46858 init_once);
46859 if (jfs_inode_cachep == NULL)
46860 return -ENOMEM;
46861diff --git a/fs/libfs.c b/fs/libfs.c
46862index f6d411e..e82a08d 100644
46863--- a/fs/libfs.c
46864+++ b/fs/libfs.c
46865@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
46866
46867 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
46868 struct dentry *next;
46869+ char d_name[sizeof(next->d_iname)];
46870+ const unsigned char *name;
46871+
46872 next = list_entry(p, struct dentry, d_u.d_child);
46873 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
46874 if (!simple_positive(next)) {
46875@@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
46876
46877 spin_unlock(&next->d_lock);
46878 spin_unlock(&dentry->d_lock);
46879- if (filldir(dirent, next->d_name.name,
46880+ name = next->d_name.name;
46881+ if (name == next->d_iname) {
46882+ memcpy(d_name, name, next->d_name.len);
46883+ name = d_name;
46884+ }
46885+ if (filldir(dirent, name,
46886 next->d_name.len, filp->f_pos,
46887 next->d_inode->i_ino,
46888 dt_type(next->d_inode)) < 0)
46889diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
46890index 8392cb8..80d6193 100644
46891--- a/fs/lockd/clntproc.c
46892+++ b/fs/lockd/clntproc.c
46893@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
46894 /*
46895 * Cookie counter for NLM requests
46896 */
46897-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
46898+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
46899
46900 void nlmclnt_next_cookie(struct nlm_cookie *c)
46901 {
46902- u32 cookie = atomic_inc_return(&nlm_cookie);
46903+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
46904
46905 memcpy(c->data, &cookie, 4);
46906 c->len=4;
46907diff --git a/fs/locks.c b/fs/locks.c
46908index 637694b..f84a121 100644
46909--- a/fs/locks.c
46910+++ b/fs/locks.c
46911@@ -2074,16 +2074,16 @@ void locks_remove_flock(struct file *filp)
46912 return;
46913
46914 if (filp->f_op && filp->f_op->flock) {
46915- struct file_lock fl = {
46916+ struct file_lock flock = {
46917 .fl_pid = current->tgid,
46918 .fl_file = filp,
46919 .fl_flags = FL_FLOCK,
46920 .fl_type = F_UNLCK,
46921 .fl_end = OFFSET_MAX,
46922 };
46923- filp->f_op->flock(filp, F_SETLKW, &fl);
46924- if (fl.fl_ops && fl.fl_ops->fl_release_private)
46925- fl.fl_ops->fl_release_private(&fl);
46926+ filp->f_op->flock(filp, F_SETLKW, &flock);
46927+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
46928+ flock.fl_ops->fl_release_private(&flock);
46929 }
46930
46931 lock_flocks();
46932diff --git a/fs/namei.c b/fs/namei.c
46933index 744e942..a19f203 100644
46934--- a/fs/namei.c
46935+++ b/fs/namei.c
46936@@ -279,16 +279,32 @@ int generic_permission(struct inode *inode, int mask)
46937 if (ret != -EACCES)
46938 return ret;
46939
46940+#ifdef CONFIG_GRKERNSEC
46941+ /* we'll block if we have to log due to a denied capability use */
46942+ if (mask & MAY_NOT_BLOCK)
46943+ return -ECHILD;
46944+#endif
46945+
46946 if (S_ISDIR(inode->i_mode)) {
46947 /* DACs are overridable for directories */
46948- if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
46949- return 0;
46950 if (!(mask & MAY_WRITE))
46951- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46952+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
46953+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46954 return 0;
46955+ if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
46956+ return 0;
46957 return -EACCES;
46958 }
46959 /*
46960+ * Searching includes executable on directories, else just read.
46961+ */
46962+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
46963+ if (mask == MAY_READ)
46964+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
46965+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46966+ return 0;
46967+
46968+ /*
46969 * Read/write DACs are always overridable.
46970 * Executable DACs are overridable when there is
46971 * at least one exec bit set.
46972@@ -297,14 +313,6 @@ int generic_permission(struct inode *inode, int mask)
46973 if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
46974 return 0;
46975
46976- /*
46977- * Searching includes executable on directories, else just read.
46978- */
46979- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
46980- if (mask == MAY_READ)
46981- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46982- return 0;
46983-
46984 return -EACCES;
46985 }
46986
46987@@ -653,11 +661,19 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
46988 return error;
46989 }
46990
46991+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
46992+ dentry->d_inode, dentry, nd->path.mnt)) {
46993+ error = -EACCES;
46994+ *p = ERR_PTR(error); /* no ->put_link(), please */
46995+ path_put(&nd->path);
46996+ return error;
46997+ }
46998+
46999 nd->last_type = LAST_BIND;
47000 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
47001 error = PTR_ERR(*p);
47002 if (!IS_ERR(*p)) {
47003- char *s = nd_get_link(nd);
47004+ const char *s = nd_get_link(nd);
47005 error = 0;
47006 if (s)
47007 error = __vfs_follow_link(nd, s);
47008@@ -1624,6 +1640,21 @@ static int path_lookupat(int dfd, const char *name,
47009 if (!err)
47010 err = complete_walk(nd);
47011
47012+ if (!(nd->flags & LOOKUP_PARENT)) {
47013+#ifdef CONFIG_GRKERNSEC
47014+ if (flags & LOOKUP_RCU) {
47015+ if (!err)
47016+ path_put(&nd->path);
47017+ err = -ECHILD;
47018+ } else
47019+#endif
47020+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
47021+ if (!err)
47022+ path_put(&nd->path);
47023+ err = -ENOENT;
47024+ }
47025+ }
47026+
47027 if (!err && nd->flags & LOOKUP_DIRECTORY) {
47028 if (!nd->inode->i_op->lookup) {
47029 path_put(&nd->path);
47030@@ -1651,6 +1682,15 @@ static int do_path_lookup(int dfd, const char *name,
47031 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
47032
47033 if (likely(!retval)) {
47034+ if (*name != '/' && nd->path.dentry && nd->inode) {
47035+#ifdef CONFIG_GRKERNSEC
47036+ if (flags & LOOKUP_RCU)
47037+ return -ECHILD;
47038+#endif
47039+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
47040+ return -ENOENT;
47041+ }
47042+
47043 if (unlikely(!audit_dummy_context())) {
47044 if (nd->path.dentry && nd->inode)
47045 audit_inode(name, nd->path.dentry);
47046@@ -2048,6 +2088,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
47047 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
47048 return -EPERM;
47049
47050+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
47051+ return -EPERM;
47052+ if (gr_handle_rawio(inode))
47053+ return -EPERM;
47054+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
47055+ return -EACCES;
47056+
47057 return 0;
47058 }
47059
47060@@ -2109,6 +2156,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47061 error = complete_walk(nd);
47062 if (error)
47063 return ERR_PTR(error);
47064+#ifdef CONFIG_GRKERNSEC
47065+ if (nd->flags & LOOKUP_RCU) {
47066+ error = -ECHILD;
47067+ goto exit;
47068+ }
47069+#endif
47070+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
47071+ error = -ENOENT;
47072+ goto exit;
47073+ }
47074 audit_inode(pathname, nd->path.dentry);
47075 if (open_flag & O_CREAT) {
47076 error = -EISDIR;
47077@@ -2119,6 +2176,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47078 error = complete_walk(nd);
47079 if (error)
47080 return ERR_PTR(error);
47081+#ifdef CONFIG_GRKERNSEC
47082+ if (nd->flags & LOOKUP_RCU) {
47083+ error = -ECHILD;
47084+ goto exit;
47085+ }
47086+#endif
47087+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
47088+ error = -ENOENT;
47089+ goto exit;
47090+ }
47091 audit_inode(pathname, dir);
47092 goto ok;
47093 }
47094@@ -2139,7 +2206,17 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47095 /* sayonara */
47096 error = complete_walk(nd);
47097 if (error)
47098- return ERR_PTR(-ECHILD);
47099+ return ERR_PTR(error);
47100+#ifdef CONFIG_GRKERNSEC
47101+ if (nd->flags & LOOKUP_RCU) {
47102+ error = -ECHILD;
47103+ goto exit;
47104+ }
47105+#endif
47106+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
47107+ error = -ENOENT;
47108+ goto exit;
47109+ }
47110
47111 error = -ENOTDIR;
47112 if (nd->flags & LOOKUP_DIRECTORY) {
47113@@ -2180,6 +2257,12 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47114 /* Negative dentry, just create the file */
47115 if (!dentry->d_inode) {
47116 int mode = op->mode;
47117+
47118+ if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, open_flag, acc_mode, mode)) {
47119+ error = -EACCES;
47120+ goto exit_mutex_unlock;
47121+ }
47122+
47123 if (!IS_POSIXACL(dir->d_inode))
47124 mode &= ~current_umask();
47125 /*
47126@@ -2203,6 +2286,8 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47127 error = vfs_create(dir->d_inode, dentry, mode, nd);
47128 if (error)
47129 goto exit_mutex_unlock;
47130+ else
47131+ gr_handle_create(path->dentry, path->mnt);
47132 mutex_unlock(&dir->d_inode->i_mutex);
47133 dput(nd->path.dentry);
47134 nd->path.dentry = dentry;
47135@@ -2212,6 +2297,19 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47136 /*
47137 * It already exists.
47138 */
47139+
47140+ if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
47141+ error = -ENOENT;
47142+ goto exit_mutex_unlock;
47143+ }
47144+
47145+ /* only check if O_CREAT is specified, all other checks need to go
47146+ into may_open */
47147+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
47148+ error = -EACCES;
47149+ goto exit_mutex_unlock;
47150+ }
47151+
47152 mutex_unlock(&dir->d_inode->i_mutex);
47153 audit_inode(pathname, path->dentry);
47154
47155@@ -2238,7 +2336,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47156 /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
47157 error = complete_walk(nd);
47158 if (error)
47159- goto exit;
47160+ return ERR_PTR(error);
47161 error = -EISDIR;
47162 if (S_ISDIR(nd->inode->i_mode))
47163 goto exit;
47164@@ -2424,6 +2522,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path
47165 *path = nd.path;
47166 return dentry;
47167 eexist:
47168+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
47169+ dput(dentry);
47170+ dentry = ERR_PTR(-ENOENT);
47171+ goto fail;
47172+ }
47173 dput(dentry);
47174 dentry = ERR_PTR(-EEXIST);
47175 fail:
47176@@ -2446,6 +2549,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat
47177 }
47178 EXPORT_SYMBOL(user_path_create);
47179
47180+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, char **to, int is_dir)
47181+{
47182+ char *tmp = getname(pathname);
47183+ struct dentry *res;
47184+ if (IS_ERR(tmp))
47185+ return ERR_CAST(tmp);
47186+ res = kern_path_create(dfd, tmp, path, is_dir);
47187+ if (IS_ERR(res))
47188+ putname(tmp);
47189+ else
47190+ *to = tmp;
47191+ return res;
47192+}
47193+
47194 int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
47195 {
47196 int error = may_create(dir, dentry);
47197@@ -2513,6 +2630,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
47198 error = mnt_want_write(path.mnt);
47199 if (error)
47200 goto out_dput;
47201+
47202+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
47203+ error = -EPERM;
47204+ goto out_drop_write;
47205+ }
47206+
47207+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
47208+ error = -EACCES;
47209+ goto out_drop_write;
47210+ }
47211+
47212 error = security_path_mknod(&path, dentry, mode, dev);
47213 if (error)
47214 goto out_drop_write;
47215@@ -2530,6 +2658,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
47216 }
47217 out_drop_write:
47218 mnt_drop_write(path.mnt);
47219+
47220+ if (!error)
47221+ gr_handle_create(dentry, path.mnt);
47222 out_dput:
47223 dput(dentry);
47224 mutex_unlock(&path.dentry->d_inode->i_mutex);
47225@@ -2579,12 +2710,21 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
47226 error = mnt_want_write(path.mnt);
47227 if (error)
47228 goto out_dput;
47229+
47230+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
47231+ error = -EACCES;
47232+ goto out_drop_write;
47233+ }
47234+
47235 error = security_path_mkdir(&path, dentry, mode);
47236 if (error)
47237 goto out_drop_write;
47238 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
47239 out_drop_write:
47240 mnt_drop_write(path.mnt);
47241+
47242+ if (!error)
47243+ gr_handle_create(dentry, path.mnt);
47244 out_dput:
47245 dput(dentry);
47246 mutex_unlock(&path.dentry->d_inode->i_mutex);
47247@@ -2664,6 +2804,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
47248 char * name;
47249 struct dentry *dentry;
47250 struct nameidata nd;
47251+ ino_t saved_ino = 0;
47252+ dev_t saved_dev = 0;
47253
47254 error = user_path_parent(dfd, pathname, &nd, &name);
47255 if (error)
47256@@ -2692,6 +2834,15 @@ static long do_rmdir(int dfd, const char __user *pathname)
47257 error = -ENOENT;
47258 goto exit3;
47259 }
47260+
47261+ saved_ino = dentry->d_inode->i_ino;
47262+ saved_dev = gr_get_dev_from_dentry(dentry);
47263+
47264+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
47265+ error = -EACCES;
47266+ goto exit3;
47267+ }
47268+
47269 error = mnt_want_write(nd.path.mnt);
47270 if (error)
47271 goto exit3;
47272@@ -2699,6 +2850,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
47273 if (error)
47274 goto exit4;
47275 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
47276+ if (!error && (saved_dev || saved_ino))
47277+ gr_handle_delete(saved_ino, saved_dev);
47278 exit4:
47279 mnt_drop_write(nd.path.mnt);
47280 exit3:
47281@@ -2761,6 +2914,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47282 struct dentry *dentry;
47283 struct nameidata nd;
47284 struct inode *inode = NULL;
47285+ ino_t saved_ino = 0;
47286+ dev_t saved_dev = 0;
47287
47288 error = user_path_parent(dfd, pathname, &nd, &name);
47289 if (error)
47290@@ -2783,6 +2938,16 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47291 if (!inode)
47292 goto slashes;
47293 ihold(inode);
47294+
47295+ if (inode->i_nlink <= 1) {
47296+ saved_ino = inode->i_ino;
47297+ saved_dev = gr_get_dev_from_dentry(dentry);
47298+ }
47299+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
47300+ error = -EACCES;
47301+ goto exit2;
47302+ }
47303+
47304 error = mnt_want_write(nd.path.mnt);
47305 if (error)
47306 goto exit2;
47307@@ -2790,6 +2955,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47308 if (error)
47309 goto exit3;
47310 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
47311+ if (!error && (saved_ino || saved_dev))
47312+ gr_handle_delete(saved_ino, saved_dev);
47313 exit3:
47314 mnt_drop_write(nd.path.mnt);
47315 exit2:
47316@@ -2865,10 +3032,18 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
47317 error = mnt_want_write(path.mnt);
47318 if (error)
47319 goto out_dput;
47320+
47321+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
47322+ error = -EACCES;
47323+ goto out_drop_write;
47324+ }
47325+
47326 error = security_path_symlink(&path, dentry, from);
47327 if (error)
47328 goto out_drop_write;
47329 error = vfs_symlink(path.dentry->d_inode, dentry, from);
47330+ if (!error)
47331+ gr_handle_create(dentry, path.mnt);
47332 out_drop_write:
47333 mnt_drop_write(path.mnt);
47334 out_dput:
47335@@ -2940,6 +3115,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47336 {
47337 struct dentry *new_dentry;
47338 struct path old_path, new_path;
47339+ char *to = NULL;
47340 int how = 0;
47341 int error;
47342
47343@@ -2963,7 +3139,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47344 if (error)
47345 return error;
47346
47347- new_dentry = user_path_create(newdfd, newname, &new_path, 0);
47348+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to, 0);
47349 error = PTR_ERR(new_dentry);
47350 if (IS_ERR(new_dentry))
47351 goto out;
47352@@ -2974,13 +3150,30 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47353 error = mnt_want_write(new_path.mnt);
47354 if (error)
47355 goto out_dput;
47356+
47357+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
47358+ old_path.dentry->d_inode,
47359+ old_path.dentry->d_inode->i_mode, to)) {
47360+ error = -EACCES;
47361+ goto out_drop_write;
47362+ }
47363+
47364+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
47365+ old_path.dentry, old_path.mnt, to)) {
47366+ error = -EACCES;
47367+ goto out_drop_write;
47368+ }
47369+
47370 error = security_path_link(old_path.dentry, &new_path, new_dentry);
47371 if (error)
47372 goto out_drop_write;
47373 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
47374+ if (!error)
47375+ gr_handle_create(new_dentry, new_path.mnt);
47376 out_drop_write:
47377 mnt_drop_write(new_path.mnt);
47378 out_dput:
47379+ putname(to);
47380 dput(new_dentry);
47381 mutex_unlock(&new_path.dentry->d_inode->i_mutex);
47382 path_put(&new_path);
47383@@ -3208,6 +3401,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
47384 if (new_dentry == trap)
47385 goto exit5;
47386
47387+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
47388+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
47389+ to);
47390+ if (error)
47391+ goto exit5;
47392+
47393 error = mnt_want_write(oldnd.path.mnt);
47394 if (error)
47395 goto exit5;
47396@@ -3217,6 +3416,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
47397 goto exit6;
47398 error = vfs_rename(old_dir->d_inode, old_dentry,
47399 new_dir->d_inode, new_dentry);
47400+ if (!error)
47401+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
47402+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
47403 exit6:
47404 mnt_drop_write(oldnd.path.mnt);
47405 exit5:
47406@@ -3242,6 +3444,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
47407
47408 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
47409 {
47410+ char tmpbuf[64];
47411+ const char *newlink;
47412 int len;
47413
47414 len = PTR_ERR(link);
47415@@ -3251,7 +3455,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
47416 len = strlen(link);
47417 if (len > (unsigned) buflen)
47418 len = buflen;
47419- if (copy_to_user(buffer, link, len))
47420+
47421+ if (len < sizeof(tmpbuf)) {
47422+ memcpy(tmpbuf, link, len);
47423+ newlink = tmpbuf;
47424+ } else
47425+ newlink = link;
47426+
47427+ if (copy_to_user(buffer, newlink, len))
47428 len = -EFAULT;
47429 out:
47430 return len;
47431diff --git a/fs/namespace.c b/fs/namespace.c
47432index cfc6d44..b4632a5 100644
47433--- a/fs/namespace.c
47434+++ b/fs/namespace.c
47435@@ -1326,6 +1326,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
47436 if (!(sb->s_flags & MS_RDONLY))
47437 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
47438 up_write(&sb->s_umount);
47439+
47440+ gr_log_remount(mnt->mnt_devname, retval);
47441+
47442 return retval;
47443 }
47444
47445@@ -1345,6 +1348,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
47446 br_write_unlock(vfsmount_lock);
47447 up_write(&namespace_sem);
47448 release_mounts(&umount_list);
47449+
47450+ gr_log_unmount(mnt->mnt_devname, retval);
47451+
47452 return retval;
47453 }
47454
47455@@ -2336,6 +2342,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
47456 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
47457 MS_STRICTATIME);
47458
47459+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
47460+ retval = -EPERM;
47461+ goto dput_out;
47462+ }
47463+
47464+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
47465+ retval = -EPERM;
47466+ goto dput_out;
47467+ }
47468+
47469 if (flags & MS_REMOUNT)
47470 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
47471 data_page);
47472@@ -2350,6 +2366,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
47473 dev_name, data_page);
47474 dput_out:
47475 path_put(&path);
47476+
47477+ gr_log_mount(dev_name, dir_name, retval);
47478+
47479 return retval;
47480 }
47481
47482@@ -2605,6 +2624,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
47483 if (error)
47484 goto out2;
47485
47486+ if (gr_handle_chroot_pivot()) {
47487+ error = -EPERM;
47488+ goto out2;
47489+ }
47490+
47491 get_fs_root(current->fs, &root);
47492 error = lock_mount(&old);
47493 if (error)
47494diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h
47495index 09881e6..308ff20 100644
47496--- a/fs/ncpfs/ncplib_kernel.h
47497+++ b/fs/ncpfs/ncplib_kernel.h
47498@@ -130,7 +130,7 @@ static inline int ncp_is_nfs_extras(struct ncp_server* server, unsigned int voln
47499 int ncp__io2vol(struct ncp_server *, unsigned char *, unsigned int *,
47500 const unsigned char *, unsigned int, int);
47501 int ncp__vol2io(struct ncp_server *, unsigned char *, unsigned int *,
47502- const unsigned char *, unsigned int, int);
47503+ const unsigned char *, unsigned int, int) __size_overflow(5);
47504
47505 #define NCP_ESC ':'
47506 #define NCP_IO_TABLE(sb) (NCP_SBP(sb)->nls_io)
47507@@ -146,7 +146,7 @@ int ncp__vol2io(struct ncp_server *, unsigned char *, unsigned int *,
47508 int ncp__io2vol(unsigned char *, unsigned int *,
47509 const unsigned char *, unsigned int, int);
47510 int ncp__vol2io(unsigned char *, unsigned int *,
47511- const unsigned char *, unsigned int, int);
47512+ const unsigned char *, unsigned int, int) __size_overflow(5);
47513
47514 #define NCP_IO_TABLE(sb) NULL
47515 #define ncp_tolower(t, c) tolower(c)
47516diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
47517index 3db6b82..a57597e 100644
47518--- a/fs/nfs/blocklayout/blocklayout.c
47519+++ b/fs/nfs/blocklayout/blocklayout.c
47520@@ -90,7 +90,7 @@ static int is_writable(struct pnfs_block_extent *be, sector_t isect)
47521 */
47522 struct parallel_io {
47523 struct kref refcnt;
47524- struct rpc_call_ops call_ops;
47525+ rpc_call_ops_no_const call_ops;
47526 void (*pnfs_callback) (void *data);
47527 void *data;
47528 };
47529diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
47530index 50a15fa..ca113f9 100644
47531--- a/fs/nfs/inode.c
47532+++ b/fs/nfs/inode.c
47533@@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct inode *inode)
47534 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
47535 nfsi->attrtimeo_timestamp = jiffies;
47536
47537- memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
47538+ memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_I(inode)->cookieverf));
47539 if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
47540 nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
47541 else
47542@@ -1002,16 +1002,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
47543 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
47544 }
47545
47546-static atomic_long_t nfs_attr_generation_counter;
47547+static atomic_long_unchecked_t nfs_attr_generation_counter;
47548
47549 static unsigned long nfs_read_attr_generation_counter(void)
47550 {
47551- return atomic_long_read(&nfs_attr_generation_counter);
47552+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
47553 }
47554
47555 unsigned long nfs_inc_attr_generation_counter(void)
47556 {
47557- return atomic_long_inc_return(&nfs_attr_generation_counter);
47558+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
47559 }
47560
47561 void nfs_fattr_init(struct nfs_fattr *fattr)
47562diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
47563index 7a2e442..8e544cc 100644
47564--- a/fs/nfsd/vfs.c
47565+++ b/fs/nfsd/vfs.c
47566@@ -914,7 +914,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
47567 } else {
47568 oldfs = get_fs();
47569 set_fs(KERNEL_DS);
47570- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
47571+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
47572 set_fs(oldfs);
47573 }
47574
47575@@ -1018,7 +1018,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
47576
47577 /* Write the data. */
47578 oldfs = get_fs(); set_fs(KERNEL_DS);
47579- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
47580+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
47581 set_fs(oldfs);
47582 if (host_err < 0)
47583 goto out_nfserr;
47584@@ -1553,7 +1553,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
47585 */
47586
47587 oldfs = get_fs(); set_fs(KERNEL_DS);
47588- host_err = inode->i_op->readlink(dentry, buf, *lenp);
47589+ host_err = inode->i_op->readlink(dentry, (char __force_user *)buf, *lenp);
47590 set_fs(oldfs);
47591
47592 if (host_err < 0)
47593diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
47594index d327140..501b7f8 100644
47595--- a/fs/nilfs2/the_nilfs.c
47596+++ b/fs/nilfs2/the_nilfs.c
47597@@ -409,6 +409,12 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs,
47598 nilfs->ns_first_data_block = le64_to_cpu(sbp->s_first_data_block);
47599 nilfs->ns_r_segments_percentage =
47600 le32_to_cpu(sbp->s_r_segments_percentage);
47601+ if (nilfs->ns_r_segments_percentage < 1 ||
47602+ nilfs->ns_r_segments_percentage > 99) {
47603+ printk(KERN_ERR "NILFS: invalid reserved segments percentage.\n");
47604+ return -EINVAL;
47605+ }
47606+
47607 nilfs_set_nsegments(nilfs, le64_to_cpu(sbp->s_nsegments));
47608 nilfs->ns_crc_seed = le32_to_cpu(sbp->s_crc_seed);
47609 return 0;
47610@@ -515,6 +521,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs,
47611 brelse(sbh[1]);
47612 sbh[1] = NULL;
47613 sbp[1] = NULL;
47614+ valid[1] = 0;
47615 swp = 0;
47616 }
47617 if (!valid[swp]) {
47618diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
47619index 9fde1c0..14e8827 100644
47620--- a/fs/notify/fanotify/fanotify_user.c
47621+++ b/fs/notify/fanotify/fanotify_user.c
47622@@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
47623 goto out_close_fd;
47624
47625 ret = -EFAULT;
47626- if (copy_to_user(buf, &fanotify_event_metadata,
47627+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
47628+ copy_to_user(buf, &fanotify_event_metadata,
47629 fanotify_event_metadata.event_len))
47630 goto out_kill_access_response;
47631
47632diff --git a/fs/notify/notification.c b/fs/notify/notification.c
47633index ee18815..7aa5d01 100644
47634--- a/fs/notify/notification.c
47635+++ b/fs/notify/notification.c
47636@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
47637 * get set to 0 so it will never get 'freed'
47638 */
47639 static struct fsnotify_event *q_overflow_event;
47640-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47641+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47642
47643 /**
47644 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
47645@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47646 */
47647 u32 fsnotify_get_cookie(void)
47648 {
47649- return atomic_inc_return(&fsnotify_sync_cookie);
47650+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
47651 }
47652 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
47653
47654diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
47655index 99e3610..02c1068 100644
47656--- a/fs/ntfs/dir.c
47657+++ b/fs/ntfs/dir.c
47658@@ -1329,7 +1329,7 @@ find_next_index_buffer:
47659 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
47660 ~(s64)(ndir->itype.index.block_size - 1)));
47661 /* Bounds checks. */
47662- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47663+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47664 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
47665 "inode 0x%lx or driver bug.", vdir->i_ino);
47666 goto err_out;
47667diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
47668index c587e2d..3641eaa 100644
47669--- a/fs/ntfs/file.c
47670+++ b/fs/ntfs/file.c
47671@@ -2229,6 +2229,6 @@ const struct inode_operations ntfs_file_inode_ops = {
47672 #endif /* NTFS_RW */
47673 };
47674
47675-const struct file_operations ntfs_empty_file_ops = {};
47676+const struct file_operations ntfs_empty_file_ops __read_only;
47677
47678-const struct inode_operations ntfs_empty_inode_ops = {};
47679+const struct inode_operations ntfs_empty_inode_ops __read_only;
47680diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
47681index 210c352..a174f83 100644
47682--- a/fs/ocfs2/localalloc.c
47683+++ b/fs/ocfs2/localalloc.c
47684@@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
47685 goto bail;
47686 }
47687
47688- atomic_inc(&osb->alloc_stats.moves);
47689+ atomic_inc_unchecked(&osb->alloc_stats.moves);
47690
47691 bail:
47692 if (handle)
47693diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
47694index d355e6e..578d905 100644
47695--- a/fs/ocfs2/ocfs2.h
47696+++ b/fs/ocfs2/ocfs2.h
47697@@ -235,11 +235,11 @@ enum ocfs2_vol_state
47698
47699 struct ocfs2_alloc_stats
47700 {
47701- atomic_t moves;
47702- atomic_t local_data;
47703- atomic_t bitmap_data;
47704- atomic_t bg_allocs;
47705- atomic_t bg_extends;
47706+ atomic_unchecked_t moves;
47707+ atomic_unchecked_t local_data;
47708+ atomic_unchecked_t bitmap_data;
47709+ atomic_unchecked_t bg_allocs;
47710+ atomic_unchecked_t bg_extends;
47711 };
47712
47713 enum ocfs2_local_alloc_state
47714diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
47715index ba5d97e..c77db25 100644
47716--- a/fs/ocfs2/suballoc.c
47717+++ b/fs/ocfs2/suballoc.c
47718@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
47719 mlog_errno(status);
47720 goto bail;
47721 }
47722- atomic_inc(&osb->alloc_stats.bg_extends);
47723+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
47724
47725 /* You should never ask for this much metadata */
47726 BUG_ON(bits_wanted >
47727@@ -2008,7 +2008,7 @@ int ocfs2_claim_metadata(handle_t *handle,
47728 mlog_errno(status);
47729 goto bail;
47730 }
47731- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47732+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47733
47734 *suballoc_loc = res.sr_bg_blkno;
47735 *suballoc_bit_start = res.sr_bit_offset;
47736@@ -2172,7 +2172,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
47737 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
47738 res->sr_bits);
47739
47740- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47741+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47742
47743 BUG_ON(res->sr_bits != 1);
47744
47745@@ -2214,7 +2214,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
47746 mlog_errno(status);
47747 goto bail;
47748 }
47749- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47750+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47751
47752 BUG_ON(res.sr_bits != 1);
47753
47754@@ -2318,7 +2318,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
47755 cluster_start,
47756 num_clusters);
47757 if (!status)
47758- atomic_inc(&osb->alloc_stats.local_data);
47759+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
47760 } else {
47761 if (min_clusters > (osb->bitmap_cpg - 1)) {
47762 /* The only paths asking for contiguousness
47763@@ -2344,7 +2344,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
47764 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
47765 res.sr_bg_blkno,
47766 res.sr_bit_offset);
47767- atomic_inc(&osb->alloc_stats.bitmap_data);
47768+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
47769 *num_clusters = res.sr_bits;
47770 }
47771 }
47772diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
47773index 4994f8b..eaab8eb 100644
47774--- a/fs/ocfs2/super.c
47775+++ b/fs/ocfs2/super.c
47776@@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
47777 "%10s => GlobalAllocs: %d LocalAllocs: %d "
47778 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
47779 "Stats",
47780- atomic_read(&osb->alloc_stats.bitmap_data),
47781- atomic_read(&osb->alloc_stats.local_data),
47782- atomic_read(&osb->alloc_stats.bg_allocs),
47783- atomic_read(&osb->alloc_stats.moves),
47784- atomic_read(&osb->alloc_stats.bg_extends));
47785+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
47786+ atomic_read_unchecked(&osb->alloc_stats.local_data),
47787+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
47788+ atomic_read_unchecked(&osb->alloc_stats.moves),
47789+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
47790
47791 out += snprintf(buf + out, len - out,
47792 "%10s => State: %u Descriptor: %llu Size: %u bits "
47793@@ -2119,11 +2119,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
47794 spin_lock_init(&osb->osb_xattr_lock);
47795 ocfs2_init_steal_slots(osb);
47796
47797- atomic_set(&osb->alloc_stats.moves, 0);
47798- atomic_set(&osb->alloc_stats.local_data, 0);
47799- atomic_set(&osb->alloc_stats.bitmap_data, 0);
47800- atomic_set(&osb->alloc_stats.bg_allocs, 0);
47801- atomic_set(&osb->alloc_stats.bg_extends, 0);
47802+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
47803+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
47804+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
47805+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
47806+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
47807
47808 /* Copy the blockcheck stats from the superblock probe */
47809 osb->osb_ecc_stats = *stats;
47810diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
47811index 5d22872..523db20 100644
47812--- a/fs/ocfs2/symlink.c
47813+++ b/fs/ocfs2/symlink.c
47814@@ -142,7 +142,7 @@ bail:
47815
47816 static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
47817 {
47818- char *link = nd_get_link(nd);
47819+ const char *link = nd_get_link(nd);
47820 if (!IS_ERR(link))
47821 kfree(link);
47822 }
47823diff --git a/fs/open.c b/fs/open.c
47824index 22c41b5..78894cf 100644
47825--- a/fs/open.c
47826+++ b/fs/open.c
47827@@ -112,6 +112,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
47828 error = locks_verify_truncate(inode, NULL, length);
47829 if (!error)
47830 error = security_path_truncate(&path);
47831+
47832+ if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
47833+ error = -EACCES;
47834+
47835 if (!error)
47836 error = do_truncate(path.dentry, length, 0, NULL);
47837
47838@@ -358,6 +362,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
47839 if (__mnt_is_readonly(path.mnt))
47840 res = -EROFS;
47841
47842+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
47843+ res = -EACCES;
47844+
47845 out_path_release:
47846 path_put(&path);
47847 out:
47848@@ -384,6 +391,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
47849 if (error)
47850 goto dput_and_out;
47851
47852+ gr_log_chdir(path.dentry, path.mnt);
47853+
47854 set_fs_pwd(current->fs, &path);
47855
47856 dput_and_out:
47857@@ -410,6 +419,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
47858 goto out_putf;
47859
47860 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
47861+
47862+ if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
47863+ error = -EPERM;
47864+
47865+ if (!error)
47866+ gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
47867+
47868 if (!error)
47869 set_fs_pwd(current->fs, &file->f_path);
47870 out_putf:
47871@@ -438,7 +454,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
47872 if (error)
47873 goto dput_and_out;
47874
47875+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
47876+ goto dput_and_out;
47877+
47878 set_fs_root(current->fs, &path);
47879+
47880+ gr_handle_chroot_chdir(&path);
47881+
47882 error = 0;
47883 dput_and_out:
47884 path_put(&path);
47885@@ -456,6 +478,16 @@ static int chmod_common(struct path *path, umode_t mode)
47886 if (error)
47887 return error;
47888 mutex_lock(&inode->i_mutex);
47889+
47890+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
47891+ error = -EACCES;
47892+ goto out_unlock;
47893+ }
47894+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
47895+ error = -EACCES;
47896+ goto out_unlock;
47897+ }
47898+
47899 error = security_path_chmod(path->dentry, path->mnt, mode);
47900 if (error)
47901 goto out_unlock;
47902@@ -506,6 +538,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
47903 int error;
47904 struct iattr newattrs;
47905
47906+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
47907+ return -EACCES;
47908+
47909 newattrs.ia_valid = ATTR_CTIME;
47910 if (user != (uid_t) -1) {
47911 newattrs.ia_valid |= ATTR_UID;
47912diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c
47913index 6296b40..417c00f 100644
47914--- a/fs/partitions/efi.c
47915+++ b/fs/partitions/efi.c
47916@@ -234,14 +234,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
47917 if (!gpt)
47918 return NULL;
47919
47920+ if (!le32_to_cpu(gpt->num_partition_entries))
47921+ return NULL;
47922+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
47923+ if (!pte)
47924+ return NULL;
47925+
47926 count = le32_to_cpu(gpt->num_partition_entries) *
47927 le32_to_cpu(gpt->sizeof_partition_entry);
47928- if (!count)
47929- return NULL;
47930- pte = kzalloc(count, GFP_KERNEL);
47931- if (!pte)
47932- return NULL;
47933-
47934 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
47935 (u8 *) pte,
47936 count) < count) {
47937diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
47938index bd8ae78..539d250 100644
47939--- a/fs/partitions/ldm.c
47940+++ b/fs/partitions/ldm.c
47941@@ -1324,7 +1324,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags)
47942 goto found;
47943 }
47944
47945- f = kmalloc (sizeof (*f) + size*num, GFP_KERNEL);
47946+ f = kmalloc (size*num + sizeof (*f), GFP_KERNEL);
47947 if (!f) {
47948 ldm_crit ("Out of memory.");
47949 return false;
47950diff --git a/fs/pipe.c b/fs/pipe.c
47951index 4065f07..68c0706 100644
47952--- a/fs/pipe.c
47953+++ b/fs/pipe.c
47954@@ -420,9 +420,9 @@ redo:
47955 }
47956 if (bufs) /* More to do? */
47957 continue;
47958- if (!pipe->writers)
47959+ if (!atomic_read(&pipe->writers))
47960 break;
47961- if (!pipe->waiting_writers) {
47962+ if (!atomic_read(&pipe->waiting_writers)) {
47963 /* syscall merging: Usually we must not sleep
47964 * if O_NONBLOCK is set, or if we got some data.
47965 * But if a writer sleeps in kernel space, then
47966@@ -481,7 +481,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
47967 mutex_lock(&inode->i_mutex);
47968 pipe = inode->i_pipe;
47969
47970- if (!pipe->readers) {
47971+ if (!atomic_read(&pipe->readers)) {
47972 send_sig(SIGPIPE, current, 0);
47973 ret = -EPIPE;
47974 goto out;
47975@@ -530,7 +530,7 @@ redo1:
47976 for (;;) {
47977 int bufs;
47978
47979- if (!pipe->readers) {
47980+ if (!atomic_read(&pipe->readers)) {
47981 send_sig(SIGPIPE, current, 0);
47982 if (!ret)
47983 ret = -EPIPE;
47984@@ -616,9 +616,9 @@ redo2:
47985 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
47986 do_wakeup = 0;
47987 }
47988- pipe->waiting_writers++;
47989+ atomic_inc(&pipe->waiting_writers);
47990 pipe_wait(pipe);
47991- pipe->waiting_writers--;
47992+ atomic_dec(&pipe->waiting_writers);
47993 }
47994 out:
47995 mutex_unlock(&inode->i_mutex);
47996@@ -685,7 +685,7 @@ pipe_poll(struct file *filp, poll_table *wait)
47997 mask = 0;
47998 if (filp->f_mode & FMODE_READ) {
47999 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
48000- if (!pipe->writers && filp->f_version != pipe->w_counter)
48001+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
48002 mask |= POLLHUP;
48003 }
48004
48005@@ -695,7 +695,7 @@ pipe_poll(struct file *filp, poll_table *wait)
48006 * Most Unices do not set POLLERR for FIFOs but on Linux they
48007 * behave exactly like pipes for poll().
48008 */
48009- if (!pipe->readers)
48010+ if (!atomic_read(&pipe->readers))
48011 mask |= POLLERR;
48012 }
48013
48014@@ -709,10 +709,10 @@ pipe_release(struct inode *inode, int decr, int decw)
48015
48016 mutex_lock(&inode->i_mutex);
48017 pipe = inode->i_pipe;
48018- pipe->readers -= decr;
48019- pipe->writers -= decw;
48020+ atomic_sub(decr, &pipe->readers);
48021+ atomic_sub(decw, &pipe->writers);
48022
48023- if (!pipe->readers && !pipe->writers) {
48024+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
48025 free_pipe_info(inode);
48026 } else {
48027 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
48028@@ -802,7 +802,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
48029
48030 if (inode->i_pipe) {
48031 ret = 0;
48032- inode->i_pipe->readers++;
48033+ atomic_inc(&inode->i_pipe->readers);
48034 }
48035
48036 mutex_unlock(&inode->i_mutex);
48037@@ -819,7 +819,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
48038
48039 if (inode->i_pipe) {
48040 ret = 0;
48041- inode->i_pipe->writers++;
48042+ atomic_inc(&inode->i_pipe->writers);
48043 }
48044
48045 mutex_unlock(&inode->i_mutex);
48046@@ -837,9 +837,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
48047 if (inode->i_pipe) {
48048 ret = 0;
48049 if (filp->f_mode & FMODE_READ)
48050- inode->i_pipe->readers++;
48051+ atomic_inc(&inode->i_pipe->readers);
48052 if (filp->f_mode & FMODE_WRITE)
48053- inode->i_pipe->writers++;
48054+ atomic_inc(&inode->i_pipe->writers);
48055 }
48056
48057 mutex_unlock(&inode->i_mutex);
48058@@ -931,7 +931,7 @@ void free_pipe_info(struct inode *inode)
48059 inode->i_pipe = NULL;
48060 }
48061
48062-static struct vfsmount *pipe_mnt __read_mostly;
48063+struct vfsmount *pipe_mnt __read_mostly;
48064
48065 /*
48066 * pipefs_dname() is called from d_path().
48067@@ -961,7 +961,8 @@ static struct inode * get_pipe_inode(void)
48068 goto fail_iput;
48069 inode->i_pipe = pipe;
48070
48071- pipe->readers = pipe->writers = 1;
48072+ atomic_set(&pipe->readers, 1);
48073+ atomic_set(&pipe->writers, 1);
48074 inode->i_fop = &rdwr_pipefifo_fops;
48075
48076 /*
48077diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
48078index 15af622..0e9f4467 100644
48079--- a/fs/proc/Kconfig
48080+++ b/fs/proc/Kconfig
48081@@ -30,12 +30,12 @@ config PROC_FS
48082
48083 config PROC_KCORE
48084 bool "/proc/kcore support" if !ARM
48085- depends on PROC_FS && MMU
48086+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
48087
48088 config PROC_VMCORE
48089 bool "/proc/vmcore support"
48090- depends on PROC_FS && CRASH_DUMP
48091- default y
48092+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
48093+ default n
48094 help
48095 Exports the dump image of crashed kernel in ELF format.
48096
48097@@ -59,8 +59,8 @@ config PROC_SYSCTL
48098 limited in memory.
48099
48100 config PROC_PAGE_MONITOR
48101- default y
48102- depends on PROC_FS && MMU
48103+ default n
48104+ depends on PROC_FS && MMU && !GRKERNSEC
48105 bool "Enable /proc page monitoring" if EXPERT
48106 help
48107 Various /proc files exist to monitor process memory utilization:
48108diff --git a/fs/proc/array.c b/fs/proc/array.c
48109index 3a1dafd..bf1bd84 100644
48110--- a/fs/proc/array.c
48111+++ b/fs/proc/array.c
48112@@ -60,6 +60,7 @@
48113 #include <linux/tty.h>
48114 #include <linux/string.h>
48115 #include <linux/mman.h>
48116+#include <linux/grsecurity.h>
48117 #include <linux/proc_fs.h>
48118 #include <linux/ioport.h>
48119 #include <linux/uaccess.h>
48120@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
48121 seq_putc(m, '\n');
48122 }
48123
48124+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
48125+static inline void task_pax(struct seq_file *m, struct task_struct *p)
48126+{
48127+ if (p->mm)
48128+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
48129+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
48130+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
48131+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
48132+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
48133+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
48134+ else
48135+ seq_printf(m, "PaX:\t-----\n");
48136+}
48137+#endif
48138+
48139 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
48140 struct pid *pid, struct task_struct *task)
48141 {
48142@@ -354,9 +370,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
48143 task_cpus_allowed(m, task);
48144 cpuset_task_status_allowed(m, task);
48145 task_context_switch_counts(m, task);
48146+
48147+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
48148+ task_pax(m, task);
48149+#endif
48150+
48151+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
48152+ task_grsec_rbac(m, task);
48153+#endif
48154+
48155 return 0;
48156 }
48157
48158+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48159+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
48160+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
48161+ _mm->pax_flags & MF_PAX_SEGMEXEC))
48162+#endif
48163+
48164 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48165 struct pid *pid, struct task_struct *task, int whole)
48166 {
48167@@ -378,6 +409,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48168 char tcomm[sizeof(task->comm)];
48169 unsigned long flags;
48170
48171+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48172+ if (current->exec_id != m->exec_id) {
48173+ gr_log_badprocpid("stat");
48174+ return 0;
48175+ }
48176+#endif
48177+
48178 state = *get_task_state(task);
48179 vsize = eip = esp = 0;
48180 permitted = ptrace_may_access(task, PTRACE_MODE_READ);
48181@@ -449,6 +487,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48182 gtime = task->gtime;
48183 }
48184
48185+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48186+ if (PAX_RAND_FLAGS(mm)) {
48187+ eip = 0;
48188+ esp = 0;
48189+ wchan = 0;
48190+ }
48191+#endif
48192+#ifdef CONFIG_GRKERNSEC_HIDESYM
48193+ wchan = 0;
48194+ eip =0;
48195+ esp =0;
48196+#endif
48197+
48198 /* scale priority and nice values from timeslices to -20..20 */
48199 /* to make it look like a "normal" Unix priority/nice value */
48200 priority = task_prio(task);
48201@@ -489,9 +540,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48202 vsize,
48203 mm ? get_mm_rss(mm) : 0,
48204 rsslim,
48205+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48206+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0),
48207+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0),
48208+ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
48209+#else
48210 mm ? (permitted ? mm->start_code : 1) : 0,
48211 mm ? (permitted ? mm->end_code : 1) : 0,
48212 (permitted && mm) ? mm->start_stack : 0,
48213+#endif
48214 esp,
48215 eip,
48216 /* The signal information here is obsolete.
48217@@ -533,8 +590,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48218 struct pid *pid, struct task_struct *task)
48219 {
48220 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
48221- struct mm_struct *mm = get_task_mm(task);
48222+ struct mm_struct *mm;
48223
48224+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48225+ if (current->exec_id != m->exec_id) {
48226+ gr_log_badprocpid("statm");
48227+ return 0;
48228+ }
48229+#endif
48230+ mm = get_task_mm(task);
48231 if (mm) {
48232 size = task_statm(mm, &shared, &text, &data, &resident);
48233 mmput(mm);
48234@@ -544,3 +608,18 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48235
48236 return 0;
48237 }
48238+
48239+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48240+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
48241+{
48242+ u32 curr_ip = 0;
48243+ unsigned long flags;
48244+
48245+ if (lock_task_sighand(task, &flags)) {
48246+ curr_ip = task->signal->curr_ip;
48247+ unlock_task_sighand(task, &flags);
48248+ }
48249+
48250+ return sprintf(buffer, "%pI4\n", &curr_ip);
48251+}
48252+#endif
48253diff --git a/fs/proc/base.c b/fs/proc/base.c
48254index 1ace83d..f5e575d 100644
48255--- a/fs/proc/base.c
48256+++ b/fs/proc/base.c
48257@@ -107,6 +107,22 @@ struct pid_entry {
48258 union proc_op op;
48259 };
48260
48261+struct getdents_callback {
48262+ struct linux_dirent __user * current_dir;
48263+ struct linux_dirent __user * previous;
48264+ struct file * file;
48265+ int count;
48266+ int error;
48267+};
48268+
48269+static int gr_fake_filldir(void * __buf, const char *name, int namlen,
48270+ loff_t offset, u64 ino, unsigned int d_type)
48271+{
48272+ struct getdents_callback * buf = (struct getdents_callback *) __buf;
48273+ buf->error = -EINVAL;
48274+ return 0;
48275+}
48276+
48277 #define NOD(NAME, MODE, IOP, FOP, OP) { \
48278 .name = (NAME), \
48279 .len = sizeof(NAME) - 1, \
48280@@ -194,26 +210,6 @@ static int proc_root_link(struct inode *inode, struct path *path)
48281 return result;
48282 }
48283
48284-static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
48285-{
48286- struct mm_struct *mm;
48287- int err;
48288-
48289- err = mutex_lock_killable(&task->signal->cred_guard_mutex);
48290- if (err)
48291- return ERR_PTR(err);
48292-
48293- mm = get_task_mm(task);
48294- if (mm && mm != current->mm &&
48295- !ptrace_may_access(task, mode)) {
48296- mmput(mm);
48297- mm = ERR_PTR(-EACCES);
48298- }
48299- mutex_unlock(&task->signal->cred_guard_mutex);
48300-
48301- return mm;
48302-}
48303-
48304 struct mm_struct *mm_for_maps(struct task_struct *task)
48305 {
48306 return mm_access(task, PTRACE_MODE_READ);
48307@@ -229,6 +225,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
48308 if (!mm->arg_end)
48309 goto out_mm; /* Shh! No looking before we're done */
48310
48311+ if (gr_acl_handle_procpidmem(task))
48312+ goto out_mm;
48313+
48314 len = mm->arg_end - mm->arg_start;
48315
48316 if (len > PAGE_SIZE)
48317@@ -256,12 +255,28 @@ out:
48318 return res;
48319 }
48320
48321+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48322+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
48323+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
48324+ _mm->pax_flags & MF_PAX_SEGMEXEC))
48325+#endif
48326+
48327 static int proc_pid_auxv(struct task_struct *task, char *buffer)
48328 {
48329 struct mm_struct *mm = mm_for_maps(task);
48330 int res = PTR_ERR(mm);
48331 if (mm && !IS_ERR(mm)) {
48332 unsigned int nwords = 0;
48333+
48334+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48335+ /* allow if we're currently ptracing this task */
48336+ if (PAX_RAND_FLAGS(mm) &&
48337+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
48338+ mmput(mm);
48339+ return 0;
48340+ }
48341+#endif
48342+
48343 do {
48344 nwords += 2;
48345 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
48346@@ -275,7 +290,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
48347 }
48348
48349
48350-#ifdef CONFIG_KALLSYMS
48351+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48352 /*
48353 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
48354 * Returns the resolved symbol. If that fails, simply return the address.
48355@@ -314,7 +329,7 @@ static void unlock_trace(struct task_struct *task)
48356 mutex_unlock(&task->signal->cred_guard_mutex);
48357 }
48358
48359-#ifdef CONFIG_STACKTRACE
48360+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48361
48362 #define MAX_STACK_TRACE_DEPTH 64
48363
48364@@ -505,7 +520,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
48365 return count;
48366 }
48367
48368-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48369+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48370 static int proc_pid_syscall(struct task_struct *task, char *buffer)
48371 {
48372 long nr;
48373@@ -534,7 +549,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
48374 /************************************************************************/
48375
48376 /* permission checks */
48377-static int proc_fd_access_allowed(struct inode *inode)
48378+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
48379 {
48380 struct task_struct *task;
48381 int allowed = 0;
48382@@ -544,7 +559,10 @@ static int proc_fd_access_allowed(struct inode *inode)
48383 */
48384 task = get_proc_task(inode);
48385 if (task) {
48386- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
48387+ if (log)
48388+ allowed = ptrace_may_access_log(task, PTRACE_MODE_READ);
48389+ else
48390+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
48391 put_task_struct(task);
48392 }
48393 return allowed;
48394@@ -786,6 +804,10 @@ static int mem_open(struct inode* inode, struct file* file)
48395 file->f_mode |= FMODE_UNSIGNED_OFFSET;
48396 file->private_data = mm;
48397
48398+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48399+ file->f_version = current->exec_id;
48400+#endif
48401+
48402 return 0;
48403 }
48404
48405@@ -797,6 +819,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
48406 ssize_t copied;
48407 char *page;
48408
48409+#ifdef CONFIG_GRKERNSEC
48410+ if (write)
48411+ return -EPERM;
48412+#endif
48413+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48414+ if (file->f_version != current->exec_id) {
48415+ gr_log_badprocpid("mem");
48416+ return 0;
48417+ }
48418+#endif
48419+
48420 if (!mm)
48421 return 0;
48422
48423@@ -897,6 +930,9 @@ static ssize_t environ_read(struct file *file, char __user *buf,
48424 if (!task)
48425 goto out_no_task;
48426
48427+ if (gr_acl_handle_procpidmem(task))
48428+ goto out;
48429+
48430 ret = -ENOMEM;
48431 page = (char *)__get_free_page(GFP_TEMPORARY);
48432 if (!page)
48433@@ -1519,7 +1555,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
48434 path_put(&nd->path);
48435
48436 /* Are we allowed to snoop on the tasks file descriptors? */
48437- if (!proc_fd_access_allowed(inode))
48438+ if (!proc_fd_access_allowed(inode,0))
48439 goto out;
48440
48441 error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
48442@@ -1558,8 +1594,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
48443 struct path path;
48444
48445 /* Are we allowed to snoop on the tasks file descriptors? */
48446- if (!proc_fd_access_allowed(inode))
48447- goto out;
48448+ /* logging this is needed for learning on chromium to work properly,
48449+ but we don't want to flood the logs from 'ps' which does a readlink
48450+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
48451+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
48452+ */
48453+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
48454+ if (!proc_fd_access_allowed(inode,0))
48455+ goto out;
48456+ } else {
48457+ if (!proc_fd_access_allowed(inode,1))
48458+ goto out;
48459+ }
48460
48461 error = PROC_I(inode)->op.proc_get_link(inode, &path);
48462 if (error)
48463@@ -1624,7 +1670,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
48464 rcu_read_lock();
48465 cred = __task_cred(task);
48466 inode->i_uid = cred->euid;
48467+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48468+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48469+#else
48470 inode->i_gid = cred->egid;
48471+#endif
48472 rcu_read_unlock();
48473 }
48474 security_task_to_inode(task, inode);
48475@@ -1642,6 +1692,9 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
48476 struct inode *inode = dentry->d_inode;
48477 struct task_struct *task;
48478 const struct cred *cred;
48479+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48480+ const struct cred *tmpcred = current_cred();
48481+#endif
48482
48483 generic_fillattr(inode, stat);
48484
48485@@ -1649,13 +1702,41 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
48486 stat->uid = 0;
48487 stat->gid = 0;
48488 task = pid_task(proc_pid(inode), PIDTYPE_PID);
48489+
48490+ if (task && (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))) {
48491+ rcu_read_unlock();
48492+ return -ENOENT;
48493+ }
48494+
48495 if (task) {
48496+ cred = __task_cred(task);
48497+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48498+ if (!tmpcred->uid || (tmpcred->uid == cred->uid)
48499+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48500+ || in_group_p(CONFIG_GRKERNSEC_PROC_GID)
48501+#endif
48502+ ) {
48503+#endif
48504 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48505+#ifdef CONFIG_GRKERNSEC_PROC_USER
48506+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48507+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48508+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48509+#endif
48510 task_dumpable(task)) {
48511- cred = __task_cred(task);
48512 stat->uid = cred->euid;
48513+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48514+ stat->gid = CONFIG_GRKERNSEC_PROC_GID;
48515+#else
48516 stat->gid = cred->egid;
48517+#endif
48518 }
48519+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48520+ } else {
48521+ rcu_read_unlock();
48522+ return -ENOENT;
48523+ }
48524+#endif
48525 }
48526 rcu_read_unlock();
48527 return 0;
48528@@ -1692,11 +1773,20 @@ int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
48529
48530 if (task) {
48531 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48532+#ifdef CONFIG_GRKERNSEC_PROC_USER
48533+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48534+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48535+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48536+#endif
48537 task_dumpable(task)) {
48538 rcu_read_lock();
48539 cred = __task_cred(task);
48540 inode->i_uid = cred->euid;
48541+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48542+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48543+#else
48544 inode->i_gid = cred->egid;
48545+#endif
48546 rcu_read_unlock();
48547 } else {
48548 inode->i_uid = 0;
48549@@ -1814,7 +1904,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
48550 int fd = proc_fd(inode);
48551
48552 if (task) {
48553- files = get_files_struct(task);
48554+ if (!gr_acl_handle_procpidmem(task))
48555+ files = get_files_struct(task);
48556 put_task_struct(task);
48557 }
48558 if (files) {
48559@@ -2082,11 +2173,21 @@ static const struct file_operations proc_fd_operations = {
48560 */
48561 static int proc_fd_permission(struct inode *inode, int mask)
48562 {
48563+ struct task_struct *task;
48564 int rv = generic_permission(inode, mask);
48565- if (rv == 0)
48566- return 0;
48567+
48568 if (task_pid(current) == proc_pid(inode))
48569 rv = 0;
48570+
48571+ task = get_proc_task(inode);
48572+ if (task == NULL)
48573+ return rv;
48574+
48575+ if (gr_acl_handle_procpidmem(task))
48576+ rv = -EACCES;
48577+
48578+ put_task_struct(task);
48579+
48580 return rv;
48581 }
48582
48583@@ -2196,6 +2297,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
48584 if (!task)
48585 goto out_no_task;
48586
48587+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48588+ goto out;
48589+
48590 /*
48591 * Yes, it does not scale. And it should not. Don't add
48592 * new entries into /proc/<tgid>/ without very good reasons.
48593@@ -2240,6 +2344,9 @@ static int proc_pident_readdir(struct file *filp,
48594 if (!task)
48595 goto out_no_task;
48596
48597+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48598+ goto out;
48599+
48600 ret = 0;
48601 i = filp->f_pos;
48602 switch (i) {
48603@@ -2510,7 +2617,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
48604 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
48605 void *cookie)
48606 {
48607- char *s = nd_get_link(nd);
48608+ const char *s = nd_get_link(nd);
48609 if (!IS_ERR(s))
48610 __putname(s);
48611 }
48612@@ -2708,7 +2815,7 @@ static const struct pid_entry tgid_base_stuff[] = {
48613 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
48614 #endif
48615 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
48616-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48617+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48618 INF("syscall", S_IRUGO, proc_pid_syscall),
48619 #endif
48620 INF("cmdline", S_IRUGO, proc_pid_cmdline),
48621@@ -2733,10 +2840,10 @@ static const struct pid_entry tgid_base_stuff[] = {
48622 #ifdef CONFIG_SECURITY
48623 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
48624 #endif
48625-#ifdef CONFIG_KALLSYMS
48626+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48627 INF("wchan", S_IRUGO, proc_pid_wchan),
48628 #endif
48629-#ifdef CONFIG_STACKTRACE
48630+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48631 ONE("stack", S_IRUGO, proc_pid_stack),
48632 #endif
48633 #ifdef CONFIG_SCHEDSTATS
48634@@ -2770,6 +2877,9 @@ static const struct pid_entry tgid_base_stuff[] = {
48635 #ifdef CONFIG_HARDWALL
48636 INF("hardwall", S_IRUGO, proc_pid_hardwall),
48637 #endif
48638+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48639+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
48640+#endif
48641 };
48642
48643 static int proc_tgid_base_readdir(struct file * filp,
48644@@ -2895,7 +3005,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
48645 if (!inode)
48646 goto out;
48647
48648+#ifdef CONFIG_GRKERNSEC_PROC_USER
48649+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
48650+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48651+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48652+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
48653+#else
48654 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
48655+#endif
48656 inode->i_op = &proc_tgid_base_inode_operations;
48657 inode->i_fop = &proc_tgid_base_operations;
48658 inode->i_flags|=S_IMMUTABLE;
48659@@ -2937,7 +3054,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct
48660 if (!task)
48661 goto out;
48662
48663+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48664+ goto out_put_task;
48665+
48666 result = proc_pid_instantiate(dir, dentry, task, NULL);
48667+out_put_task:
48668 put_task_struct(task);
48669 out:
48670 return result;
48671@@ -3002,6 +3123,11 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
48672 {
48673 unsigned int nr;
48674 struct task_struct *reaper;
48675+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48676+ const struct cred *tmpcred = current_cred();
48677+ const struct cred *itercred;
48678+#endif
48679+ filldir_t __filldir = filldir;
48680 struct tgid_iter iter;
48681 struct pid_namespace *ns;
48682
48683@@ -3025,8 +3151,27 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
48684 for (iter = next_tgid(ns, iter);
48685 iter.task;
48686 iter.tgid += 1, iter = next_tgid(ns, iter)) {
48687+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48688+ rcu_read_lock();
48689+ itercred = __task_cred(iter.task);
48690+#endif
48691+ if (gr_pid_is_chrooted(iter.task) || gr_check_hidden_task(iter.task)
48692+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48693+ || (tmpcred->uid && (itercred->uid != tmpcred->uid)
48694+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48695+ && !in_group_p(CONFIG_GRKERNSEC_PROC_GID)
48696+#endif
48697+ )
48698+#endif
48699+ )
48700+ __filldir = &gr_fake_filldir;
48701+ else
48702+ __filldir = filldir;
48703+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48704+ rcu_read_unlock();
48705+#endif
48706 filp->f_pos = iter.tgid + TGID_OFFSET;
48707- if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) {
48708+ if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
48709 put_task_struct(iter.task);
48710 goto out;
48711 }
48712@@ -3054,7 +3199,7 @@ static const struct pid_entry tid_base_stuff[] = {
48713 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
48714 #endif
48715 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
48716-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48717+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48718 INF("syscall", S_IRUGO, proc_pid_syscall),
48719 #endif
48720 INF("cmdline", S_IRUGO, proc_pid_cmdline),
48721@@ -3078,10 +3223,10 @@ static const struct pid_entry tid_base_stuff[] = {
48722 #ifdef CONFIG_SECURITY
48723 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
48724 #endif
48725-#ifdef CONFIG_KALLSYMS
48726+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48727 INF("wchan", S_IRUGO, proc_pid_wchan),
48728 #endif
48729-#ifdef CONFIG_STACKTRACE
48730+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48731 ONE("stack", S_IRUGO, proc_pid_stack),
48732 #endif
48733 #ifdef CONFIG_SCHEDSTATS
48734diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
48735index 82676e3..5f8518a 100644
48736--- a/fs/proc/cmdline.c
48737+++ b/fs/proc/cmdline.c
48738@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
48739
48740 static int __init proc_cmdline_init(void)
48741 {
48742+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48743+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
48744+#else
48745 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
48746+#endif
48747 return 0;
48748 }
48749 module_init(proc_cmdline_init);
48750diff --git a/fs/proc/devices.c b/fs/proc/devices.c
48751index b143471..bb105e5 100644
48752--- a/fs/proc/devices.c
48753+++ b/fs/proc/devices.c
48754@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
48755
48756 static int __init proc_devices_init(void)
48757 {
48758+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48759+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
48760+#else
48761 proc_create("devices", 0, NULL, &proc_devinfo_operations);
48762+#endif
48763 return 0;
48764 }
48765 module_init(proc_devices_init);
48766diff --git a/fs/proc/inode.c b/fs/proc/inode.c
48767index 7737c54..7172574 100644
48768--- a/fs/proc/inode.c
48769+++ b/fs/proc/inode.c
48770@@ -18,12 +18,18 @@
48771 #include <linux/module.h>
48772 #include <linux/sysctl.h>
48773 #include <linux/slab.h>
48774+#include <linux/grsecurity.h>
48775
48776 #include <asm/system.h>
48777 #include <asm/uaccess.h>
48778
48779 #include "internal.h"
48780
48781+#ifdef CONFIG_PROC_SYSCTL
48782+extern const struct inode_operations proc_sys_inode_operations;
48783+extern const struct inode_operations proc_sys_dir_operations;
48784+#endif
48785+
48786 static void proc_evict_inode(struct inode *inode)
48787 {
48788 struct proc_dir_entry *de;
48789@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
48790 ns_ops = PROC_I(inode)->ns_ops;
48791 if (ns_ops && ns_ops->put)
48792 ns_ops->put(PROC_I(inode)->ns);
48793+
48794+#ifdef CONFIG_PROC_SYSCTL
48795+ if (inode->i_op == &proc_sys_inode_operations ||
48796+ inode->i_op == &proc_sys_dir_operations)
48797+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
48798+#endif
48799+
48800 }
48801
48802 static struct kmem_cache * proc_inode_cachep;
48803@@ -440,7 +453,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
48804 if (de->mode) {
48805 inode->i_mode = de->mode;
48806 inode->i_uid = de->uid;
48807+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48808+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48809+#else
48810 inode->i_gid = de->gid;
48811+#endif
48812 }
48813 if (de->size)
48814 inode->i_size = de->size;
48815diff --git a/fs/proc/internal.h b/fs/proc/internal.h
48816index 7838e5c..ff92cbc 100644
48817--- a/fs/proc/internal.h
48818+++ b/fs/proc/internal.h
48819@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
48820 struct pid *pid, struct task_struct *task);
48821 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48822 struct pid *pid, struct task_struct *task);
48823+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48824+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
48825+#endif
48826 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
48827
48828 extern const struct file_operations proc_maps_operations;
48829diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
48830index d245cb2..f4e8498 100644
48831--- a/fs/proc/kcore.c
48832+++ b/fs/proc/kcore.c
48833@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48834 * the addresses in the elf_phdr on our list.
48835 */
48836 start = kc_offset_to_vaddr(*fpos - elf_buflen);
48837- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
48838+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
48839+ if (tsz > buflen)
48840 tsz = buflen;
48841-
48842+
48843 while (buflen) {
48844 struct kcore_list *m;
48845
48846@@ -509,20 +510,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48847 kfree(elf_buf);
48848 } else {
48849 if (kern_addr_valid(start)) {
48850- unsigned long n;
48851+ char *elf_buf;
48852+ mm_segment_t oldfs;
48853
48854- n = copy_to_user(buffer, (char *)start, tsz);
48855- /*
48856- * We cannot distingush between fault on source
48857- * and fault on destination. When this happens
48858- * we clear too and hope it will trigger the
48859- * EFAULT again.
48860- */
48861- if (n) {
48862- if (clear_user(buffer + tsz - n,
48863- n))
48864+ elf_buf = kmalloc(tsz, GFP_KERNEL);
48865+ if (!elf_buf)
48866+ return -ENOMEM;
48867+ oldfs = get_fs();
48868+ set_fs(KERNEL_DS);
48869+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
48870+ set_fs(oldfs);
48871+ if (copy_to_user(buffer, elf_buf, tsz)) {
48872+ kfree(elf_buf);
48873 return -EFAULT;
48874+ }
48875 }
48876+ set_fs(oldfs);
48877+ kfree(elf_buf);
48878 } else {
48879 if (clear_user(buffer, tsz))
48880 return -EFAULT;
48881@@ -542,6 +546,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48882
48883 static int open_kcore(struct inode *inode, struct file *filp)
48884 {
48885+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
48886+ return -EPERM;
48887+#endif
48888 if (!capable(CAP_SYS_RAWIO))
48889 return -EPERM;
48890 if (kcore_need_update)
48891diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
48892index 80e4645..53e5fcf 100644
48893--- a/fs/proc/meminfo.c
48894+++ b/fs/proc/meminfo.c
48895@@ -158,7 +158,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
48896 vmi.used >> 10,
48897 vmi.largest_chunk >> 10
48898 #ifdef CONFIG_MEMORY_FAILURE
48899- ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
48900+ ,atomic_long_read_unchecked(&mce_bad_pages) << (PAGE_SHIFT - 10)
48901 #endif
48902 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
48903 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
48904diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
48905index b1822dd..df622cb 100644
48906--- a/fs/proc/nommu.c
48907+++ b/fs/proc/nommu.c
48908@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
48909 if (len < 1)
48910 len = 1;
48911 seq_printf(m, "%*c", len, ' ');
48912- seq_path(m, &file->f_path, "");
48913+ seq_path(m, &file->f_path, "\n\\");
48914 }
48915
48916 seq_putc(m, '\n');
48917diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
48918index f738024..876984a 100644
48919--- a/fs/proc/proc_net.c
48920+++ b/fs/proc/proc_net.c
48921@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(struct inode *dir)
48922 struct task_struct *task;
48923 struct nsproxy *ns;
48924 struct net *net = NULL;
48925+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48926+ const struct cred *cred = current_cred();
48927+#endif
48928+
48929+#ifdef CONFIG_GRKERNSEC_PROC_USER
48930+ if (cred->fsuid)
48931+ return net;
48932+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48933+ if (cred->fsuid && !in_group_p(CONFIG_GRKERNSEC_PROC_GID))
48934+ return net;
48935+#endif
48936
48937 rcu_read_lock();
48938 task = pid_task(proc_pid(dir), PIDTYPE_PID);
48939diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
48940index a6b6217..1e0579d 100644
48941--- a/fs/proc/proc_sysctl.c
48942+++ b/fs/proc/proc_sysctl.c
48943@@ -9,11 +9,13 @@
48944 #include <linux/namei.h>
48945 #include "internal.h"
48946
48947+extern __u32 gr_handle_sysctl(const struct ctl_table *table, const int op);
48948+
48949 static const struct dentry_operations proc_sys_dentry_operations;
48950 static const struct file_operations proc_sys_file_operations;
48951-static const struct inode_operations proc_sys_inode_operations;
48952+const struct inode_operations proc_sys_inode_operations;
48953 static const struct file_operations proc_sys_dir_file_operations;
48954-static const struct inode_operations proc_sys_dir_operations;
48955+const struct inode_operations proc_sys_dir_operations;
48956
48957 void proc_sys_poll_notify(struct ctl_table_poll *poll)
48958 {
48959@@ -131,8 +133,14 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
48960
48961 err = NULL;
48962 d_set_d_op(dentry, &proc_sys_dentry_operations);
48963+
48964+ gr_handle_proc_create(dentry, inode);
48965+
48966 d_add(dentry, inode);
48967
48968+ if (gr_handle_sysctl(p, MAY_EXEC))
48969+ err = ERR_PTR(-ENOENT);
48970+
48971 out:
48972 sysctl_head_finish(head);
48973 return err;
48974@@ -163,6 +171,12 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
48975 if (!table->proc_handler)
48976 goto out;
48977
48978+#ifdef CONFIG_GRKERNSEC
48979+ error = -EPERM;
48980+ if (write && !capable(CAP_SYS_ADMIN))
48981+ goto out;
48982+#endif
48983+
48984 /* careful: calling conventions are nasty here */
48985 res = count;
48986 error = table->proc_handler(table, write, buf, &res, ppos);
48987@@ -245,6 +259,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
48988 return -ENOMEM;
48989 } else {
48990 d_set_d_op(child, &proc_sys_dentry_operations);
48991+
48992+ gr_handle_proc_create(child, inode);
48993+
48994 d_add(child, inode);
48995 }
48996 } else {
48997@@ -273,6 +290,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
48998 if (*pos < file->f_pos)
48999 continue;
49000
49001+ if (gr_handle_sysctl(table, 0))
49002+ continue;
49003+
49004 res = proc_sys_fill_cache(file, dirent, filldir, head, table);
49005 if (res)
49006 return res;
49007@@ -398,6 +418,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
49008 if (IS_ERR(head))
49009 return PTR_ERR(head);
49010
49011+ if (table && gr_handle_sysctl(table, MAY_EXEC))
49012+ return -ENOENT;
49013+
49014 generic_fillattr(inode, stat);
49015 if (table)
49016 stat->mode = (stat->mode & S_IFMT) | table->mode;
49017@@ -420,13 +443,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
49018 .llseek = generic_file_llseek,
49019 };
49020
49021-static const struct inode_operations proc_sys_inode_operations = {
49022+const struct inode_operations proc_sys_inode_operations = {
49023 .permission = proc_sys_permission,
49024 .setattr = proc_sys_setattr,
49025 .getattr = proc_sys_getattr,
49026 };
49027
49028-static const struct inode_operations proc_sys_dir_operations = {
49029+const struct inode_operations proc_sys_dir_operations = {
49030 .lookup = proc_sys_lookup,
49031 .permission = proc_sys_permission,
49032 .setattr = proc_sys_setattr,
49033diff --git a/fs/proc/root.c b/fs/proc/root.c
49034index 03102d9..4ae347e 100644
49035--- a/fs/proc/root.c
49036+++ b/fs/proc/root.c
49037@@ -121,7 +121,15 @@ void __init proc_root_init(void)
49038 #ifdef CONFIG_PROC_DEVICETREE
49039 proc_device_tree_init();
49040 #endif
49041+#ifdef CONFIG_GRKERNSEC_PROC_ADD
49042+#ifdef CONFIG_GRKERNSEC_PROC_USER
49043+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
49044+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49045+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
49046+#endif
49047+#else
49048 proc_mkdir("bus", NULL);
49049+#endif
49050 proc_sys_init();
49051 }
49052
49053diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
49054index 7dcd2a2..b2f410e 100644
49055--- a/fs/proc/task_mmu.c
49056+++ b/fs/proc/task_mmu.c
49057@@ -11,6 +11,7 @@
49058 #include <linux/rmap.h>
49059 #include <linux/swap.h>
49060 #include <linux/swapops.h>
49061+#include <linux/grsecurity.h>
49062
49063 #include <asm/elf.h>
49064 #include <asm/uaccess.h>
49065@@ -52,8 +53,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
49066 "VmExe:\t%8lu kB\n"
49067 "VmLib:\t%8lu kB\n"
49068 "VmPTE:\t%8lu kB\n"
49069- "VmSwap:\t%8lu kB\n",
49070- hiwater_vm << (PAGE_SHIFT-10),
49071+ "VmSwap:\t%8lu kB\n"
49072+
49073+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
49074+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
49075+#endif
49076+
49077+ ,hiwater_vm << (PAGE_SHIFT-10),
49078 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
49079 mm->locked_vm << (PAGE_SHIFT-10),
49080 mm->pinned_vm << (PAGE_SHIFT-10),
49081@@ -62,7 +68,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
49082 data << (PAGE_SHIFT-10),
49083 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
49084 (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
49085- swap << (PAGE_SHIFT-10));
49086+ swap << (PAGE_SHIFT-10)
49087+
49088+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
49089+ , mm->context.user_cs_base, mm->context.user_cs_limit
49090+#endif
49091+
49092+ );
49093 }
49094
49095 unsigned long task_vsize(struct mm_struct *mm)
49096@@ -209,6 +221,12 @@ static int do_maps_open(struct inode *inode, struct file *file,
49097 return ret;
49098 }
49099
49100+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49101+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
49102+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
49103+ _mm->pax_flags & MF_PAX_SEGMEXEC))
49104+#endif
49105+
49106 static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
49107 {
49108 struct mm_struct *mm = vma->vm_mm;
49109@@ -227,13 +245,13 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
49110 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
49111 }
49112
49113- /* We don't show the stack guard page in /proc/maps */
49114+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49115+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
49116+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
49117+#else
49118 start = vma->vm_start;
49119- if (stack_guard_page_start(vma, start))
49120- start += PAGE_SIZE;
49121 end = vma->vm_end;
49122- if (stack_guard_page_end(vma, end))
49123- end -= PAGE_SIZE;
49124+#endif
49125
49126 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
49127 start,
49128@@ -242,7 +260,11 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
49129 flags & VM_WRITE ? 'w' : '-',
49130 flags & VM_EXEC ? 'x' : '-',
49131 flags & VM_MAYSHARE ? 's' : 'p',
49132+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49133+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
49134+#else
49135 pgoff,
49136+#endif
49137 MAJOR(dev), MINOR(dev), ino, &len);
49138
49139 /*
49140@@ -251,7 +273,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
49141 */
49142 if (file) {
49143 pad_len_spaces(m, len);
49144- seq_path(m, &file->f_path, "\n");
49145+ seq_path(m, &file->f_path, "\n\\");
49146 } else {
49147 const char *name = arch_vma_name(vma);
49148 if (!name) {
49149@@ -259,8 +281,9 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
49150 if (vma->vm_start <= mm->brk &&
49151 vma->vm_end >= mm->start_brk) {
49152 name = "[heap]";
49153- } else if (vma->vm_start <= mm->start_stack &&
49154- vma->vm_end >= mm->start_stack) {
49155+ } else if ((vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
49156+ (vma->vm_start <= mm->start_stack &&
49157+ vma->vm_end >= mm->start_stack)) {
49158 name = "[stack]";
49159 }
49160 } else {
49161@@ -281,6 +304,13 @@ static int show_map(struct seq_file *m, void *v)
49162 struct proc_maps_private *priv = m->private;
49163 struct task_struct *task = priv->task;
49164
49165+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49166+ if (current->exec_id != m->exec_id) {
49167+ gr_log_badprocpid("maps");
49168+ return 0;
49169+ }
49170+#endif
49171+
49172 show_map_vma(m, vma);
49173
49174 if (m->count < m->size) /* vma is copied successfully */
49175@@ -434,12 +464,23 @@ static int show_smap(struct seq_file *m, void *v)
49176 .private = &mss,
49177 };
49178
49179+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49180+ if (current->exec_id != m->exec_id) {
49181+ gr_log_badprocpid("smaps");
49182+ return 0;
49183+ }
49184+#endif
49185 memset(&mss, 0, sizeof mss);
49186- mss.vma = vma;
49187- /* mmap_sem is held in m_start */
49188- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
49189- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
49190-
49191+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49192+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
49193+#endif
49194+ mss.vma = vma;
49195+ /* mmap_sem is held in m_start */
49196+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
49197+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
49198+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49199+ }
49200+#endif
49201 show_map_vma(m, vma);
49202
49203 seq_printf(m,
49204@@ -457,7 +498,11 @@ static int show_smap(struct seq_file *m, void *v)
49205 "KernelPageSize: %8lu kB\n"
49206 "MMUPageSize: %8lu kB\n"
49207 "Locked: %8lu kB\n",
49208+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49209+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
49210+#else
49211 (vma->vm_end - vma->vm_start) >> 10,
49212+#endif
49213 mss.resident >> 10,
49214 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
49215 mss.shared_clean >> 10,
49216@@ -1015,6 +1060,13 @@ static int show_numa_map(struct seq_file *m, void *v)
49217 int n;
49218 char buffer[50];
49219
49220+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49221+ if (current->exec_id != m->exec_id) {
49222+ gr_log_badprocpid("numa_maps");
49223+ return 0;
49224+ }
49225+#endif
49226+
49227 if (!mm)
49228 return 0;
49229
49230@@ -1032,11 +1084,15 @@ static int show_numa_map(struct seq_file *m, void *v)
49231 mpol_to_str(buffer, sizeof(buffer), pol, 0);
49232 mpol_cond_put(pol);
49233
49234+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49235+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
49236+#else
49237 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
49238+#endif
49239
49240 if (file) {
49241 seq_printf(m, " file=");
49242- seq_path(m, &file->f_path, "\n\t= ");
49243+ seq_path(m, &file->f_path, "\n\t\\= ");
49244 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
49245 seq_printf(m, " heap");
49246 } else if (vma->vm_start <= mm->start_stack &&
49247diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
49248index 980de54..2a4db5f 100644
49249--- a/fs/proc/task_nommu.c
49250+++ b/fs/proc/task_nommu.c
49251@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
49252 else
49253 bytes += kobjsize(mm);
49254
49255- if (current->fs && current->fs->users > 1)
49256+ if (current->fs && atomic_read(&current->fs->users) > 1)
49257 sbytes += kobjsize(current->fs);
49258 else
49259 bytes += kobjsize(current->fs);
49260@@ -166,7 +166,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
49261
49262 if (file) {
49263 pad_len_spaces(m, len);
49264- seq_path(m, &file->f_path, "");
49265+ seq_path(m, &file->f_path, "\n\\");
49266 } else if (mm) {
49267 if (vma->vm_start <= mm->start_stack &&
49268 vma->vm_end >= mm->start_stack) {
49269diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
49270index d67908b..d13f6a6 100644
49271--- a/fs/quota/netlink.c
49272+++ b/fs/quota/netlink.c
49273@@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
49274 void quota_send_warning(short type, unsigned int id, dev_t dev,
49275 const char warntype)
49276 {
49277- static atomic_t seq;
49278+ static atomic_unchecked_t seq;
49279 struct sk_buff *skb;
49280 void *msg_head;
49281 int ret;
49282@@ -49,7 +49,7 @@ void quota_send_warning(short type, unsigned int id, dev_t dev,
49283 "VFS: Not enough memory to send quota warning.\n");
49284 return;
49285 }
49286- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
49287+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
49288 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
49289 if (!msg_head) {
49290 printk(KERN_ERR
49291diff --git a/fs/readdir.c b/fs/readdir.c
49292index 356f715..c918d38 100644
49293--- a/fs/readdir.c
49294+++ b/fs/readdir.c
49295@@ -17,6 +17,7 @@
49296 #include <linux/security.h>
49297 #include <linux/syscalls.h>
49298 #include <linux/unistd.h>
49299+#include <linux/namei.h>
49300
49301 #include <asm/uaccess.h>
49302
49303@@ -67,6 +68,7 @@ struct old_linux_dirent {
49304
49305 struct readdir_callback {
49306 struct old_linux_dirent __user * dirent;
49307+ struct file * file;
49308 int result;
49309 };
49310
49311@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
49312 buf->result = -EOVERFLOW;
49313 return -EOVERFLOW;
49314 }
49315+
49316+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49317+ return 0;
49318+
49319 buf->result++;
49320 dirent = buf->dirent;
49321 if (!access_ok(VERIFY_WRITE, dirent,
49322@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
49323
49324 buf.result = 0;
49325 buf.dirent = dirent;
49326+ buf.file = file;
49327
49328 error = vfs_readdir(file, fillonedir, &buf);
49329 if (buf.result)
49330@@ -142,6 +149,7 @@ struct linux_dirent {
49331 struct getdents_callback {
49332 struct linux_dirent __user * current_dir;
49333 struct linux_dirent __user * previous;
49334+ struct file * file;
49335 int count;
49336 int error;
49337 };
49338@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
49339 buf->error = -EOVERFLOW;
49340 return -EOVERFLOW;
49341 }
49342+
49343+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49344+ return 0;
49345+
49346 dirent = buf->previous;
49347 if (dirent) {
49348 if (__put_user(offset, &dirent->d_off))
49349@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
49350 buf.previous = NULL;
49351 buf.count = count;
49352 buf.error = 0;
49353+ buf.file = file;
49354
49355 error = vfs_readdir(file, filldir, &buf);
49356 if (error >= 0)
49357@@ -229,6 +242,7 @@ out:
49358 struct getdents_callback64 {
49359 struct linux_dirent64 __user * current_dir;
49360 struct linux_dirent64 __user * previous;
49361+ struct file *file;
49362 int count;
49363 int error;
49364 };
49365@@ -244,6 +258,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
49366 buf->error = -EINVAL; /* only used if we fail.. */
49367 if (reclen > buf->count)
49368 return -EINVAL;
49369+
49370+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49371+ return 0;
49372+
49373 dirent = buf->previous;
49374 if (dirent) {
49375 if (__put_user(offset, &dirent->d_off))
49376@@ -291,6 +309,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
49377
49378 buf.current_dir = dirent;
49379 buf.previous = NULL;
49380+ buf.file = file;
49381 buf.count = count;
49382 buf.error = 0;
49383
49384@@ -299,7 +318,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
49385 error = buf.error;
49386 lastdirent = buf.previous;
49387 if (lastdirent) {
49388- typeof(lastdirent->d_off) d_off = file->f_pos;
49389+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
49390 if (__put_user(d_off, &lastdirent->d_off))
49391 error = -EFAULT;
49392 else
49393diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
49394index 60c0804..d814f98 100644
49395--- a/fs/reiserfs/do_balan.c
49396+++ b/fs/reiserfs/do_balan.c
49397@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
49398 return;
49399 }
49400
49401- atomic_inc(&(fs_generation(tb->tb_sb)));
49402+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
49403 do_balance_starts(tb);
49404
49405 /* balance leaf returns 0 except if combining L R and S into
49406diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
49407index 7a99811..a7c96c4 100644
49408--- a/fs/reiserfs/procfs.c
49409+++ b/fs/reiserfs/procfs.c
49410@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
49411 "SMALL_TAILS " : "NO_TAILS ",
49412 replay_only(sb) ? "REPLAY_ONLY " : "",
49413 convert_reiserfs(sb) ? "CONV " : "",
49414- atomic_read(&r->s_generation_counter),
49415+ atomic_read_unchecked(&r->s_generation_counter),
49416 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
49417 SF(s_do_balance), SF(s_unneeded_left_neighbor),
49418 SF(s_good_search_by_key_reada), SF(s_bmaps),
49419diff --git a/fs/select.c b/fs/select.c
49420index d33418f..2a5345e 100644
49421--- a/fs/select.c
49422+++ b/fs/select.c
49423@@ -20,6 +20,7 @@
49424 #include <linux/module.h>
49425 #include <linux/slab.h>
49426 #include <linux/poll.h>
49427+#include <linux/security.h>
49428 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
49429 #include <linux/file.h>
49430 #include <linux/fdtable.h>
49431@@ -837,6 +838,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
49432 struct poll_list *walk = head;
49433 unsigned long todo = nfds;
49434
49435+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
49436 if (nfds > rlimit(RLIMIT_NOFILE))
49437 return -EINVAL;
49438
49439diff --git a/fs/seq_file.c b/fs/seq_file.c
49440index dba43c3..4b3f701 100644
49441--- a/fs/seq_file.c
49442+++ b/fs/seq_file.c
49443@@ -9,6 +9,7 @@
49444 #include <linux/module.h>
49445 #include <linux/seq_file.h>
49446 #include <linux/slab.h>
49447+#include <linux/sched.h>
49448
49449 #include <asm/uaccess.h>
49450 #include <asm/page.h>
49451@@ -40,6 +41,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
49452 memset(p, 0, sizeof(*p));
49453 mutex_init(&p->lock);
49454 p->op = op;
49455+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49456+ p->exec_id = current->exec_id;
49457+#endif
49458
49459 /*
49460 * Wrappers around seq_open(e.g. swaps_open) need to be
49461@@ -549,7 +553,7 @@ static void single_stop(struct seq_file *p, void *v)
49462 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
49463 void *data)
49464 {
49465- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
49466+ seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
49467 int res = -ENOMEM;
49468
49469 if (op) {
49470diff --git a/fs/splice.c b/fs/splice.c
49471index fa2defa..8601650 100644
49472--- a/fs/splice.c
49473+++ b/fs/splice.c
49474@@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
49475 pipe_lock(pipe);
49476
49477 for (;;) {
49478- if (!pipe->readers) {
49479+ if (!atomic_read(&pipe->readers)) {
49480 send_sig(SIGPIPE, current, 0);
49481 if (!ret)
49482 ret = -EPIPE;
49483@@ -248,9 +248,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
49484 do_wakeup = 0;
49485 }
49486
49487- pipe->waiting_writers++;
49488+ atomic_inc(&pipe->waiting_writers);
49489 pipe_wait(pipe);
49490- pipe->waiting_writers--;
49491+ atomic_dec(&pipe->waiting_writers);
49492 }
49493
49494 pipe_unlock(pipe);
49495@@ -560,7 +560,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
49496 old_fs = get_fs();
49497 set_fs(get_ds());
49498 /* The cast to a user pointer is valid due to the set_fs() */
49499- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
49500+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
49501 set_fs(old_fs);
49502
49503 return res;
49504@@ -575,7 +575,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
49505 old_fs = get_fs();
49506 set_fs(get_ds());
49507 /* The cast to a user pointer is valid due to the set_fs() */
49508- res = vfs_write(file, (const char __user *)buf, count, &pos);
49509+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
49510 set_fs(old_fs);
49511
49512 return res;
49513@@ -626,7 +626,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
49514 goto err;
49515
49516 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
49517- vec[i].iov_base = (void __user *) page_address(page);
49518+ vec[i].iov_base = (void __force_user *) page_address(page);
49519 vec[i].iov_len = this_len;
49520 spd.pages[i] = page;
49521 spd.nr_pages++;
49522@@ -846,10 +846,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
49523 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
49524 {
49525 while (!pipe->nrbufs) {
49526- if (!pipe->writers)
49527+ if (!atomic_read(&pipe->writers))
49528 return 0;
49529
49530- if (!pipe->waiting_writers && sd->num_spliced)
49531+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
49532 return 0;
49533
49534 if (sd->flags & SPLICE_F_NONBLOCK)
49535@@ -1182,7 +1182,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
49536 * out of the pipe right after the splice_to_pipe(). So set
49537 * PIPE_READERS appropriately.
49538 */
49539- pipe->readers = 1;
49540+ atomic_set(&pipe->readers, 1);
49541
49542 current->splice_pipe = pipe;
49543 }
49544@@ -1734,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49545 ret = -ERESTARTSYS;
49546 break;
49547 }
49548- if (!pipe->writers)
49549+ if (!atomic_read(&pipe->writers))
49550 break;
49551- if (!pipe->waiting_writers) {
49552+ if (!atomic_read(&pipe->waiting_writers)) {
49553 if (flags & SPLICE_F_NONBLOCK) {
49554 ret = -EAGAIN;
49555 break;
49556@@ -1768,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49557 pipe_lock(pipe);
49558
49559 while (pipe->nrbufs >= pipe->buffers) {
49560- if (!pipe->readers) {
49561+ if (!atomic_read(&pipe->readers)) {
49562 send_sig(SIGPIPE, current, 0);
49563 ret = -EPIPE;
49564 break;
49565@@ -1781,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49566 ret = -ERESTARTSYS;
49567 break;
49568 }
49569- pipe->waiting_writers++;
49570+ atomic_inc(&pipe->waiting_writers);
49571 pipe_wait(pipe);
49572- pipe->waiting_writers--;
49573+ atomic_dec(&pipe->waiting_writers);
49574 }
49575
49576 pipe_unlock(pipe);
49577@@ -1819,14 +1819,14 @@ retry:
49578 pipe_double_lock(ipipe, opipe);
49579
49580 do {
49581- if (!opipe->readers) {
49582+ if (!atomic_read(&opipe->readers)) {
49583 send_sig(SIGPIPE, current, 0);
49584 if (!ret)
49585 ret = -EPIPE;
49586 break;
49587 }
49588
49589- if (!ipipe->nrbufs && !ipipe->writers)
49590+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
49591 break;
49592
49593 /*
49594@@ -1923,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
49595 pipe_double_lock(ipipe, opipe);
49596
49597 do {
49598- if (!opipe->readers) {
49599+ if (!atomic_read(&opipe->readers)) {
49600 send_sig(SIGPIPE, current, 0);
49601 if (!ret)
49602 ret = -EPIPE;
49603@@ -1968,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
49604 * return EAGAIN if we have the potential of some data in the
49605 * future, otherwise just return 0
49606 */
49607- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
49608+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
49609 ret = -EAGAIN;
49610
49611 pipe_unlock(ipipe);
49612diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
49613index a475983..9c6a1f0 100644
49614--- a/fs/sysfs/bin.c
49615+++ b/fs/sysfs/bin.c
49616@@ -67,6 +67,8 @@ fill_read(struct file *file, char *buffer, loff_t off, size_t count)
49617 }
49618
49619 static ssize_t
49620+read(struct file *file, char __user *userbuf, size_t bytes, loff_t *off) __size_overflow(3);
49621+static ssize_t
49622 read(struct file *file, char __user *userbuf, size_t bytes, loff_t *off)
49623 {
49624 struct bin_buffer *bb = file->private_data;
49625diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
49626index 7fdf6a7..e6cd8ad 100644
49627--- a/fs/sysfs/dir.c
49628+++ b/fs/sysfs/dir.c
49629@@ -642,6 +642,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
49630 struct sysfs_dirent *sd;
49631 int rc;
49632
49633+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
49634+ const char *parent_name = parent_sd->s_name;
49635+
49636+ mode = S_IFDIR | S_IRWXU;
49637+
49638+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
49639+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
49640+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse"))) ||
49641+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
49642+ mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
49643+#endif
49644+
49645 /* allocate */
49646 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
49647 if (!sd)
49648diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
49649index 779789a..f58193c 100644
49650--- a/fs/sysfs/file.c
49651+++ b/fs/sysfs/file.c
49652@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
49653
49654 struct sysfs_open_dirent {
49655 atomic_t refcnt;
49656- atomic_t event;
49657+ atomic_unchecked_t event;
49658 wait_queue_head_t poll;
49659 struct list_head buffers; /* goes through sysfs_buffer.list */
49660 };
49661@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
49662 if (!sysfs_get_active(attr_sd))
49663 return -ENODEV;
49664
49665- buffer->event = atomic_read(&attr_sd->s_attr.open->event);
49666+ buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
49667 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
49668
49669 sysfs_put_active(attr_sd);
49670@@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
49671 return -ENOMEM;
49672
49673 atomic_set(&new_od->refcnt, 0);
49674- atomic_set(&new_od->event, 1);
49675+ atomic_set_unchecked(&new_od->event, 1);
49676 init_waitqueue_head(&new_od->poll);
49677 INIT_LIST_HEAD(&new_od->buffers);
49678 goto retry;
49679@@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
49680
49681 sysfs_put_active(attr_sd);
49682
49683- if (buffer->event != atomic_read(&od->event))
49684+ if (buffer->event != atomic_read_unchecked(&od->event))
49685 goto trigger;
49686
49687 return DEFAULT_POLLMASK;
49688@@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
49689
49690 od = sd->s_attr.open;
49691 if (od) {
49692- atomic_inc(&od->event);
49693+ atomic_inc_unchecked(&od->event);
49694 wake_up_interruptible(&od->poll);
49695 }
49696
49697diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
49698index a7ac78f..02158e1 100644
49699--- a/fs/sysfs/symlink.c
49700+++ b/fs/sysfs/symlink.c
49701@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
49702
49703 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
49704 {
49705- char *page = nd_get_link(nd);
49706+ const char *page = nd_get_link(nd);
49707 if (!IS_ERR(page))
49708 free_page((unsigned long)page);
49709 }
49710diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
49711index b09ba2d..1cad1a8 100644
49712--- a/fs/ubifs/debug.c
49713+++ b/fs/ubifs/debug.c
49714@@ -2817,6 +2817,7 @@ static ssize_t dfs_file_read(struct file *file, char __user *u, size_t count,
49715 * debugfs file. Returns %0 or %1 in case of success and a negative error code
49716 * in case of failure.
49717 */
49718+static int interpret_user_input(const char __user *u, size_t count) __size_overflow(2);
49719 static int interpret_user_input(const char __user *u, size_t count)
49720 {
49721 size_t buf_size;
49722@@ -2835,6 +2836,8 @@ static int interpret_user_input(const char __user *u, size_t count)
49723 }
49724
49725 static ssize_t dfs_file_write(struct file *file, const char __user *u,
49726+ size_t count, loff_t *ppos) __size_overflow(3);
49727+static ssize_t dfs_file_write(struct file *file, const char __user *u,
49728 size_t count, loff_t *ppos)
49729 {
49730 struct ubifs_info *c = file->private_data;
49731diff --git a/fs/udf/file.c b/fs/udf/file.c
49732index dca0c38..d567b84 100644
49733--- a/fs/udf/file.c
49734+++ b/fs/udf/file.c
49735@@ -201,12 +201,10 @@ out:
49736 static int udf_release_file(struct inode *inode, struct file *filp)
49737 {
49738 if (filp->f_mode & FMODE_WRITE) {
49739- mutex_lock(&inode->i_mutex);
49740 down_write(&UDF_I(inode)->i_data_sem);
49741 udf_discard_prealloc(inode);
49742 udf_truncate_tail_extent(inode);
49743 up_write(&UDF_I(inode)->i_data_sem);
49744- mutex_unlock(&inode->i_mutex);
49745 }
49746 return 0;
49747 }
49748diff --git a/fs/udf/misc.c b/fs/udf/misc.c
49749index c175b4d..8f36a16 100644
49750--- a/fs/udf/misc.c
49751+++ b/fs/udf/misc.c
49752@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
49753
49754 u8 udf_tag_checksum(const struct tag *t)
49755 {
49756- u8 *data = (u8 *)t;
49757+ const u8 *data = (const u8 *)t;
49758 u8 checksum = 0;
49759 int i;
49760 for (i = 0; i < sizeof(struct tag); ++i)
49761diff --git a/fs/utimes.c b/fs/utimes.c
49762index ba653f3..06ea4b1 100644
49763--- a/fs/utimes.c
49764+++ b/fs/utimes.c
49765@@ -1,6 +1,7 @@
49766 #include <linux/compiler.h>
49767 #include <linux/file.h>
49768 #include <linux/fs.h>
49769+#include <linux/security.h>
49770 #include <linux/linkage.h>
49771 #include <linux/mount.h>
49772 #include <linux/namei.h>
49773@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
49774 goto mnt_drop_write_and_out;
49775 }
49776 }
49777+
49778+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
49779+ error = -EACCES;
49780+ goto mnt_drop_write_and_out;
49781+ }
49782+
49783 mutex_lock(&inode->i_mutex);
49784 error = notify_change(path->dentry, &newattrs);
49785 mutex_unlock(&inode->i_mutex);
49786diff --git a/fs/xattr.c b/fs/xattr.c
49787index 67583de..c5aad14 100644
49788--- a/fs/xattr.c
49789+++ b/fs/xattr.c
49790@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
49791 * Extended attribute SET operations
49792 */
49793 static long
49794-setxattr(struct dentry *d, const char __user *name, const void __user *value,
49795+setxattr(struct path *path, const char __user *name, const void __user *value,
49796 size_t size, int flags)
49797 {
49798 int error;
49799@@ -339,7 +339,13 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
49800 return PTR_ERR(kvalue);
49801 }
49802
49803- error = vfs_setxattr(d, kname, kvalue, size, flags);
49804+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
49805+ error = -EACCES;
49806+ goto out;
49807+ }
49808+
49809+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
49810+out:
49811 kfree(kvalue);
49812 return error;
49813 }
49814@@ -356,7 +362,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
49815 return error;
49816 error = mnt_want_write(path.mnt);
49817 if (!error) {
49818- error = setxattr(path.dentry, name, value, size, flags);
49819+ error = setxattr(&path, name, value, size, flags);
49820 mnt_drop_write(path.mnt);
49821 }
49822 path_put(&path);
49823@@ -375,7 +381,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
49824 return error;
49825 error = mnt_want_write(path.mnt);
49826 if (!error) {
49827- error = setxattr(path.dentry, name, value, size, flags);
49828+ error = setxattr(&path, name, value, size, flags);
49829 mnt_drop_write(path.mnt);
49830 }
49831 path_put(&path);
49832@@ -386,17 +392,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
49833 const void __user *,value, size_t, size, int, flags)
49834 {
49835 struct file *f;
49836- struct dentry *dentry;
49837 int error = -EBADF;
49838
49839 f = fget(fd);
49840 if (!f)
49841 return error;
49842- dentry = f->f_path.dentry;
49843- audit_inode(NULL, dentry);
49844+ audit_inode(NULL, f->f_path.dentry);
49845 error = mnt_want_write_file(f);
49846 if (!error) {
49847- error = setxattr(dentry, name, value, size, flags);
49848+ error = setxattr(&f->f_path, name, value, size, flags);
49849 mnt_drop_write(f->f_path.mnt);
49850 }
49851 fput(f);
49852diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
49853index 8d5a506..7f62712 100644
49854--- a/fs/xattr_acl.c
49855+++ b/fs/xattr_acl.c
49856@@ -17,8 +17,8 @@
49857 struct posix_acl *
49858 posix_acl_from_xattr(const void *value, size_t size)
49859 {
49860- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
49861- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
49862+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
49863+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
49864 int count;
49865 struct posix_acl *acl;
49866 struct posix_acl_entry *acl_e;
49867diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
49868index d0ab788..827999b 100644
49869--- a/fs/xfs/xfs_bmap.c
49870+++ b/fs/xfs/xfs_bmap.c
49871@@ -190,7 +190,7 @@ xfs_bmap_validate_ret(
49872 int nmap,
49873 int ret_nmap);
49874 #else
49875-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
49876+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
49877 #endif /* DEBUG */
49878
49879 STATIC int
49880diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
49881index 79d05e8..e3e5861 100644
49882--- a/fs/xfs/xfs_dir2_sf.c
49883+++ b/fs/xfs/xfs_dir2_sf.c
49884@@ -852,7 +852,15 @@ xfs_dir2_sf_getdents(
49885 }
49886
49887 ino = xfs_dir2_sfe_get_ino(sfp, sfep);
49888- if (filldir(dirent, (char *)sfep->name, sfep->namelen,
49889+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
49890+ char name[sfep->namelen];
49891+ memcpy(name, sfep->name, sfep->namelen);
49892+ if (filldir(dirent, name, sfep->namelen,
49893+ off & 0x7fffffff, ino, DT_UNKNOWN)) {
49894+ *offset = off & 0x7fffffff;
49895+ return 0;
49896+ }
49897+ } else if (filldir(dirent, (char *)sfep->name, sfep->namelen,
49898 off & 0x7fffffff, ino, DT_UNKNOWN)) {
49899 *offset = off & 0x7fffffff;
49900 return 0;
49901diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
49902index d99a905..9f88202 100644
49903--- a/fs/xfs/xfs_ioctl.c
49904+++ b/fs/xfs/xfs_ioctl.c
49905@@ -128,7 +128,7 @@ xfs_find_handle(
49906 }
49907
49908 error = -EFAULT;
49909- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
49910+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
49911 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
49912 goto out_put;
49913
49914diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
49915index 23ce927..e274cc1 100644
49916--- a/fs/xfs/xfs_iops.c
49917+++ b/fs/xfs/xfs_iops.c
49918@@ -447,7 +447,7 @@ xfs_vn_put_link(
49919 struct nameidata *nd,
49920 void *p)
49921 {
49922- char *s = nd_get_link(nd);
49923+ const char *s = nd_get_link(nd);
49924
49925 if (!IS_ERR(s))
49926 kfree(s);
49927diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
49928new file mode 100644
49929index 0000000..4089e05
49930--- /dev/null
49931+++ b/grsecurity/Kconfig
49932@@ -0,0 +1,1078 @@
49933+#
49934+# grecurity configuration
49935+#
49936+
49937+menu "Grsecurity"
49938+
49939+config GRKERNSEC
49940+ bool "Grsecurity"
49941+ select CRYPTO
49942+ select CRYPTO_SHA256
49943+ help
49944+ If you say Y here, you will be able to configure many features
49945+ that will enhance the security of your system. It is highly
49946+ recommended that you say Y here and read through the help
49947+ for each option so that you fully understand the features and
49948+ can evaluate their usefulness for your machine.
49949+
49950+choice
49951+ prompt "Security Level"
49952+ depends on GRKERNSEC
49953+ default GRKERNSEC_CUSTOM
49954+
49955+config GRKERNSEC_LOW
49956+ bool "Low"
49957+ select GRKERNSEC_LINK
49958+ select GRKERNSEC_FIFO
49959+ select GRKERNSEC_RANDNET
49960+ select GRKERNSEC_DMESG
49961+ select GRKERNSEC_CHROOT
49962+ select GRKERNSEC_CHROOT_CHDIR
49963+
49964+ help
49965+ If you choose this option, several of the grsecurity options will
49966+ be enabled that will give you greater protection against a number
49967+ of attacks, while assuring that none of your software will have any
49968+ conflicts with the additional security measures. If you run a lot
49969+ of unusual software, or you are having problems with the higher
49970+ security levels, you should say Y here. With this option, the
49971+ following features are enabled:
49972+
49973+ - Linking restrictions
49974+ - FIFO restrictions
49975+ - Restricted dmesg
49976+ - Enforced chdir("/") on chroot
49977+ - Runtime module disabling
49978+
49979+config GRKERNSEC_MEDIUM
49980+ bool "Medium"
49981+ select PAX
49982+ select PAX_EI_PAX
49983+ select PAX_PT_PAX_FLAGS
49984+ select PAX_HAVE_ACL_FLAGS
49985+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
49986+ select GRKERNSEC_CHROOT
49987+ select GRKERNSEC_CHROOT_SYSCTL
49988+ select GRKERNSEC_LINK
49989+ select GRKERNSEC_FIFO
49990+ select GRKERNSEC_DMESG
49991+ select GRKERNSEC_RANDNET
49992+ select GRKERNSEC_FORKFAIL
49993+ select GRKERNSEC_TIME
49994+ select GRKERNSEC_SIGNAL
49995+ select GRKERNSEC_CHROOT
49996+ select GRKERNSEC_CHROOT_UNIX
49997+ select GRKERNSEC_CHROOT_MOUNT
49998+ select GRKERNSEC_CHROOT_PIVOT
49999+ select GRKERNSEC_CHROOT_DOUBLE
50000+ select GRKERNSEC_CHROOT_CHDIR
50001+ select GRKERNSEC_CHROOT_MKNOD
50002+ select GRKERNSEC_PROC
50003+ select GRKERNSEC_PROC_USERGROUP
50004+ select PAX_RANDUSTACK
50005+ select PAX_ASLR
50006+ select PAX_RANDMMAP
50007+ select PAX_REFCOUNT if (X86 || SPARC64)
50008+ select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
50009+
50010+ help
50011+ If you say Y here, several features in addition to those included
50012+ in the low additional security level will be enabled. These
50013+ features provide even more security to your system, though in rare
50014+ cases they may be incompatible with very old or poorly written
50015+ software. If you enable this option, make sure that your auth
50016+ service (identd) is running as gid 1001. With this option,
50017+ the following features (in addition to those provided in the
50018+ low additional security level) will be enabled:
50019+
50020+ - Failed fork logging
50021+ - Time change logging
50022+ - Signal logging
50023+ - Deny mounts in chroot
50024+ - Deny double chrooting
50025+ - Deny sysctl writes in chroot
50026+ - Deny mknod in chroot
50027+ - Deny access to abstract AF_UNIX sockets out of chroot
50028+ - Deny pivot_root in chroot
50029+ - Denied reads/writes of /dev/kmem, /dev/mem, and /dev/port
50030+ - /proc restrictions with special GID set to 10 (usually wheel)
50031+ - Address Space Layout Randomization (ASLR)
50032+ - Prevent exploitation of most refcount overflows
50033+ - Bounds checking of copying between the kernel and userland
50034+
50035+config GRKERNSEC_HIGH
50036+ bool "High"
50037+ select GRKERNSEC_LINK
50038+ select GRKERNSEC_FIFO
50039+ select GRKERNSEC_DMESG
50040+ select GRKERNSEC_FORKFAIL
50041+ select GRKERNSEC_TIME
50042+ select GRKERNSEC_SIGNAL
50043+ select GRKERNSEC_CHROOT
50044+ select GRKERNSEC_CHROOT_SHMAT
50045+ select GRKERNSEC_CHROOT_UNIX
50046+ select GRKERNSEC_CHROOT_MOUNT
50047+ select GRKERNSEC_CHROOT_FCHDIR
50048+ select GRKERNSEC_CHROOT_PIVOT
50049+ select GRKERNSEC_CHROOT_DOUBLE
50050+ select GRKERNSEC_CHROOT_CHDIR
50051+ select GRKERNSEC_CHROOT_MKNOD
50052+ select GRKERNSEC_CHROOT_CAPS
50053+ select GRKERNSEC_CHROOT_SYSCTL
50054+ select GRKERNSEC_CHROOT_FINDTASK
50055+ select GRKERNSEC_SYSFS_RESTRICT
50056+ select GRKERNSEC_PROC
50057+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
50058+ select GRKERNSEC_HIDESYM
50059+ select GRKERNSEC_BRUTE
50060+ select GRKERNSEC_PROC_USERGROUP
50061+ select GRKERNSEC_KMEM
50062+ select GRKERNSEC_RESLOG
50063+ select GRKERNSEC_RANDNET
50064+ select GRKERNSEC_PROC_ADD
50065+ select GRKERNSEC_CHROOT_CHMOD
50066+ select GRKERNSEC_CHROOT_NICE
50067+ select GRKERNSEC_SETXID
50068+ select GRKERNSEC_AUDIT_MOUNT
50069+ select GRKERNSEC_MODHARDEN if (MODULES)
50070+ select GRKERNSEC_HARDEN_PTRACE
50071+ select GRKERNSEC_PTRACE_READEXEC
50072+ select GRKERNSEC_VM86 if (X86_32)
50073+ select GRKERNSEC_KERN_LOCKOUT if (X86 || ARM || PPC || SPARC)
50074+ select PAX
50075+ select PAX_RANDUSTACK
50076+ select PAX_ASLR
50077+ select PAX_RANDMMAP
50078+ select PAX_NOEXEC
50079+ select PAX_MPROTECT
50080+ select PAX_EI_PAX
50081+ select PAX_PT_PAX_FLAGS
50082+ select PAX_HAVE_ACL_FLAGS
50083+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
50084+ select PAX_MEMORY_UDEREF if (X86 && !XEN)
50085+ select PAX_RANDKSTACK if (X86_TSC && X86)
50086+ select PAX_SEGMEXEC if (X86_32)
50087+ select PAX_PAGEEXEC
50088+ select PAX_EMUPLT if (ALPHA || PARISC || SPARC)
50089+ select PAX_EMUTRAMP if (PARISC)
50090+ select PAX_EMUSIGRT if (PARISC)
50091+ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
50092+ select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
50093+ select PAX_REFCOUNT if (X86 || SPARC64)
50094+ select PAX_USERCOPY if ((X86 || PPC || SPARC || ARM) && (SLAB || SLUB || SLOB))
50095+ help
50096+ If you say Y here, many of the features of grsecurity will be
50097+ enabled, which will protect you against many kinds of attacks
50098+ against your system. The heightened security comes at a cost
50099+ of an increased chance of incompatibilities with rare software
50100+ on your machine. Since this security level enables PaX, you should
50101+ view <http://pax.grsecurity.net> and read about the PaX
50102+ project. While you are there, download chpax and run it on
50103+ binaries that cause problems with PaX. Also remember that
50104+ since the /proc restrictions are enabled, you must run your
50105+ identd as gid 1001. This security level enables the following
50106+ features in addition to those listed in the low and medium
50107+ security levels:
50108+
50109+ - Additional /proc restrictions
50110+ - Chmod restrictions in chroot
50111+ - No signals, ptrace, or viewing of processes outside of chroot
50112+ - Capability restrictions in chroot
50113+ - Deny fchdir out of chroot
50114+ - Priority restrictions in chroot
50115+ - Segmentation-based implementation of PaX
50116+ - Mprotect restrictions
50117+ - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
50118+ - Kernel stack randomization
50119+ - Mount/unmount/remount logging
50120+ - Kernel symbol hiding
50121+ - Hardening of module auto-loading
50122+ - Ptrace restrictions
50123+ - Restricted vm86 mode
50124+ - Restricted sysfs/debugfs
50125+ - Active kernel exploit response
50126+
50127+config GRKERNSEC_CUSTOM
50128+ bool "Custom"
50129+ help
50130+ If you say Y here, you will be able to configure every grsecurity
50131+ option, which allows you to enable many more features that aren't
50132+ covered in the basic security levels. These additional features
50133+ include TPE, socket restrictions, and the sysctl system for
50134+ grsecurity. It is advised that you read through the help for
50135+ each option to determine its usefulness in your situation.
50136+
50137+endchoice
50138+
50139+menu "Memory Protections"
50140+depends on GRKERNSEC
50141+
50142+config GRKERNSEC_KMEM
50143+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
50144+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
50145+ help
50146+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
50147+ be written to or read from to modify or leak the contents of the running
50148+ kernel. /dev/port will also not be allowed to be opened. If you have module
50149+ support disabled, enabling this will close up four ways that are
50150+ currently used to insert malicious code into the running kernel.
50151+ Even with all these features enabled, we still highly recommend that
50152+ you use the RBAC system, as it is still possible for an attacker to
50153+ modify the running kernel through privileged I/O granted by ioperm/iopl.
50154+ If you are not using XFree86, you may be able to stop this additional
50155+ case by enabling the 'Disable privileged I/O' option. Though nothing
50156+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
50157+ but only to video memory, which is the only writing we allow in this
50158+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
50159+ not be allowed to mprotect it with PROT_WRITE later.
50160+ It is highly recommended that you say Y here if you meet all the
50161+ conditions above.
50162+
50163+config GRKERNSEC_VM86
50164+ bool "Restrict VM86 mode"
50165+ depends on X86_32
50166+
50167+ help
50168+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
50169+ make use of a special execution mode on 32bit x86 processors called
50170+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
50171+ video cards and will still work with this option enabled. The purpose
50172+ of the option is to prevent exploitation of emulation errors in
50173+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
50174+ Nearly all users should be able to enable this option.
50175+
50176+config GRKERNSEC_IO
50177+ bool "Disable privileged I/O"
50178+ depends on X86
50179+ select RTC_CLASS
50180+ select RTC_INTF_DEV
50181+ select RTC_DRV_CMOS
50182+
50183+ help
50184+ If you say Y here, all ioperm and iopl calls will return an error.
50185+ Ioperm and iopl can be used to modify the running kernel.
50186+ Unfortunately, some programs need this access to operate properly,
50187+ the most notable of which are XFree86 and hwclock. hwclock can be
50188+ remedied by having RTC support in the kernel, so real-time
50189+ clock support is enabled if this option is enabled, to ensure
50190+ that hwclock operates correctly. XFree86 still will not
50191+ operate correctly with this option enabled, so DO NOT CHOOSE Y
50192+ IF YOU USE XFree86. If you use XFree86 and you still want to
50193+ protect your kernel against modification, use the RBAC system.
50194+
50195+config GRKERNSEC_PROC_MEMMAP
50196+ bool "Harden ASLR against information leaks and entropy reduction"
50197+ default y if (PAX_NOEXEC || PAX_ASLR)
50198+ depends on PAX_NOEXEC || PAX_ASLR
50199+ help
50200+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
50201+ give no information about the addresses of its mappings if
50202+ PaX features that rely on random addresses are enabled on the task.
50203+ In addition to sanitizing this information and disabling other
50204+ dangerous sources of information, this option causes reads of sensitive
50205+ /proc/<pid> entries where the file descriptor was opened in a different
50206+ task than the one performing the read. Such attempts are logged.
50207+ This option also limits argv/env strings for suid/sgid binaries
50208+ to 512KB to prevent a complete exhaustion of the stack entropy provided
50209+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
50210+ binaries to prevent alternative mmap layouts from being abused.
50211+
50212+ If you use PaX it is essential that you say Y here as it closes up
50213+ several holes that make full ASLR useless locally.
50214+
50215+config GRKERNSEC_BRUTE
50216+ bool "Deter exploit bruteforcing"
50217+ help
50218+ If you say Y here, attempts to bruteforce exploits against forking
50219+ daemons such as apache or sshd, as well as against suid/sgid binaries
50220+ will be deterred. When a child of a forking daemon is killed by PaX
50221+ or crashes due to an illegal instruction or other suspicious signal,
50222+ the parent process will be delayed 30 seconds upon every subsequent
50223+ fork until the administrator is able to assess the situation and
50224+ restart the daemon.
50225+ In the suid/sgid case, the attempt is logged, the user has all their
50226+ processes terminated, and they are prevented from executing any further
50227+ processes for 15 minutes.
50228+ It is recommended that you also enable signal logging in the auditing
50229+ section so that logs are generated when a process triggers a suspicious
50230+ signal.
50231+ If the sysctl option is enabled, a sysctl option with name
50232+ "deter_bruteforce" is created.
50233+
50234+
50235+config GRKERNSEC_MODHARDEN
50236+ bool "Harden module auto-loading"
50237+ depends on MODULES
50238+ help
50239+ If you say Y here, module auto-loading in response to use of some
50240+ feature implemented by an unloaded module will be restricted to
50241+ root users. Enabling this option helps defend against attacks
50242+ by unprivileged users who abuse the auto-loading behavior to
50243+ cause a vulnerable module to load that is then exploited.
50244+
50245+ If this option prevents a legitimate use of auto-loading for a
50246+ non-root user, the administrator can execute modprobe manually
50247+ with the exact name of the module mentioned in the alert log.
50248+ Alternatively, the administrator can add the module to the list
50249+ of modules loaded at boot by modifying init scripts.
50250+
50251+ Modification of init scripts will most likely be needed on
50252+ Ubuntu servers with encrypted home directory support enabled,
50253+ as the first non-root user logging in will cause the ecb(aes),
50254+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
50255+
50256+config GRKERNSEC_HIDESYM
50257+ bool "Hide kernel symbols"
50258+ help
50259+ If you say Y here, getting information on loaded modules, and
50260+ displaying all kernel symbols through a syscall will be restricted
50261+ to users with CAP_SYS_MODULE. For software compatibility reasons,
50262+ /proc/kallsyms will be restricted to the root user. The RBAC
50263+ system can hide that entry even from root.
50264+
50265+ This option also prevents leaking of kernel addresses through
50266+ several /proc entries.
50267+
50268+ Note that this option is only effective provided the following
50269+ conditions are met:
50270+ 1) The kernel using grsecurity is not precompiled by some distribution
50271+ 2) You have also enabled GRKERNSEC_DMESG
50272+ 3) You are using the RBAC system and hiding other files such as your
50273+ kernel image and System.map. Alternatively, enabling this option
50274+ causes the permissions on /boot, /lib/modules, and the kernel
50275+ source directory to change at compile time to prevent
50276+ reading by non-root users.
50277+ If the above conditions are met, this option will aid in providing a
50278+ useful protection against local kernel exploitation of overflows
50279+ and arbitrary read/write vulnerabilities.
50280+
50281+config GRKERNSEC_KERN_LOCKOUT
50282+ bool "Active kernel exploit response"
50283+ depends on X86 || ARM || PPC || SPARC
50284+ help
50285+ If you say Y here, when a PaX alert is triggered due to suspicious
50286+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
50287+ or an OOPs occurs due to bad memory accesses, instead of just
50288+ terminating the offending process (and potentially allowing
50289+ a subsequent exploit from the same user), we will take one of two
50290+ actions:
50291+ If the user was root, we will panic the system
50292+ If the user was non-root, we will log the attempt, terminate
50293+ all processes owned by the user, then prevent them from creating
50294+ any new processes until the system is restarted
50295+ This deters repeated kernel exploitation/bruteforcing attempts
50296+ and is useful for later forensics.
50297+
50298+endmenu
50299+menu "Role Based Access Control Options"
50300+depends on GRKERNSEC
50301+
50302+config GRKERNSEC_RBAC_DEBUG
50303+ bool
50304+
50305+config GRKERNSEC_NO_RBAC
50306+ bool "Disable RBAC system"
50307+ help
50308+ If you say Y here, the /dev/grsec device will be removed from the kernel,
50309+ preventing the RBAC system from being enabled. You should only say Y
50310+ here if you have no intention of using the RBAC system, so as to prevent
50311+ an attacker with root access from misusing the RBAC system to hide files
50312+ and processes when loadable module support and /dev/[k]mem have been
50313+ locked down.
50314+
50315+config GRKERNSEC_ACL_HIDEKERN
50316+ bool "Hide kernel processes"
50317+ help
50318+ If you say Y here, all kernel threads will be hidden to all
50319+ processes but those whose subject has the "view hidden processes"
50320+ flag.
50321+
50322+config GRKERNSEC_ACL_MAXTRIES
50323+ int "Maximum tries before password lockout"
50324+ default 3
50325+ help
50326+ This option enforces the maximum number of times a user can attempt
50327+ to authorize themselves with the grsecurity RBAC system before being
50328+ denied the ability to attempt authorization again for a specified time.
50329+ The lower the number, the harder it will be to brute-force a password.
50330+
50331+config GRKERNSEC_ACL_TIMEOUT
50332+ int "Time to wait after max password tries, in seconds"
50333+ default 30
50334+ help
50335+ This option specifies the time the user must wait after attempting to
50336+ authorize to the RBAC system with the maximum number of invalid
50337+ passwords. The higher the number, the harder it will be to brute-force
50338+ a password.
50339+
50340+endmenu
50341+menu "Filesystem Protections"
50342+depends on GRKERNSEC
50343+
50344+config GRKERNSEC_PROC
50345+ bool "Proc restrictions"
50346+ help
50347+ If you say Y here, the permissions of the /proc filesystem
50348+ will be altered to enhance system security and privacy. You MUST
50349+ choose either a user only restriction or a user and group restriction.
50350+ Depending upon the option you choose, you can either restrict users to
50351+ see only the processes they themselves run, or choose a group that can
50352+ view all processes and files normally restricted to root if you choose
50353+ the "restrict to user only" option. NOTE: If you're running identd or
50354+ ntpd as a non-root user, you will have to run it as the group you
50355+ specify here.
50356+
50357+config GRKERNSEC_PROC_USER
50358+ bool "Restrict /proc to user only"
50359+ depends on GRKERNSEC_PROC
50360+ help
50361+ If you say Y here, non-root users will only be able to view their own
50362+ processes, and restricts them from viewing network-related information,
50363+ and viewing kernel symbol and module information.
50364+
50365+config GRKERNSEC_PROC_USERGROUP
50366+ bool "Allow special group"
50367+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
50368+ help
50369+ If you say Y here, you will be able to select a group that will be
50370+ able to view all processes and network-related information. If you've
50371+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
50372+ remain hidden. This option is useful if you want to run identd as
50373+ a non-root user.
50374+
50375+config GRKERNSEC_PROC_GID
50376+ int "GID for special group"
50377+ depends on GRKERNSEC_PROC_USERGROUP
50378+ default 1001
50379+
50380+config GRKERNSEC_PROC_ADD
50381+ bool "Additional restrictions"
50382+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
50383+ help
50384+ If you say Y here, additional restrictions will be placed on
50385+ /proc that keep normal users from viewing device information and
50386+ slabinfo information that could be useful for exploits.
50387+
50388+config GRKERNSEC_LINK
50389+ bool "Linking restrictions"
50390+ help
50391+ If you say Y here, /tmp race exploits will be prevented, since users
50392+ will no longer be able to follow symlinks owned by other users in
50393+ world-writable +t directories (e.g. /tmp), unless the owner of the
50394+ symlink is the owner of the directory. users will also not be
50395+ able to hardlink to files they do not own. If the sysctl option is
50396+ enabled, a sysctl option with name "linking_restrictions" is created.
50397+
50398+config GRKERNSEC_FIFO
50399+ bool "FIFO restrictions"
50400+ help
50401+ If you say Y here, users will not be able to write to FIFOs they don't
50402+ own in world-writable +t directories (e.g. /tmp), unless the owner of
50403+ the FIFO is the same owner of the directory it's held in. If the sysctl
50404+ option is enabled, a sysctl option with name "fifo_restrictions" is
50405+ created.
50406+
50407+config GRKERNSEC_SYSFS_RESTRICT
50408+ bool "Sysfs/debugfs restriction"
50409+ depends on SYSFS
50410+ help
50411+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
50412+ any filesystem normally mounted under it (e.g. debugfs) will be
50413+ mostly accessible only by root. These filesystems generally provide access
50414+ to hardware and debug information that isn't appropriate for unprivileged
50415+ users of the system. Sysfs and debugfs have also become a large source
50416+ of new vulnerabilities, ranging from infoleaks to local compromise.
50417+ There has been very little oversight with an eye toward security involved
50418+ in adding new exporters of information to these filesystems, so their
50419+ use is discouraged.
50420+ For reasons of compatibility, a few directories have been whitelisted
50421+ for access by non-root users:
50422+ /sys/fs/selinux
50423+ /sys/fs/fuse
50424+ /sys/devices/system/cpu
50425+
50426+config GRKERNSEC_ROFS
50427+ bool "Runtime read-only mount protection"
50428+ help
50429+ If you say Y here, a sysctl option with name "romount_protect" will
50430+ be created. By setting this option to 1 at runtime, filesystems
50431+ will be protected in the following ways:
50432+ * No new writable mounts will be allowed
50433+ * Existing read-only mounts won't be able to be remounted read/write
50434+ * Write operations will be denied on all block devices
50435+ This option acts independently of grsec_lock: once it is set to 1,
50436+ it cannot be turned off. Therefore, please be mindful of the resulting
50437+ behavior if this option is enabled in an init script on a read-only
50438+ filesystem. This feature is mainly intended for secure embedded systems.
50439+
50440+config GRKERNSEC_CHROOT
50441+ bool "Chroot jail restrictions"
50442+ help
50443+ If you say Y here, you will be able to choose several options that will
50444+ make breaking out of a chrooted jail much more difficult. If you
50445+ encounter no software incompatibilities with the following options, it
50446+ is recommended that you enable each one.
50447+
50448+config GRKERNSEC_CHROOT_MOUNT
50449+ bool "Deny mounts"
50450+ depends on GRKERNSEC_CHROOT
50451+ help
50452+ If you say Y here, processes inside a chroot will not be able to
50453+ mount or remount filesystems. If the sysctl option is enabled, a
50454+ sysctl option with name "chroot_deny_mount" is created.
50455+
50456+config GRKERNSEC_CHROOT_DOUBLE
50457+ bool "Deny double-chroots"
50458+ depends on GRKERNSEC_CHROOT
50459+ help
50460+ If you say Y here, processes inside a chroot will not be able to chroot
50461+ again outside the chroot. This is a widely used method of breaking
50462+ out of a chroot jail and should not be allowed. If the sysctl
50463+ option is enabled, a sysctl option with name
50464+ "chroot_deny_chroot" is created.
50465+
50466+config GRKERNSEC_CHROOT_PIVOT
50467+ bool "Deny pivot_root in chroot"
50468+ depends on GRKERNSEC_CHROOT
50469+ help
50470+ If you say Y here, processes inside a chroot will not be able to use
50471+ a function called pivot_root() that was introduced in Linux 2.3.41. It
50472+ works similar to chroot in that it changes the root filesystem. This
50473+ function could be misused in a chrooted process to attempt to break out
50474+ of the chroot, and therefore should not be allowed. If the sysctl
50475+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
50476+ created.
50477+
50478+config GRKERNSEC_CHROOT_CHDIR
50479+ bool "Enforce chdir(\"/\") on all chroots"
50480+ depends on GRKERNSEC_CHROOT
50481+ help
50482+ If you say Y here, the current working directory of all newly-chrooted
50483+ applications will be set to the the root directory of the chroot.
50484+ The man page on chroot(2) states:
50485+ Note that this call does not change the current working
50486+ directory, so that `.' can be outside the tree rooted at
50487+ `/'. In particular, the super-user can escape from a
50488+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
50489+
50490+ It is recommended that you say Y here, since it's not known to break
50491+ any software. If the sysctl option is enabled, a sysctl option with
50492+ name "chroot_enforce_chdir" is created.
50493+
50494+config GRKERNSEC_CHROOT_CHMOD
50495+ bool "Deny (f)chmod +s"
50496+ depends on GRKERNSEC_CHROOT
50497+ help
50498+ If you say Y here, processes inside a chroot will not be able to chmod
50499+ or fchmod files to make them have suid or sgid bits. This protects
50500+ against another published method of breaking a chroot. If the sysctl
50501+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
50502+ created.
50503+
50504+config GRKERNSEC_CHROOT_FCHDIR
50505+ bool "Deny fchdir out of chroot"
50506+ depends on GRKERNSEC_CHROOT
50507+ help
50508+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
50509+ to a file descriptor of the chrooting process that points to a directory
50510+ outside the filesystem will be stopped. If the sysctl option
50511+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
50512+
50513+config GRKERNSEC_CHROOT_MKNOD
50514+ bool "Deny mknod"
50515+ depends on GRKERNSEC_CHROOT
50516+ help
50517+ If you say Y here, processes inside a chroot will not be allowed to
50518+ mknod. The problem with using mknod inside a chroot is that it
50519+ would allow an attacker to create a device entry that is the same
50520+ as one on the physical root of your system, which could range from
50521+ anything from the console device to a device for your harddrive (which
50522+ they could then use to wipe the drive or steal data). It is recommended
50523+ that you say Y here, unless you run into software incompatibilities.
50524+ If the sysctl option is enabled, a sysctl option with name
50525+ "chroot_deny_mknod" is created.
50526+
50527+config GRKERNSEC_CHROOT_SHMAT
50528+ bool "Deny shmat() out of chroot"
50529+ depends on GRKERNSEC_CHROOT
50530+ help
50531+ If you say Y here, processes inside a chroot will not be able to attach
50532+ to shared memory segments that were created outside of the chroot jail.
50533+ It is recommended that you say Y here. If the sysctl option is enabled,
50534+ a sysctl option with name "chroot_deny_shmat" is created.
50535+
50536+config GRKERNSEC_CHROOT_UNIX
50537+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
50538+ depends on GRKERNSEC_CHROOT
50539+ help
50540+ If you say Y here, processes inside a chroot will not be able to
50541+ connect to abstract (meaning not belonging to a filesystem) Unix
50542+ domain sockets that were bound outside of a chroot. It is recommended
50543+ that you say Y here. If the sysctl option is enabled, a sysctl option
50544+ with name "chroot_deny_unix" is created.
50545+
50546+config GRKERNSEC_CHROOT_FINDTASK
50547+ bool "Protect outside processes"
50548+ depends on GRKERNSEC_CHROOT
50549+ help
50550+ If you say Y here, processes inside a chroot will not be able to
50551+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
50552+ getsid, or view any process outside of the chroot. If the sysctl
50553+ option is enabled, a sysctl option with name "chroot_findtask" is
50554+ created.
50555+
50556+config GRKERNSEC_CHROOT_NICE
50557+ bool "Restrict priority changes"
50558+ depends on GRKERNSEC_CHROOT
50559+ help
50560+ If you say Y here, processes inside a chroot will not be able to raise
50561+ the priority of processes in the chroot, or alter the priority of
50562+ processes outside the chroot. This provides more security than simply
50563+ removing CAP_SYS_NICE from the process' capability set. If the
50564+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
50565+ is created.
50566+
50567+config GRKERNSEC_CHROOT_SYSCTL
50568+ bool "Deny sysctl writes"
50569+ depends on GRKERNSEC_CHROOT
50570+ help
50571+ If you say Y here, an attacker in a chroot will not be able to
50572+ write to sysctl entries, either by sysctl(2) or through a /proc
50573+ interface. It is strongly recommended that you say Y here. If the
50574+ sysctl option is enabled, a sysctl option with name
50575+ "chroot_deny_sysctl" is created.
50576+
50577+config GRKERNSEC_CHROOT_CAPS
50578+ bool "Capability restrictions"
50579+ depends on GRKERNSEC_CHROOT
50580+ help
50581+ If you say Y here, the capabilities on all processes within a
50582+ chroot jail will be lowered to stop module insertion, raw i/o,
50583+ system and net admin tasks, rebooting the system, modifying immutable
50584+ files, modifying IPC owned by another, and changing the system time.
50585+ This is left an option because it can break some apps. Disable this
50586+ if your chrooted apps are having problems performing those kinds of
50587+ tasks. If the sysctl option is enabled, a sysctl option with
50588+ name "chroot_caps" is created.
50589+
50590+endmenu
50591+menu "Kernel Auditing"
50592+depends on GRKERNSEC
50593+
50594+config GRKERNSEC_AUDIT_GROUP
50595+ bool "Single group for auditing"
50596+ help
50597+ If you say Y here, the exec, chdir, and (un)mount logging features
50598+ will only operate on a group you specify. This option is recommended
50599+ if you only want to watch certain users instead of having a large
50600+ amount of logs from the entire system. If the sysctl option is enabled,
50601+ a sysctl option with name "audit_group" is created.
50602+
50603+config GRKERNSEC_AUDIT_GID
50604+ int "GID for auditing"
50605+ depends on GRKERNSEC_AUDIT_GROUP
50606+ default 1007
50607+
50608+config GRKERNSEC_EXECLOG
50609+ bool "Exec logging"
50610+ help
50611+ If you say Y here, all execve() calls will be logged (since the
50612+ other exec*() calls are frontends to execve(), all execution
50613+ will be logged). Useful for shell-servers that like to keep track
50614+ of their users. If the sysctl option is enabled, a sysctl option with
50615+ name "exec_logging" is created.
50616+ WARNING: This option when enabled will produce a LOT of logs, especially
50617+ on an active system.
50618+
50619+config GRKERNSEC_RESLOG
50620+ bool "Resource logging"
50621+ help
50622+ If you say Y here, all attempts to overstep resource limits will
50623+ be logged with the resource name, the requested size, and the current
50624+ limit. It is highly recommended that you say Y here. If the sysctl
50625+ option is enabled, a sysctl option with name "resource_logging" is
50626+ created. If the RBAC system is enabled, the sysctl value is ignored.
50627+
50628+config GRKERNSEC_CHROOT_EXECLOG
50629+ bool "Log execs within chroot"
50630+ help
50631+ If you say Y here, all executions inside a chroot jail will be logged
50632+ to syslog. This can cause a large amount of logs if certain
50633+ applications (eg. djb's daemontools) are installed on the system, and
50634+ is therefore left as an option. If the sysctl option is enabled, a
50635+ sysctl option with name "chroot_execlog" is created.
50636+
50637+config GRKERNSEC_AUDIT_PTRACE
50638+ bool "Ptrace logging"
50639+ help
50640+ If you say Y here, all attempts to attach to a process via ptrace
50641+ will be logged. If the sysctl option is enabled, a sysctl option
50642+ with name "audit_ptrace" is created.
50643+
50644+config GRKERNSEC_AUDIT_CHDIR
50645+ bool "Chdir logging"
50646+ help
50647+ If you say Y here, all chdir() calls will be logged. If the sysctl
50648+ option is enabled, a sysctl option with name "audit_chdir" is created.
50649+
50650+config GRKERNSEC_AUDIT_MOUNT
50651+ bool "(Un)Mount logging"
50652+ help
50653+ If you say Y here, all mounts and unmounts will be logged. If the
50654+ sysctl option is enabled, a sysctl option with name "audit_mount" is
50655+ created.
50656+
50657+config GRKERNSEC_SIGNAL
50658+ bool "Signal logging"
50659+ help
50660+ If you say Y here, certain important signals will be logged, such as
50661+ SIGSEGV, which will as a result inform you of when a error in a program
50662+ occurred, which in some cases could mean a possible exploit attempt.
50663+ If the sysctl option is enabled, a sysctl option with name
50664+ "signal_logging" is created.
50665+
50666+config GRKERNSEC_FORKFAIL
50667+ bool "Fork failure logging"
50668+ help
50669+ If you say Y here, all failed fork() attempts will be logged.
50670+ This could suggest a fork bomb, or someone attempting to overstep
50671+ their process limit. If the sysctl option is enabled, a sysctl option
50672+ with name "forkfail_logging" is created.
50673+
50674+config GRKERNSEC_TIME
50675+ bool "Time change logging"
50676+ help
50677+ If you say Y here, any changes of the system clock will be logged.
50678+ If the sysctl option is enabled, a sysctl option with name
50679+ "timechange_logging" is created.
50680+
50681+config GRKERNSEC_PROC_IPADDR
50682+ bool "/proc/<pid>/ipaddr support"
50683+ help
50684+ If you say Y here, a new entry will be added to each /proc/<pid>
50685+ directory that contains the IP address of the person using the task.
50686+ The IP is carried across local TCP and AF_UNIX stream sockets.
50687+ This information can be useful for IDS/IPSes to perform remote response
50688+ to a local attack. The entry is readable by only the owner of the
50689+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
50690+ the RBAC system), and thus does not create privacy concerns.
50691+
50692+config GRKERNSEC_RWXMAP_LOG
50693+ bool 'Denied RWX mmap/mprotect logging'
50694+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
50695+ help
50696+ If you say Y here, calls to mmap() and mprotect() with explicit
50697+ usage of PROT_WRITE and PROT_EXEC together will be logged when
50698+ denied by the PAX_MPROTECT feature. If the sysctl option is
50699+ enabled, a sysctl option with name "rwxmap_logging" is created.
50700+
50701+config GRKERNSEC_AUDIT_TEXTREL
50702+ bool 'ELF text relocations logging (READ HELP)'
50703+ depends on PAX_MPROTECT
50704+ help
50705+ If you say Y here, text relocations will be logged with the filename
50706+ of the offending library or binary. The purpose of the feature is
50707+ to help Linux distribution developers get rid of libraries and
50708+ binaries that need text relocations which hinder the future progress
50709+ of PaX. Only Linux distribution developers should say Y here, and
50710+ never on a production machine, as this option creates an information
50711+ leak that could aid an attacker in defeating the randomization of
50712+ a single memory region. If the sysctl option is enabled, a sysctl
50713+ option with name "audit_textrel" is created.
50714+
50715+endmenu
50716+
50717+menu "Executable Protections"
50718+depends on GRKERNSEC
50719+
50720+config GRKERNSEC_DMESG
50721+ bool "Dmesg(8) restriction"
50722+ help
50723+ If you say Y here, non-root users will not be able to use dmesg(8)
50724+ to view up to the last 4kb of messages in the kernel's log buffer.
50725+ The kernel's log buffer often contains kernel addresses and other
50726+ identifying information useful to an attacker in fingerprinting a
50727+ system for a targeted exploit.
50728+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
50729+ created.
50730+
50731+config GRKERNSEC_HARDEN_PTRACE
50732+ bool "Deter ptrace-based process snooping"
50733+ help
50734+ If you say Y here, TTY sniffers and other malicious monitoring
50735+ programs implemented through ptrace will be defeated. If you
50736+ have been using the RBAC system, this option has already been
50737+ enabled for several years for all users, with the ability to make
50738+ fine-grained exceptions.
50739+
50740+ This option only affects the ability of non-root users to ptrace
50741+ processes that are not a descendent of the ptracing process.
50742+ This means that strace ./binary and gdb ./binary will still work,
50743+ but attaching to arbitrary processes will not. If the sysctl
50744+ option is enabled, a sysctl option with name "harden_ptrace" is
50745+ created.
50746+
50747+config GRKERNSEC_PTRACE_READEXEC
50748+ bool "Require read access to ptrace sensitive binaries"
50749+ help
50750+ If you say Y here, unprivileged users will not be able to ptrace unreadable
50751+ binaries. This option is useful in environments that
50752+ remove the read bits (e.g. file mode 4711) from suid binaries to
50753+ prevent infoleaking of their contents. This option adds
50754+ consistency to the use of that file mode, as the binary could normally
50755+ be read out when run without privileges while ptracing.
50756+
50757+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
50758+ is created.
50759+
50760+config GRKERNSEC_SETXID
50761+ bool "Enforce consistent multithreaded privileges"
50762+ help
50763+ If you say Y here, a change from a root uid to a non-root uid
50764+ in a multithreaded application will cause the resulting uids,
50765+ gids, supplementary groups, and capabilities in that thread
50766+ to be propagated to the other threads of the process. In most
50767+ cases this is unnecessary, as glibc will emulate this behavior
50768+ on behalf of the application. Other libcs do not act in the
50769+ same way, allowing the other threads of the process to continue
50770+ running with root privileges. If the sysctl option is enabled,
50771+ a sysctl option with name "consistent_setxid" is created.
50772+
50773+config GRKERNSEC_TPE
50774+ bool "Trusted Path Execution (TPE)"
50775+ help
50776+ If you say Y here, you will be able to choose a gid to add to the
50777+ supplementary groups of users you want to mark as "untrusted."
50778+ These users will not be able to execute any files that are not in
50779+ root-owned directories writable only by root. If the sysctl option
50780+ is enabled, a sysctl option with name "tpe" is created.
50781+
50782+config GRKERNSEC_TPE_ALL
50783+ bool "Partially restrict all non-root users"
50784+ depends on GRKERNSEC_TPE
50785+ help
50786+ If you say Y here, all non-root users will be covered under
50787+ a weaker TPE restriction. This is separate from, and in addition to,
50788+ the main TPE options that you have selected elsewhere. Thus, if a
50789+ "trusted" GID is chosen, this restriction applies to even that GID.
50790+ Under this restriction, all non-root users will only be allowed to
50791+ execute files in directories they own that are not group or
50792+ world-writable, or in directories owned by root and writable only by
50793+ root. If the sysctl option is enabled, a sysctl option with name
50794+ "tpe_restrict_all" is created.
50795+
50796+config GRKERNSEC_TPE_INVERT
50797+ bool "Invert GID option"
50798+ depends on GRKERNSEC_TPE
50799+ help
50800+ If you say Y here, the group you specify in the TPE configuration will
50801+ decide what group TPE restrictions will be *disabled* for. This
50802+ option is useful if you want TPE restrictions to be applied to most
50803+ users on the system. If the sysctl option is enabled, a sysctl option
50804+ with name "tpe_invert" is created. Unlike other sysctl options, this
50805+ entry will default to on for backward-compatibility.
50806+
50807+config GRKERNSEC_TPE_GID
50808+ int "GID for untrusted users"
50809+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
50810+ default 1005
50811+ help
50812+ Setting this GID determines what group TPE restrictions will be
50813+ *enabled* for. If the sysctl option is enabled, a sysctl option
50814+ with name "tpe_gid" is created.
50815+
50816+config GRKERNSEC_TPE_GID
50817+ int "GID for trusted users"
50818+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
50819+ default 1005
50820+ help
50821+ Setting this GID determines what group TPE restrictions will be
50822+ *disabled* for. If the sysctl option is enabled, a sysctl option
50823+ with name "tpe_gid" is created.
50824+
50825+endmenu
50826+menu "Network Protections"
50827+depends on GRKERNSEC
50828+
50829+config GRKERNSEC_RANDNET
50830+ bool "Larger entropy pools"
50831+ help
50832+ If you say Y here, the entropy pools used for many features of Linux
50833+ and grsecurity will be doubled in size. Since several grsecurity
50834+ features use additional randomness, it is recommended that you say Y
50835+ here. Saying Y here has a similar effect as modifying
50836+ /proc/sys/kernel/random/poolsize.
50837+
50838+config GRKERNSEC_BLACKHOLE
50839+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
50840+ depends on NET
50841+ help
50842+ If you say Y here, neither TCP resets nor ICMP
50843+ destination-unreachable packets will be sent in response to packets
50844+ sent to ports for which no associated listening process exists.
50845+ This feature supports both IPV4 and IPV6 and exempts the
50846+ loopback interface from blackholing. Enabling this feature
50847+ makes a host more resilient to DoS attacks and reduces network
50848+ visibility against scanners.
50849+
50850+ The blackhole feature as-implemented is equivalent to the FreeBSD
50851+ blackhole feature, as it prevents RST responses to all packets, not
50852+ just SYNs. Under most application behavior this causes no
50853+ problems, but applications (like haproxy) may not close certain
50854+ connections in a way that cleanly terminates them on the remote
50855+ end, leaving the remote host in LAST_ACK state. Because of this
50856+ side-effect and to prevent intentional LAST_ACK DoSes, this
50857+ feature also adds automatic mitigation against such attacks.
50858+ The mitigation drastically reduces the amount of time a socket
50859+ can spend in LAST_ACK state. If you're using haproxy and not
50860+ all servers it connects to have this option enabled, consider
50861+ disabling this feature on the haproxy host.
50862+
50863+ If the sysctl option is enabled, two sysctl options with names
50864+ "ip_blackhole" and "lastack_retries" will be created.
50865+ While "ip_blackhole" takes the standard zero/non-zero on/off
50866+ toggle, "lastack_retries" uses the same kinds of values as
50867+ "tcp_retries1" and "tcp_retries2". The default value of 4
50868+ prevents a socket from lasting more than 45 seconds in LAST_ACK
50869+ state.
50870+
50871+config GRKERNSEC_SOCKET
50872+ bool "Socket restrictions"
50873+ depends on NET
50874+ help
50875+ If you say Y here, you will be able to choose from several options.
50876+ If you assign a GID on your system and add it to the supplementary
50877+ groups of users you want to restrict socket access to, this patch
50878+ will perform up to three things, based on the option(s) you choose.
50879+
50880+config GRKERNSEC_SOCKET_ALL
50881+ bool "Deny any sockets to group"
50882+ depends on GRKERNSEC_SOCKET
50883+ help
50884+ If you say Y here, you will be able to choose a GID of whose users will
50885+ be unable to connect to other hosts from your machine or run server
50886+ applications from your machine. If the sysctl option is enabled, a
50887+ sysctl option with name "socket_all" is created.
50888+
50889+config GRKERNSEC_SOCKET_ALL_GID
50890+ int "GID to deny all sockets for"
50891+ depends on GRKERNSEC_SOCKET_ALL
50892+ default 1004
50893+ help
50894+ Here you can choose the GID to disable socket access for. Remember to
50895+ add the users you want socket access disabled for to the GID
50896+ specified here. If the sysctl option is enabled, a sysctl option
50897+ with name "socket_all_gid" is created.
50898+
50899+config GRKERNSEC_SOCKET_CLIENT
50900+ bool "Deny client sockets to group"
50901+ depends on GRKERNSEC_SOCKET
50902+ help
50903+ If you say Y here, you will be able to choose a GID of whose users will
50904+ be unable to connect to other hosts from your machine, but will be
50905+ able to run servers. If this option is enabled, all users in the group
50906+ you specify will have to use passive mode when initiating ftp transfers
50907+ from the shell on your machine. If the sysctl option is enabled, a
50908+ sysctl option with name "socket_client" is created.
50909+
50910+config GRKERNSEC_SOCKET_CLIENT_GID
50911+ int "GID to deny client sockets for"
50912+ depends on GRKERNSEC_SOCKET_CLIENT
50913+ default 1003
50914+ help
50915+ Here you can choose the GID to disable client socket access for.
50916+ Remember to add the users you want client socket access disabled for to
50917+ the GID specified here. If the sysctl option is enabled, a sysctl
50918+ option with name "socket_client_gid" is created.
50919+
50920+config GRKERNSEC_SOCKET_SERVER
50921+ bool "Deny server sockets to group"
50922+ depends on GRKERNSEC_SOCKET
50923+ help
50924+ If you say Y here, you will be able to choose a GID of whose users will
50925+ be unable to run server applications from your machine. If the sysctl
50926+ option is enabled, a sysctl option with name "socket_server" is created.
50927+
50928+config GRKERNSEC_SOCKET_SERVER_GID
50929+ int "GID to deny server sockets for"
50930+ depends on GRKERNSEC_SOCKET_SERVER
50931+ default 1002
50932+ help
50933+ Here you can choose the GID to disable server socket access for.
50934+ Remember to add the users you want server socket access disabled for to
50935+ the GID specified here. If the sysctl option is enabled, a sysctl
50936+ option with name "socket_server_gid" is created.
50937+
50938+endmenu
50939+menu "Sysctl support"
50940+depends on GRKERNSEC && SYSCTL
50941+
50942+config GRKERNSEC_SYSCTL
50943+ bool "Sysctl support"
50944+ help
50945+ If you say Y here, you will be able to change the options that
50946+ grsecurity runs with at bootup, without having to recompile your
50947+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
50948+ to enable (1) or disable (0) various features. All the sysctl entries
50949+ are mutable until the "grsec_lock" entry is set to a non-zero value.
50950+ All features enabled in the kernel configuration are disabled at boot
50951+ if you do not say Y to the "Turn on features by default" option.
50952+ All options should be set at startup, and the grsec_lock entry should
50953+ be set to a non-zero value after all the options are set.
50954+ *THIS IS EXTREMELY IMPORTANT*
50955+
50956+config GRKERNSEC_SYSCTL_DISTRO
50957+ bool "Extra sysctl support for distro makers (READ HELP)"
50958+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
50959+ help
50960+ If you say Y here, additional sysctl options will be created
50961+ for features that affect processes running as root. Therefore,
50962+ it is critical when using this option that the grsec_lock entry be
50963+ enabled after boot. Only distros with prebuilt kernel packages
50964+ with this option enabled that can ensure grsec_lock is enabled
50965+ after boot should use this option.
50966+ *Failure to set grsec_lock after boot makes all grsec features
50967+ this option covers useless*
50968+
50969+ Currently this option creates the following sysctl entries:
50970+ "Disable Privileged I/O": "disable_priv_io"
50971+
50972+config GRKERNSEC_SYSCTL_ON
50973+ bool "Turn on features by default"
50974+ depends on GRKERNSEC_SYSCTL
50975+ help
50976+ If you say Y here, instead of having all features enabled in the
50977+ kernel configuration disabled at boot time, the features will be
50978+ enabled at boot time. It is recommended you say Y here unless
50979+ there is some reason you would want all sysctl-tunable features to
50980+ be disabled by default. As mentioned elsewhere, it is important
50981+ to enable the grsec_lock entry once you have finished modifying
50982+ the sysctl entries.
50983+
50984+endmenu
50985+menu "Logging Options"
50986+depends on GRKERNSEC
50987+
50988+config GRKERNSEC_FLOODTIME
50989+ int "Seconds in between log messages (minimum)"
50990+ default 10
50991+ help
50992+ This option allows you to enforce the number of seconds between
50993+ grsecurity log messages. The default should be suitable for most
50994+ people, however, if you choose to change it, choose a value small enough
50995+ to allow informative logs to be produced, but large enough to
50996+ prevent flooding.
50997+
50998+config GRKERNSEC_FLOODBURST
50999+ int "Number of messages in a burst (maximum)"
51000+ default 6
51001+ help
51002+ This option allows you to choose the maximum number of messages allowed
51003+ within the flood time interval you chose in a separate option. The
51004+ default should be suitable for most people, however if you find that
51005+ many of your logs are being interpreted as flooding, you may want to
51006+ raise this value.
51007+
51008+endmenu
51009+
51010+endmenu
51011diff --git a/grsecurity/Makefile b/grsecurity/Makefile
51012new file mode 100644
51013index 0000000..1b9afa9
51014--- /dev/null
51015+++ b/grsecurity/Makefile
51016@@ -0,0 +1,38 @@
51017+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
51018+# during 2001-2009 it has been completely redesigned by Brad Spengler
51019+# into an RBAC system
51020+#
51021+# All code in this directory and various hooks inserted throughout the kernel
51022+# are copyright Brad Spengler - Open Source Security, Inc., and released
51023+# under the GPL v2 or higher
51024+
51025+KBUILD_CFLAGS += -Werror
51026+
51027+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
51028+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
51029+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
51030+
51031+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
51032+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
51033+ gracl_learn.o grsec_log.o
51034+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
51035+
51036+ifdef CONFIG_NET
51037+obj-y += grsec_sock.o
51038+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
51039+endif
51040+
51041+ifndef CONFIG_GRKERNSEC
51042+obj-y += grsec_disabled.o
51043+endif
51044+
51045+ifdef CONFIG_GRKERNSEC_HIDESYM
51046+extra-y := grsec_hidesym.o
51047+$(obj)/grsec_hidesym.o:
51048+ @-chmod -f 500 /boot
51049+ @-chmod -f 500 /lib/modules
51050+ @-chmod -f 500 /lib64/modules
51051+ @-chmod -f 500 /lib32/modules
51052+ @-chmod -f 700 .
51053+ @echo ' grsec: protected kernel image paths'
51054+endif
51055diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
51056new file mode 100644
51057index 0000000..2733872
51058--- /dev/null
51059+++ b/grsecurity/gracl.c
51060@@ -0,0 +1,4163 @@
51061+#include <linux/kernel.h>
51062+#include <linux/module.h>
51063+#include <linux/sched.h>
51064+#include <linux/mm.h>
51065+#include <linux/file.h>
51066+#include <linux/fs.h>
51067+#include <linux/namei.h>
51068+#include <linux/mount.h>
51069+#include <linux/tty.h>
51070+#include <linux/proc_fs.h>
51071+#include <linux/lglock.h>
51072+#include <linux/slab.h>
51073+#include <linux/vmalloc.h>
51074+#include <linux/types.h>
51075+#include <linux/sysctl.h>
51076+#include <linux/netdevice.h>
51077+#include <linux/ptrace.h>
51078+#include <linux/gracl.h>
51079+#include <linux/gralloc.h>
51080+#include <linux/security.h>
51081+#include <linux/grinternal.h>
51082+#include <linux/pid_namespace.h>
51083+#include <linux/fdtable.h>
51084+#include <linux/percpu.h>
51085+
51086+#include <asm/uaccess.h>
51087+#include <asm/errno.h>
51088+#include <asm/mman.h>
51089+
51090+static struct acl_role_db acl_role_set;
51091+static struct name_db name_set;
51092+static struct inodev_db inodev_set;
51093+
51094+/* for keeping track of userspace pointers used for subjects, so we
51095+ can share references in the kernel as well
51096+*/
51097+
51098+static struct path real_root;
51099+
51100+static struct acl_subj_map_db subj_map_set;
51101+
51102+static struct acl_role_label *default_role;
51103+
51104+static struct acl_role_label *role_list;
51105+
51106+static u16 acl_sp_role_value;
51107+
51108+extern char *gr_shared_page[4];
51109+static DEFINE_MUTEX(gr_dev_mutex);
51110+DEFINE_RWLOCK(gr_inode_lock);
51111+
51112+struct gr_arg *gr_usermode;
51113+
51114+static unsigned int gr_status __read_only = GR_STATUS_INIT;
51115+
51116+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
51117+extern void gr_clear_learn_entries(void);
51118+
51119+#ifdef CONFIG_GRKERNSEC_RESLOG
51120+extern void gr_log_resource(const struct task_struct *task,
51121+ const int res, const unsigned long wanted, const int gt);
51122+#endif
51123+
51124+unsigned char *gr_system_salt;
51125+unsigned char *gr_system_sum;
51126+
51127+static struct sprole_pw **acl_special_roles = NULL;
51128+static __u16 num_sprole_pws = 0;
51129+
51130+static struct acl_role_label *kernel_role = NULL;
51131+
51132+static unsigned int gr_auth_attempts = 0;
51133+static unsigned long gr_auth_expires = 0UL;
51134+
51135+#ifdef CONFIG_NET
51136+extern struct vfsmount *sock_mnt;
51137+#endif
51138+
51139+extern struct vfsmount *pipe_mnt;
51140+extern struct vfsmount *shm_mnt;
51141+#ifdef CONFIG_HUGETLBFS
51142+extern struct vfsmount *hugetlbfs_vfsmount;
51143+#endif
51144+
51145+static struct acl_object_label *fakefs_obj_rw;
51146+static struct acl_object_label *fakefs_obj_rwx;
51147+
51148+extern int gr_init_uidset(void);
51149+extern void gr_free_uidset(void);
51150+extern void gr_remove_uid(uid_t uid);
51151+extern int gr_find_uid(uid_t uid);
51152+
51153+DECLARE_BRLOCK(vfsmount_lock);
51154+
51155+__inline__ int
51156+gr_acl_is_enabled(void)
51157+{
51158+ return (gr_status & GR_READY);
51159+}
51160+
51161+#ifdef CONFIG_BTRFS_FS
51162+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
51163+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
51164+#endif
51165+
51166+static inline dev_t __get_dev(const struct dentry *dentry)
51167+{
51168+#ifdef CONFIG_BTRFS_FS
51169+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
51170+ return get_btrfs_dev_from_inode(dentry->d_inode);
51171+ else
51172+#endif
51173+ return dentry->d_inode->i_sb->s_dev;
51174+}
51175+
51176+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
51177+{
51178+ return __get_dev(dentry);
51179+}
51180+
51181+static char gr_task_roletype_to_char(struct task_struct *task)
51182+{
51183+ switch (task->role->roletype &
51184+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
51185+ GR_ROLE_SPECIAL)) {
51186+ case GR_ROLE_DEFAULT:
51187+ return 'D';
51188+ case GR_ROLE_USER:
51189+ return 'U';
51190+ case GR_ROLE_GROUP:
51191+ return 'G';
51192+ case GR_ROLE_SPECIAL:
51193+ return 'S';
51194+ }
51195+
51196+ return 'X';
51197+}
51198+
51199+char gr_roletype_to_char(void)
51200+{
51201+ return gr_task_roletype_to_char(current);
51202+}
51203+
51204+__inline__ int
51205+gr_acl_tpe_check(void)
51206+{
51207+ if (unlikely(!(gr_status & GR_READY)))
51208+ return 0;
51209+ if (current->role->roletype & GR_ROLE_TPE)
51210+ return 1;
51211+ else
51212+ return 0;
51213+}
51214+
51215+int
51216+gr_handle_rawio(const struct inode *inode)
51217+{
51218+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
51219+ if (inode && S_ISBLK(inode->i_mode) &&
51220+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
51221+ !capable(CAP_SYS_RAWIO))
51222+ return 1;
51223+#endif
51224+ return 0;
51225+}
51226+
51227+static int
51228+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
51229+{
51230+ if (likely(lena != lenb))
51231+ return 0;
51232+
51233+ return !memcmp(a, b, lena);
51234+}
51235+
51236+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
51237+{
51238+ *buflen -= namelen;
51239+ if (*buflen < 0)
51240+ return -ENAMETOOLONG;
51241+ *buffer -= namelen;
51242+ memcpy(*buffer, str, namelen);
51243+ return 0;
51244+}
51245+
51246+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
51247+{
51248+ return prepend(buffer, buflen, name->name, name->len);
51249+}
51250+
51251+static int prepend_path(const struct path *path, struct path *root,
51252+ char **buffer, int *buflen)
51253+{
51254+ struct dentry *dentry = path->dentry;
51255+ struct vfsmount *vfsmnt = path->mnt;
51256+ bool slash = false;
51257+ int error = 0;
51258+
51259+ while (dentry != root->dentry || vfsmnt != root->mnt) {
51260+ struct dentry * parent;
51261+
51262+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
51263+ /* Global root? */
51264+ if (vfsmnt->mnt_parent == vfsmnt) {
51265+ goto out;
51266+ }
51267+ dentry = vfsmnt->mnt_mountpoint;
51268+ vfsmnt = vfsmnt->mnt_parent;
51269+ continue;
51270+ }
51271+ parent = dentry->d_parent;
51272+ prefetch(parent);
51273+ spin_lock(&dentry->d_lock);
51274+ error = prepend_name(buffer, buflen, &dentry->d_name);
51275+ spin_unlock(&dentry->d_lock);
51276+ if (!error)
51277+ error = prepend(buffer, buflen, "/", 1);
51278+ if (error)
51279+ break;
51280+
51281+ slash = true;
51282+ dentry = parent;
51283+ }
51284+
51285+out:
51286+ if (!error && !slash)
51287+ error = prepend(buffer, buflen, "/", 1);
51288+
51289+ return error;
51290+}
51291+
51292+/* this must be called with vfsmount_lock and rename_lock held */
51293+
51294+static char *__our_d_path(const struct path *path, struct path *root,
51295+ char *buf, int buflen)
51296+{
51297+ char *res = buf + buflen;
51298+ int error;
51299+
51300+ prepend(&res, &buflen, "\0", 1);
51301+ error = prepend_path(path, root, &res, &buflen);
51302+ if (error)
51303+ return ERR_PTR(error);
51304+
51305+ return res;
51306+}
51307+
51308+static char *
51309+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
51310+{
51311+ char *retval;
51312+
51313+ retval = __our_d_path(path, root, buf, buflen);
51314+ if (unlikely(IS_ERR(retval)))
51315+ retval = strcpy(buf, "<path too long>");
51316+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
51317+ retval[1] = '\0';
51318+
51319+ return retval;
51320+}
51321+
51322+static char *
51323+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
51324+ char *buf, int buflen)
51325+{
51326+ struct path path;
51327+ char *res;
51328+
51329+ path.dentry = (struct dentry *)dentry;
51330+ path.mnt = (struct vfsmount *)vfsmnt;
51331+
51332+ /* we can use real_root.dentry, real_root.mnt, because this is only called
51333+ by the RBAC system */
51334+ res = gen_full_path(&path, &real_root, buf, buflen);
51335+
51336+ return res;
51337+}
51338+
51339+static char *
51340+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
51341+ char *buf, int buflen)
51342+{
51343+ char *res;
51344+ struct path path;
51345+ struct path root;
51346+ struct task_struct *reaper = &init_task;
51347+
51348+ path.dentry = (struct dentry *)dentry;
51349+ path.mnt = (struct vfsmount *)vfsmnt;
51350+
51351+ /* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */
51352+ get_fs_root(reaper->fs, &root);
51353+
51354+ write_seqlock(&rename_lock);
51355+ br_read_lock(vfsmount_lock);
51356+ res = gen_full_path(&path, &root, buf, buflen);
51357+ br_read_unlock(vfsmount_lock);
51358+ write_sequnlock(&rename_lock);
51359+
51360+ path_put(&root);
51361+ return res;
51362+}
51363+
51364+static char *
51365+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
51366+{
51367+ char *ret;
51368+ write_seqlock(&rename_lock);
51369+ br_read_lock(vfsmount_lock);
51370+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
51371+ PAGE_SIZE);
51372+ br_read_unlock(vfsmount_lock);
51373+ write_sequnlock(&rename_lock);
51374+ return ret;
51375+}
51376+
51377+static char *
51378+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
51379+{
51380+ char *ret;
51381+ char *buf;
51382+ int buflen;
51383+
51384+ write_seqlock(&rename_lock);
51385+ br_read_lock(vfsmount_lock);
51386+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
51387+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
51388+ buflen = (int)(ret - buf);
51389+ if (buflen >= 5)
51390+ prepend(&ret, &buflen, "/proc", 5);
51391+ else
51392+ ret = strcpy(buf, "<path too long>");
51393+ br_read_unlock(vfsmount_lock);
51394+ write_sequnlock(&rename_lock);
51395+ return ret;
51396+}
51397+
51398+char *
51399+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
51400+{
51401+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
51402+ PAGE_SIZE);
51403+}
51404+
51405+char *
51406+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
51407+{
51408+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
51409+ PAGE_SIZE);
51410+}
51411+
51412+char *
51413+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
51414+{
51415+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
51416+ PAGE_SIZE);
51417+}
51418+
51419+char *
51420+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
51421+{
51422+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
51423+ PAGE_SIZE);
51424+}
51425+
51426+char *
51427+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
51428+{
51429+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
51430+ PAGE_SIZE);
51431+}
51432+
51433+__inline__ __u32
51434+to_gr_audit(const __u32 reqmode)
51435+{
51436+ /* masks off auditable permission flags, then shifts them to create
51437+ auditing flags, and adds the special case of append auditing if
51438+ we're requesting write */
51439+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
51440+}
51441+
51442+struct acl_subject_label *
51443+lookup_subject_map(const struct acl_subject_label *userp)
51444+{
51445+ unsigned int index = shash(userp, subj_map_set.s_size);
51446+ struct subject_map *match;
51447+
51448+ match = subj_map_set.s_hash[index];
51449+
51450+ while (match && match->user != userp)
51451+ match = match->next;
51452+
51453+ if (match != NULL)
51454+ return match->kernel;
51455+ else
51456+ return NULL;
51457+}
51458+
51459+static void
51460+insert_subj_map_entry(struct subject_map *subjmap)
51461+{
51462+ unsigned int index = shash(subjmap->user, subj_map_set.s_size);
51463+ struct subject_map **curr;
51464+
51465+ subjmap->prev = NULL;
51466+
51467+ curr = &subj_map_set.s_hash[index];
51468+ if (*curr != NULL)
51469+ (*curr)->prev = subjmap;
51470+
51471+ subjmap->next = *curr;
51472+ *curr = subjmap;
51473+
51474+ return;
51475+}
51476+
51477+static struct acl_role_label *
51478+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
51479+ const gid_t gid)
51480+{
51481+ unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
51482+ struct acl_role_label *match;
51483+ struct role_allowed_ip *ipp;
51484+ unsigned int x;
51485+ u32 curr_ip = task->signal->curr_ip;
51486+
51487+ task->signal->saved_ip = curr_ip;
51488+
51489+ match = acl_role_set.r_hash[index];
51490+
51491+ while (match) {
51492+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
51493+ for (x = 0; x < match->domain_child_num; x++) {
51494+ if (match->domain_children[x] == uid)
51495+ goto found;
51496+ }
51497+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
51498+ break;
51499+ match = match->next;
51500+ }
51501+found:
51502+ if (match == NULL) {
51503+ try_group:
51504+ index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
51505+ match = acl_role_set.r_hash[index];
51506+
51507+ while (match) {
51508+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
51509+ for (x = 0; x < match->domain_child_num; x++) {
51510+ if (match->domain_children[x] == gid)
51511+ goto found2;
51512+ }
51513+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
51514+ break;
51515+ match = match->next;
51516+ }
51517+found2:
51518+ if (match == NULL)
51519+ match = default_role;
51520+ if (match->allowed_ips == NULL)
51521+ return match;
51522+ else {
51523+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
51524+ if (likely
51525+ ((ntohl(curr_ip) & ipp->netmask) ==
51526+ (ntohl(ipp->addr) & ipp->netmask)))
51527+ return match;
51528+ }
51529+ match = default_role;
51530+ }
51531+ } else if (match->allowed_ips == NULL) {
51532+ return match;
51533+ } else {
51534+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
51535+ if (likely
51536+ ((ntohl(curr_ip) & ipp->netmask) ==
51537+ (ntohl(ipp->addr) & ipp->netmask)))
51538+ return match;
51539+ }
51540+ goto try_group;
51541+ }
51542+
51543+ return match;
51544+}
51545+
51546+struct acl_subject_label *
51547+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
51548+ const struct acl_role_label *role)
51549+{
51550+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
51551+ struct acl_subject_label *match;
51552+
51553+ match = role->subj_hash[index];
51554+
51555+ while (match && (match->inode != ino || match->device != dev ||
51556+ (match->mode & GR_DELETED))) {
51557+ match = match->next;
51558+ }
51559+
51560+ if (match && !(match->mode & GR_DELETED))
51561+ return match;
51562+ else
51563+ return NULL;
51564+}
51565+
51566+struct acl_subject_label *
51567+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
51568+ const struct acl_role_label *role)
51569+{
51570+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
51571+ struct acl_subject_label *match;
51572+
51573+ match = role->subj_hash[index];
51574+
51575+ while (match && (match->inode != ino || match->device != dev ||
51576+ !(match->mode & GR_DELETED))) {
51577+ match = match->next;
51578+ }
51579+
51580+ if (match && (match->mode & GR_DELETED))
51581+ return match;
51582+ else
51583+ return NULL;
51584+}
51585+
51586+static struct acl_object_label *
51587+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
51588+ const struct acl_subject_label *subj)
51589+{
51590+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51591+ struct acl_object_label *match;
51592+
51593+ match = subj->obj_hash[index];
51594+
51595+ while (match && (match->inode != ino || match->device != dev ||
51596+ (match->mode & GR_DELETED))) {
51597+ match = match->next;
51598+ }
51599+
51600+ if (match && !(match->mode & GR_DELETED))
51601+ return match;
51602+ else
51603+ return NULL;
51604+}
51605+
51606+static struct acl_object_label *
51607+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
51608+ const struct acl_subject_label *subj)
51609+{
51610+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51611+ struct acl_object_label *match;
51612+
51613+ match = subj->obj_hash[index];
51614+
51615+ while (match && (match->inode != ino || match->device != dev ||
51616+ !(match->mode & GR_DELETED))) {
51617+ match = match->next;
51618+ }
51619+
51620+ if (match && (match->mode & GR_DELETED))
51621+ return match;
51622+
51623+ match = subj->obj_hash[index];
51624+
51625+ while (match && (match->inode != ino || match->device != dev ||
51626+ (match->mode & GR_DELETED))) {
51627+ match = match->next;
51628+ }
51629+
51630+ if (match && !(match->mode & GR_DELETED))
51631+ return match;
51632+ else
51633+ return NULL;
51634+}
51635+
51636+static struct name_entry *
51637+lookup_name_entry(const char *name)
51638+{
51639+ unsigned int len = strlen(name);
51640+ unsigned int key = full_name_hash(name, len);
51641+ unsigned int index = key % name_set.n_size;
51642+ struct name_entry *match;
51643+
51644+ match = name_set.n_hash[index];
51645+
51646+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
51647+ match = match->next;
51648+
51649+ return match;
51650+}
51651+
51652+static struct name_entry *
51653+lookup_name_entry_create(const char *name)
51654+{
51655+ unsigned int len = strlen(name);
51656+ unsigned int key = full_name_hash(name, len);
51657+ unsigned int index = key % name_set.n_size;
51658+ struct name_entry *match;
51659+
51660+ match = name_set.n_hash[index];
51661+
51662+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51663+ !match->deleted))
51664+ match = match->next;
51665+
51666+ if (match && match->deleted)
51667+ return match;
51668+
51669+ match = name_set.n_hash[index];
51670+
51671+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51672+ match->deleted))
51673+ match = match->next;
51674+
51675+ if (match && !match->deleted)
51676+ return match;
51677+ else
51678+ return NULL;
51679+}
51680+
51681+static struct inodev_entry *
51682+lookup_inodev_entry(const ino_t ino, const dev_t dev)
51683+{
51684+ unsigned int index = fhash(ino, dev, inodev_set.i_size);
51685+ struct inodev_entry *match;
51686+
51687+ match = inodev_set.i_hash[index];
51688+
51689+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
51690+ match = match->next;
51691+
51692+ return match;
51693+}
51694+
51695+static void
51696+insert_inodev_entry(struct inodev_entry *entry)
51697+{
51698+ unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
51699+ inodev_set.i_size);
51700+ struct inodev_entry **curr;
51701+
51702+ entry->prev = NULL;
51703+
51704+ curr = &inodev_set.i_hash[index];
51705+ if (*curr != NULL)
51706+ (*curr)->prev = entry;
51707+
51708+ entry->next = *curr;
51709+ *curr = entry;
51710+
51711+ return;
51712+}
51713+
51714+static void
51715+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
51716+{
51717+ unsigned int index =
51718+ rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
51719+ struct acl_role_label **curr;
51720+ struct acl_role_label *tmp;
51721+
51722+ curr = &acl_role_set.r_hash[index];
51723+
51724+ /* if role was already inserted due to domains and already has
51725+ a role in the same bucket as it attached, then we need to
51726+ combine these two buckets
51727+ */
51728+ if (role->next) {
51729+ tmp = role->next;
51730+ while (tmp->next)
51731+ tmp = tmp->next;
51732+ tmp->next = *curr;
51733+ } else
51734+ role->next = *curr;
51735+ *curr = role;
51736+
51737+ return;
51738+}
51739+
51740+static void
51741+insert_acl_role_label(struct acl_role_label *role)
51742+{
51743+ int i;
51744+
51745+ if (role_list == NULL) {
51746+ role_list = role;
51747+ role->prev = NULL;
51748+ } else {
51749+ role->prev = role_list;
51750+ role_list = role;
51751+ }
51752+
51753+ /* used for hash chains */
51754+ role->next = NULL;
51755+
51756+ if (role->roletype & GR_ROLE_DOMAIN) {
51757+ for (i = 0; i < role->domain_child_num; i++)
51758+ __insert_acl_role_label(role, role->domain_children[i]);
51759+ } else
51760+ __insert_acl_role_label(role, role->uidgid);
51761+}
51762+
51763+static int
51764+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
51765+{
51766+ struct name_entry **curr, *nentry;
51767+ struct inodev_entry *ientry;
51768+ unsigned int len = strlen(name);
51769+ unsigned int key = full_name_hash(name, len);
51770+ unsigned int index = key % name_set.n_size;
51771+
51772+ curr = &name_set.n_hash[index];
51773+
51774+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
51775+ curr = &((*curr)->next);
51776+
51777+ if (*curr != NULL)
51778+ return 1;
51779+
51780+ nentry = acl_alloc(sizeof (struct name_entry));
51781+ if (nentry == NULL)
51782+ return 0;
51783+ ientry = acl_alloc(sizeof (struct inodev_entry));
51784+ if (ientry == NULL)
51785+ return 0;
51786+ ientry->nentry = nentry;
51787+
51788+ nentry->key = key;
51789+ nentry->name = name;
51790+ nentry->inode = inode;
51791+ nentry->device = device;
51792+ nentry->len = len;
51793+ nentry->deleted = deleted;
51794+
51795+ nentry->prev = NULL;
51796+ curr = &name_set.n_hash[index];
51797+ if (*curr != NULL)
51798+ (*curr)->prev = nentry;
51799+ nentry->next = *curr;
51800+ *curr = nentry;
51801+
51802+ /* insert us into the table searchable by inode/dev */
51803+ insert_inodev_entry(ientry);
51804+
51805+ return 1;
51806+}
51807+
51808+static void
51809+insert_acl_obj_label(struct acl_object_label *obj,
51810+ struct acl_subject_label *subj)
51811+{
51812+ unsigned int index =
51813+ fhash(obj->inode, obj->device, subj->obj_hash_size);
51814+ struct acl_object_label **curr;
51815+
51816+
51817+ obj->prev = NULL;
51818+
51819+ curr = &subj->obj_hash[index];
51820+ if (*curr != NULL)
51821+ (*curr)->prev = obj;
51822+
51823+ obj->next = *curr;
51824+ *curr = obj;
51825+
51826+ return;
51827+}
51828+
51829+static void
51830+insert_acl_subj_label(struct acl_subject_label *obj,
51831+ struct acl_role_label *role)
51832+{
51833+ unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
51834+ struct acl_subject_label **curr;
51835+
51836+ obj->prev = NULL;
51837+
51838+ curr = &role->subj_hash[index];
51839+ if (*curr != NULL)
51840+ (*curr)->prev = obj;
51841+
51842+ obj->next = *curr;
51843+ *curr = obj;
51844+
51845+ return;
51846+}
51847+
51848+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
51849+
51850+static void *
51851+create_table(__u32 * len, int elementsize)
51852+{
51853+ unsigned int table_sizes[] = {
51854+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
51855+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
51856+ 4194301, 8388593, 16777213, 33554393, 67108859
51857+ };
51858+ void *newtable = NULL;
51859+ unsigned int pwr = 0;
51860+
51861+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
51862+ table_sizes[pwr] <= *len)
51863+ pwr++;
51864+
51865+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
51866+ return newtable;
51867+
51868+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
51869+ newtable =
51870+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
51871+ else
51872+ newtable = vmalloc(table_sizes[pwr] * elementsize);
51873+
51874+ *len = table_sizes[pwr];
51875+
51876+ return newtable;
51877+}
51878+
51879+static int
51880+init_variables(const struct gr_arg *arg)
51881+{
51882+ struct task_struct *reaper = &init_task;
51883+ unsigned int stacksize;
51884+
51885+ subj_map_set.s_size = arg->role_db.num_subjects;
51886+ acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
51887+ name_set.n_size = arg->role_db.num_objects;
51888+ inodev_set.i_size = arg->role_db.num_objects;
51889+
51890+ if (!subj_map_set.s_size || !acl_role_set.r_size ||
51891+ !name_set.n_size || !inodev_set.i_size)
51892+ return 1;
51893+
51894+ if (!gr_init_uidset())
51895+ return 1;
51896+
51897+ /* set up the stack that holds allocation info */
51898+
51899+ stacksize = arg->role_db.num_pointers + 5;
51900+
51901+ if (!acl_alloc_stack_init(stacksize))
51902+ return 1;
51903+
51904+ /* grab reference for the real root dentry and vfsmount */
51905+ get_fs_root(reaper->fs, &real_root);
51906+
51907+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
51908+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino);
51909+#endif
51910+
51911+ fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
51912+ if (fakefs_obj_rw == NULL)
51913+ return 1;
51914+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
51915+
51916+ fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
51917+ if (fakefs_obj_rwx == NULL)
51918+ return 1;
51919+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
51920+
51921+ subj_map_set.s_hash =
51922+ (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
51923+ acl_role_set.r_hash =
51924+ (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
51925+ name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
51926+ inodev_set.i_hash =
51927+ (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
51928+
51929+ if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
51930+ !name_set.n_hash || !inodev_set.i_hash)
51931+ return 1;
51932+
51933+ memset(subj_map_set.s_hash, 0,
51934+ sizeof(struct subject_map *) * subj_map_set.s_size);
51935+ memset(acl_role_set.r_hash, 0,
51936+ sizeof (struct acl_role_label *) * acl_role_set.r_size);
51937+ memset(name_set.n_hash, 0,
51938+ sizeof (struct name_entry *) * name_set.n_size);
51939+ memset(inodev_set.i_hash, 0,
51940+ sizeof (struct inodev_entry *) * inodev_set.i_size);
51941+
51942+ return 0;
51943+}
51944+
51945+/* free information not needed after startup
51946+ currently contains user->kernel pointer mappings for subjects
51947+*/
51948+
51949+static void
51950+free_init_variables(void)
51951+{
51952+ __u32 i;
51953+
51954+ if (subj_map_set.s_hash) {
51955+ for (i = 0; i < subj_map_set.s_size; i++) {
51956+ if (subj_map_set.s_hash[i]) {
51957+ kfree(subj_map_set.s_hash[i]);
51958+ subj_map_set.s_hash[i] = NULL;
51959+ }
51960+ }
51961+
51962+ if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
51963+ PAGE_SIZE)
51964+ kfree(subj_map_set.s_hash);
51965+ else
51966+ vfree(subj_map_set.s_hash);
51967+ }
51968+
51969+ return;
51970+}
51971+
51972+static void
51973+free_variables(void)
51974+{
51975+ struct acl_subject_label *s;
51976+ struct acl_role_label *r;
51977+ struct task_struct *task, *task2;
51978+ unsigned int x;
51979+
51980+ gr_clear_learn_entries();
51981+
51982+ read_lock(&tasklist_lock);
51983+ do_each_thread(task2, task) {
51984+ task->acl_sp_role = 0;
51985+ task->acl_role_id = 0;
51986+ task->acl = NULL;
51987+ task->role = NULL;
51988+ } while_each_thread(task2, task);
51989+ read_unlock(&tasklist_lock);
51990+
51991+ /* release the reference to the real root dentry and vfsmount */
51992+ path_put(&real_root);
51993+
51994+ /* free all object hash tables */
51995+
51996+ FOR_EACH_ROLE_START(r)
51997+ if (r->subj_hash == NULL)
51998+ goto next_role;
51999+ FOR_EACH_SUBJECT_START(r, s, x)
52000+ if (s->obj_hash == NULL)
52001+ break;
52002+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
52003+ kfree(s->obj_hash);
52004+ else
52005+ vfree(s->obj_hash);
52006+ FOR_EACH_SUBJECT_END(s, x)
52007+ FOR_EACH_NESTED_SUBJECT_START(r, s)
52008+ if (s->obj_hash == NULL)
52009+ break;
52010+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
52011+ kfree(s->obj_hash);
52012+ else
52013+ vfree(s->obj_hash);
52014+ FOR_EACH_NESTED_SUBJECT_END(s)
52015+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
52016+ kfree(r->subj_hash);
52017+ else
52018+ vfree(r->subj_hash);
52019+ r->subj_hash = NULL;
52020+next_role:
52021+ FOR_EACH_ROLE_END(r)
52022+
52023+ acl_free_all();
52024+
52025+ if (acl_role_set.r_hash) {
52026+ if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
52027+ PAGE_SIZE)
52028+ kfree(acl_role_set.r_hash);
52029+ else
52030+ vfree(acl_role_set.r_hash);
52031+ }
52032+ if (name_set.n_hash) {
52033+ if ((name_set.n_size * sizeof (struct name_entry *)) <=
52034+ PAGE_SIZE)
52035+ kfree(name_set.n_hash);
52036+ else
52037+ vfree(name_set.n_hash);
52038+ }
52039+
52040+ if (inodev_set.i_hash) {
52041+ if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
52042+ PAGE_SIZE)
52043+ kfree(inodev_set.i_hash);
52044+ else
52045+ vfree(inodev_set.i_hash);
52046+ }
52047+
52048+ gr_free_uidset();
52049+
52050+ memset(&name_set, 0, sizeof (struct name_db));
52051+ memset(&inodev_set, 0, sizeof (struct inodev_db));
52052+ memset(&acl_role_set, 0, sizeof (struct acl_role_db));
52053+ memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
52054+
52055+ default_role = NULL;
52056+ role_list = NULL;
52057+
52058+ return;
52059+}
52060+
52061+static __u32
52062+count_user_objs(struct acl_object_label *userp)
52063+{
52064+ struct acl_object_label o_tmp;
52065+ __u32 num = 0;
52066+
52067+ while (userp) {
52068+ if (copy_from_user(&o_tmp, userp,
52069+ sizeof (struct acl_object_label)))
52070+ break;
52071+
52072+ userp = o_tmp.prev;
52073+ num++;
52074+ }
52075+
52076+ return num;
52077+}
52078+
52079+static struct acl_subject_label *
52080+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
52081+
52082+static int
52083+copy_user_glob(struct acl_object_label *obj)
52084+{
52085+ struct acl_object_label *g_tmp, **guser;
52086+ unsigned int len;
52087+ char *tmp;
52088+
52089+ if (obj->globbed == NULL)
52090+ return 0;
52091+
52092+ guser = &obj->globbed;
52093+ while (*guser) {
52094+ g_tmp = (struct acl_object_label *)
52095+ acl_alloc(sizeof (struct acl_object_label));
52096+ if (g_tmp == NULL)
52097+ return -ENOMEM;
52098+
52099+ if (copy_from_user(g_tmp, *guser,
52100+ sizeof (struct acl_object_label)))
52101+ return -EFAULT;
52102+
52103+ len = strnlen_user(g_tmp->filename, PATH_MAX);
52104+
52105+ if (!len || len >= PATH_MAX)
52106+ return -EINVAL;
52107+
52108+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52109+ return -ENOMEM;
52110+
52111+ if (copy_from_user(tmp, g_tmp->filename, len))
52112+ return -EFAULT;
52113+ tmp[len-1] = '\0';
52114+ g_tmp->filename = tmp;
52115+
52116+ *guser = g_tmp;
52117+ guser = &(g_tmp->next);
52118+ }
52119+
52120+ return 0;
52121+}
52122+
52123+static int
52124+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
52125+ struct acl_role_label *role)
52126+{
52127+ struct acl_object_label *o_tmp;
52128+ unsigned int len;
52129+ int ret;
52130+ char *tmp;
52131+
52132+ while (userp) {
52133+ if ((o_tmp = (struct acl_object_label *)
52134+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
52135+ return -ENOMEM;
52136+
52137+ if (copy_from_user(o_tmp, userp,
52138+ sizeof (struct acl_object_label)))
52139+ return -EFAULT;
52140+
52141+ userp = o_tmp->prev;
52142+
52143+ len = strnlen_user(o_tmp->filename, PATH_MAX);
52144+
52145+ if (!len || len >= PATH_MAX)
52146+ return -EINVAL;
52147+
52148+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52149+ return -ENOMEM;
52150+
52151+ if (copy_from_user(tmp, o_tmp->filename, len))
52152+ return -EFAULT;
52153+ tmp[len-1] = '\0';
52154+ o_tmp->filename = tmp;
52155+
52156+ insert_acl_obj_label(o_tmp, subj);
52157+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
52158+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
52159+ return -ENOMEM;
52160+
52161+ ret = copy_user_glob(o_tmp);
52162+ if (ret)
52163+ return ret;
52164+
52165+ if (o_tmp->nested) {
52166+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role);
52167+ if (IS_ERR(o_tmp->nested))
52168+ return PTR_ERR(o_tmp->nested);
52169+
52170+ /* insert into nested subject list */
52171+ o_tmp->nested->next = role->hash->first;
52172+ role->hash->first = o_tmp->nested;
52173+ }
52174+ }
52175+
52176+ return 0;
52177+}
52178+
52179+static __u32
52180+count_user_subjs(struct acl_subject_label *userp)
52181+{
52182+ struct acl_subject_label s_tmp;
52183+ __u32 num = 0;
52184+
52185+ while (userp) {
52186+ if (copy_from_user(&s_tmp, userp,
52187+ sizeof (struct acl_subject_label)))
52188+ break;
52189+
52190+ userp = s_tmp.prev;
52191+ /* do not count nested subjects against this count, since
52192+ they are not included in the hash table, but are
52193+ attached to objects. We have already counted
52194+ the subjects in userspace for the allocation
52195+ stack
52196+ */
52197+ if (!(s_tmp.mode & GR_NESTED))
52198+ num++;
52199+ }
52200+
52201+ return num;
52202+}
52203+
52204+static int
52205+copy_user_allowedips(struct acl_role_label *rolep)
52206+{
52207+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
52208+
52209+ ruserip = rolep->allowed_ips;
52210+
52211+ while (ruserip) {
52212+ rlast = rtmp;
52213+
52214+ if ((rtmp = (struct role_allowed_ip *)
52215+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
52216+ return -ENOMEM;
52217+
52218+ if (copy_from_user(rtmp, ruserip,
52219+ sizeof (struct role_allowed_ip)))
52220+ return -EFAULT;
52221+
52222+ ruserip = rtmp->prev;
52223+
52224+ if (!rlast) {
52225+ rtmp->prev = NULL;
52226+ rolep->allowed_ips = rtmp;
52227+ } else {
52228+ rlast->next = rtmp;
52229+ rtmp->prev = rlast;
52230+ }
52231+
52232+ if (!ruserip)
52233+ rtmp->next = NULL;
52234+ }
52235+
52236+ return 0;
52237+}
52238+
52239+static int
52240+copy_user_transitions(struct acl_role_label *rolep)
52241+{
52242+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
52243+
52244+ unsigned int len;
52245+ char *tmp;
52246+
52247+ rusertp = rolep->transitions;
52248+
52249+ while (rusertp) {
52250+ rlast = rtmp;
52251+
52252+ if ((rtmp = (struct role_transition *)
52253+ acl_alloc(sizeof (struct role_transition))) == NULL)
52254+ return -ENOMEM;
52255+
52256+ if (copy_from_user(rtmp, rusertp,
52257+ sizeof (struct role_transition)))
52258+ return -EFAULT;
52259+
52260+ rusertp = rtmp->prev;
52261+
52262+ len = strnlen_user(rtmp->rolename, GR_SPROLE_LEN);
52263+
52264+ if (!len || len >= GR_SPROLE_LEN)
52265+ return -EINVAL;
52266+
52267+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52268+ return -ENOMEM;
52269+
52270+ if (copy_from_user(tmp, rtmp->rolename, len))
52271+ return -EFAULT;
52272+ tmp[len-1] = '\0';
52273+ rtmp->rolename = tmp;
52274+
52275+ if (!rlast) {
52276+ rtmp->prev = NULL;
52277+ rolep->transitions = rtmp;
52278+ } else {
52279+ rlast->next = rtmp;
52280+ rtmp->prev = rlast;
52281+ }
52282+
52283+ if (!rusertp)
52284+ rtmp->next = NULL;
52285+ }
52286+
52287+ return 0;
52288+}
52289+
52290+static struct acl_subject_label *
52291+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
52292+{
52293+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
52294+ unsigned int len;
52295+ char *tmp;
52296+ __u32 num_objs;
52297+ struct acl_ip_label **i_tmp, *i_utmp2;
52298+ struct gr_hash_struct ghash;
52299+ struct subject_map *subjmap;
52300+ unsigned int i_num;
52301+ int err;
52302+
52303+ s_tmp = lookup_subject_map(userp);
52304+
52305+ /* we've already copied this subject into the kernel, just return
52306+ the reference to it, and don't copy it over again
52307+ */
52308+ if (s_tmp)
52309+ return(s_tmp);
52310+
52311+ if ((s_tmp = (struct acl_subject_label *)
52312+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
52313+ return ERR_PTR(-ENOMEM);
52314+
52315+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
52316+ if (subjmap == NULL)
52317+ return ERR_PTR(-ENOMEM);
52318+
52319+ subjmap->user = userp;
52320+ subjmap->kernel = s_tmp;
52321+ insert_subj_map_entry(subjmap);
52322+
52323+ if (copy_from_user(s_tmp, userp,
52324+ sizeof (struct acl_subject_label)))
52325+ return ERR_PTR(-EFAULT);
52326+
52327+ len = strnlen_user(s_tmp->filename, PATH_MAX);
52328+
52329+ if (!len || len >= PATH_MAX)
52330+ return ERR_PTR(-EINVAL);
52331+
52332+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52333+ return ERR_PTR(-ENOMEM);
52334+
52335+ if (copy_from_user(tmp, s_tmp->filename, len))
52336+ return ERR_PTR(-EFAULT);
52337+ tmp[len-1] = '\0';
52338+ s_tmp->filename = tmp;
52339+
52340+ if (!strcmp(s_tmp->filename, "/"))
52341+ role->root_label = s_tmp;
52342+
52343+ if (copy_from_user(&ghash, s_tmp->hash, sizeof(struct gr_hash_struct)))
52344+ return ERR_PTR(-EFAULT);
52345+
52346+ /* copy user and group transition tables */
52347+
52348+ if (s_tmp->user_trans_num) {
52349+ uid_t *uidlist;
52350+
52351+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
52352+ if (uidlist == NULL)
52353+ return ERR_PTR(-ENOMEM);
52354+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
52355+ return ERR_PTR(-EFAULT);
52356+
52357+ s_tmp->user_transitions = uidlist;
52358+ }
52359+
52360+ if (s_tmp->group_trans_num) {
52361+ gid_t *gidlist;
52362+
52363+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
52364+ if (gidlist == NULL)
52365+ return ERR_PTR(-ENOMEM);
52366+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
52367+ return ERR_PTR(-EFAULT);
52368+
52369+ s_tmp->group_transitions = gidlist;
52370+ }
52371+
52372+ /* set up object hash table */
52373+ num_objs = count_user_objs(ghash.first);
52374+
52375+ s_tmp->obj_hash_size = num_objs;
52376+ s_tmp->obj_hash =
52377+ (struct acl_object_label **)
52378+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
52379+
52380+ if (!s_tmp->obj_hash)
52381+ return ERR_PTR(-ENOMEM);
52382+
52383+ memset(s_tmp->obj_hash, 0,
52384+ s_tmp->obj_hash_size *
52385+ sizeof (struct acl_object_label *));
52386+
52387+ /* add in objects */
52388+ err = copy_user_objs(ghash.first, s_tmp, role);
52389+
52390+ if (err)
52391+ return ERR_PTR(err);
52392+
52393+ /* set pointer for parent subject */
52394+ if (s_tmp->parent_subject) {
52395+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role);
52396+
52397+ if (IS_ERR(s_tmp2))
52398+ return s_tmp2;
52399+
52400+ s_tmp->parent_subject = s_tmp2;
52401+ }
52402+
52403+ /* add in ip acls */
52404+
52405+ if (!s_tmp->ip_num) {
52406+ s_tmp->ips = NULL;
52407+ goto insert;
52408+ }
52409+
52410+ i_tmp =
52411+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
52412+ sizeof (struct acl_ip_label *));
52413+
52414+ if (!i_tmp)
52415+ return ERR_PTR(-ENOMEM);
52416+
52417+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
52418+ *(i_tmp + i_num) =
52419+ (struct acl_ip_label *)
52420+ acl_alloc(sizeof (struct acl_ip_label));
52421+ if (!*(i_tmp + i_num))
52422+ return ERR_PTR(-ENOMEM);
52423+
52424+ if (copy_from_user
52425+ (&i_utmp2, s_tmp->ips + i_num,
52426+ sizeof (struct acl_ip_label *)))
52427+ return ERR_PTR(-EFAULT);
52428+
52429+ if (copy_from_user
52430+ (*(i_tmp + i_num), i_utmp2,
52431+ sizeof (struct acl_ip_label)))
52432+ return ERR_PTR(-EFAULT);
52433+
52434+ if ((*(i_tmp + i_num))->iface == NULL)
52435+ continue;
52436+
52437+ len = strnlen_user((*(i_tmp + i_num))->iface, IFNAMSIZ);
52438+ if (!len || len >= IFNAMSIZ)
52439+ return ERR_PTR(-EINVAL);
52440+ tmp = acl_alloc(len);
52441+ if (tmp == NULL)
52442+ return ERR_PTR(-ENOMEM);
52443+ if (copy_from_user(tmp, (*(i_tmp + i_num))->iface, len))
52444+ return ERR_PTR(-EFAULT);
52445+ (*(i_tmp + i_num))->iface = tmp;
52446+ }
52447+
52448+ s_tmp->ips = i_tmp;
52449+
52450+insert:
52451+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
52452+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
52453+ return ERR_PTR(-ENOMEM);
52454+
52455+ return s_tmp;
52456+}
52457+
52458+static int
52459+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
52460+{
52461+ struct acl_subject_label s_pre;
52462+ struct acl_subject_label * ret;
52463+ int err;
52464+
52465+ while (userp) {
52466+ if (copy_from_user(&s_pre, userp,
52467+ sizeof (struct acl_subject_label)))
52468+ return -EFAULT;
52469+
52470+ /* do not add nested subjects here, add
52471+ while parsing objects
52472+ */
52473+
52474+ if (s_pre.mode & GR_NESTED) {
52475+ userp = s_pre.prev;
52476+ continue;
52477+ }
52478+
52479+ ret = do_copy_user_subj(userp, role);
52480+
52481+ err = PTR_ERR(ret);
52482+ if (IS_ERR(ret))
52483+ return err;
52484+
52485+ insert_acl_subj_label(ret, role);
52486+
52487+ userp = s_pre.prev;
52488+ }
52489+
52490+ return 0;
52491+}
52492+
52493+static int
52494+copy_user_acl(struct gr_arg *arg)
52495+{
52496+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
52497+ struct sprole_pw *sptmp;
52498+ struct gr_hash_struct *ghash;
52499+ uid_t *domainlist;
52500+ unsigned int r_num;
52501+ unsigned int len;
52502+ char *tmp;
52503+ int err = 0;
52504+ __u16 i;
52505+ __u32 num_subjs;
52506+
52507+ /* we need a default and kernel role */
52508+ if (arg->role_db.num_roles < 2)
52509+ return -EINVAL;
52510+
52511+ /* copy special role authentication info from userspace */
52512+
52513+ num_sprole_pws = arg->num_sprole_pws;
52514+ acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
52515+
52516+ if (!acl_special_roles) {
52517+ err = -ENOMEM;
52518+ goto cleanup;
52519+ }
52520+
52521+ for (i = 0; i < num_sprole_pws; i++) {
52522+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
52523+ if (!sptmp) {
52524+ err = -ENOMEM;
52525+ goto cleanup;
52526+ }
52527+ if (copy_from_user(sptmp, arg->sprole_pws + i,
52528+ sizeof (struct sprole_pw))) {
52529+ err = -EFAULT;
52530+ goto cleanup;
52531+ }
52532+
52533+ len =
52534+ strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
52535+
52536+ if (!len || len >= GR_SPROLE_LEN) {
52537+ err = -EINVAL;
52538+ goto cleanup;
52539+ }
52540+
52541+ if ((tmp = (char *) acl_alloc(len)) == NULL) {
52542+ err = -ENOMEM;
52543+ goto cleanup;
52544+ }
52545+
52546+ if (copy_from_user(tmp, sptmp->rolename, len)) {
52547+ err = -EFAULT;
52548+ goto cleanup;
52549+ }
52550+ tmp[len-1] = '\0';
52551+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
52552+ printk(KERN_ALERT "Copying special role %s\n", tmp);
52553+#endif
52554+ sptmp->rolename = tmp;
52555+ acl_special_roles[i] = sptmp;
52556+ }
52557+
52558+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
52559+
52560+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
52561+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
52562+
52563+ if (!r_tmp) {
52564+ err = -ENOMEM;
52565+ goto cleanup;
52566+ }
52567+
52568+ if (copy_from_user(&r_utmp2, r_utmp + r_num,
52569+ sizeof (struct acl_role_label *))) {
52570+ err = -EFAULT;
52571+ goto cleanup;
52572+ }
52573+
52574+ if (copy_from_user(r_tmp, r_utmp2,
52575+ sizeof (struct acl_role_label))) {
52576+ err = -EFAULT;
52577+ goto cleanup;
52578+ }
52579+
52580+ len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
52581+
52582+ if (!len || len >= PATH_MAX) {
52583+ err = -EINVAL;
52584+ goto cleanup;
52585+ }
52586+
52587+ if ((tmp = (char *) acl_alloc(len)) == NULL) {
52588+ err = -ENOMEM;
52589+ goto cleanup;
52590+ }
52591+ if (copy_from_user(tmp, r_tmp->rolename, len)) {
52592+ err = -EFAULT;
52593+ goto cleanup;
52594+ }
52595+ tmp[len-1] = '\0';
52596+ r_tmp->rolename = tmp;
52597+
52598+ if (!strcmp(r_tmp->rolename, "default")
52599+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
52600+ default_role = r_tmp;
52601+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
52602+ kernel_role = r_tmp;
52603+ }
52604+
52605+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL) {
52606+ err = -ENOMEM;
52607+ goto cleanup;
52608+ }
52609+ if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct))) {
52610+ err = -EFAULT;
52611+ goto cleanup;
52612+ }
52613+
52614+ r_tmp->hash = ghash;
52615+
52616+ num_subjs = count_user_subjs(r_tmp->hash->first);
52617+
52618+ r_tmp->subj_hash_size = num_subjs;
52619+ r_tmp->subj_hash =
52620+ (struct acl_subject_label **)
52621+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
52622+
52623+ if (!r_tmp->subj_hash) {
52624+ err = -ENOMEM;
52625+ goto cleanup;
52626+ }
52627+
52628+ err = copy_user_allowedips(r_tmp);
52629+ if (err)
52630+ goto cleanup;
52631+
52632+ /* copy domain info */
52633+ if (r_tmp->domain_children != NULL) {
52634+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
52635+ if (domainlist == NULL) {
52636+ err = -ENOMEM;
52637+ goto cleanup;
52638+ }
52639+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t))) {
52640+ err = -EFAULT;
52641+ goto cleanup;
52642+ }
52643+ r_tmp->domain_children = domainlist;
52644+ }
52645+
52646+ err = copy_user_transitions(r_tmp);
52647+ if (err)
52648+ goto cleanup;
52649+
52650+ memset(r_tmp->subj_hash, 0,
52651+ r_tmp->subj_hash_size *
52652+ sizeof (struct acl_subject_label *));
52653+
52654+ err = copy_user_subjs(r_tmp->hash->first, r_tmp);
52655+
52656+ if (err)
52657+ goto cleanup;
52658+
52659+ /* set nested subject list to null */
52660+ r_tmp->hash->first = NULL;
52661+
52662+ insert_acl_role_label(r_tmp);
52663+ }
52664+
52665+ goto return_err;
52666+ cleanup:
52667+ free_variables();
52668+ return_err:
52669+ return err;
52670+
52671+}
52672+
52673+static int
52674+gracl_init(struct gr_arg *args)
52675+{
52676+ int error = 0;
52677+
52678+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
52679+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
52680+
52681+ if (init_variables(args)) {
52682+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
52683+ error = -ENOMEM;
52684+ free_variables();
52685+ goto out;
52686+ }
52687+
52688+ error = copy_user_acl(args);
52689+ free_init_variables();
52690+ if (error) {
52691+ free_variables();
52692+ goto out;
52693+ }
52694+
52695+ if ((error = gr_set_acls(0))) {
52696+ free_variables();
52697+ goto out;
52698+ }
52699+
52700+ pax_open_kernel();
52701+ gr_status |= GR_READY;
52702+ pax_close_kernel();
52703+
52704+ out:
52705+ return error;
52706+}
52707+
52708+/* derived from glibc fnmatch() 0: match, 1: no match*/
52709+
52710+static int
52711+glob_match(const char *p, const char *n)
52712+{
52713+ char c;
52714+
52715+ while ((c = *p++) != '\0') {
52716+ switch (c) {
52717+ case '?':
52718+ if (*n == '\0')
52719+ return 1;
52720+ else if (*n == '/')
52721+ return 1;
52722+ break;
52723+ case '\\':
52724+ if (*n != c)
52725+ return 1;
52726+ break;
52727+ case '*':
52728+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
52729+ if (*n == '/')
52730+ return 1;
52731+ else if (c == '?') {
52732+ if (*n == '\0')
52733+ return 1;
52734+ else
52735+ ++n;
52736+ }
52737+ }
52738+ if (c == '\0') {
52739+ return 0;
52740+ } else {
52741+ const char *endp;
52742+
52743+ if ((endp = strchr(n, '/')) == NULL)
52744+ endp = n + strlen(n);
52745+
52746+ if (c == '[') {
52747+ for (--p; n < endp; ++n)
52748+ if (!glob_match(p, n))
52749+ return 0;
52750+ } else if (c == '/') {
52751+ while (*n != '\0' && *n != '/')
52752+ ++n;
52753+ if (*n == '/' && !glob_match(p, n + 1))
52754+ return 0;
52755+ } else {
52756+ for (--p; n < endp; ++n)
52757+ if (*n == c && !glob_match(p, n))
52758+ return 0;
52759+ }
52760+
52761+ return 1;
52762+ }
52763+ case '[':
52764+ {
52765+ int not;
52766+ char cold;
52767+
52768+ if (*n == '\0' || *n == '/')
52769+ return 1;
52770+
52771+ not = (*p == '!' || *p == '^');
52772+ if (not)
52773+ ++p;
52774+
52775+ c = *p++;
52776+ for (;;) {
52777+ unsigned char fn = (unsigned char)*n;
52778+
52779+ if (c == '\0')
52780+ return 1;
52781+ else {
52782+ if (c == fn)
52783+ goto matched;
52784+ cold = c;
52785+ c = *p++;
52786+
52787+ if (c == '-' && *p != ']') {
52788+ unsigned char cend = *p++;
52789+
52790+ if (cend == '\0')
52791+ return 1;
52792+
52793+ if (cold <= fn && fn <= cend)
52794+ goto matched;
52795+
52796+ c = *p++;
52797+ }
52798+ }
52799+
52800+ if (c == ']')
52801+ break;
52802+ }
52803+ if (!not)
52804+ return 1;
52805+ break;
52806+ matched:
52807+ while (c != ']') {
52808+ if (c == '\0')
52809+ return 1;
52810+
52811+ c = *p++;
52812+ }
52813+ if (not)
52814+ return 1;
52815+ }
52816+ break;
52817+ default:
52818+ if (c != *n)
52819+ return 1;
52820+ }
52821+
52822+ ++n;
52823+ }
52824+
52825+ if (*n == '\0')
52826+ return 0;
52827+
52828+ if (*n == '/')
52829+ return 0;
52830+
52831+ return 1;
52832+}
52833+
52834+static struct acl_object_label *
52835+chk_glob_label(struct acl_object_label *globbed,
52836+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
52837+{
52838+ struct acl_object_label *tmp;
52839+
52840+ if (*path == NULL)
52841+ *path = gr_to_filename_nolock(dentry, mnt);
52842+
52843+ tmp = globbed;
52844+
52845+ while (tmp) {
52846+ if (!glob_match(tmp->filename, *path))
52847+ return tmp;
52848+ tmp = tmp->next;
52849+ }
52850+
52851+ return NULL;
52852+}
52853+
52854+static struct acl_object_label *
52855+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
52856+ const ino_t curr_ino, const dev_t curr_dev,
52857+ const struct acl_subject_label *subj, char **path, const int checkglob)
52858+{
52859+ struct acl_subject_label *tmpsubj;
52860+ struct acl_object_label *retval;
52861+ struct acl_object_label *retval2;
52862+
52863+ tmpsubj = (struct acl_subject_label *) subj;
52864+ read_lock(&gr_inode_lock);
52865+ do {
52866+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
52867+ if (retval) {
52868+ if (checkglob && retval->globbed) {
52869+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
52870+ if (retval2)
52871+ retval = retval2;
52872+ }
52873+ break;
52874+ }
52875+ } while ((tmpsubj = tmpsubj->parent_subject));
52876+ read_unlock(&gr_inode_lock);
52877+
52878+ return retval;
52879+}
52880+
52881+static __inline__ struct acl_object_label *
52882+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
52883+ struct dentry *curr_dentry,
52884+ const struct acl_subject_label *subj, char **path, const int checkglob)
52885+{
52886+ int newglob = checkglob;
52887+ ino_t inode;
52888+ dev_t device;
52889+
52890+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
52891+ as we don't want a / * rule to match instead of the / object
52892+ don't do this for create lookups that call this function though, since they're looking up
52893+ on the parent and thus need globbing checks on all paths
52894+ */
52895+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
52896+ newglob = GR_NO_GLOB;
52897+
52898+ spin_lock(&curr_dentry->d_lock);
52899+ inode = curr_dentry->d_inode->i_ino;
52900+ device = __get_dev(curr_dentry);
52901+ spin_unlock(&curr_dentry->d_lock);
52902+
52903+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
52904+}
52905+
52906+static struct acl_object_label *
52907+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52908+ const struct acl_subject_label *subj, char *path, const int checkglob)
52909+{
52910+ struct dentry *dentry = (struct dentry *) l_dentry;
52911+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
52912+ struct acl_object_label *retval;
52913+ struct dentry *parent;
52914+
52915+ write_seqlock(&rename_lock);
52916+ br_read_lock(vfsmount_lock);
52917+
52918+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
52919+#ifdef CONFIG_NET
52920+ mnt == sock_mnt ||
52921+#endif
52922+#ifdef CONFIG_HUGETLBFS
52923+ (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
52924+#endif
52925+ /* ignore Eric Biederman */
52926+ IS_PRIVATE(l_dentry->d_inode))) {
52927+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
52928+ goto out;
52929+ }
52930+
52931+ for (;;) {
52932+ if (dentry == real_root.dentry && mnt == real_root.mnt)
52933+ break;
52934+
52935+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
52936+ if (mnt->mnt_parent == mnt)
52937+ break;
52938+
52939+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52940+ if (retval != NULL)
52941+ goto out;
52942+
52943+ dentry = mnt->mnt_mountpoint;
52944+ mnt = mnt->mnt_parent;
52945+ continue;
52946+ }
52947+
52948+ parent = dentry->d_parent;
52949+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52950+ if (retval != NULL)
52951+ goto out;
52952+
52953+ dentry = parent;
52954+ }
52955+
52956+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52957+
52958+ /* real_root is pinned so we don't have to hold a reference */
52959+ if (retval == NULL)
52960+ retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob);
52961+out:
52962+ br_read_unlock(vfsmount_lock);
52963+ write_sequnlock(&rename_lock);
52964+
52965+ BUG_ON(retval == NULL);
52966+
52967+ return retval;
52968+}
52969+
52970+static __inline__ struct acl_object_label *
52971+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52972+ const struct acl_subject_label *subj)
52973+{
52974+ char *path = NULL;
52975+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
52976+}
52977+
52978+static __inline__ struct acl_object_label *
52979+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52980+ const struct acl_subject_label *subj)
52981+{
52982+ char *path = NULL;
52983+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
52984+}
52985+
52986+static __inline__ struct acl_object_label *
52987+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52988+ const struct acl_subject_label *subj, char *path)
52989+{
52990+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
52991+}
52992+
52993+static struct acl_subject_label *
52994+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52995+ const struct acl_role_label *role)
52996+{
52997+ struct dentry *dentry = (struct dentry *) l_dentry;
52998+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
52999+ struct acl_subject_label *retval;
53000+ struct dentry *parent;
53001+
53002+ write_seqlock(&rename_lock);
53003+ br_read_lock(vfsmount_lock);
53004+
53005+ for (;;) {
53006+ if (dentry == real_root.dentry && mnt == real_root.mnt)
53007+ break;
53008+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
53009+ if (mnt->mnt_parent == mnt)
53010+ break;
53011+
53012+ spin_lock(&dentry->d_lock);
53013+ read_lock(&gr_inode_lock);
53014+ retval =
53015+ lookup_acl_subj_label(dentry->d_inode->i_ino,
53016+ __get_dev(dentry), role);
53017+ read_unlock(&gr_inode_lock);
53018+ spin_unlock(&dentry->d_lock);
53019+ if (retval != NULL)
53020+ goto out;
53021+
53022+ dentry = mnt->mnt_mountpoint;
53023+ mnt = mnt->mnt_parent;
53024+ continue;
53025+ }
53026+
53027+ spin_lock(&dentry->d_lock);
53028+ read_lock(&gr_inode_lock);
53029+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
53030+ __get_dev(dentry), role);
53031+ read_unlock(&gr_inode_lock);
53032+ parent = dentry->d_parent;
53033+ spin_unlock(&dentry->d_lock);
53034+
53035+ if (retval != NULL)
53036+ goto out;
53037+
53038+ dentry = parent;
53039+ }
53040+
53041+ spin_lock(&dentry->d_lock);
53042+ read_lock(&gr_inode_lock);
53043+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
53044+ __get_dev(dentry), role);
53045+ read_unlock(&gr_inode_lock);
53046+ spin_unlock(&dentry->d_lock);
53047+
53048+ if (unlikely(retval == NULL)) {
53049+ /* real_root is pinned, we don't need to hold a reference */
53050+ read_lock(&gr_inode_lock);
53051+ retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino,
53052+ __get_dev(real_root.dentry), role);
53053+ read_unlock(&gr_inode_lock);
53054+ }
53055+out:
53056+ br_read_unlock(vfsmount_lock);
53057+ write_sequnlock(&rename_lock);
53058+
53059+ BUG_ON(retval == NULL);
53060+
53061+ return retval;
53062+}
53063+
53064+static void
53065+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
53066+{
53067+ struct task_struct *task = current;
53068+ const struct cred *cred = current_cred();
53069+
53070+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
53071+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
53072+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
53073+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
53074+
53075+ return;
53076+}
53077+
53078+static void
53079+gr_log_learn_sysctl(const char *path, const __u32 mode)
53080+{
53081+ struct task_struct *task = current;
53082+ const struct cred *cred = current_cred();
53083+
53084+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
53085+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
53086+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
53087+ 1UL, 1UL, path, (unsigned long) mode, &task->signal->saved_ip);
53088+
53089+ return;
53090+}
53091+
53092+static void
53093+gr_log_learn_id_change(const char type, const unsigned int real,
53094+ const unsigned int effective, const unsigned int fs)
53095+{
53096+ struct task_struct *task = current;
53097+ const struct cred *cred = current_cred();
53098+
53099+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
53100+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
53101+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
53102+ type, real, effective, fs, &task->signal->saved_ip);
53103+
53104+ return;
53105+}
53106+
53107+__u32
53108+gr_search_file(const struct dentry * dentry, const __u32 mode,
53109+ const struct vfsmount * mnt)
53110+{
53111+ __u32 retval = mode;
53112+ struct acl_subject_label *curracl;
53113+ struct acl_object_label *currobj;
53114+
53115+ if (unlikely(!(gr_status & GR_READY)))
53116+ return (mode & ~GR_AUDITS);
53117+
53118+ curracl = current->acl;
53119+
53120+ currobj = chk_obj_label(dentry, mnt, curracl);
53121+ retval = currobj->mode & mode;
53122+
53123+ /* if we're opening a specified transfer file for writing
53124+ (e.g. /dev/initctl), then transfer our role to init
53125+ */
53126+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
53127+ current->role->roletype & GR_ROLE_PERSIST)) {
53128+ struct task_struct *task = init_pid_ns.child_reaper;
53129+
53130+ if (task->role != current->role) {
53131+ task->acl_sp_role = 0;
53132+ task->acl_role_id = current->acl_role_id;
53133+ task->role = current->role;
53134+ rcu_read_lock();
53135+ read_lock(&grsec_exec_file_lock);
53136+ gr_apply_subject_to_task(task);
53137+ read_unlock(&grsec_exec_file_lock);
53138+ rcu_read_unlock();
53139+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
53140+ }
53141+ }
53142+
53143+ if (unlikely
53144+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
53145+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
53146+ __u32 new_mode = mode;
53147+
53148+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
53149+
53150+ retval = new_mode;
53151+
53152+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
53153+ new_mode |= GR_INHERIT;
53154+
53155+ if (!(mode & GR_NOLEARN))
53156+ gr_log_learn(dentry, mnt, new_mode);
53157+ }
53158+
53159+ return retval;
53160+}
53161+
53162+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
53163+ const struct dentry *parent,
53164+ const struct vfsmount *mnt)
53165+{
53166+ struct name_entry *match;
53167+ struct acl_object_label *matchpo;
53168+ struct acl_subject_label *curracl;
53169+ char *path;
53170+
53171+ if (unlikely(!(gr_status & GR_READY)))
53172+ return NULL;
53173+
53174+ preempt_disable();
53175+ path = gr_to_filename_rbac(new_dentry, mnt);
53176+ match = lookup_name_entry_create(path);
53177+
53178+ curracl = current->acl;
53179+
53180+ if (match) {
53181+ read_lock(&gr_inode_lock);
53182+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
53183+ read_unlock(&gr_inode_lock);
53184+
53185+ if (matchpo) {
53186+ preempt_enable();
53187+ return matchpo;
53188+ }
53189+ }
53190+
53191+ // lookup parent
53192+
53193+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
53194+
53195+ preempt_enable();
53196+ return matchpo;
53197+}
53198+
53199+__u32
53200+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
53201+ const struct vfsmount * mnt, const __u32 mode)
53202+{
53203+ struct acl_object_label *matchpo;
53204+ __u32 retval;
53205+
53206+ if (unlikely(!(gr_status & GR_READY)))
53207+ return (mode & ~GR_AUDITS);
53208+
53209+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
53210+
53211+ retval = matchpo->mode & mode;
53212+
53213+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
53214+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
53215+ __u32 new_mode = mode;
53216+
53217+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
53218+
53219+ gr_log_learn(new_dentry, mnt, new_mode);
53220+ return new_mode;
53221+ }
53222+
53223+ return retval;
53224+}
53225+
53226+__u32
53227+gr_check_link(const struct dentry * new_dentry,
53228+ const struct dentry * parent_dentry,
53229+ const struct vfsmount * parent_mnt,
53230+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
53231+{
53232+ struct acl_object_label *obj;
53233+ __u32 oldmode, newmode;
53234+ __u32 needmode;
53235+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
53236+ GR_DELETE | GR_INHERIT;
53237+
53238+ if (unlikely(!(gr_status & GR_READY)))
53239+ return (GR_CREATE | GR_LINK);
53240+
53241+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
53242+ oldmode = obj->mode;
53243+
53244+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
53245+ newmode = obj->mode;
53246+
53247+ needmode = newmode & checkmodes;
53248+
53249+ // old name for hardlink must have at least the permissions of the new name
53250+ if ((oldmode & needmode) != needmode)
53251+ goto bad;
53252+
53253+ // if old name had restrictions/auditing, make sure the new name does as well
53254+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
53255+
53256+ // don't allow hardlinking of suid/sgid files without permission
53257+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
53258+ needmode |= GR_SETID;
53259+
53260+ if ((newmode & needmode) != needmode)
53261+ goto bad;
53262+
53263+ // enforce minimum permissions
53264+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
53265+ return newmode;
53266+bad:
53267+ needmode = oldmode;
53268+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
53269+ needmode |= GR_SETID;
53270+
53271+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
53272+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
53273+ return (GR_CREATE | GR_LINK);
53274+ } else if (newmode & GR_SUPPRESS)
53275+ return GR_SUPPRESS;
53276+ else
53277+ return 0;
53278+}
53279+
53280+int
53281+gr_check_hidden_task(const struct task_struct *task)
53282+{
53283+ if (unlikely(!(gr_status & GR_READY)))
53284+ return 0;
53285+
53286+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
53287+ return 1;
53288+
53289+ return 0;
53290+}
53291+
53292+int
53293+gr_check_protected_task(const struct task_struct *task)
53294+{
53295+ if (unlikely(!(gr_status & GR_READY) || !task))
53296+ return 0;
53297+
53298+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
53299+ task->acl != current->acl)
53300+ return 1;
53301+
53302+ return 0;
53303+}
53304+
53305+int
53306+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
53307+{
53308+ struct task_struct *p;
53309+ int ret = 0;
53310+
53311+ if (unlikely(!(gr_status & GR_READY) || !pid))
53312+ return ret;
53313+
53314+ read_lock(&tasklist_lock);
53315+ do_each_pid_task(pid, type, p) {
53316+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
53317+ p->acl != current->acl) {
53318+ ret = 1;
53319+ goto out;
53320+ }
53321+ } while_each_pid_task(pid, type, p);
53322+out:
53323+ read_unlock(&tasklist_lock);
53324+
53325+ return ret;
53326+}
53327+
53328+void
53329+gr_copy_label(struct task_struct *tsk)
53330+{
53331+ /* plain copying of fields is already done by dup_task_struct */
53332+ tsk->signal->used_accept = 0;
53333+ tsk->acl_sp_role = 0;
53334+ //tsk->acl_role_id = current->acl_role_id;
53335+ //tsk->acl = current->acl;
53336+ //tsk->role = current->role;
53337+ tsk->signal->curr_ip = current->signal->curr_ip;
53338+ tsk->signal->saved_ip = current->signal->saved_ip;
53339+ if (current->exec_file)
53340+ get_file(current->exec_file);
53341+ //tsk->exec_file = current->exec_file;
53342+ //tsk->is_writable = current->is_writable;
53343+ if (unlikely(current->signal->used_accept)) {
53344+ current->signal->curr_ip = 0;
53345+ current->signal->saved_ip = 0;
53346+ }
53347+
53348+ return;
53349+}
53350+
53351+static void
53352+gr_set_proc_res(struct task_struct *task)
53353+{
53354+ struct acl_subject_label *proc;
53355+ unsigned short i;
53356+
53357+ proc = task->acl;
53358+
53359+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
53360+ return;
53361+
53362+ for (i = 0; i < RLIM_NLIMITS; i++) {
53363+ if (!(proc->resmask & (1 << i)))
53364+ continue;
53365+
53366+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
53367+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
53368+ }
53369+
53370+ return;
53371+}
53372+
53373+extern int __gr_process_user_ban(struct user_struct *user);
53374+
53375+int
53376+gr_check_user_change(int real, int effective, int fs)
53377+{
53378+ unsigned int i;
53379+ __u16 num;
53380+ uid_t *uidlist;
53381+ int curuid;
53382+ int realok = 0;
53383+ int effectiveok = 0;
53384+ int fsok = 0;
53385+
53386+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
53387+ struct user_struct *user;
53388+
53389+ if (real == -1)
53390+ goto skipit;
53391+
53392+ user = find_user(real);
53393+ if (user == NULL)
53394+ goto skipit;
53395+
53396+ if (__gr_process_user_ban(user)) {
53397+ /* for find_user */
53398+ free_uid(user);
53399+ return 1;
53400+ }
53401+
53402+ /* for find_user */
53403+ free_uid(user);
53404+
53405+skipit:
53406+#endif
53407+
53408+ if (unlikely(!(gr_status & GR_READY)))
53409+ return 0;
53410+
53411+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
53412+ gr_log_learn_id_change('u', real, effective, fs);
53413+
53414+ num = current->acl->user_trans_num;
53415+ uidlist = current->acl->user_transitions;
53416+
53417+ if (uidlist == NULL)
53418+ return 0;
53419+
53420+ if (real == -1)
53421+ realok = 1;
53422+ if (effective == -1)
53423+ effectiveok = 1;
53424+ if (fs == -1)
53425+ fsok = 1;
53426+
53427+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
53428+ for (i = 0; i < num; i++) {
53429+ curuid = (int)uidlist[i];
53430+ if (real == curuid)
53431+ realok = 1;
53432+ if (effective == curuid)
53433+ effectiveok = 1;
53434+ if (fs == curuid)
53435+ fsok = 1;
53436+ }
53437+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
53438+ for (i = 0; i < num; i++) {
53439+ curuid = (int)uidlist[i];
53440+ if (real == curuid)
53441+ break;
53442+ if (effective == curuid)
53443+ break;
53444+ if (fs == curuid)
53445+ break;
53446+ }
53447+ /* not in deny list */
53448+ if (i == num) {
53449+ realok = 1;
53450+ effectiveok = 1;
53451+ fsok = 1;
53452+ }
53453+ }
53454+
53455+ if (realok && effectiveok && fsok)
53456+ return 0;
53457+ else {
53458+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
53459+ return 1;
53460+ }
53461+}
53462+
53463+int
53464+gr_check_group_change(int real, int effective, int fs)
53465+{
53466+ unsigned int i;
53467+ __u16 num;
53468+ gid_t *gidlist;
53469+ int curgid;
53470+ int realok = 0;
53471+ int effectiveok = 0;
53472+ int fsok = 0;
53473+
53474+ if (unlikely(!(gr_status & GR_READY)))
53475+ return 0;
53476+
53477+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
53478+ gr_log_learn_id_change('g', real, effective, fs);
53479+
53480+ num = current->acl->group_trans_num;
53481+ gidlist = current->acl->group_transitions;
53482+
53483+ if (gidlist == NULL)
53484+ return 0;
53485+
53486+ if (real == -1)
53487+ realok = 1;
53488+ if (effective == -1)
53489+ effectiveok = 1;
53490+ if (fs == -1)
53491+ fsok = 1;
53492+
53493+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
53494+ for (i = 0; i < num; i++) {
53495+ curgid = (int)gidlist[i];
53496+ if (real == curgid)
53497+ realok = 1;
53498+ if (effective == curgid)
53499+ effectiveok = 1;
53500+ if (fs == curgid)
53501+ fsok = 1;
53502+ }
53503+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
53504+ for (i = 0; i < num; i++) {
53505+ curgid = (int)gidlist[i];
53506+ if (real == curgid)
53507+ break;
53508+ if (effective == curgid)
53509+ break;
53510+ if (fs == curgid)
53511+ break;
53512+ }
53513+ /* not in deny list */
53514+ if (i == num) {
53515+ realok = 1;
53516+ effectiveok = 1;
53517+ fsok = 1;
53518+ }
53519+ }
53520+
53521+ if (realok && effectiveok && fsok)
53522+ return 0;
53523+ else {
53524+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
53525+ return 1;
53526+ }
53527+}
53528+
53529+extern int gr_acl_is_capable(const int cap);
53530+
53531+void
53532+gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
53533+{
53534+ struct acl_role_label *role = task->role;
53535+ struct acl_subject_label *subj = NULL;
53536+ struct acl_object_label *obj;
53537+ struct file *filp;
53538+
53539+ if (unlikely(!(gr_status & GR_READY)))
53540+ return;
53541+
53542+ filp = task->exec_file;
53543+
53544+ /* kernel process, we'll give them the kernel role */
53545+ if (unlikely(!filp)) {
53546+ task->role = kernel_role;
53547+ task->acl = kernel_role->root_label;
53548+ return;
53549+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
53550+ role = lookup_acl_role_label(task, uid, gid);
53551+
53552+ /* don't change the role if we're not a privileged process */
53553+ if (role && task->role != role &&
53554+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
53555+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
53556+ return;
53557+
53558+ /* perform subject lookup in possibly new role
53559+ we can use this result below in the case where role == task->role
53560+ */
53561+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
53562+
53563+ /* if we changed uid/gid, but result in the same role
53564+ and are using inheritance, don't lose the inherited subject
53565+ if current subject is other than what normal lookup
53566+ would result in, we arrived via inheritance, don't
53567+ lose subject
53568+ */
53569+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
53570+ (subj == task->acl)))
53571+ task->acl = subj;
53572+
53573+ task->role = role;
53574+
53575+ task->is_writable = 0;
53576+
53577+ /* ignore additional mmap checks for processes that are writable
53578+ by the default ACL */
53579+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
53580+ if (unlikely(obj->mode & GR_WRITE))
53581+ task->is_writable = 1;
53582+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
53583+ if (unlikely(obj->mode & GR_WRITE))
53584+ task->is_writable = 1;
53585+
53586+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53587+ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53588+#endif
53589+
53590+ gr_set_proc_res(task);
53591+
53592+ return;
53593+}
53594+
53595+int
53596+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
53597+ const int unsafe_flags)
53598+{
53599+ struct task_struct *task = current;
53600+ struct acl_subject_label *newacl;
53601+ struct acl_object_label *obj;
53602+ __u32 retmode;
53603+
53604+ if (unlikely(!(gr_status & GR_READY)))
53605+ return 0;
53606+
53607+ newacl = chk_subj_label(dentry, mnt, task->role);
53608+
53609+ task_lock(task);
53610+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
53611+ !(task->role->roletype & GR_ROLE_GOD) &&
53612+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
53613+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
53614+ task_unlock(task);
53615+ if (unsafe_flags & LSM_UNSAFE_SHARE)
53616+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
53617+ else
53618+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
53619+ return -EACCES;
53620+ }
53621+ task_unlock(task);
53622+
53623+ obj = chk_obj_label(dentry, mnt, task->acl);
53624+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
53625+
53626+ if (!(task->acl->mode & GR_INHERITLEARN) &&
53627+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
53628+ if (obj->nested)
53629+ task->acl = obj->nested;
53630+ else
53631+ task->acl = newacl;
53632+ } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
53633+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
53634+
53635+ task->is_writable = 0;
53636+
53637+ /* ignore additional mmap checks for processes that are writable
53638+ by the default ACL */
53639+ obj = chk_obj_label(dentry, mnt, default_role->root_label);
53640+ if (unlikely(obj->mode & GR_WRITE))
53641+ task->is_writable = 1;
53642+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
53643+ if (unlikely(obj->mode & GR_WRITE))
53644+ task->is_writable = 1;
53645+
53646+ gr_set_proc_res(task);
53647+
53648+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53649+ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53650+#endif
53651+ return 0;
53652+}
53653+
53654+/* always called with valid inodev ptr */
53655+static void
53656+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
53657+{
53658+ struct acl_object_label *matchpo;
53659+ struct acl_subject_label *matchps;
53660+ struct acl_subject_label *subj;
53661+ struct acl_role_label *role;
53662+ unsigned int x;
53663+
53664+ FOR_EACH_ROLE_START(role)
53665+ FOR_EACH_SUBJECT_START(role, subj, x)
53666+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
53667+ matchpo->mode |= GR_DELETED;
53668+ FOR_EACH_SUBJECT_END(subj,x)
53669+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
53670+ if (subj->inode == ino && subj->device == dev)
53671+ subj->mode |= GR_DELETED;
53672+ FOR_EACH_NESTED_SUBJECT_END(subj)
53673+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
53674+ matchps->mode |= GR_DELETED;
53675+ FOR_EACH_ROLE_END(role)
53676+
53677+ inodev->nentry->deleted = 1;
53678+
53679+ return;
53680+}
53681+
53682+void
53683+gr_handle_delete(const ino_t ino, const dev_t dev)
53684+{
53685+ struct inodev_entry *inodev;
53686+
53687+ if (unlikely(!(gr_status & GR_READY)))
53688+ return;
53689+
53690+ write_lock(&gr_inode_lock);
53691+ inodev = lookup_inodev_entry(ino, dev);
53692+ if (inodev != NULL)
53693+ do_handle_delete(inodev, ino, dev);
53694+ write_unlock(&gr_inode_lock);
53695+
53696+ return;
53697+}
53698+
53699+static void
53700+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
53701+ const ino_t newinode, const dev_t newdevice,
53702+ struct acl_subject_label *subj)
53703+{
53704+ unsigned int index = fhash(oldinode, olddevice, subj->obj_hash_size);
53705+ struct acl_object_label *match;
53706+
53707+ match = subj->obj_hash[index];
53708+
53709+ while (match && (match->inode != oldinode ||
53710+ match->device != olddevice ||
53711+ !(match->mode & GR_DELETED)))
53712+ match = match->next;
53713+
53714+ if (match && (match->inode == oldinode)
53715+ && (match->device == olddevice)
53716+ && (match->mode & GR_DELETED)) {
53717+ if (match->prev == NULL) {
53718+ subj->obj_hash[index] = match->next;
53719+ if (match->next != NULL)
53720+ match->next->prev = NULL;
53721+ } else {
53722+ match->prev->next = match->next;
53723+ if (match->next != NULL)
53724+ match->next->prev = match->prev;
53725+ }
53726+ match->prev = NULL;
53727+ match->next = NULL;
53728+ match->inode = newinode;
53729+ match->device = newdevice;
53730+ match->mode &= ~GR_DELETED;
53731+
53732+ insert_acl_obj_label(match, subj);
53733+ }
53734+
53735+ return;
53736+}
53737+
53738+static void
53739+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
53740+ const ino_t newinode, const dev_t newdevice,
53741+ struct acl_role_label *role)
53742+{
53743+ unsigned int index = fhash(oldinode, olddevice, role->subj_hash_size);
53744+ struct acl_subject_label *match;
53745+
53746+ match = role->subj_hash[index];
53747+
53748+ while (match && (match->inode != oldinode ||
53749+ match->device != olddevice ||
53750+ !(match->mode & GR_DELETED)))
53751+ match = match->next;
53752+
53753+ if (match && (match->inode == oldinode)
53754+ && (match->device == olddevice)
53755+ && (match->mode & GR_DELETED)) {
53756+ if (match->prev == NULL) {
53757+ role->subj_hash[index] = match->next;
53758+ if (match->next != NULL)
53759+ match->next->prev = NULL;
53760+ } else {
53761+ match->prev->next = match->next;
53762+ if (match->next != NULL)
53763+ match->next->prev = match->prev;
53764+ }
53765+ match->prev = NULL;
53766+ match->next = NULL;
53767+ match->inode = newinode;
53768+ match->device = newdevice;
53769+ match->mode &= ~GR_DELETED;
53770+
53771+ insert_acl_subj_label(match, role);
53772+ }
53773+
53774+ return;
53775+}
53776+
53777+static void
53778+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
53779+ const ino_t newinode, const dev_t newdevice)
53780+{
53781+ unsigned int index = fhash(oldinode, olddevice, inodev_set.i_size);
53782+ struct inodev_entry *match;
53783+
53784+ match = inodev_set.i_hash[index];
53785+
53786+ while (match && (match->nentry->inode != oldinode ||
53787+ match->nentry->device != olddevice || !match->nentry->deleted))
53788+ match = match->next;
53789+
53790+ if (match && (match->nentry->inode == oldinode)
53791+ && (match->nentry->device == olddevice) &&
53792+ match->nentry->deleted) {
53793+ if (match->prev == NULL) {
53794+ inodev_set.i_hash[index] = match->next;
53795+ if (match->next != NULL)
53796+ match->next->prev = NULL;
53797+ } else {
53798+ match->prev->next = match->next;
53799+ if (match->next != NULL)
53800+ match->next->prev = match->prev;
53801+ }
53802+ match->prev = NULL;
53803+ match->next = NULL;
53804+ match->nentry->inode = newinode;
53805+ match->nentry->device = newdevice;
53806+ match->nentry->deleted = 0;
53807+
53808+ insert_inodev_entry(match);
53809+ }
53810+
53811+ return;
53812+}
53813+
53814+static void
53815+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
53816+{
53817+ struct acl_subject_label *subj;
53818+ struct acl_role_label *role;
53819+ unsigned int x;
53820+
53821+ FOR_EACH_ROLE_START(role)
53822+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
53823+
53824+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
53825+ if ((subj->inode == ino) && (subj->device == dev)) {
53826+ subj->inode = ino;
53827+ subj->device = dev;
53828+ }
53829+ FOR_EACH_NESTED_SUBJECT_END(subj)
53830+ FOR_EACH_SUBJECT_START(role, subj, x)
53831+ update_acl_obj_label(matchn->inode, matchn->device,
53832+ ino, dev, subj);
53833+ FOR_EACH_SUBJECT_END(subj,x)
53834+ FOR_EACH_ROLE_END(role)
53835+
53836+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
53837+
53838+ return;
53839+}
53840+
53841+static void
53842+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
53843+ const struct vfsmount *mnt)
53844+{
53845+ ino_t ino = dentry->d_inode->i_ino;
53846+ dev_t dev = __get_dev(dentry);
53847+
53848+ __do_handle_create(matchn, ino, dev);
53849+
53850+ return;
53851+}
53852+
53853+void
53854+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
53855+{
53856+ struct name_entry *matchn;
53857+
53858+ if (unlikely(!(gr_status & GR_READY)))
53859+ return;
53860+
53861+ preempt_disable();
53862+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
53863+
53864+ if (unlikely((unsigned long)matchn)) {
53865+ write_lock(&gr_inode_lock);
53866+ do_handle_create(matchn, dentry, mnt);
53867+ write_unlock(&gr_inode_lock);
53868+ }
53869+ preempt_enable();
53870+
53871+ return;
53872+}
53873+
53874+void
53875+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
53876+{
53877+ struct name_entry *matchn;
53878+
53879+ if (unlikely(!(gr_status & GR_READY)))
53880+ return;
53881+
53882+ preempt_disable();
53883+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
53884+
53885+ if (unlikely((unsigned long)matchn)) {
53886+ write_lock(&gr_inode_lock);
53887+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
53888+ write_unlock(&gr_inode_lock);
53889+ }
53890+ preempt_enable();
53891+
53892+ return;
53893+}
53894+
53895+void
53896+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
53897+ struct dentry *old_dentry,
53898+ struct dentry *new_dentry,
53899+ struct vfsmount *mnt, const __u8 replace)
53900+{
53901+ struct name_entry *matchn;
53902+ struct inodev_entry *inodev;
53903+ struct inode *inode = new_dentry->d_inode;
53904+ ino_t old_ino = old_dentry->d_inode->i_ino;
53905+ dev_t old_dev = __get_dev(old_dentry);
53906+
53907+ /* vfs_rename swaps the name and parent link for old_dentry and
53908+ new_dentry
53909+ at this point, old_dentry has the new name, parent link, and inode
53910+ for the renamed file
53911+ if a file is being replaced by a rename, new_dentry has the inode
53912+ and name for the replaced file
53913+ */
53914+
53915+ if (unlikely(!(gr_status & GR_READY)))
53916+ return;
53917+
53918+ preempt_disable();
53919+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
53920+
53921+ /* we wouldn't have to check d_inode if it weren't for
53922+ NFS silly-renaming
53923+ */
53924+
53925+ write_lock(&gr_inode_lock);
53926+ if (unlikely(replace && inode)) {
53927+ ino_t new_ino = inode->i_ino;
53928+ dev_t new_dev = __get_dev(new_dentry);
53929+
53930+ inodev = lookup_inodev_entry(new_ino, new_dev);
53931+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
53932+ do_handle_delete(inodev, new_ino, new_dev);
53933+ }
53934+
53935+ inodev = lookup_inodev_entry(old_ino, old_dev);
53936+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
53937+ do_handle_delete(inodev, old_ino, old_dev);
53938+
53939+ if (unlikely((unsigned long)matchn))
53940+ do_handle_create(matchn, old_dentry, mnt);
53941+
53942+ write_unlock(&gr_inode_lock);
53943+ preempt_enable();
53944+
53945+ return;
53946+}
53947+
53948+static int
53949+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
53950+ unsigned char **sum)
53951+{
53952+ struct acl_role_label *r;
53953+ struct role_allowed_ip *ipp;
53954+ struct role_transition *trans;
53955+ unsigned int i;
53956+ int found = 0;
53957+ u32 curr_ip = current->signal->curr_ip;
53958+
53959+ current->signal->saved_ip = curr_ip;
53960+
53961+ /* check transition table */
53962+
53963+ for (trans = current->role->transitions; trans; trans = trans->next) {
53964+ if (!strcmp(rolename, trans->rolename)) {
53965+ found = 1;
53966+ break;
53967+ }
53968+ }
53969+
53970+ if (!found)
53971+ return 0;
53972+
53973+ /* handle special roles that do not require authentication
53974+ and check ip */
53975+
53976+ FOR_EACH_ROLE_START(r)
53977+ if (!strcmp(rolename, r->rolename) &&
53978+ (r->roletype & GR_ROLE_SPECIAL)) {
53979+ found = 0;
53980+ if (r->allowed_ips != NULL) {
53981+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
53982+ if ((ntohl(curr_ip) & ipp->netmask) ==
53983+ (ntohl(ipp->addr) & ipp->netmask))
53984+ found = 1;
53985+ }
53986+ } else
53987+ found = 2;
53988+ if (!found)
53989+ return 0;
53990+
53991+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
53992+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
53993+ *salt = NULL;
53994+ *sum = NULL;
53995+ return 1;
53996+ }
53997+ }
53998+ FOR_EACH_ROLE_END(r)
53999+
54000+ for (i = 0; i < num_sprole_pws; i++) {
54001+ if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
54002+ *salt = acl_special_roles[i]->salt;
54003+ *sum = acl_special_roles[i]->sum;
54004+ return 1;
54005+ }
54006+ }
54007+
54008+ return 0;
54009+}
54010+
54011+static void
54012+assign_special_role(char *rolename)
54013+{
54014+ struct acl_object_label *obj;
54015+ struct acl_role_label *r;
54016+ struct acl_role_label *assigned = NULL;
54017+ struct task_struct *tsk;
54018+ struct file *filp;
54019+
54020+ FOR_EACH_ROLE_START(r)
54021+ if (!strcmp(rolename, r->rolename) &&
54022+ (r->roletype & GR_ROLE_SPECIAL)) {
54023+ assigned = r;
54024+ break;
54025+ }
54026+ FOR_EACH_ROLE_END(r)
54027+
54028+ if (!assigned)
54029+ return;
54030+
54031+ read_lock(&tasklist_lock);
54032+ read_lock(&grsec_exec_file_lock);
54033+
54034+ tsk = current->real_parent;
54035+ if (tsk == NULL)
54036+ goto out_unlock;
54037+
54038+ filp = tsk->exec_file;
54039+ if (filp == NULL)
54040+ goto out_unlock;
54041+
54042+ tsk->is_writable = 0;
54043+
54044+ tsk->acl_sp_role = 1;
54045+ tsk->acl_role_id = ++acl_sp_role_value;
54046+ tsk->role = assigned;
54047+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
54048+
54049+ /* ignore additional mmap checks for processes that are writable
54050+ by the default ACL */
54051+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54052+ if (unlikely(obj->mode & GR_WRITE))
54053+ tsk->is_writable = 1;
54054+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
54055+ if (unlikely(obj->mode & GR_WRITE))
54056+ tsk->is_writable = 1;
54057+
54058+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
54059+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
54060+#endif
54061+
54062+out_unlock:
54063+ read_unlock(&grsec_exec_file_lock);
54064+ read_unlock(&tasklist_lock);
54065+ return;
54066+}
54067+
54068+int gr_check_secure_terminal(struct task_struct *task)
54069+{
54070+ struct task_struct *p, *p2, *p3;
54071+ struct files_struct *files;
54072+ struct fdtable *fdt;
54073+ struct file *our_file = NULL, *file;
54074+ int i;
54075+
54076+ if (task->signal->tty == NULL)
54077+ return 1;
54078+
54079+ files = get_files_struct(task);
54080+ if (files != NULL) {
54081+ rcu_read_lock();
54082+ fdt = files_fdtable(files);
54083+ for (i=0; i < fdt->max_fds; i++) {
54084+ file = fcheck_files(files, i);
54085+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
54086+ get_file(file);
54087+ our_file = file;
54088+ }
54089+ }
54090+ rcu_read_unlock();
54091+ put_files_struct(files);
54092+ }
54093+
54094+ if (our_file == NULL)
54095+ return 1;
54096+
54097+ read_lock(&tasklist_lock);
54098+ do_each_thread(p2, p) {
54099+ files = get_files_struct(p);
54100+ if (files == NULL ||
54101+ (p->signal && p->signal->tty == task->signal->tty)) {
54102+ if (files != NULL)
54103+ put_files_struct(files);
54104+ continue;
54105+ }
54106+ rcu_read_lock();
54107+ fdt = files_fdtable(files);
54108+ for (i=0; i < fdt->max_fds; i++) {
54109+ file = fcheck_files(files, i);
54110+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
54111+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
54112+ p3 = task;
54113+ while (p3->pid > 0) {
54114+ if (p3 == p)
54115+ break;
54116+ p3 = p3->real_parent;
54117+ }
54118+ if (p3 == p)
54119+ break;
54120+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
54121+ gr_handle_alertkill(p);
54122+ rcu_read_unlock();
54123+ put_files_struct(files);
54124+ read_unlock(&tasklist_lock);
54125+ fput(our_file);
54126+ return 0;
54127+ }
54128+ }
54129+ rcu_read_unlock();
54130+ put_files_struct(files);
54131+ } while_each_thread(p2, p);
54132+ read_unlock(&tasklist_lock);
54133+
54134+ fput(our_file);
54135+ return 1;
54136+}
54137+
54138+ssize_t
54139+write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos)
54140+{
54141+ struct gr_arg_wrapper uwrap;
54142+ unsigned char *sprole_salt = NULL;
54143+ unsigned char *sprole_sum = NULL;
54144+ int error = sizeof (struct gr_arg_wrapper);
54145+ int error2 = 0;
54146+
54147+ mutex_lock(&gr_dev_mutex);
54148+
54149+ if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
54150+ error = -EPERM;
54151+ goto out;
54152+ }
54153+
54154+ if (count != sizeof (struct gr_arg_wrapper)) {
54155+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)sizeof(struct gr_arg_wrapper));
54156+ error = -EINVAL;
54157+ goto out;
54158+ }
54159+
54160+
54161+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
54162+ gr_auth_expires = 0;
54163+ gr_auth_attempts = 0;
54164+ }
54165+
54166+ if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
54167+ error = -EFAULT;
54168+ goto out;
54169+ }
54170+
54171+ if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
54172+ error = -EINVAL;
54173+ goto out;
54174+ }
54175+
54176+ if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
54177+ error = -EFAULT;
54178+ goto out;
54179+ }
54180+
54181+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
54182+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
54183+ time_after(gr_auth_expires, get_seconds())) {
54184+ error = -EBUSY;
54185+ goto out;
54186+ }
54187+
54188+ /* if non-root trying to do anything other than use a special role,
54189+ do not attempt authentication, do not count towards authentication
54190+ locking
54191+ */
54192+
54193+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
54194+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
54195+ current_uid()) {
54196+ error = -EPERM;
54197+ goto out;
54198+ }
54199+
54200+ /* ensure pw and special role name are null terminated */
54201+
54202+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
54203+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
54204+
54205+ /* Okay.
54206+ * We have our enough of the argument structure..(we have yet
54207+ * to copy_from_user the tables themselves) . Copy the tables
54208+ * only if we need them, i.e. for loading operations. */
54209+
54210+ switch (gr_usermode->mode) {
54211+ case GR_STATUS:
54212+ if (gr_status & GR_READY) {
54213+ error = 1;
54214+ if (!gr_check_secure_terminal(current))
54215+ error = 3;
54216+ } else
54217+ error = 2;
54218+ goto out;
54219+ case GR_SHUTDOWN:
54220+ if ((gr_status & GR_READY)
54221+ && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54222+ pax_open_kernel();
54223+ gr_status &= ~GR_READY;
54224+ pax_close_kernel();
54225+
54226+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
54227+ free_variables();
54228+ memset(gr_usermode, 0, sizeof (struct gr_arg));
54229+ memset(gr_system_salt, 0, GR_SALT_LEN);
54230+ memset(gr_system_sum, 0, GR_SHA_LEN);
54231+ } else if (gr_status & GR_READY) {
54232+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
54233+ error = -EPERM;
54234+ } else {
54235+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
54236+ error = -EAGAIN;
54237+ }
54238+ break;
54239+ case GR_ENABLE:
54240+ if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
54241+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
54242+ else {
54243+ if (gr_status & GR_READY)
54244+ error = -EAGAIN;
54245+ else
54246+ error = error2;
54247+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
54248+ }
54249+ break;
54250+ case GR_RELOAD:
54251+ if (!(gr_status & GR_READY)) {
54252+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
54253+ error = -EAGAIN;
54254+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54255+ preempt_disable();
54256+
54257+ pax_open_kernel();
54258+ gr_status &= ~GR_READY;
54259+ pax_close_kernel();
54260+
54261+ free_variables();
54262+ if (!(error2 = gracl_init(gr_usermode))) {
54263+ preempt_enable();
54264+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
54265+ } else {
54266+ preempt_enable();
54267+ error = error2;
54268+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
54269+ }
54270+ } else {
54271+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
54272+ error = -EPERM;
54273+ }
54274+ break;
54275+ case GR_SEGVMOD:
54276+ if (unlikely(!(gr_status & GR_READY))) {
54277+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
54278+ error = -EAGAIN;
54279+ break;
54280+ }
54281+
54282+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54283+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
54284+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
54285+ struct acl_subject_label *segvacl;
54286+ segvacl =
54287+ lookup_acl_subj_label(gr_usermode->segv_inode,
54288+ gr_usermode->segv_device,
54289+ current->role);
54290+ if (segvacl) {
54291+ segvacl->crashes = 0;
54292+ segvacl->expires = 0;
54293+ }
54294+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
54295+ gr_remove_uid(gr_usermode->segv_uid);
54296+ }
54297+ } else {
54298+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
54299+ error = -EPERM;
54300+ }
54301+ break;
54302+ case GR_SPROLE:
54303+ case GR_SPROLEPAM:
54304+ if (unlikely(!(gr_status & GR_READY))) {
54305+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
54306+ error = -EAGAIN;
54307+ break;
54308+ }
54309+
54310+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
54311+ current->role->expires = 0;
54312+ current->role->auth_attempts = 0;
54313+ }
54314+
54315+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
54316+ time_after(current->role->expires, get_seconds())) {
54317+ error = -EBUSY;
54318+ goto out;
54319+ }
54320+
54321+ if (lookup_special_role_auth
54322+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
54323+ && ((!sprole_salt && !sprole_sum)
54324+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
54325+ char *p = "";
54326+ assign_special_role(gr_usermode->sp_role);
54327+ read_lock(&tasklist_lock);
54328+ if (current->real_parent)
54329+ p = current->real_parent->role->rolename;
54330+ read_unlock(&tasklist_lock);
54331+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
54332+ p, acl_sp_role_value);
54333+ } else {
54334+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
54335+ error = -EPERM;
54336+ if(!(current->role->auth_attempts++))
54337+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
54338+
54339+ goto out;
54340+ }
54341+ break;
54342+ case GR_UNSPROLE:
54343+ if (unlikely(!(gr_status & GR_READY))) {
54344+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
54345+ error = -EAGAIN;
54346+ break;
54347+ }
54348+
54349+ if (current->role->roletype & GR_ROLE_SPECIAL) {
54350+ char *p = "";
54351+ int i = 0;
54352+
54353+ read_lock(&tasklist_lock);
54354+ if (current->real_parent) {
54355+ p = current->real_parent->role->rolename;
54356+ i = current->real_parent->acl_role_id;
54357+ }
54358+ read_unlock(&tasklist_lock);
54359+
54360+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
54361+ gr_set_acls(1);
54362+ } else {
54363+ error = -EPERM;
54364+ goto out;
54365+ }
54366+ break;
54367+ default:
54368+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
54369+ error = -EINVAL;
54370+ break;
54371+ }
54372+
54373+ if (error != -EPERM)
54374+ goto out;
54375+
54376+ if(!(gr_auth_attempts++))
54377+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
54378+
54379+ out:
54380+ mutex_unlock(&gr_dev_mutex);
54381+ return error;
54382+}
54383+
54384+/* must be called with
54385+ rcu_read_lock();
54386+ read_lock(&tasklist_lock);
54387+ read_lock(&grsec_exec_file_lock);
54388+*/
54389+int gr_apply_subject_to_task(struct task_struct *task)
54390+{
54391+ struct acl_object_label *obj;
54392+ char *tmpname;
54393+ struct acl_subject_label *tmpsubj;
54394+ struct file *filp;
54395+ struct name_entry *nmatch;
54396+
54397+ filp = task->exec_file;
54398+ if (filp == NULL)
54399+ return 0;
54400+
54401+ /* the following is to apply the correct subject
54402+ on binaries running when the RBAC system
54403+ is enabled, when the binaries have been
54404+ replaced or deleted since their execution
54405+ -----
54406+ when the RBAC system starts, the inode/dev
54407+ from exec_file will be one the RBAC system
54408+ is unaware of. It only knows the inode/dev
54409+ of the present file on disk, or the absence
54410+ of it.
54411+ */
54412+ preempt_disable();
54413+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
54414+
54415+ nmatch = lookup_name_entry(tmpname);
54416+ preempt_enable();
54417+ tmpsubj = NULL;
54418+ if (nmatch) {
54419+ if (nmatch->deleted)
54420+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
54421+ else
54422+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
54423+ if (tmpsubj != NULL)
54424+ task->acl = tmpsubj;
54425+ }
54426+ if (tmpsubj == NULL)
54427+ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
54428+ task->role);
54429+ if (task->acl) {
54430+ task->is_writable = 0;
54431+ /* ignore additional mmap checks for processes that are writable
54432+ by the default ACL */
54433+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54434+ if (unlikely(obj->mode & GR_WRITE))
54435+ task->is_writable = 1;
54436+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
54437+ if (unlikely(obj->mode & GR_WRITE))
54438+ task->is_writable = 1;
54439+
54440+ gr_set_proc_res(task);
54441+
54442+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
54443+ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
54444+#endif
54445+ } else {
54446+ return 1;
54447+ }
54448+
54449+ return 0;
54450+}
54451+
54452+int
54453+gr_set_acls(const int type)
54454+{
54455+ struct task_struct *task, *task2;
54456+ struct acl_role_label *role = current->role;
54457+ __u16 acl_role_id = current->acl_role_id;
54458+ const struct cred *cred;
54459+ int ret;
54460+
54461+ rcu_read_lock();
54462+ read_lock(&tasklist_lock);
54463+ read_lock(&grsec_exec_file_lock);
54464+ do_each_thread(task2, task) {
54465+ /* check to see if we're called from the exit handler,
54466+ if so, only replace ACLs that have inherited the admin
54467+ ACL */
54468+
54469+ if (type && (task->role != role ||
54470+ task->acl_role_id != acl_role_id))
54471+ continue;
54472+
54473+ task->acl_role_id = 0;
54474+ task->acl_sp_role = 0;
54475+
54476+ if (task->exec_file) {
54477+ cred = __task_cred(task);
54478+ task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
54479+ ret = gr_apply_subject_to_task(task);
54480+ if (ret) {
54481+ read_unlock(&grsec_exec_file_lock);
54482+ read_unlock(&tasklist_lock);
54483+ rcu_read_unlock();
54484+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
54485+ return ret;
54486+ }
54487+ } else {
54488+ // it's a kernel process
54489+ task->role = kernel_role;
54490+ task->acl = kernel_role->root_label;
54491+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
54492+ task->acl->mode &= ~GR_PROCFIND;
54493+#endif
54494+ }
54495+ } while_each_thread(task2, task);
54496+ read_unlock(&grsec_exec_file_lock);
54497+ read_unlock(&tasklist_lock);
54498+ rcu_read_unlock();
54499+
54500+ return 0;
54501+}
54502+
54503+void
54504+gr_learn_resource(const struct task_struct *task,
54505+ const int res, const unsigned long wanted, const int gt)
54506+{
54507+ struct acl_subject_label *acl;
54508+ const struct cred *cred;
54509+
54510+ if (unlikely((gr_status & GR_READY) &&
54511+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
54512+ goto skip_reslog;
54513+
54514+#ifdef CONFIG_GRKERNSEC_RESLOG
54515+ gr_log_resource(task, res, wanted, gt);
54516+#endif
54517+ skip_reslog:
54518+
54519+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
54520+ return;
54521+
54522+ acl = task->acl;
54523+
54524+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
54525+ !(acl->resmask & (1 << (unsigned short) res))))
54526+ return;
54527+
54528+ if (wanted >= acl->res[res].rlim_cur) {
54529+ unsigned long res_add;
54530+
54531+ res_add = wanted;
54532+ switch (res) {
54533+ case RLIMIT_CPU:
54534+ res_add += GR_RLIM_CPU_BUMP;
54535+ break;
54536+ case RLIMIT_FSIZE:
54537+ res_add += GR_RLIM_FSIZE_BUMP;
54538+ break;
54539+ case RLIMIT_DATA:
54540+ res_add += GR_RLIM_DATA_BUMP;
54541+ break;
54542+ case RLIMIT_STACK:
54543+ res_add += GR_RLIM_STACK_BUMP;
54544+ break;
54545+ case RLIMIT_CORE:
54546+ res_add += GR_RLIM_CORE_BUMP;
54547+ break;
54548+ case RLIMIT_RSS:
54549+ res_add += GR_RLIM_RSS_BUMP;
54550+ break;
54551+ case RLIMIT_NPROC:
54552+ res_add += GR_RLIM_NPROC_BUMP;
54553+ break;
54554+ case RLIMIT_NOFILE:
54555+ res_add += GR_RLIM_NOFILE_BUMP;
54556+ break;
54557+ case RLIMIT_MEMLOCK:
54558+ res_add += GR_RLIM_MEMLOCK_BUMP;
54559+ break;
54560+ case RLIMIT_AS:
54561+ res_add += GR_RLIM_AS_BUMP;
54562+ break;
54563+ case RLIMIT_LOCKS:
54564+ res_add += GR_RLIM_LOCKS_BUMP;
54565+ break;
54566+ case RLIMIT_SIGPENDING:
54567+ res_add += GR_RLIM_SIGPENDING_BUMP;
54568+ break;
54569+ case RLIMIT_MSGQUEUE:
54570+ res_add += GR_RLIM_MSGQUEUE_BUMP;
54571+ break;
54572+ case RLIMIT_NICE:
54573+ res_add += GR_RLIM_NICE_BUMP;
54574+ break;
54575+ case RLIMIT_RTPRIO:
54576+ res_add += GR_RLIM_RTPRIO_BUMP;
54577+ break;
54578+ case RLIMIT_RTTIME:
54579+ res_add += GR_RLIM_RTTIME_BUMP;
54580+ break;
54581+ }
54582+
54583+ acl->res[res].rlim_cur = res_add;
54584+
54585+ if (wanted > acl->res[res].rlim_max)
54586+ acl->res[res].rlim_max = res_add;
54587+
54588+ /* only log the subject filename, since resource logging is supported for
54589+ single-subject learning only */
54590+ rcu_read_lock();
54591+ cred = __task_cred(task);
54592+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
54593+ task->role->roletype, cred->uid, cred->gid, acl->filename,
54594+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
54595+ "", (unsigned long) res, &task->signal->saved_ip);
54596+ rcu_read_unlock();
54597+ }
54598+
54599+ return;
54600+}
54601+
54602+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
54603+void
54604+pax_set_initial_flags(struct linux_binprm *bprm)
54605+{
54606+ struct task_struct *task = current;
54607+ struct acl_subject_label *proc;
54608+ unsigned long flags;
54609+
54610+ if (unlikely(!(gr_status & GR_READY)))
54611+ return;
54612+
54613+ flags = pax_get_flags(task);
54614+
54615+ proc = task->acl;
54616+
54617+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
54618+ flags &= ~MF_PAX_PAGEEXEC;
54619+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
54620+ flags &= ~MF_PAX_SEGMEXEC;
54621+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
54622+ flags &= ~MF_PAX_RANDMMAP;
54623+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
54624+ flags &= ~MF_PAX_EMUTRAMP;
54625+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
54626+ flags &= ~MF_PAX_MPROTECT;
54627+
54628+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
54629+ flags |= MF_PAX_PAGEEXEC;
54630+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
54631+ flags |= MF_PAX_SEGMEXEC;
54632+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
54633+ flags |= MF_PAX_RANDMMAP;
54634+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
54635+ flags |= MF_PAX_EMUTRAMP;
54636+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
54637+ flags |= MF_PAX_MPROTECT;
54638+
54639+ pax_set_flags(task, flags);
54640+
54641+ return;
54642+}
54643+#endif
54644+
54645+#ifdef CONFIG_SYSCTL
54646+/* Eric Biederman likes breaking userland ABI and every inode-based security
54647+ system to save 35kb of memory */
54648+
54649+/* we modify the passed in filename, but adjust it back before returning */
54650+static struct acl_object_label *gr_lookup_by_name(char *name, unsigned int len)
54651+{
54652+ struct name_entry *nmatch;
54653+ char *p, *lastp = NULL;
54654+ struct acl_object_label *obj = NULL, *tmp;
54655+ struct acl_subject_label *tmpsubj;
54656+ char c = '\0';
54657+
54658+ read_lock(&gr_inode_lock);
54659+
54660+ p = name + len - 1;
54661+ do {
54662+ nmatch = lookup_name_entry(name);
54663+ if (lastp != NULL)
54664+ *lastp = c;
54665+
54666+ if (nmatch == NULL)
54667+ goto next_component;
54668+ tmpsubj = current->acl;
54669+ do {
54670+ obj = lookup_acl_obj_label(nmatch->inode, nmatch->device, tmpsubj);
54671+ if (obj != NULL) {
54672+ tmp = obj->globbed;
54673+ while (tmp) {
54674+ if (!glob_match(tmp->filename, name)) {
54675+ obj = tmp;
54676+ goto found_obj;
54677+ }
54678+ tmp = tmp->next;
54679+ }
54680+ goto found_obj;
54681+ }
54682+ } while ((tmpsubj = tmpsubj->parent_subject));
54683+next_component:
54684+ /* end case */
54685+ if (p == name)
54686+ break;
54687+
54688+ while (*p != '/')
54689+ p--;
54690+ if (p == name)
54691+ lastp = p + 1;
54692+ else {
54693+ lastp = p;
54694+ p--;
54695+ }
54696+ c = *lastp;
54697+ *lastp = '\0';
54698+ } while (1);
54699+found_obj:
54700+ read_unlock(&gr_inode_lock);
54701+ /* obj returned will always be non-null */
54702+ return obj;
54703+}
54704+
54705+/* returns 0 when allowing, non-zero on error
54706+ op of 0 is used for readdir, so we don't log the names of hidden files
54707+*/
54708+__u32
54709+gr_handle_sysctl(const struct ctl_table *table, const int op)
54710+{
54711+ struct ctl_table *tmp;
54712+ const char *proc_sys = "/proc/sys";
54713+ char *path;
54714+ struct acl_object_label *obj;
54715+ unsigned short len = 0, pos = 0, depth = 0, i;
54716+ __u32 err = 0;
54717+ __u32 mode = 0;
54718+
54719+ if (unlikely(!(gr_status & GR_READY)))
54720+ return 0;
54721+
54722+ /* for now, ignore operations on non-sysctl entries if it's not a
54723+ readdir*/
54724+ if (table->child != NULL && op != 0)
54725+ return 0;
54726+
54727+ mode |= GR_FIND;
54728+ /* it's only a read if it's an entry, read on dirs is for readdir */
54729+ if (op & MAY_READ)
54730+ mode |= GR_READ;
54731+ if (op & MAY_WRITE)
54732+ mode |= GR_WRITE;
54733+
54734+ preempt_disable();
54735+
54736+ path = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
54737+
54738+ /* it's only a read/write if it's an actual entry, not a dir
54739+ (which are opened for readdir)
54740+ */
54741+
54742+ /* convert the requested sysctl entry into a pathname */
54743+
54744+ for (tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
54745+ len += strlen(tmp->procname);
54746+ len++;
54747+ depth++;
54748+ }
54749+
54750+ if ((len + depth + strlen(proc_sys) + 1) > PAGE_SIZE) {
54751+ /* deny */
54752+ goto out;
54753+ }
54754+
54755+ memset(path, 0, PAGE_SIZE);
54756+
54757+ memcpy(path, proc_sys, strlen(proc_sys));
54758+
54759+ pos += strlen(proc_sys);
54760+
54761+ for (; depth > 0; depth--) {
54762+ path[pos] = '/';
54763+ pos++;
54764+ for (i = 1, tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
54765+ if (depth == i) {
54766+ memcpy(path + pos, tmp->procname,
54767+ strlen(tmp->procname));
54768+ pos += strlen(tmp->procname);
54769+ }
54770+ i++;
54771+ }
54772+ }
54773+
54774+ obj = gr_lookup_by_name(path, pos);
54775+ err = obj->mode & (mode | to_gr_audit(mode) | GR_SUPPRESS);
54776+
54777+ if (unlikely((current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) &&
54778+ ((err & mode) != mode))) {
54779+ __u32 new_mode = mode;
54780+
54781+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
54782+
54783+ err = 0;
54784+ gr_log_learn_sysctl(path, new_mode);
54785+ } else if (!(err & GR_FIND) && !(err & GR_SUPPRESS) && op != 0) {
54786+ gr_log_hidden_sysctl(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, path);
54787+ err = -ENOENT;
54788+ } else if (!(err & GR_FIND)) {
54789+ err = -ENOENT;
54790+ } else if (((err & mode) & ~GR_FIND) != (mode & ~GR_FIND) && !(err & GR_SUPPRESS)) {
54791+ gr_log_str4(GR_DONT_AUDIT, GR_SYSCTL_ACL_MSG, "denied",
54792+ path, (mode & GR_READ) ? " reading" : "",
54793+ (mode & GR_WRITE) ? " writing" : "");
54794+ err = -EACCES;
54795+ } else if ((err & mode) != mode) {
54796+ err = -EACCES;
54797+ } else if ((((err & mode) & ~GR_FIND) == (mode & ~GR_FIND)) && (err & GR_AUDITS)) {
54798+ gr_log_str4(GR_DO_AUDIT, GR_SYSCTL_ACL_MSG, "successful",
54799+ path, (mode & GR_READ) ? " reading" : "",
54800+ (mode & GR_WRITE) ? " writing" : "");
54801+ err = 0;
54802+ } else
54803+ err = 0;
54804+
54805+ out:
54806+ preempt_enable();
54807+
54808+ return err;
54809+}
54810+#endif
54811+
54812+int
54813+gr_handle_proc_ptrace(struct task_struct *task)
54814+{
54815+ struct file *filp;
54816+ struct task_struct *tmp = task;
54817+ struct task_struct *curtemp = current;
54818+ __u32 retmode;
54819+
54820+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54821+ if (unlikely(!(gr_status & GR_READY)))
54822+ return 0;
54823+#endif
54824+
54825+ read_lock(&tasklist_lock);
54826+ read_lock(&grsec_exec_file_lock);
54827+ filp = task->exec_file;
54828+
54829+ while (tmp->pid > 0) {
54830+ if (tmp == curtemp)
54831+ break;
54832+ tmp = tmp->real_parent;
54833+ }
54834+
54835+ if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
54836+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
54837+ read_unlock(&grsec_exec_file_lock);
54838+ read_unlock(&tasklist_lock);
54839+ return 1;
54840+ }
54841+
54842+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54843+ if (!(gr_status & GR_READY)) {
54844+ read_unlock(&grsec_exec_file_lock);
54845+ read_unlock(&tasklist_lock);
54846+ return 0;
54847+ }
54848+#endif
54849+
54850+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
54851+ read_unlock(&grsec_exec_file_lock);
54852+ read_unlock(&tasklist_lock);
54853+
54854+ if (retmode & GR_NOPTRACE)
54855+ return 1;
54856+
54857+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
54858+ && (current->acl != task->acl || (current->acl != current->role->root_label
54859+ && current->pid != task->pid)))
54860+ return 1;
54861+
54862+ return 0;
54863+}
54864+
54865+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
54866+{
54867+ if (unlikely(!(gr_status & GR_READY)))
54868+ return;
54869+
54870+ if (!(current->role->roletype & GR_ROLE_GOD))
54871+ return;
54872+
54873+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
54874+ p->role->rolename, gr_task_roletype_to_char(p),
54875+ p->acl->filename);
54876+}
54877+
54878+int
54879+gr_handle_ptrace(struct task_struct *task, const long request)
54880+{
54881+ struct task_struct *tmp = task;
54882+ struct task_struct *curtemp = current;
54883+ __u32 retmode;
54884+
54885+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54886+ if (unlikely(!(gr_status & GR_READY)))
54887+ return 0;
54888+#endif
54889+
54890+ read_lock(&tasklist_lock);
54891+ while (tmp->pid > 0) {
54892+ if (tmp == curtemp)
54893+ break;
54894+ tmp = tmp->real_parent;
54895+ }
54896+
54897+ if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
54898+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
54899+ read_unlock(&tasklist_lock);
54900+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54901+ return 1;
54902+ }
54903+ read_unlock(&tasklist_lock);
54904+
54905+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54906+ if (!(gr_status & GR_READY))
54907+ return 0;
54908+#endif
54909+
54910+ read_lock(&grsec_exec_file_lock);
54911+ if (unlikely(!task->exec_file)) {
54912+ read_unlock(&grsec_exec_file_lock);
54913+ return 0;
54914+ }
54915+
54916+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
54917+ read_unlock(&grsec_exec_file_lock);
54918+
54919+ if (retmode & GR_NOPTRACE) {
54920+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54921+ return 1;
54922+ }
54923+
54924+ if (retmode & GR_PTRACERD) {
54925+ switch (request) {
54926+ case PTRACE_SEIZE:
54927+ case PTRACE_POKETEXT:
54928+ case PTRACE_POKEDATA:
54929+ case PTRACE_POKEUSR:
54930+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
54931+ case PTRACE_SETREGS:
54932+ case PTRACE_SETFPREGS:
54933+#endif
54934+#ifdef CONFIG_X86
54935+ case PTRACE_SETFPXREGS:
54936+#endif
54937+#ifdef CONFIG_ALTIVEC
54938+ case PTRACE_SETVRREGS:
54939+#endif
54940+ return 1;
54941+ default:
54942+ return 0;
54943+ }
54944+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
54945+ !(current->role->roletype & GR_ROLE_GOD) &&
54946+ (current->acl != task->acl)) {
54947+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54948+ return 1;
54949+ }
54950+
54951+ return 0;
54952+}
54953+
54954+static int is_writable_mmap(const struct file *filp)
54955+{
54956+ struct task_struct *task = current;
54957+ struct acl_object_label *obj, *obj2;
54958+
54959+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
54960+ !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))) {
54961+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54962+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
54963+ task->role->root_label);
54964+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
54965+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
54966+ return 1;
54967+ }
54968+ }
54969+ return 0;
54970+}
54971+
54972+int
54973+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
54974+{
54975+ __u32 mode;
54976+
54977+ if (unlikely(!file || !(prot & PROT_EXEC)))
54978+ return 1;
54979+
54980+ if (is_writable_mmap(file))
54981+ return 0;
54982+
54983+ mode =
54984+ gr_search_file(file->f_path.dentry,
54985+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
54986+ file->f_path.mnt);
54987+
54988+ if (!gr_tpe_allow(file))
54989+ return 0;
54990+
54991+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
54992+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54993+ return 0;
54994+ } else if (unlikely(!(mode & GR_EXEC))) {
54995+ return 0;
54996+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
54997+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54998+ return 1;
54999+ }
55000+
55001+ return 1;
55002+}
55003+
55004+int
55005+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
55006+{
55007+ __u32 mode;
55008+
55009+ if (unlikely(!file || !(prot & PROT_EXEC)))
55010+ return 1;
55011+
55012+ if (is_writable_mmap(file))
55013+ return 0;
55014+
55015+ mode =
55016+ gr_search_file(file->f_path.dentry,
55017+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
55018+ file->f_path.mnt);
55019+
55020+ if (!gr_tpe_allow(file))
55021+ return 0;
55022+
55023+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
55024+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
55025+ return 0;
55026+ } else if (unlikely(!(mode & GR_EXEC))) {
55027+ return 0;
55028+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
55029+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
55030+ return 1;
55031+ }
55032+
55033+ return 1;
55034+}
55035+
55036+void
55037+gr_acl_handle_psacct(struct task_struct *task, const long code)
55038+{
55039+ unsigned long runtime;
55040+ unsigned long cputime;
55041+ unsigned int wday, cday;
55042+ __u8 whr, chr;
55043+ __u8 wmin, cmin;
55044+ __u8 wsec, csec;
55045+ struct timespec timeval;
55046+
55047+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
55048+ !(task->acl->mode & GR_PROCACCT)))
55049+ return;
55050+
55051+ do_posix_clock_monotonic_gettime(&timeval);
55052+ runtime = timeval.tv_sec - task->start_time.tv_sec;
55053+ wday = runtime / (3600 * 24);
55054+ runtime -= wday * (3600 * 24);
55055+ whr = runtime / 3600;
55056+ runtime -= whr * 3600;
55057+ wmin = runtime / 60;
55058+ runtime -= wmin * 60;
55059+ wsec = runtime;
55060+
55061+ cputime = (task->utime + task->stime) / HZ;
55062+ cday = cputime / (3600 * 24);
55063+ cputime -= cday * (3600 * 24);
55064+ chr = cputime / 3600;
55065+ cputime -= chr * 3600;
55066+ cmin = cputime / 60;
55067+ cputime -= cmin * 60;
55068+ csec = cputime;
55069+
55070+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
55071+
55072+ return;
55073+}
55074+
55075+void gr_set_kernel_label(struct task_struct *task)
55076+{
55077+ if (gr_status & GR_READY) {
55078+ task->role = kernel_role;
55079+ task->acl = kernel_role->root_label;
55080+ }
55081+ return;
55082+}
55083+
55084+#ifdef CONFIG_TASKSTATS
55085+int gr_is_taskstats_denied(int pid)
55086+{
55087+ struct task_struct *task;
55088+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
55089+ const struct cred *cred;
55090+#endif
55091+ int ret = 0;
55092+
55093+ /* restrict taskstats viewing to un-chrooted root users
55094+ who have the 'view' subject flag if the RBAC system is enabled
55095+ */
55096+
55097+ rcu_read_lock();
55098+ read_lock(&tasklist_lock);
55099+ task = find_task_by_vpid(pid);
55100+ if (task) {
55101+#ifdef CONFIG_GRKERNSEC_CHROOT
55102+ if (proc_is_chrooted(task))
55103+ ret = -EACCES;
55104+#endif
55105+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
55106+ cred = __task_cred(task);
55107+#ifdef CONFIG_GRKERNSEC_PROC_USER
55108+ if (cred->uid != 0)
55109+ ret = -EACCES;
55110+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
55111+ if (cred->uid != 0 && !groups_search(cred->group_info, CONFIG_GRKERNSEC_PROC_GID))
55112+ ret = -EACCES;
55113+#endif
55114+#endif
55115+ if (gr_status & GR_READY) {
55116+ if (!(task->acl->mode & GR_VIEW))
55117+ ret = -EACCES;
55118+ }
55119+ } else
55120+ ret = -ENOENT;
55121+
55122+ read_unlock(&tasklist_lock);
55123+ rcu_read_unlock();
55124+
55125+ return ret;
55126+}
55127+#endif
55128+
55129+/* AUXV entries are filled via a descendant of search_binary_handler
55130+ after we've already applied the subject for the target
55131+*/
55132+int gr_acl_enable_at_secure(void)
55133+{
55134+ if (unlikely(!(gr_status & GR_READY)))
55135+ return 0;
55136+
55137+ if (current->acl->mode & GR_ATSECURE)
55138+ return 1;
55139+
55140+ return 0;
55141+}
55142+
55143+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
55144+{
55145+ struct task_struct *task = current;
55146+ struct dentry *dentry = file->f_path.dentry;
55147+ struct vfsmount *mnt = file->f_path.mnt;
55148+ struct acl_object_label *obj, *tmp;
55149+ struct acl_subject_label *subj;
55150+ unsigned int bufsize;
55151+ int is_not_root;
55152+ char *path;
55153+ dev_t dev = __get_dev(dentry);
55154+
55155+ if (unlikely(!(gr_status & GR_READY)))
55156+ return 1;
55157+
55158+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
55159+ return 1;
55160+
55161+ /* ignore Eric Biederman */
55162+ if (IS_PRIVATE(dentry->d_inode))
55163+ return 1;
55164+
55165+ subj = task->acl;
55166+ do {
55167+ obj = lookup_acl_obj_label(ino, dev, subj);
55168+ if (obj != NULL)
55169+ return (obj->mode & GR_FIND) ? 1 : 0;
55170+ } while ((subj = subj->parent_subject));
55171+
55172+ /* this is purely an optimization since we're looking for an object
55173+ for the directory we're doing a readdir on
55174+ if it's possible for any globbed object to match the entry we're
55175+ filling into the directory, then the object we find here will be
55176+ an anchor point with attached globbed objects
55177+ */
55178+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
55179+ if (obj->globbed == NULL)
55180+ return (obj->mode & GR_FIND) ? 1 : 0;
55181+
55182+ is_not_root = ((obj->filename[0] == '/') &&
55183+ (obj->filename[1] == '\0')) ? 0 : 1;
55184+ bufsize = PAGE_SIZE - namelen - is_not_root;
55185+
55186+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
55187+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
55188+ return 1;
55189+
55190+ preempt_disable();
55191+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
55192+ bufsize);
55193+
55194+ bufsize = strlen(path);
55195+
55196+ /* if base is "/", don't append an additional slash */
55197+ if (is_not_root)
55198+ *(path + bufsize) = '/';
55199+ memcpy(path + bufsize + is_not_root, name, namelen);
55200+ *(path + bufsize + namelen + is_not_root) = '\0';
55201+
55202+ tmp = obj->globbed;
55203+ while (tmp) {
55204+ if (!glob_match(tmp->filename, path)) {
55205+ preempt_enable();
55206+ return (tmp->mode & GR_FIND) ? 1 : 0;
55207+ }
55208+ tmp = tmp->next;
55209+ }
55210+ preempt_enable();
55211+ return (obj->mode & GR_FIND) ? 1 : 0;
55212+}
55213+
55214+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
55215+EXPORT_SYMBOL(gr_acl_is_enabled);
55216+#endif
55217+EXPORT_SYMBOL(gr_learn_resource);
55218+EXPORT_SYMBOL(gr_set_kernel_label);
55219+#ifdef CONFIG_SECURITY
55220+EXPORT_SYMBOL(gr_check_user_change);
55221+EXPORT_SYMBOL(gr_check_group_change);
55222+#endif
55223+
55224diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
55225new file mode 100644
55226index 0000000..34fefda
55227--- /dev/null
55228+++ b/grsecurity/gracl_alloc.c
55229@@ -0,0 +1,105 @@
55230+#include <linux/kernel.h>
55231+#include <linux/mm.h>
55232+#include <linux/slab.h>
55233+#include <linux/vmalloc.h>
55234+#include <linux/gracl.h>
55235+#include <linux/grsecurity.h>
55236+
55237+static unsigned long alloc_stack_next = 1;
55238+static unsigned long alloc_stack_size = 1;
55239+static void **alloc_stack;
55240+
55241+static __inline__ int
55242+alloc_pop(void)
55243+{
55244+ if (alloc_stack_next == 1)
55245+ return 0;
55246+
55247+ kfree(alloc_stack[alloc_stack_next - 2]);
55248+
55249+ alloc_stack_next--;
55250+
55251+ return 1;
55252+}
55253+
55254+static __inline__ int
55255+alloc_push(void *buf)
55256+{
55257+ if (alloc_stack_next >= alloc_stack_size)
55258+ return 1;
55259+
55260+ alloc_stack[alloc_stack_next - 1] = buf;
55261+
55262+ alloc_stack_next++;
55263+
55264+ return 0;
55265+}
55266+
55267+void *
55268+acl_alloc(unsigned long len)
55269+{
55270+ void *ret = NULL;
55271+
55272+ if (!len || len > PAGE_SIZE)
55273+ goto out;
55274+
55275+ ret = kmalloc(len, GFP_KERNEL);
55276+
55277+ if (ret) {
55278+ if (alloc_push(ret)) {
55279+ kfree(ret);
55280+ ret = NULL;
55281+ }
55282+ }
55283+
55284+out:
55285+ return ret;
55286+}
55287+
55288+void *
55289+acl_alloc_num(unsigned long num, unsigned long len)
55290+{
55291+ if (!len || (num > (PAGE_SIZE / len)))
55292+ return NULL;
55293+
55294+ return acl_alloc(num * len);
55295+}
55296+
55297+void
55298+acl_free_all(void)
55299+{
55300+ if (gr_acl_is_enabled() || !alloc_stack)
55301+ return;
55302+
55303+ while (alloc_pop()) ;
55304+
55305+ if (alloc_stack) {
55306+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
55307+ kfree(alloc_stack);
55308+ else
55309+ vfree(alloc_stack);
55310+ }
55311+
55312+ alloc_stack = NULL;
55313+ alloc_stack_size = 1;
55314+ alloc_stack_next = 1;
55315+
55316+ return;
55317+}
55318+
55319+int
55320+acl_alloc_stack_init(unsigned long size)
55321+{
55322+ if ((size * sizeof (void *)) <= PAGE_SIZE)
55323+ alloc_stack =
55324+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
55325+ else
55326+ alloc_stack = (void **) vmalloc(size * sizeof (void *));
55327+
55328+ alloc_stack_size = size;
55329+
55330+ if (!alloc_stack)
55331+ return 0;
55332+ else
55333+ return 1;
55334+}
55335diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
55336new file mode 100644
55337index 0000000..955ddfb
55338--- /dev/null
55339+++ b/grsecurity/gracl_cap.c
55340@@ -0,0 +1,101 @@
55341+#include <linux/kernel.h>
55342+#include <linux/module.h>
55343+#include <linux/sched.h>
55344+#include <linux/gracl.h>
55345+#include <linux/grsecurity.h>
55346+#include <linux/grinternal.h>
55347+
55348+extern const char *captab_log[];
55349+extern int captab_log_entries;
55350+
55351+int
55352+gr_acl_is_capable(const int cap)
55353+{
55354+ struct task_struct *task = current;
55355+ const struct cred *cred = current_cred();
55356+ struct acl_subject_label *curracl;
55357+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
55358+ kernel_cap_t cap_audit = __cap_empty_set;
55359+
55360+ if (!gr_acl_is_enabled())
55361+ return 1;
55362+
55363+ curracl = task->acl;
55364+
55365+ cap_drop = curracl->cap_lower;
55366+ cap_mask = curracl->cap_mask;
55367+ cap_audit = curracl->cap_invert_audit;
55368+
55369+ while ((curracl = curracl->parent_subject)) {
55370+ /* if the cap isn't specified in the current computed mask but is specified in the
55371+ current level subject, and is lowered in the current level subject, then add
55372+ it to the set of dropped capabilities
55373+ otherwise, add the current level subject's mask to the current computed mask
55374+ */
55375+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
55376+ cap_raise(cap_mask, cap);
55377+ if (cap_raised(curracl->cap_lower, cap))
55378+ cap_raise(cap_drop, cap);
55379+ if (cap_raised(curracl->cap_invert_audit, cap))
55380+ cap_raise(cap_audit, cap);
55381+ }
55382+ }
55383+
55384+ if (!cap_raised(cap_drop, cap)) {
55385+ if (cap_raised(cap_audit, cap))
55386+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
55387+ return 1;
55388+ }
55389+
55390+ curracl = task->acl;
55391+
55392+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
55393+ && cap_raised(cred->cap_effective, cap)) {
55394+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
55395+ task->role->roletype, cred->uid,
55396+ cred->gid, task->exec_file ?
55397+ gr_to_filename(task->exec_file->f_path.dentry,
55398+ task->exec_file->f_path.mnt) : curracl->filename,
55399+ curracl->filename, 0UL,
55400+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
55401+ return 1;
55402+ }
55403+
55404+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
55405+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
55406+ return 0;
55407+}
55408+
55409+int
55410+gr_acl_is_capable_nolog(const int cap)
55411+{
55412+ struct acl_subject_label *curracl;
55413+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
55414+
55415+ if (!gr_acl_is_enabled())
55416+ return 1;
55417+
55418+ curracl = current->acl;
55419+
55420+ cap_drop = curracl->cap_lower;
55421+ cap_mask = curracl->cap_mask;
55422+
55423+ while ((curracl = curracl->parent_subject)) {
55424+ /* if the cap isn't specified in the current computed mask but is specified in the
55425+ current level subject, and is lowered in the current level subject, then add
55426+ it to the set of dropped capabilities
55427+ otherwise, add the current level subject's mask to the current computed mask
55428+ */
55429+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
55430+ cap_raise(cap_mask, cap);
55431+ if (cap_raised(curracl->cap_lower, cap))
55432+ cap_raise(cap_drop, cap);
55433+ }
55434+ }
55435+
55436+ if (!cap_raised(cap_drop, cap))
55437+ return 1;
55438+
55439+ return 0;
55440+}
55441+
55442diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
55443new file mode 100644
55444index 0000000..88d0e87
55445--- /dev/null
55446+++ b/grsecurity/gracl_fs.c
55447@@ -0,0 +1,435 @@
55448+#include <linux/kernel.h>
55449+#include <linux/sched.h>
55450+#include <linux/types.h>
55451+#include <linux/fs.h>
55452+#include <linux/file.h>
55453+#include <linux/stat.h>
55454+#include <linux/grsecurity.h>
55455+#include <linux/grinternal.h>
55456+#include <linux/gracl.h>
55457+
55458+umode_t
55459+gr_acl_umask(void)
55460+{
55461+ if (unlikely(!gr_acl_is_enabled()))
55462+ return 0;
55463+
55464+ return current->role->umask;
55465+}
55466+
55467+__u32
55468+gr_acl_handle_hidden_file(const struct dentry * dentry,
55469+ const struct vfsmount * mnt)
55470+{
55471+ __u32 mode;
55472+
55473+ if (unlikely(!dentry->d_inode))
55474+ return GR_FIND;
55475+
55476+ mode =
55477+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
55478+
55479+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
55480+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
55481+ return mode;
55482+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
55483+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
55484+ return 0;
55485+ } else if (unlikely(!(mode & GR_FIND)))
55486+ return 0;
55487+
55488+ return GR_FIND;
55489+}
55490+
55491+__u32
55492+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
55493+ int acc_mode)
55494+{
55495+ __u32 reqmode = GR_FIND;
55496+ __u32 mode;
55497+
55498+ if (unlikely(!dentry->d_inode))
55499+ return reqmode;
55500+
55501+ if (acc_mode & MAY_APPEND)
55502+ reqmode |= GR_APPEND;
55503+ else if (acc_mode & MAY_WRITE)
55504+ reqmode |= GR_WRITE;
55505+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
55506+ reqmode |= GR_READ;
55507+
55508+ mode =
55509+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
55510+ mnt);
55511+
55512+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55513+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
55514+ reqmode & GR_READ ? " reading" : "",
55515+ reqmode & GR_WRITE ? " writing" : reqmode &
55516+ GR_APPEND ? " appending" : "");
55517+ return reqmode;
55518+ } else
55519+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55520+ {
55521+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
55522+ reqmode & GR_READ ? " reading" : "",
55523+ reqmode & GR_WRITE ? " writing" : reqmode &
55524+ GR_APPEND ? " appending" : "");
55525+ return 0;
55526+ } else if (unlikely((mode & reqmode) != reqmode))
55527+ return 0;
55528+
55529+ return reqmode;
55530+}
55531+
55532+__u32
55533+gr_acl_handle_creat(const struct dentry * dentry,
55534+ const struct dentry * p_dentry,
55535+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
55536+ const int imode)
55537+{
55538+ __u32 reqmode = GR_WRITE | GR_CREATE;
55539+ __u32 mode;
55540+
55541+ if (acc_mode & MAY_APPEND)
55542+ reqmode |= GR_APPEND;
55543+ // if a directory was required or the directory already exists, then
55544+ // don't count this open as a read
55545+ if ((acc_mode & MAY_READ) &&
55546+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
55547+ reqmode |= GR_READ;
55548+ if ((open_flags & O_CREAT) && (imode & (S_ISUID | S_ISGID)))
55549+ reqmode |= GR_SETID;
55550+
55551+ mode =
55552+ gr_check_create(dentry, p_dentry, p_mnt,
55553+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
55554+
55555+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55556+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
55557+ reqmode & GR_READ ? " reading" : "",
55558+ reqmode & GR_WRITE ? " writing" : reqmode &
55559+ GR_APPEND ? " appending" : "");
55560+ return reqmode;
55561+ } else
55562+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55563+ {
55564+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
55565+ reqmode & GR_READ ? " reading" : "",
55566+ reqmode & GR_WRITE ? " writing" : reqmode &
55567+ GR_APPEND ? " appending" : "");
55568+ return 0;
55569+ } else if (unlikely((mode & reqmode) != reqmode))
55570+ return 0;
55571+
55572+ return reqmode;
55573+}
55574+
55575+__u32
55576+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
55577+ const int fmode)
55578+{
55579+ __u32 mode, reqmode = GR_FIND;
55580+
55581+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
55582+ reqmode |= GR_EXEC;
55583+ if (fmode & S_IWOTH)
55584+ reqmode |= GR_WRITE;
55585+ if (fmode & S_IROTH)
55586+ reqmode |= GR_READ;
55587+
55588+ mode =
55589+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
55590+ mnt);
55591+
55592+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55593+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
55594+ reqmode & GR_READ ? " reading" : "",
55595+ reqmode & GR_WRITE ? " writing" : "",
55596+ reqmode & GR_EXEC ? " executing" : "");
55597+ return reqmode;
55598+ } else
55599+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55600+ {
55601+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
55602+ reqmode & GR_READ ? " reading" : "",
55603+ reqmode & GR_WRITE ? " writing" : "",
55604+ reqmode & GR_EXEC ? " executing" : "");
55605+ return 0;
55606+ } else if (unlikely((mode & reqmode) != reqmode))
55607+ return 0;
55608+
55609+ return reqmode;
55610+}
55611+
55612+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
55613+{
55614+ __u32 mode;
55615+
55616+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
55617+
55618+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
55619+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
55620+ return mode;
55621+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
55622+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
55623+ return 0;
55624+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
55625+ return 0;
55626+
55627+ return (reqmode);
55628+}
55629+
55630+__u32
55631+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
55632+{
55633+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
55634+}
55635+
55636+__u32
55637+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
55638+{
55639+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
55640+}
55641+
55642+__u32
55643+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
55644+{
55645+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
55646+}
55647+
55648+__u32
55649+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
55650+{
55651+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
55652+}
55653+
55654+__u32
55655+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
55656+ umode_t *modeptr)
55657+{
55658+ umode_t mode;
55659+
55660+ *modeptr &= ~gr_acl_umask();
55661+ mode = *modeptr;
55662+
55663+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
55664+ return 1;
55665+
55666+ if (unlikely(mode & (S_ISUID | S_ISGID))) {
55667+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
55668+ GR_CHMOD_ACL_MSG);
55669+ } else {
55670+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
55671+ }
55672+}
55673+
55674+__u32
55675+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
55676+{
55677+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
55678+}
55679+
55680+__u32
55681+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
55682+{
55683+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
55684+}
55685+
55686+__u32
55687+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
55688+{
55689+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
55690+}
55691+
55692+__u32
55693+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
55694+{
55695+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
55696+ GR_UNIXCONNECT_ACL_MSG);
55697+}
55698+
55699+/* hardlinks require at minimum create and link permission,
55700+ any additional privilege required is based on the
55701+ privilege of the file being linked to
55702+*/
55703+__u32
55704+gr_acl_handle_link(const struct dentry * new_dentry,
55705+ const struct dentry * parent_dentry,
55706+ const struct vfsmount * parent_mnt,
55707+ const struct dentry * old_dentry,
55708+ const struct vfsmount * old_mnt, const char *to)
55709+{
55710+ __u32 mode;
55711+ __u32 needmode = GR_CREATE | GR_LINK;
55712+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
55713+
55714+ mode =
55715+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
55716+ old_mnt);
55717+
55718+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
55719+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
55720+ return mode;
55721+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
55722+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
55723+ return 0;
55724+ } else if (unlikely((mode & needmode) != needmode))
55725+ return 0;
55726+
55727+ return 1;
55728+}
55729+
55730+__u32
55731+gr_acl_handle_symlink(const struct dentry * new_dentry,
55732+ const struct dentry * parent_dentry,
55733+ const struct vfsmount * parent_mnt, const char *from)
55734+{
55735+ __u32 needmode = GR_WRITE | GR_CREATE;
55736+ __u32 mode;
55737+
55738+ mode =
55739+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
55740+ GR_CREATE | GR_AUDIT_CREATE |
55741+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
55742+
55743+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
55744+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55745+ return mode;
55746+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
55747+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55748+ return 0;
55749+ } else if (unlikely((mode & needmode) != needmode))
55750+ return 0;
55751+
55752+ return (GR_WRITE | GR_CREATE);
55753+}
55754+
55755+static __u32 generic_fs_create_handler(const struct dentry *new_dentry, const struct dentry *parent_dentry, const struct vfsmount *parent_mnt, __u32 reqmode, const char *fmt)
55756+{
55757+ __u32 mode;
55758+
55759+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
55760+
55761+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
55762+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
55763+ return mode;
55764+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
55765+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
55766+ return 0;
55767+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
55768+ return 0;
55769+
55770+ return (reqmode);
55771+}
55772+
55773+__u32
55774+gr_acl_handle_mknod(const struct dentry * new_dentry,
55775+ const struct dentry * parent_dentry,
55776+ const struct vfsmount * parent_mnt,
55777+ const int mode)
55778+{
55779+ __u32 reqmode = GR_WRITE | GR_CREATE;
55780+ if (unlikely(mode & (S_ISUID | S_ISGID)))
55781+ reqmode |= GR_SETID;
55782+
55783+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55784+ reqmode, GR_MKNOD_ACL_MSG);
55785+}
55786+
55787+__u32
55788+gr_acl_handle_mkdir(const struct dentry *new_dentry,
55789+ const struct dentry *parent_dentry,
55790+ const struct vfsmount *parent_mnt)
55791+{
55792+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55793+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
55794+}
55795+
55796+#define RENAME_CHECK_SUCCESS(old, new) \
55797+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
55798+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
55799+
55800+int
55801+gr_acl_handle_rename(struct dentry *new_dentry,
55802+ struct dentry *parent_dentry,
55803+ const struct vfsmount *parent_mnt,
55804+ struct dentry *old_dentry,
55805+ struct inode *old_parent_inode,
55806+ struct vfsmount *old_mnt, const char *newname)
55807+{
55808+ __u32 comp1, comp2;
55809+ int error = 0;
55810+
55811+ if (unlikely(!gr_acl_is_enabled()))
55812+ return 0;
55813+
55814+ if (!new_dentry->d_inode) {
55815+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
55816+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
55817+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
55818+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
55819+ GR_DELETE | GR_AUDIT_DELETE |
55820+ GR_AUDIT_READ | GR_AUDIT_WRITE |
55821+ GR_SUPPRESS, old_mnt);
55822+ } else {
55823+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
55824+ GR_CREATE | GR_DELETE |
55825+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
55826+ GR_AUDIT_READ | GR_AUDIT_WRITE |
55827+ GR_SUPPRESS, parent_mnt);
55828+ comp2 =
55829+ gr_search_file(old_dentry,
55830+ GR_READ | GR_WRITE | GR_AUDIT_READ |
55831+ GR_DELETE | GR_AUDIT_DELETE |
55832+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
55833+ }
55834+
55835+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
55836+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
55837+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55838+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
55839+ && !(comp2 & GR_SUPPRESS)) {
55840+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55841+ error = -EACCES;
55842+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
55843+ error = -EACCES;
55844+
55845+ return error;
55846+}
55847+
55848+void
55849+gr_acl_handle_exit(void)
55850+{
55851+ u16 id;
55852+ char *rolename;
55853+ struct file *exec_file;
55854+
55855+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
55856+ !(current->role->roletype & GR_ROLE_PERSIST))) {
55857+ id = current->acl_role_id;
55858+ rolename = current->role->rolename;
55859+ gr_set_acls(1);
55860+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
55861+ }
55862+
55863+ write_lock(&grsec_exec_file_lock);
55864+ exec_file = current->exec_file;
55865+ current->exec_file = NULL;
55866+ write_unlock(&grsec_exec_file_lock);
55867+
55868+ if (exec_file)
55869+ fput(exec_file);
55870+}
55871+
55872+int
55873+gr_acl_handle_procpidmem(const struct task_struct *task)
55874+{
55875+ if (unlikely(!gr_acl_is_enabled()))
55876+ return 0;
55877+
55878+ if (task != current && task->acl->mode & GR_PROTPROCFD)
55879+ return -EACCES;
55880+
55881+ return 0;
55882+}
55883diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
55884new file mode 100644
55885index 0000000..17050ca
55886--- /dev/null
55887+++ b/grsecurity/gracl_ip.c
55888@@ -0,0 +1,381 @@
55889+#include <linux/kernel.h>
55890+#include <asm/uaccess.h>
55891+#include <asm/errno.h>
55892+#include <net/sock.h>
55893+#include <linux/file.h>
55894+#include <linux/fs.h>
55895+#include <linux/net.h>
55896+#include <linux/in.h>
55897+#include <linux/skbuff.h>
55898+#include <linux/ip.h>
55899+#include <linux/udp.h>
55900+#include <linux/types.h>
55901+#include <linux/sched.h>
55902+#include <linux/netdevice.h>
55903+#include <linux/inetdevice.h>
55904+#include <linux/gracl.h>
55905+#include <linux/grsecurity.h>
55906+#include <linux/grinternal.h>
55907+
55908+#define GR_BIND 0x01
55909+#define GR_CONNECT 0x02
55910+#define GR_INVERT 0x04
55911+#define GR_BINDOVERRIDE 0x08
55912+#define GR_CONNECTOVERRIDE 0x10
55913+#define GR_SOCK_FAMILY 0x20
55914+
55915+static const char * gr_protocols[IPPROTO_MAX] = {
55916+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
55917+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
55918+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
55919+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
55920+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
55921+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
55922+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
55923+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
55924+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
55925+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
55926+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
55927+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
55928+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
55929+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
55930+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
55931+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
55932+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
55933+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
55934+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
55935+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
55936+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
55937+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
55938+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
55939+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
55940+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
55941+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
55942+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
55943+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
55944+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
55945+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
55946+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
55947+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
55948+ };
55949+
55950+static const char * gr_socktypes[SOCK_MAX] = {
55951+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
55952+ "unknown:7", "unknown:8", "unknown:9", "packet"
55953+ };
55954+
55955+static const char * gr_sockfamilies[AF_MAX+1] = {
55956+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
55957+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
55958+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
55959+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
55960+ };
55961+
55962+const char *
55963+gr_proto_to_name(unsigned char proto)
55964+{
55965+ return gr_protocols[proto];
55966+}
55967+
55968+const char *
55969+gr_socktype_to_name(unsigned char type)
55970+{
55971+ return gr_socktypes[type];
55972+}
55973+
55974+const char *
55975+gr_sockfamily_to_name(unsigned char family)
55976+{
55977+ return gr_sockfamilies[family];
55978+}
55979+
55980+int
55981+gr_search_socket(const int domain, const int type, const int protocol)
55982+{
55983+ struct acl_subject_label *curr;
55984+ const struct cred *cred = current_cred();
55985+
55986+ if (unlikely(!gr_acl_is_enabled()))
55987+ goto exit;
55988+
55989+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
55990+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
55991+ goto exit; // let the kernel handle it
55992+
55993+ curr = current->acl;
55994+
55995+ if (curr->sock_families[domain / 32] & (1 << (domain % 32))) {
55996+ /* the family is allowed, if this is PF_INET allow it only if
55997+ the extra sock type/protocol checks pass */
55998+ if (domain == PF_INET)
55999+ goto inet_check;
56000+ goto exit;
56001+ } else {
56002+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
56003+ __u32 fakeip = 0;
56004+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
56005+ current->role->roletype, cred->uid,
56006+ cred->gid, current->exec_file ?
56007+ gr_to_filename(current->exec_file->f_path.dentry,
56008+ current->exec_file->f_path.mnt) :
56009+ curr->filename, curr->filename,
56010+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
56011+ &current->signal->saved_ip);
56012+ goto exit;
56013+ }
56014+ goto exit_fail;
56015+ }
56016+
56017+inet_check:
56018+ /* the rest of this checking is for IPv4 only */
56019+ if (!curr->ips)
56020+ goto exit;
56021+
56022+ if ((curr->ip_type & (1 << type)) &&
56023+ (curr->ip_proto[protocol / 32] & (1 << (protocol % 32))))
56024+ goto exit;
56025+
56026+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
56027+ /* we don't place acls on raw sockets , and sometimes
56028+ dgram/ip sockets are opened for ioctl and not
56029+ bind/connect, so we'll fake a bind learn log */
56030+ if (type == SOCK_RAW || type == SOCK_PACKET) {
56031+ __u32 fakeip = 0;
56032+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
56033+ current->role->roletype, cred->uid,
56034+ cred->gid, current->exec_file ?
56035+ gr_to_filename(current->exec_file->f_path.dentry,
56036+ current->exec_file->f_path.mnt) :
56037+ curr->filename, curr->filename,
56038+ &fakeip, 0, type,
56039+ protocol, GR_CONNECT, &current->signal->saved_ip);
56040+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
56041+ __u32 fakeip = 0;
56042+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
56043+ current->role->roletype, cred->uid,
56044+ cred->gid, current->exec_file ?
56045+ gr_to_filename(current->exec_file->f_path.dentry,
56046+ current->exec_file->f_path.mnt) :
56047+ curr->filename, curr->filename,
56048+ &fakeip, 0, type,
56049+ protocol, GR_BIND, &current->signal->saved_ip);
56050+ }
56051+ /* we'll log when they use connect or bind */
56052+ goto exit;
56053+ }
56054+
56055+exit_fail:
56056+ if (domain == PF_INET)
56057+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
56058+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
56059+ else
56060+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
56061+ gr_socktype_to_name(type), protocol);
56062+
56063+ return 0;
56064+exit:
56065+ return 1;
56066+}
56067+
56068+int check_ip_policy(struct acl_ip_label *ip, __u32 ip_addr, __u16 ip_port, __u8 protocol, const int mode, const int type, __u32 our_addr, __u32 our_netmask)
56069+{
56070+ if ((ip->mode & mode) &&
56071+ (ip_port >= ip->low) &&
56072+ (ip_port <= ip->high) &&
56073+ ((ntohl(ip_addr) & our_netmask) ==
56074+ (ntohl(our_addr) & our_netmask))
56075+ && (ip->proto[protocol / 32] & (1 << (protocol % 32)))
56076+ && (ip->type & (1 << type))) {
56077+ if (ip->mode & GR_INVERT)
56078+ return 2; // specifically denied
56079+ else
56080+ return 1; // allowed
56081+ }
56082+
56083+ return 0; // not specifically allowed, may continue parsing
56084+}
56085+
56086+static int
56087+gr_search_connectbind(const int full_mode, struct sock *sk,
56088+ struct sockaddr_in *addr, const int type)
56089+{
56090+ char iface[IFNAMSIZ] = {0};
56091+ struct acl_subject_label *curr;
56092+ struct acl_ip_label *ip;
56093+ struct inet_sock *isk;
56094+ struct net_device *dev;
56095+ struct in_device *idev;
56096+ unsigned long i;
56097+ int ret;
56098+ int mode = full_mode & (GR_BIND | GR_CONNECT);
56099+ __u32 ip_addr = 0;
56100+ __u32 our_addr;
56101+ __u32 our_netmask;
56102+ char *p;
56103+ __u16 ip_port = 0;
56104+ const struct cred *cred = current_cred();
56105+
56106+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
56107+ return 0;
56108+
56109+ curr = current->acl;
56110+ isk = inet_sk(sk);
56111+
56112+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
56113+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
56114+ addr->sin_addr.s_addr = curr->inaddr_any_override;
56115+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
56116+ struct sockaddr_in saddr;
56117+ int err;
56118+
56119+ saddr.sin_family = AF_INET;
56120+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
56121+ saddr.sin_port = isk->inet_sport;
56122+
56123+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
56124+ if (err)
56125+ return err;
56126+
56127+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
56128+ if (err)
56129+ return err;
56130+ }
56131+
56132+ if (!curr->ips)
56133+ return 0;
56134+
56135+ ip_addr = addr->sin_addr.s_addr;
56136+ ip_port = ntohs(addr->sin_port);
56137+
56138+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
56139+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
56140+ current->role->roletype, cred->uid,
56141+ cred->gid, current->exec_file ?
56142+ gr_to_filename(current->exec_file->f_path.dentry,
56143+ current->exec_file->f_path.mnt) :
56144+ curr->filename, curr->filename,
56145+ &ip_addr, ip_port, type,
56146+ sk->sk_protocol, mode, &current->signal->saved_ip);
56147+ return 0;
56148+ }
56149+
56150+ for (i = 0; i < curr->ip_num; i++) {
56151+ ip = *(curr->ips + i);
56152+ if (ip->iface != NULL) {
56153+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
56154+ p = strchr(iface, ':');
56155+ if (p != NULL)
56156+ *p = '\0';
56157+ dev = dev_get_by_name(sock_net(sk), iface);
56158+ if (dev == NULL)
56159+ continue;
56160+ idev = in_dev_get(dev);
56161+ if (idev == NULL) {
56162+ dev_put(dev);
56163+ continue;
56164+ }
56165+ rcu_read_lock();
56166+ for_ifa(idev) {
56167+ if (!strcmp(ip->iface, ifa->ifa_label)) {
56168+ our_addr = ifa->ifa_address;
56169+ our_netmask = 0xffffffff;
56170+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
56171+ if (ret == 1) {
56172+ rcu_read_unlock();
56173+ in_dev_put(idev);
56174+ dev_put(dev);
56175+ return 0;
56176+ } else if (ret == 2) {
56177+ rcu_read_unlock();
56178+ in_dev_put(idev);
56179+ dev_put(dev);
56180+ goto denied;
56181+ }
56182+ }
56183+ } endfor_ifa(idev);
56184+ rcu_read_unlock();
56185+ in_dev_put(idev);
56186+ dev_put(dev);
56187+ } else {
56188+ our_addr = ip->addr;
56189+ our_netmask = ip->netmask;
56190+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
56191+ if (ret == 1)
56192+ return 0;
56193+ else if (ret == 2)
56194+ goto denied;
56195+ }
56196+ }
56197+
56198+denied:
56199+ if (mode == GR_BIND)
56200+ gr_log_int5_str2(GR_DONT_AUDIT, GR_BIND_ACL_MSG, &ip_addr, ip_port, gr_socktype_to_name(type), gr_proto_to_name(sk->sk_protocol));
56201+ else if (mode == GR_CONNECT)
56202+ gr_log_int5_str2(GR_DONT_AUDIT, GR_CONNECT_ACL_MSG, &ip_addr, ip_port, gr_socktype_to_name(type), gr_proto_to_name(sk->sk_protocol));
56203+
56204+ return -EACCES;
56205+}
56206+
56207+int
56208+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
56209+{
56210+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
56211+}
56212+
56213+int
56214+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
56215+{
56216+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
56217+}
56218+
56219+int gr_search_listen(struct socket *sock)
56220+{
56221+ struct sock *sk = sock->sk;
56222+ struct sockaddr_in addr;
56223+
56224+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
56225+ addr.sin_port = inet_sk(sk)->inet_sport;
56226+
56227+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
56228+}
56229+
56230+int gr_search_accept(struct socket *sock)
56231+{
56232+ struct sock *sk = sock->sk;
56233+ struct sockaddr_in addr;
56234+
56235+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
56236+ addr.sin_port = inet_sk(sk)->inet_sport;
56237+
56238+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
56239+}
56240+
56241+int
56242+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
56243+{
56244+ if (addr)
56245+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
56246+ else {
56247+ struct sockaddr_in sin;
56248+ const struct inet_sock *inet = inet_sk(sk);
56249+
56250+ sin.sin_addr.s_addr = inet->inet_daddr;
56251+ sin.sin_port = inet->inet_dport;
56252+
56253+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
56254+ }
56255+}
56256+
56257+int
56258+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
56259+{
56260+ struct sockaddr_in sin;
56261+
56262+ if (unlikely(skb->len < sizeof (struct udphdr)))
56263+ return 0; // skip this packet
56264+
56265+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
56266+ sin.sin_port = udp_hdr(skb)->source;
56267+
56268+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
56269+}
56270diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
56271new file mode 100644
56272index 0000000..25f54ef
56273--- /dev/null
56274+++ b/grsecurity/gracl_learn.c
56275@@ -0,0 +1,207 @@
56276+#include <linux/kernel.h>
56277+#include <linux/mm.h>
56278+#include <linux/sched.h>
56279+#include <linux/poll.h>
56280+#include <linux/string.h>
56281+#include <linux/file.h>
56282+#include <linux/types.h>
56283+#include <linux/vmalloc.h>
56284+#include <linux/grinternal.h>
56285+
56286+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
56287+ size_t count, loff_t *ppos);
56288+extern int gr_acl_is_enabled(void);
56289+
56290+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
56291+static int gr_learn_attached;
56292+
56293+/* use a 512k buffer */
56294+#define LEARN_BUFFER_SIZE (512 * 1024)
56295+
56296+static DEFINE_SPINLOCK(gr_learn_lock);
56297+static DEFINE_MUTEX(gr_learn_user_mutex);
56298+
56299+/* we need to maintain two buffers, so that the kernel context of grlearn
56300+ uses a semaphore around the userspace copying, and the other kernel contexts
56301+ use a spinlock when copying into the buffer, since they cannot sleep
56302+*/
56303+static char *learn_buffer;
56304+static char *learn_buffer_user;
56305+static int learn_buffer_len;
56306+static int learn_buffer_user_len;
56307+
56308+static ssize_t
56309+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
56310+{
56311+ DECLARE_WAITQUEUE(wait, current);
56312+ ssize_t retval = 0;
56313+
56314+ add_wait_queue(&learn_wait, &wait);
56315+ set_current_state(TASK_INTERRUPTIBLE);
56316+ do {
56317+ mutex_lock(&gr_learn_user_mutex);
56318+ spin_lock(&gr_learn_lock);
56319+ if (learn_buffer_len)
56320+ break;
56321+ spin_unlock(&gr_learn_lock);
56322+ mutex_unlock(&gr_learn_user_mutex);
56323+ if (file->f_flags & O_NONBLOCK) {
56324+ retval = -EAGAIN;
56325+ goto out;
56326+ }
56327+ if (signal_pending(current)) {
56328+ retval = -ERESTARTSYS;
56329+ goto out;
56330+ }
56331+
56332+ schedule();
56333+ } while (1);
56334+
56335+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
56336+ learn_buffer_user_len = learn_buffer_len;
56337+ retval = learn_buffer_len;
56338+ learn_buffer_len = 0;
56339+
56340+ spin_unlock(&gr_learn_lock);
56341+
56342+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
56343+ retval = -EFAULT;
56344+
56345+ mutex_unlock(&gr_learn_user_mutex);
56346+out:
56347+ set_current_state(TASK_RUNNING);
56348+ remove_wait_queue(&learn_wait, &wait);
56349+ return retval;
56350+}
56351+
56352+static unsigned int
56353+poll_learn(struct file * file, poll_table * wait)
56354+{
56355+ poll_wait(file, &learn_wait, wait);
56356+
56357+ if (learn_buffer_len)
56358+ return (POLLIN | POLLRDNORM);
56359+
56360+ return 0;
56361+}
56362+
56363+void
56364+gr_clear_learn_entries(void)
56365+{
56366+ char *tmp;
56367+
56368+ mutex_lock(&gr_learn_user_mutex);
56369+ spin_lock(&gr_learn_lock);
56370+ tmp = learn_buffer;
56371+ learn_buffer = NULL;
56372+ spin_unlock(&gr_learn_lock);
56373+ if (tmp)
56374+ vfree(tmp);
56375+ if (learn_buffer_user != NULL) {
56376+ vfree(learn_buffer_user);
56377+ learn_buffer_user = NULL;
56378+ }
56379+ learn_buffer_len = 0;
56380+ mutex_unlock(&gr_learn_user_mutex);
56381+
56382+ return;
56383+}
56384+
56385+void
56386+gr_add_learn_entry(const char *fmt, ...)
56387+{
56388+ va_list args;
56389+ unsigned int len;
56390+
56391+ if (!gr_learn_attached)
56392+ return;
56393+
56394+ spin_lock(&gr_learn_lock);
56395+
56396+ /* leave a gap at the end so we know when it's "full" but don't have to
56397+ compute the exact length of the string we're trying to append
56398+ */
56399+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
56400+ spin_unlock(&gr_learn_lock);
56401+ wake_up_interruptible(&learn_wait);
56402+ return;
56403+ }
56404+ if (learn_buffer == NULL) {
56405+ spin_unlock(&gr_learn_lock);
56406+ return;
56407+ }
56408+
56409+ va_start(args, fmt);
56410+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
56411+ va_end(args);
56412+
56413+ learn_buffer_len += len + 1;
56414+
56415+ spin_unlock(&gr_learn_lock);
56416+ wake_up_interruptible(&learn_wait);
56417+
56418+ return;
56419+}
56420+
56421+static int
56422+open_learn(struct inode *inode, struct file *file)
56423+{
56424+ if (file->f_mode & FMODE_READ && gr_learn_attached)
56425+ return -EBUSY;
56426+ if (file->f_mode & FMODE_READ) {
56427+ int retval = 0;
56428+ mutex_lock(&gr_learn_user_mutex);
56429+ if (learn_buffer == NULL)
56430+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
56431+ if (learn_buffer_user == NULL)
56432+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
56433+ if (learn_buffer == NULL) {
56434+ retval = -ENOMEM;
56435+ goto out_error;
56436+ }
56437+ if (learn_buffer_user == NULL) {
56438+ retval = -ENOMEM;
56439+ goto out_error;
56440+ }
56441+ learn_buffer_len = 0;
56442+ learn_buffer_user_len = 0;
56443+ gr_learn_attached = 1;
56444+out_error:
56445+ mutex_unlock(&gr_learn_user_mutex);
56446+ return retval;
56447+ }
56448+ return 0;
56449+}
56450+
56451+static int
56452+close_learn(struct inode *inode, struct file *file)
56453+{
56454+ if (file->f_mode & FMODE_READ) {
56455+ char *tmp = NULL;
56456+ mutex_lock(&gr_learn_user_mutex);
56457+ spin_lock(&gr_learn_lock);
56458+ tmp = learn_buffer;
56459+ learn_buffer = NULL;
56460+ spin_unlock(&gr_learn_lock);
56461+ if (tmp)
56462+ vfree(tmp);
56463+ if (learn_buffer_user != NULL) {
56464+ vfree(learn_buffer_user);
56465+ learn_buffer_user = NULL;
56466+ }
56467+ learn_buffer_len = 0;
56468+ learn_buffer_user_len = 0;
56469+ gr_learn_attached = 0;
56470+ mutex_unlock(&gr_learn_user_mutex);
56471+ }
56472+
56473+ return 0;
56474+}
56475+
56476+const struct file_operations grsec_fops = {
56477+ .read = read_learn,
56478+ .write = write_grsec_handler,
56479+ .open = open_learn,
56480+ .release = close_learn,
56481+ .poll = poll_learn,
56482+};
56483diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
56484new file mode 100644
56485index 0000000..39645c9
56486--- /dev/null
56487+++ b/grsecurity/gracl_res.c
56488@@ -0,0 +1,68 @@
56489+#include <linux/kernel.h>
56490+#include <linux/sched.h>
56491+#include <linux/gracl.h>
56492+#include <linux/grinternal.h>
56493+
56494+static const char *restab_log[] = {
56495+ [RLIMIT_CPU] = "RLIMIT_CPU",
56496+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
56497+ [RLIMIT_DATA] = "RLIMIT_DATA",
56498+ [RLIMIT_STACK] = "RLIMIT_STACK",
56499+ [RLIMIT_CORE] = "RLIMIT_CORE",
56500+ [RLIMIT_RSS] = "RLIMIT_RSS",
56501+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
56502+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
56503+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
56504+ [RLIMIT_AS] = "RLIMIT_AS",
56505+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
56506+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
56507+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
56508+ [RLIMIT_NICE] = "RLIMIT_NICE",
56509+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
56510+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
56511+ [GR_CRASH_RES] = "RLIMIT_CRASH"
56512+};
56513+
56514+void
56515+gr_log_resource(const struct task_struct *task,
56516+ const int res, const unsigned long wanted, const int gt)
56517+{
56518+ const struct cred *cred;
56519+ unsigned long rlim;
56520+
56521+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
56522+ return;
56523+
56524+ // not yet supported resource
56525+ if (unlikely(!restab_log[res]))
56526+ return;
56527+
56528+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
56529+ rlim = task_rlimit_max(task, res);
56530+ else
56531+ rlim = task_rlimit(task, res);
56532+
56533+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
56534+ return;
56535+
56536+ rcu_read_lock();
56537+ cred = __task_cred(task);
56538+
56539+ if (res == RLIMIT_NPROC &&
56540+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
56541+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
56542+ goto out_rcu_unlock;
56543+ else if (res == RLIMIT_MEMLOCK &&
56544+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
56545+ goto out_rcu_unlock;
56546+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
56547+ goto out_rcu_unlock;
56548+ rcu_read_unlock();
56549+
56550+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
56551+
56552+ return;
56553+out_rcu_unlock:
56554+ rcu_read_unlock();
56555+ return;
56556+}
56557diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
56558new file mode 100644
56559index 0000000..5556be3
56560--- /dev/null
56561+++ b/grsecurity/gracl_segv.c
56562@@ -0,0 +1,299 @@
56563+#include <linux/kernel.h>
56564+#include <linux/mm.h>
56565+#include <asm/uaccess.h>
56566+#include <asm/errno.h>
56567+#include <asm/mman.h>
56568+#include <net/sock.h>
56569+#include <linux/file.h>
56570+#include <linux/fs.h>
56571+#include <linux/net.h>
56572+#include <linux/in.h>
56573+#include <linux/slab.h>
56574+#include <linux/types.h>
56575+#include <linux/sched.h>
56576+#include <linux/timer.h>
56577+#include <linux/gracl.h>
56578+#include <linux/grsecurity.h>
56579+#include <linux/grinternal.h>
56580+
56581+static struct crash_uid *uid_set;
56582+static unsigned short uid_used;
56583+static DEFINE_SPINLOCK(gr_uid_lock);
56584+extern rwlock_t gr_inode_lock;
56585+extern struct acl_subject_label *
56586+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
56587+ struct acl_role_label *role);
56588+
56589+#ifdef CONFIG_BTRFS_FS
56590+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
56591+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
56592+#endif
56593+
56594+static inline dev_t __get_dev(const struct dentry *dentry)
56595+{
56596+#ifdef CONFIG_BTRFS_FS
56597+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
56598+ return get_btrfs_dev_from_inode(dentry->d_inode);
56599+ else
56600+#endif
56601+ return dentry->d_inode->i_sb->s_dev;
56602+}
56603+
56604+int
56605+gr_init_uidset(void)
56606+{
56607+ uid_set =
56608+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
56609+ uid_used = 0;
56610+
56611+ return uid_set ? 1 : 0;
56612+}
56613+
56614+void
56615+gr_free_uidset(void)
56616+{
56617+ if (uid_set)
56618+ kfree(uid_set);
56619+
56620+ return;
56621+}
56622+
56623+int
56624+gr_find_uid(const uid_t uid)
56625+{
56626+ struct crash_uid *tmp = uid_set;
56627+ uid_t buid;
56628+ int low = 0, high = uid_used - 1, mid;
56629+
56630+ while (high >= low) {
56631+ mid = (low + high) >> 1;
56632+ buid = tmp[mid].uid;
56633+ if (buid == uid)
56634+ return mid;
56635+ if (buid > uid)
56636+ high = mid - 1;
56637+ if (buid < uid)
56638+ low = mid + 1;
56639+ }
56640+
56641+ return -1;
56642+}
56643+
56644+static __inline__ void
56645+gr_insertsort(void)
56646+{
56647+ unsigned short i, j;
56648+ struct crash_uid index;
56649+
56650+ for (i = 1; i < uid_used; i++) {
56651+ index = uid_set[i];
56652+ j = i;
56653+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
56654+ uid_set[j] = uid_set[j - 1];
56655+ j--;
56656+ }
56657+ uid_set[j] = index;
56658+ }
56659+
56660+ return;
56661+}
56662+
56663+static __inline__ void
56664+gr_insert_uid(const uid_t uid, const unsigned long expires)
56665+{
56666+ int loc;
56667+
56668+ if (uid_used == GR_UIDTABLE_MAX)
56669+ return;
56670+
56671+ loc = gr_find_uid(uid);
56672+
56673+ if (loc >= 0) {
56674+ uid_set[loc].expires = expires;
56675+ return;
56676+ }
56677+
56678+ uid_set[uid_used].uid = uid;
56679+ uid_set[uid_used].expires = expires;
56680+ uid_used++;
56681+
56682+ gr_insertsort();
56683+
56684+ return;
56685+}
56686+
56687+void
56688+gr_remove_uid(const unsigned short loc)
56689+{
56690+ unsigned short i;
56691+
56692+ for (i = loc + 1; i < uid_used; i++)
56693+ uid_set[i - 1] = uid_set[i];
56694+
56695+ uid_used--;
56696+
56697+ return;
56698+}
56699+
56700+int
56701+gr_check_crash_uid(const uid_t uid)
56702+{
56703+ int loc;
56704+ int ret = 0;
56705+
56706+ if (unlikely(!gr_acl_is_enabled()))
56707+ return 0;
56708+
56709+ spin_lock(&gr_uid_lock);
56710+ loc = gr_find_uid(uid);
56711+
56712+ if (loc < 0)
56713+ goto out_unlock;
56714+
56715+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
56716+ gr_remove_uid(loc);
56717+ else
56718+ ret = 1;
56719+
56720+out_unlock:
56721+ spin_unlock(&gr_uid_lock);
56722+ return ret;
56723+}
56724+
56725+static __inline__ int
56726+proc_is_setxid(const struct cred *cred)
56727+{
56728+ if (cred->uid != cred->euid || cred->uid != cred->suid ||
56729+ cred->uid != cred->fsuid)
56730+ return 1;
56731+ if (cred->gid != cred->egid || cred->gid != cred->sgid ||
56732+ cred->gid != cred->fsgid)
56733+ return 1;
56734+
56735+ return 0;
56736+}
56737+
56738+extern int gr_fake_force_sig(int sig, struct task_struct *t);
56739+
56740+void
56741+gr_handle_crash(struct task_struct *task, const int sig)
56742+{
56743+ struct acl_subject_label *curr;
56744+ struct task_struct *tsk, *tsk2;
56745+ const struct cred *cred;
56746+ const struct cred *cred2;
56747+
56748+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
56749+ return;
56750+
56751+ if (unlikely(!gr_acl_is_enabled()))
56752+ return;
56753+
56754+ curr = task->acl;
56755+
56756+ if (!(curr->resmask & (1 << GR_CRASH_RES)))
56757+ return;
56758+
56759+ if (time_before_eq(curr->expires, get_seconds())) {
56760+ curr->expires = 0;
56761+ curr->crashes = 0;
56762+ }
56763+
56764+ curr->crashes++;
56765+
56766+ if (!curr->expires)
56767+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
56768+
56769+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56770+ time_after(curr->expires, get_seconds())) {
56771+ rcu_read_lock();
56772+ cred = __task_cred(task);
56773+ if (cred->uid && proc_is_setxid(cred)) {
56774+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56775+ spin_lock(&gr_uid_lock);
56776+ gr_insert_uid(cred->uid, curr->expires);
56777+ spin_unlock(&gr_uid_lock);
56778+ curr->expires = 0;
56779+ curr->crashes = 0;
56780+ read_lock(&tasklist_lock);
56781+ do_each_thread(tsk2, tsk) {
56782+ cred2 = __task_cred(tsk);
56783+ if (tsk != task && cred2->uid == cred->uid)
56784+ gr_fake_force_sig(SIGKILL, tsk);
56785+ } while_each_thread(tsk2, tsk);
56786+ read_unlock(&tasklist_lock);
56787+ } else {
56788+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56789+ read_lock(&tasklist_lock);
56790+ read_lock(&grsec_exec_file_lock);
56791+ do_each_thread(tsk2, tsk) {
56792+ if (likely(tsk != task)) {
56793+ // if this thread has the same subject as the one that triggered
56794+ // RES_CRASH and it's the same binary, kill it
56795+ if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
56796+ gr_fake_force_sig(SIGKILL, tsk);
56797+ }
56798+ } while_each_thread(tsk2, tsk);
56799+ read_unlock(&grsec_exec_file_lock);
56800+ read_unlock(&tasklist_lock);
56801+ }
56802+ rcu_read_unlock();
56803+ }
56804+
56805+ return;
56806+}
56807+
56808+int
56809+gr_check_crash_exec(const struct file *filp)
56810+{
56811+ struct acl_subject_label *curr;
56812+
56813+ if (unlikely(!gr_acl_is_enabled()))
56814+ return 0;
56815+
56816+ read_lock(&gr_inode_lock);
56817+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
56818+ __get_dev(filp->f_path.dentry),
56819+ current->role);
56820+ read_unlock(&gr_inode_lock);
56821+
56822+ if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
56823+ (!curr->crashes && !curr->expires))
56824+ return 0;
56825+
56826+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56827+ time_after(curr->expires, get_seconds()))
56828+ return 1;
56829+ else if (time_before_eq(curr->expires, get_seconds())) {
56830+ curr->crashes = 0;
56831+ curr->expires = 0;
56832+ }
56833+
56834+ return 0;
56835+}
56836+
56837+void
56838+gr_handle_alertkill(struct task_struct *task)
56839+{
56840+ struct acl_subject_label *curracl;
56841+ __u32 curr_ip;
56842+ struct task_struct *p, *p2;
56843+
56844+ if (unlikely(!gr_acl_is_enabled()))
56845+ return;
56846+
56847+ curracl = task->acl;
56848+ curr_ip = task->signal->curr_ip;
56849+
56850+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
56851+ read_lock(&tasklist_lock);
56852+ do_each_thread(p2, p) {
56853+ if (p->signal->curr_ip == curr_ip)
56854+ gr_fake_force_sig(SIGKILL, p);
56855+ } while_each_thread(p2, p);
56856+ read_unlock(&tasklist_lock);
56857+ } else if (curracl->mode & GR_KILLPROC)
56858+ gr_fake_force_sig(SIGKILL, task);
56859+
56860+ return;
56861+}
56862diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
56863new file mode 100644
56864index 0000000..9d83a69
56865--- /dev/null
56866+++ b/grsecurity/gracl_shm.c
56867@@ -0,0 +1,40 @@
56868+#include <linux/kernel.h>
56869+#include <linux/mm.h>
56870+#include <linux/sched.h>
56871+#include <linux/file.h>
56872+#include <linux/ipc.h>
56873+#include <linux/gracl.h>
56874+#include <linux/grsecurity.h>
56875+#include <linux/grinternal.h>
56876+
56877+int
56878+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
56879+ const time_t shm_createtime, const uid_t cuid, const int shmid)
56880+{
56881+ struct task_struct *task;
56882+
56883+ if (!gr_acl_is_enabled())
56884+ return 1;
56885+
56886+ rcu_read_lock();
56887+ read_lock(&tasklist_lock);
56888+
56889+ task = find_task_by_vpid(shm_cprid);
56890+
56891+ if (unlikely(!task))
56892+ task = find_task_by_vpid(shm_lapid);
56893+
56894+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
56895+ (task->pid == shm_lapid)) &&
56896+ (task->acl->mode & GR_PROTSHM) &&
56897+ (task->acl != current->acl))) {
56898+ read_unlock(&tasklist_lock);
56899+ rcu_read_unlock();
56900+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
56901+ return 0;
56902+ }
56903+ read_unlock(&tasklist_lock);
56904+ rcu_read_unlock();
56905+
56906+ return 1;
56907+}
56908diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
56909new file mode 100644
56910index 0000000..bc0be01
56911--- /dev/null
56912+++ b/grsecurity/grsec_chdir.c
56913@@ -0,0 +1,19 @@
56914+#include <linux/kernel.h>
56915+#include <linux/sched.h>
56916+#include <linux/fs.h>
56917+#include <linux/file.h>
56918+#include <linux/grsecurity.h>
56919+#include <linux/grinternal.h>
56920+
56921+void
56922+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
56923+{
56924+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
56925+ if ((grsec_enable_chdir && grsec_enable_group &&
56926+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
56927+ !grsec_enable_group)) {
56928+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
56929+ }
56930+#endif
56931+ return;
56932+}
56933diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
56934new file mode 100644
56935index 0000000..a2dc675
56936--- /dev/null
56937+++ b/grsecurity/grsec_chroot.c
56938@@ -0,0 +1,351 @@
56939+#include <linux/kernel.h>
56940+#include <linux/module.h>
56941+#include <linux/sched.h>
56942+#include <linux/file.h>
56943+#include <linux/fs.h>
56944+#include <linux/mount.h>
56945+#include <linux/types.h>
56946+#include <linux/pid_namespace.h>
56947+#include <linux/grsecurity.h>
56948+#include <linux/grinternal.h>
56949+
56950+void gr_set_chroot_entries(struct task_struct *task, struct path *path)
56951+{
56952+#ifdef CONFIG_GRKERNSEC
56953+ if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
56954+ path->dentry != task->nsproxy->mnt_ns->root->mnt_root)
56955+ task->gr_is_chrooted = 1;
56956+ else
56957+ task->gr_is_chrooted = 0;
56958+
56959+ task->gr_chroot_dentry = path->dentry;
56960+#endif
56961+ return;
56962+}
56963+
56964+void gr_clear_chroot_entries(struct task_struct *task)
56965+{
56966+#ifdef CONFIG_GRKERNSEC
56967+ task->gr_is_chrooted = 0;
56968+ task->gr_chroot_dentry = NULL;
56969+#endif
56970+ return;
56971+}
56972+
56973+int
56974+gr_handle_chroot_unix(const pid_t pid)
56975+{
56976+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
56977+ struct task_struct *p;
56978+
56979+ if (unlikely(!grsec_enable_chroot_unix))
56980+ return 1;
56981+
56982+ if (likely(!proc_is_chrooted(current)))
56983+ return 1;
56984+
56985+ rcu_read_lock();
56986+ read_lock(&tasklist_lock);
56987+ p = find_task_by_vpid_unrestricted(pid);
56988+ if (unlikely(p && !have_same_root(current, p))) {
56989+ read_unlock(&tasklist_lock);
56990+ rcu_read_unlock();
56991+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
56992+ return 0;
56993+ }
56994+ read_unlock(&tasklist_lock);
56995+ rcu_read_unlock();
56996+#endif
56997+ return 1;
56998+}
56999+
57000+int
57001+gr_handle_chroot_nice(void)
57002+{
57003+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
57004+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
57005+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
57006+ return -EPERM;
57007+ }
57008+#endif
57009+ return 0;
57010+}
57011+
57012+int
57013+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
57014+{
57015+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
57016+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
57017+ && proc_is_chrooted(current)) {
57018+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
57019+ return -EACCES;
57020+ }
57021+#endif
57022+ return 0;
57023+}
57024+
57025+int
57026+gr_handle_chroot_rawio(const struct inode *inode)
57027+{
57028+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57029+ if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
57030+ inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
57031+ return 1;
57032+#endif
57033+ return 0;
57034+}
57035+
57036+int
57037+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
57038+{
57039+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
57040+ struct task_struct *p;
57041+ int ret = 0;
57042+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
57043+ return ret;
57044+
57045+ read_lock(&tasklist_lock);
57046+ do_each_pid_task(pid, type, p) {
57047+ if (!have_same_root(current, p)) {
57048+ ret = 1;
57049+ goto out;
57050+ }
57051+ } while_each_pid_task(pid, type, p);
57052+out:
57053+ read_unlock(&tasklist_lock);
57054+ return ret;
57055+#endif
57056+ return 0;
57057+}
57058+
57059+int
57060+gr_pid_is_chrooted(struct task_struct *p)
57061+{
57062+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
57063+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
57064+ return 0;
57065+
57066+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
57067+ !have_same_root(current, p)) {
57068+ return 1;
57069+ }
57070+#endif
57071+ return 0;
57072+}
57073+
57074+EXPORT_SYMBOL(gr_pid_is_chrooted);
57075+
57076+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
57077+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
57078+{
57079+ struct path path, currentroot;
57080+ int ret = 0;
57081+
57082+ path.dentry = (struct dentry *)u_dentry;
57083+ path.mnt = (struct vfsmount *)u_mnt;
57084+ get_fs_root(current->fs, &currentroot);
57085+ if (path_is_under(&path, &currentroot))
57086+ ret = 1;
57087+ path_put(&currentroot);
57088+
57089+ return ret;
57090+}
57091+#endif
57092+
57093+int
57094+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
57095+{
57096+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
57097+ if (!grsec_enable_chroot_fchdir)
57098+ return 1;
57099+
57100+ if (!proc_is_chrooted(current))
57101+ return 1;
57102+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
57103+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
57104+ return 0;
57105+ }
57106+#endif
57107+ return 1;
57108+}
57109+
57110+int
57111+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
57112+ const time_t shm_createtime)
57113+{
57114+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
57115+ struct task_struct *p;
57116+ time_t starttime;
57117+
57118+ if (unlikely(!grsec_enable_chroot_shmat))
57119+ return 1;
57120+
57121+ if (likely(!proc_is_chrooted(current)))
57122+ return 1;
57123+
57124+ rcu_read_lock();
57125+ read_lock(&tasklist_lock);
57126+
57127+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
57128+ starttime = p->start_time.tv_sec;
57129+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
57130+ if (have_same_root(current, p)) {
57131+ goto allow;
57132+ } else {
57133+ read_unlock(&tasklist_lock);
57134+ rcu_read_unlock();
57135+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
57136+ return 0;
57137+ }
57138+ }
57139+ /* creator exited, pid reuse, fall through to next check */
57140+ }
57141+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
57142+ if (unlikely(!have_same_root(current, p))) {
57143+ read_unlock(&tasklist_lock);
57144+ rcu_read_unlock();
57145+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
57146+ return 0;
57147+ }
57148+ }
57149+
57150+allow:
57151+ read_unlock(&tasklist_lock);
57152+ rcu_read_unlock();
57153+#endif
57154+ return 1;
57155+}
57156+
57157+void
57158+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
57159+{
57160+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
57161+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
57162+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
57163+#endif
57164+ return;
57165+}
57166+
57167+int
57168+gr_handle_chroot_mknod(const struct dentry *dentry,
57169+ const struct vfsmount *mnt, const int mode)
57170+{
57171+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
57172+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
57173+ proc_is_chrooted(current)) {
57174+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
57175+ return -EPERM;
57176+ }
57177+#endif
57178+ return 0;
57179+}
57180+
57181+int
57182+gr_handle_chroot_mount(const struct dentry *dentry,
57183+ const struct vfsmount *mnt, const char *dev_name)
57184+{
57185+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
57186+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
57187+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
57188+ return -EPERM;
57189+ }
57190+#endif
57191+ return 0;
57192+}
57193+
57194+int
57195+gr_handle_chroot_pivot(void)
57196+{
57197+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
57198+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
57199+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
57200+ return -EPERM;
57201+ }
57202+#endif
57203+ return 0;
57204+}
57205+
57206+int
57207+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
57208+{
57209+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
57210+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
57211+ !gr_is_outside_chroot(dentry, mnt)) {
57212+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
57213+ return -EPERM;
57214+ }
57215+#endif
57216+ return 0;
57217+}
57218+
57219+extern const char *captab_log[];
57220+extern int captab_log_entries;
57221+
57222+int
57223+gr_chroot_is_capable(const int cap)
57224+{
57225+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57226+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
57227+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
57228+ if (cap_raised(chroot_caps, cap)) {
57229+ const struct cred *creds = current_cred();
57230+ if (cap_raised(creds->cap_effective, cap) && cap < captab_log_entries) {
57231+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, current, captab_log[cap]);
57232+ }
57233+ return 0;
57234+ }
57235+ }
57236+#endif
57237+ return 1;
57238+}
57239+
57240+int
57241+gr_chroot_is_capable_nolog(const int cap)
57242+{
57243+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57244+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
57245+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
57246+ if (cap_raised(chroot_caps, cap)) {
57247+ return 0;
57248+ }
57249+ }
57250+#endif
57251+ return 1;
57252+}
57253+
57254+int
57255+gr_handle_chroot_sysctl(const int op)
57256+{
57257+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
57258+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
57259+ proc_is_chrooted(current))
57260+ return -EACCES;
57261+#endif
57262+ return 0;
57263+}
57264+
57265+void
57266+gr_handle_chroot_chdir(struct path *path)
57267+{
57268+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
57269+ if (grsec_enable_chroot_chdir)
57270+ set_fs_pwd(current->fs, path);
57271+#endif
57272+ return;
57273+}
57274+
57275+int
57276+gr_handle_chroot_chmod(const struct dentry *dentry,
57277+ const struct vfsmount *mnt, const int mode)
57278+{
57279+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
57280+ /* allow chmod +s on directories, but not files */
57281+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
57282+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
57283+ proc_is_chrooted(current)) {
57284+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
57285+ return -EPERM;
57286+ }
57287+#endif
57288+ return 0;
57289+}
57290diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
57291new file mode 100644
57292index 0000000..213ad8b
57293--- /dev/null
57294+++ b/grsecurity/grsec_disabled.c
57295@@ -0,0 +1,437 @@
57296+#include <linux/kernel.h>
57297+#include <linux/module.h>
57298+#include <linux/sched.h>
57299+#include <linux/file.h>
57300+#include <linux/fs.h>
57301+#include <linux/kdev_t.h>
57302+#include <linux/net.h>
57303+#include <linux/in.h>
57304+#include <linux/ip.h>
57305+#include <linux/skbuff.h>
57306+#include <linux/sysctl.h>
57307+
57308+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
57309+void
57310+pax_set_initial_flags(struct linux_binprm *bprm)
57311+{
57312+ return;
57313+}
57314+#endif
57315+
57316+#ifdef CONFIG_SYSCTL
57317+__u32
57318+gr_handle_sysctl(const struct ctl_table * table, const int op)
57319+{
57320+ return 0;
57321+}
57322+#endif
57323+
57324+#ifdef CONFIG_TASKSTATS
57325+int gr_is_taskstats_denied(int pid)
57326+{
57327+ return 0;
57328+}
57329+#endif
57330+
57331+int
57332+gr_acl_is_enabled(void)
57333+{
57334+ return 0;
57335+}
57336+
57337+void
57338+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
57339+{
57340+ return;
57341+}
57342+
57343+int
57344+gr_handle_rawio(const struct inode *inode)
57345+{
57346+ return 0;
57347+}
57348+
57349+void
57350+gr_acl_handle_psacct(struct task_struct *task, const long code)
57351+{
57352+ return;
57353+}
57354+
57355+int
57356+gr_handle_ptrace(struct task_struct *task, const long request)
57357+{
57358+ return 0;
57359+}
57360+
57361+int
57362+gr_handle_proc_ptrace(struct task_struct *task)
57363+{
57364+ return 0;
57365+}
57366+
57367+void
57368+gr_learn_resource(const struct task_struct *task,
57369+ const int res, const unsigned long wanted, const int gt)
57370+{
57371+ return;
57372+}
57373+
57374+int
57375+gr_set_acls(const int type)
57376+{
57377+ return 0;
57378+}
57379+
57380+int
57381+gr_check_hidden_task(const struct task_struct *tsk)
57382+{
57383+ return 0;
57384+}
57385+
57386+int
57387+gr_check_protected_task(const struct task_struct *task)
57388+{
57389+ return 0;
57390+}
57391+
57392+int
57393+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
57394+{
57395+ return 0;
57396+}
57397+
57398+void
57399+gr_copy_label(struct task_struct *tsk)
57400+{
57401+ return;
57402+}
57403+
57404+void
57405+gr_set_pax_flags(struct task_struct *task)
57406+{
57407+ return;
57408+}
57409+
57410+int
57411+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
57412+ const int unsafe_share)
57413+{
57414+ return 0;
57415+}
57416+
57417+void
57418+gr_handle_delete(const ino_t ino, const dev_t dev)
57419+{
57420+ return;
57421+}
57422+
57423+void
57424+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
57425+{
57426+ return;
57427+}
57428+
57429+void
57430+gr_handle_crash(struct task_struct *task, const int sig)
57431+{
57432+ return;
57433+}
57434+
57435+int
57436+gr_check_crash_exec(const struct file *filp)
57437+{
57438+ return 0;
57439+}
57440+
57441+int
57442+gr_check_crash_uid(const uid_t uid)
57443+{
57444+ return 0;
57445+}
57446+
57447+void
57448+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
57449+ struct dentry *old_dentry,
57450+ struct dentry *new_dentry,
57451+ struct vfsmount *mnt, const __u8 replace)
57452+{
57453+ return;
57454+}
57455+
57456+int
57457+gr_search_socket(const int family, const int type, const int protocol)
57458+{
57459+ return 1;
57460+}
57461+
57462+int
57463+gr_search_connectbind(const int mode, const struct socket *sock,
57464+ const struct sockaddr_in *addr)
57465+{
57466+ return 0;
57467+}
57468+
57469+void
57470+gr_handle_alertkill(struct task_struct *task)
57471+{
57472+ return;
57473+}
57474+
57475+__u32
57476+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
57477+{
57478+ return 1;
57479+}
57480+
57481+__u32
57482+gr_acl_handle_hidden_file(const struct dentry * dentry,
57483+ const struct vfsmount * mnt)
57484+{
57485+ return 1;
57486+}
57487+
57488+__u32
57489+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
57490+ int acc_mode)
57491+{
57492+ return 1;
57493+}
57494+
57495+__u32
57496+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
57497+{
57498+ return 1;
57499+}
57500+
57501+__u32
57502+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
57503+{
57504+ return 1;
57505+}
57506+
57507+int
57508+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
57509+ unsigned int *vm_flags)
57510+{
57511+ return 1;
57512+}
57513+
57514+__u32
57515+gr_acl_handle_truncate(const struct dentry * dentry,
57516+ const struct vfsmount * mnt)
57517+{
57518+ return 1;
57519+}
57520+
57521+__u32
57522+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
57523+{
57524+ return 1;
57525+}
57526+
57527+__u32
57528+gr_acl_handle_access(const struct dentry * dentry,
57529+ const struct vfsmount * mnt, const int fmode)
57530+{
57531+ return 1;
57532+}
57533+
57534+__u32
57535+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
57536+ umode_t *mode)
57537+{
57538+ return 1;
57539+}
57540+
57541+__u32
57542+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
57543+{
57544+ return 1;
57545+}
57546+
57547+__u32
57548+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
57549+{
57550+ return 1;
57551+}
57552+
57553+void
57554+grsecurity_init(void)
57555+{
57556+ return;
57557+}
57558+
57559+umode_t gr_acl_umask(void)
57560+{
57561+ return 0;
57562+}
57563+
57564+__u32
57565+gr_acl_handle_mknod(const struct dentry * new_dentry,
57566+ const struct dentry * parent_dentry,
57567+ const struct vfsmount * parent_mnt,
57568+ const int mode)
57569+{
57570+ return 1;
57571+}
57572+
57573+__u32
57574+gr_acl_handle_mkdir(const struct dentry * new_dentry,
57575+ const struct dentry * parent_dentry,
57576+ const struct vfsmount * parent_mnt)
57577+{
57578+ return 1;
57579+}
57580+
57581+__u32
57582+gr_acl_handle_symlink(const struct dentry * new_dentry,
57583+ const struct dentry * parent_dentry,
57584+ const struct vfsmount * parent_mnt, const char *from)
57585+{
57586+ return 1;
57587+}
57588+
57589+__u32
57590+gr_acl_handle_link(const struct dentry * new_dentry,
57591+ const struct dentry * parent_dentry,
57592+ const struct vfsmount * parent_mnt,
57593+ const struct dentry * old_dentry,
57594+ const struct vfsmount * old_mnt, const char *to)
57595+{
57596+ return 1;
57597+}
57598+
57599+int
57600+gr_acl_handle_rename(const struct dentry *new_dentry,
57601+ const struct dentry *parent_dentry,
57602+ const struct vfsmount *parent_mnt,
57603+ const struct dentry *old_dentry,
57604+ const struct inode *old_parent_inode,
57605+ const struct vfsmount *old_mnt, const char *newname)
57606+{
57607+ return 0;
57608+}
57609+
57610+int
57611+gr_acl_handle_filldir(const struct file *file, const char *name,
57612+ const int namelen, const ino_t ino)
57613+{
57614+ return 1;
57615+}
57616+
57617+int
57618+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
57619+ const time_t shm_createtime, const uid_t cuid, const int shmid)
57620+{
57621+ return 1;
57622+}
57623+
57624+int
57625+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
57626+{
57627+ return 0;
57628+}
57629+
57630+int
57631+gr_search_accept(const struct socket *sock)
57632+{
57633+ return 0;
57634+}
57635+
57636+int
57637+gr_search_listen(const struct socket *sock)
57638+{
57639+ return 0;
57640+}
57641+
57642+int
57643+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
57644+{
57645+ return 0;
57646+}
57647+
57648+__u32
57649+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
57650+{
57651+ return 1;
57652+}
57653+
57654+__u32
57655+gr_acl_handle_creat(const struct dentry * dentry,
57656+ const struct dentry * p_dentry,
57657+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
57658+ const int imode)
57659+{
57660+ return 1;
57661+}
57662+
57663+void
57664+gr_acl_handle_exit(void)
57665+{
57666+ return;
57667+}
57668+
57669+int
57670+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
57671+{
57672+ return 1;
57673+}
57674+
57675+void
57676+gr_set_role_label(const uid_t uid, const gid_t gid)
57677+{
57678+ return;
57679+}
57680+
57681+int
57682+gr_acl_handle_procpidmem(const struct task_struct *task)
57683+{
57684+ return 0;
57685+}
57686+
57687+int
57688+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
57689+{
57690+ return 0;
57691+}
57692+
57693+int
57694+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
57695+{
57696+ return 0;
57697+}
57698+
57699+void
57700+gr_set_kernel_label(struct task_struct *task)
57701+{
57702+ return;
57703+}
57704+
57705+int
57706+gr_check_user_change(int real, int effective, int fs)
57707+{
57708+ return 0;
57709+}
57710+
57711+int
57712+gr_check_group_change(int real, int effective, int fs)
57713+{
57714+ return 0;
57715+}
57716+
57717+int gr_acl_enable_at_secure(void)
57718+{
57719+ return 0;
57720+}
57721+
57722+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
57723+{
57724+ return dentry->d_inode->i_sb->s_dev;
57725+}
57726+
57727+EXPORT_SYMBOL(gr_learn_resource);
57728+EXPORT_SYMBOL(gr_set_kernel_label);
57729+#ifdef CONFIG_SECURITY
57730+EXPORT_SYMBOL(gr_check_user_change);
57731+EXPORT_SYMBOL(gr_check_group_change);
57732+#endif
57733diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
57734new file mode 100644
57735index 0000000..2b05ada
57736--- /dev/null
57737+++ b/grsecurity/grsec_exec.c
57738@@ -0,0 +1,146 @@
57739+#include <linux/kernel.h>
57740+#include <linux/sched.h>
57741+#include <linux/file.h>
57742+#include <linux/binfmts.h>
57743+#include <linux/fs.h>
57744+#include <linux/types.h>
57745+#include <linux/grdefs.h>
57746+#include <linux/grsecurity.h>
57747+#include <linux/grinternal.h>
57748+#include <linux/capability.h>
57749+#include <linux/module.h>
57750+
57751+#include <asm/uaccess.h>
57752+
57753+#ifdef CONFIG_GRKERNSEC_EXECLOG
57754+static char gr_exec_arg_buf[132];
57755+static DEFINE_MUTEX(gr_exec_arg_mutex);
57756+#endif
57757+
57758+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
57759+
57760+void
57761+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
57762+{
57763+#ifdef CONFIG_GRKERNSEC_EXECLOG
57764+ char *grarg = gr_exec_arg_buf;
57765+ unsigned int i, x, execlen = 0;
57766+ char c;
57767+
57768+ if (!((grsec_enable_execlog && grsec_enable_group &&
57769+ in_group_p(grsec_audit_gid))
57770+ || (grsec_enable_execlog && !grsec_enable_group)))
57771+ return;
57772+
57773+ mutex_lock(&gr_exec_arg_mutex);
57774+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
57775+
57776+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
57777+ const char __user *p;
57778+ unsigned int len;
57779+
57780+ p = get_user_arg_ptr(argv, i);
57781+ if (IS_ERR(p))
57782+ goto log;
57783+
57784+ len = strnlen_user(p, 128 - execlen);
57785+ if (len > 128 - execlen)
57786+ len = 128 - execlen;
57787+ else if (len > 0)
57788+ len--;
57789+ if (copy_from_user(grarg + execlen, p, len))
57790+ goto log;
57791+
57792+ /* rewrite unprintable characters */
57793+ for (x = 0; x < len; x++) {
57794+ c = *(grarg + execlen + x);
57795+ if (c < 32 || c > 126)
57796+ *(grarg + execlen + x) = ' ';
57797+ }
57798+
57799+ execlen += len;
57800+ *(grarg + execlen) = ' ';
57801+ *(grarg + execlen + 1) = '\0';
57802+ execlen++;
57803+ }
57804+
57805+ log:
57806+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
57807+ bprm->file->f_path.mnt, grarg);
57808+ mutex_unlock(&gr_exec_arg_mutex);
57809+#endif
57810+ return;
57811+}
57812+
57813+#ifdef CONFIG_GRKERNSEC
57814+extern int gr_acl_is_capable(const int cap);
57815+extern int gr_acl_is_capable_nolog(const int cap);
57816+extern int gr_chroot_is_capable(const int cap);
57817+extern int gr_chroot_is_capable_nolog(const int cap);
57818+#endif
57819+
57820+const char *captab_log[] = {
57821+ "CAP_CHOWN",
57822+ "CAP_DAC_OVERRIDE",
57823+ "CAP_DAC_READ_SEARCH",
57824+ "CAP_FOWNER",
57825+ "CAP_FSETID",
57826+ "CAP_KILL",
57827+ "CAP_SETGID",
57828+ "CAP_SETUID",
57829+ "CAP_SETPCAP",
57830+ "CAP_LINUX_IMMUTABLE",
57831+ "CAP_NET_BIND_SERVICE",
57832+ "CAP_NET_BROADCAST",
57833+ "CAP_NET_ADMIN",
57834+ "CAP_NET_RAW",
57835+ "CAP_IPC_LOCK",
57836+ "CAP_IPC_OWNER",
57837+ "CAP_SYS_MODULE",
57838+ "CAP_SYS_RAWIO",
57839+ "CAP_SYS_CHROOT",
57840+ "CAP_SYS_PTRACE",
57841+ "CAP_SYS_PACCT",
57842+ "CAP_SYS_ADMIN",
57843+ "CAP_SYS_BOOT",
57844+ "CAP_SYS_NICE",
57845+ "CAP_SYS_RESOURCE",
57846+ "CAP_SYS_TIME",
57847+ "CAP_SYS_TTY_CONFIG",
57848+ "CAP_MKNOD",
57849+ "CAP_LEASE",
57850+ "CAP_AUDIT_WRITE",
57851+ "CAP_AUDIT_CONTROL",
57852+ "CAP_SETFCAP",
57853+ "CAP_MAC_OVERRIDE",
57854+ "CAP_MAC_ADMIN",
57855+ "CAP_SYSLOG",
57856+ "CAP_WAKE_ALARM"
57857+};
57858+
57859+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
57860+
57861+int gr_is_capable(const int cap)
57862+{
57863+#ifdef CONFIG_GRKERNSEC
57864+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
57865+ return 1;
57866+ return 0;
57867+#else
57868+ return 1;
57869+#endif
57870+}
57871+
57872+int gr_is_capable_nolog(const int cap)
57873+{
57874+#ifdef CONFIG_GRKERNSEC
57875+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
57876+ return 1;
57877+ return 0;
57878+#else
57879+ return 1;
57880+#endif
57881+}
57882+
57883+EXPORT_SYMBOL(gr_is_capable);
57884+EXPORT_SYMBOL(gr_is_capable_nolog);
57885diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
57886new file mode 100644
57887index 0000000..d3ee748
57888--- /dev/null
57889+++ b/grsecurity/grsec_fifo.c
57890@@ -0,0 +1,24 @@
57891+#include <linux/kernel.h>
57892+#include <linux/sched.h>
57893+#include <linux/fs.h>
57894+#include <linux/file.h>
57895+#include <linux/grinternal.h>
57896+
57897+int
57898+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
57899+ const struct dentry *dir, const int flag, const int acc_mode)
57900+{
57901+#ifdef CONFIG_GRKERNSEC_FIFO
57902+ const struct cred *cred = current_cred();
57903+
57904+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
57905+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
57906+ (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
57907+ (cred->fsuid != dentry->d_inode->i_uid)) {
57908+ if (!inode_permission(dentry->d_inode, acc_mode))
57909+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
57910+ return -EACCES;
57911+ }
57912+#endif
57913+ return 0;
57914+}
57915diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
57916new file mode 100644
57917index 0000000..8ca18bf
57918--- /dev/null
57919+++ b/grsecurity/grsec_fork.c
57920@@ -0,0 +1,23 @@
57921+#include <linux/kernel.h>
57922+#include <linux/sched.h>
57923+#include <linux/grsecurity.h>
57924+#include <linux/grinternal.h>
57925+#include <linux/errno.h>
57926+
57927+void
57928+gr_log_forkfail(const int retval)
57929+{
57930+#ifdef CONFIG_GRKERNSEC_FORKFAIL
57931+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
57932+ switch (retval) {
57933+ case -EAGAIN:
57934+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
57935+ break;
57936+ case -ENOMEM:
57937+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
57938+ break;
57939+ }
57940+ }
57941+#endif
57942+ return;
57943+}
57944diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
57945new file mode 100644
57946index 0000000..01ddde4
57947--- /dev/null
57948+++ b/grsecurity/grsec_init.c
57949@@ -0,0 +1,277 @@
57950+#include <linux/kernel.h>
57951+#include <linux/sched.h>
57952+#include <linux/mm.h>
57953+#include <linux/gracl.h>
57954+#include <linux/slab.h>
57955+#include <linux/vmalloc.h>
57956+#include <linux/percpu.h>
57957+#include <linux/module.h>
57958+
57959+int grsec_enable_ptrace_readexec;
57960+int grsec_enable_setxid;
57961+int grsec_enable_brute;
57962+int grsec_enable_link;
57963+int grsec_enable_dmesg;
57964+int grsec_enable_harden_ptrace;
57965+int grsec_enable_fifo;
57966+int grsec_enable_execlog;
57967+int grsec_enable_signal;
57968+int grsec_enable_forkfail;
57969+int grsec_enable_audit_ptrace;
57970+int grsec_enable_time;
57971+int grsec_enable_audit_textrel;
57972+int grsec_enable_group;
57973+int grsec_audit_gid;
57974+int grsec_enable_chdir;
57975+int grsec_enable_mount;
57976+int grsec_enable_rofs;
57977+int grsec_enable_chroot_findtask;
57978+int grsec_enable_chroot_mount;
57979+int grsec_enable_chroot_shmat;
57980+int grsec_enable_chroot_fchdir;
57981+int grsec_enable_chroot_double;
57982+int grsec_enable_chroot_pivot;
57983+int grsec_enable_chroot_chdir;
57984+int grsec_enable_chroot_chmod;
57985+int grsec_enable_chroot_mknod;
57986+int grsec_enable_chroot_nice;
57987+int grsec_enable_chroot_execlog;
57988+int grsec_enable_chroot_caps;
57989+int grsec_enable_chroot_sysctl;
57990+int grsec_enable_chroot_unix;
57991+int grsec_enable_tpe;
57992+int grsec_tpe_gid;
57993+int grsec_enable_blackhole;
57994+#ifdef CONFIG_IPV6_MODULE
57995+EXPORT_SYMBOL(grsec_enable_blackhole);
57996+#endif
57997+int grsec_lastack_retries;
57998+int grsec_enable_tpe_all;
57999+int grsec_enable_tpe_invert;
58000+int grsec_enable_socket_all;
58001+int grsec_socket_all_gid;
58002+int grsec_enable_socket_client;
58003+int grsec_socket_client_gid;
58004+int grsec_enable_socket_server;
58005+int grsec_socket_server_gid;
58006+int grsec_resource_logging;
58007+int grsec_disable_privio;
58008+int grsec_enable_log_rwxmaps;
58009+int grsec_lock;
58010+
58011+DEFINE_SPINLOCK(grsec_alert_lock);
58012+unsigned long grsec_alert_wtime = 0;
58013+unsigned long grsec_alert_fyet = 0;
58014+
58015+DEFINE_SPINLOCK(grsec_audit_lock);
58016+
58017+DEFINE_RWLOCK(grsec_exec_file_lock);
58018+
58019+char *gr_shared_page[4];
58020+
58021+char *gr_alert_log_fmt;
58022+char *gr_audit_log_fmt;
58023+char *gr_alert_log_buf;
58024+char *gr_audit_log_buf;
58025+
58026+extern struct gr_arg *gr_usermode;
58027+extern unsigned char *gr_system_salt;
58028+extern unsigned char *gr_system_sum;
58029+
58030+void __init
58031+grsecurity_init(void)
58032+{
58033+ int j;
58034+ /* create the per-cpu shared pages */
58035+
58036+#ifdef CONFIG_X86
58037+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
58038+#endif
58039+
58040+ for (j = 0; j < 4; j++) {
58041+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
58042+ if (gr_shared_page[j] == NULL) {
58043+ panic("Unable to allocate grsecurity shared page");
58044+ return;
58045+ }
58046+ }
58047+
58048+ /* allocate log buffers */
58049+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
58050+ if (!gr_alert_log_fmt) {
58051+ panic("Unable to allocate grsecurity alert log format buffer");
58052+ return;
58053+ }
58054+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
58055+ if (!gr_audit_log_fmt) {
58056+ panic("Unable to allocate grsecurity audit log format buffer");
58057+ return;
58058+ }
58059+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
58060+ if (!gr_alert_log_buf) {
58061+ panic("Unable to allocate grsecurity alert log buffer");
58062+ return;
58063+ }
58064+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
58065+ if (!gr_audit_log_buf) {
58066+ panic("Unable to allocate grsecurity audit log buffer");
58067+ return;
58068+ }
58069+
58070+ /* allocate memory for authentication structure */
58071+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
58072+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
58073+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
58074+
58075+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
58076+ panic("Unable to allocate grsecurity authentication structure");
58077+ return;
58078+ }
58079+
58080+
58081+#ifdef CONFIG_GRKERNSEC_IO
58082+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
58083+ grsec_disable_privio = 1;
58084+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
58085+ grsec_disable_privio = 1;
58086+#else
58087+ grsec_disable_privio = 0;
58088+#endif
58089+#endif
58090+
58091+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
58092+ /* for backward compatibility, tpe_invert always defaults to on if
58093+ enabled in the kernel
58094+ */
58095+ grsec_enable_tpe_invert = 1;
58096+#endif
58097+
58098+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
58099+#ifndef CONFIG_GRKERNSEC_SYSCTL
58100+ grsec_lock = 1;
58101+#endif
58102+
58103+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
58104+ grsec_enable_audit_textrel = 1;
58105+#endif
58106+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58107+ grsec_enable_log_rwxmaps = 1;
58108+#endif
58109+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
58110+ grsec_enable_group = 1;
58111+ grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
58112+#endif
58113+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
58114+ grsec_enable_ptrace_readexec = 1;
58115+#endif
58116+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
58117+ grsec_enable_chdir = 1;
58118+#endif
58119+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
58120+ grsec_enable_harden_ptrace = 1;
58121+#endif
58122+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58123+ grsec_enable_mount = 1;
58124+#endif
58125+#ifdef CONFIG_GRKERNSEC_LINK
58126+ grsec_enable_link = 1;
58127+#endif
58128+#ifdef CONFIG_GRKERNSEC_BRUTE
58129+ grsec_enable_brute = 1;
58130+#endif
58131+#ifdef CONFIG_GRKERNSEC_DMESG
58132+ grsec_enable_dmesg = 1;
58133+#endif
58134+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
58135+ grsec_enable_blackhole = 1;
58136+ grsec_lastack_retries = 4;
58137+#endif
58138+#ifdef CONFIG_GRKERNSEC_FIFO
58139+ grsec_enable_fifo = 1;
58140+#endif
58141+#ifdef CONFIG_GRKERNSEC_EXECLOG
58142+ grsec_enable_execlog = 1;
58143+#endif
58144+#ifdef CONFIG_GRKERNSEC_SETXID
58145+ grsec_enable_setxid = 1;
58146+#endif
58147+#ifdef CONFIG_GRKERNSEC_SIGNAL
58148+ grsec_enable_signal = 1;
58149+#endif
58150+#ifdef CONFIG_GRKERNSEC_FORKFAIL
58151+ grsec_enable_forkfail = 1;
58152+#endif
58153+#ifdef CONFIG_GRKERNSEC_TIME
58154+ grsec_enable_time = 1;
58155+#endif
58156+#ifdef CONFIG_GRKERNSEC_RESLOG
58157+ grsec_resource_logging = 1;
58158+#endif
58159+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
58160+ grsec_enable_chroot_findtask = 1;
58161+#endif
58162+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
58163+ grsec_enable_chroot_unix = 1;
58164+#endif
58165+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
58166+ grsec_enable_chroot_mount = 1;
58167+#endif
58168+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
58169+ grsec_enable_chroot_fchdir = 1;
58170+#endif
58171+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
58172+ grsec_enable_chroot_shmat = 1;
58173+#endif
58174+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
58175+ grsec_enable_audit_ptrace = 1;
58176+#endif
58177+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
58178+ grsec_enable_chroot_double = 1;
58179+#endif
58180+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
58181+ grsec_enable_chroot_pivot = 1;
58182+#endif
58183+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
58184+ grsec_enable_chroot_chdir = 1;
58185+#endif
58186+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
58187+ grsec_enable_chroot_chmod = 1;
58188+#endif
58189+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
58190+ grsec_enable_chroot_mknod = 1;
58191+#endif
58192+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
58193+ grsec_enable_chroot_nice = 1;
58194+#endif
58195+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
58196+ grsec_enable_chroot_execlog = 1;
58197+#endif
58198+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
58199+ grsec_enable_chroot_caps = 1;
58200+#endif
58201+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
58202+ grsec_enable_chroot_sysctl = 1;
58203+#endif
58204+#ifdef CONFIG_GRKERNSEC_TPE
58205+ grsec_enable_tpe = 1;
58206+ grsec_tpe_gid = CONFIG_GRKERNSEC_TPE_GID;
58207+#ifdef CONFIG_GRKERNSEC_TPE_ALL
58208+ grsec_enable_tpe_all = 1;
58209+#endif
58210+#endif
58211+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
58212+ grsec_enable_socket_all = 1;
58213+ grsec_socket_all_gid = CONFIG_GRKERNSEC_SOCKET_ALL_GID;
58214+#endif
58215+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
58216+ grsec_enable_socket_client = 1;
58217+ grsec_socket_client_gid = CONFIG_GRKERNSEC_SOCKET_CLIENT_GID;
58218+#endif
58219+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
58220+ grsec_enable_socket_server = 1;
58221+ grsec_socket_server_gid = CONFIG_GRKERNSEC_SOCKET_SERVER_GID;
58222+#endif
58223+#endif
58224+
58225+ return;
58226+}
58227diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
58228new file mode 100644
58229index 0000000..3efe141
58230--- /dev/null
58231+++ b/grsecurity/grsec_link.c
58232@@ -0,0 +1,43 @@
58233+#include <linux/kernel.h>
58234+#include <linux/sched.h>
58235+#include <linux/fs.h>
58236+#include <linux/file.h>
58237+#include <linux/grinternal.h>
58238+
58239+int
58240+gr_handle_follow_link(const struct inode *parent,
58241+ const struct inode *inode,
58242+ const struct dentry *dentry, const struct vfsmount *mnt)
58243+{
58244+#ifdef CONFIG_GRKERNSEC_LINK
58245+ const struct cred *cred = current_cred();
58246+
58247+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
58248+ (parent->i_mode & S_ISVTX) && (parent->i_uid != inode->i_uid) &&
58249+ (parent->i_mode & S_IWOTH) && (cred->fsuid != inode->i_uid)) {
58250+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
58251+ return -EACCES;
58252+ }
58253+#endif
58254+ return 0;
58255+}
58256+
58257+int
58258+gr_handle_hardlink(const struct dentry *dentry,
58259+ const struct vfsmount *mnt,
58260+ struct inode *inode, const int mode, const char *to)
58261+{
58262+#ifdef CONFIG_GRKERNSEC_LINK
58263+ const struct cred *cred = current_cred();
58264+
58265+ if (grsec_enable_link && cred->fsuid != inode->i_uid &&
58266+ (!S_ISREG(mode) || (mode & S_ISUID) ||
58267+ ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) ||
58268+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
58269+ !capable(CAP_FOWNER) && cred->uid) {
58270+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
58271+ return -EPERM;
58272+ }
58273+#endif
58274+ return 0;
58275+}
58276diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
58277new file mode 100644
58278index 0000000..a45d2e9
58279--- /dev/null
58280+++ b/grsecurity/grsec_log.c
58281@@ -0,0 +1,322 @@
58282+#include <linux/kernel.h>
58283+#include <linux/sched.h>
58284+#include <linux/file.h>
58285+#include <linux/tty.h>
58286+#include <linux/fs.h>
58287+#include <linux/grinternal.h>
58288+
58289+#ifdef CONFIG_TREE_PREEMPT_RCU
58290+#define DISABLE_PREEMPT() preempt_disable()
58291+#define ENABLE_PREEMPT() preempt_enable()
58292+#else
58293+#define DISABLE_PREEMPT()
58294+#define ENABLE_PREEMPT()
58295+#endif
58296+
58297+#define BEGIN_LOCKS(x) \
58298+ DISABLE_PREEMPT(); \
58299+ rcu_read_lock(); \
58300+ read_lock(&tasklist_lock); \
58301+ read_lock(&grsec_exec_file_lock); \
58302+ if (x != GR_DO_AUDIT) \
58303+ spin_lock(&grsec_alert_lock); \
58304+ else \
58305+ spin_lock(&grsec_audit_lock)
58306+
58307+#define END_LOCKS(x) \
58308+ if (x != GR_DO_AUDIT) \
58309+ spin_unlock(&grsec_alert_lock); \
58310+ else \
58311+ spin_unlock(&grsec_audit_lock); \
58312+ read_unlock(&grsec_exec_file_lock); \
58313+ read_unlock(&tasklist_lock); \
58314+ rcu_read_unlock(); \
58315+ ENABLE_PREEMPT(); \
58316+ if (x == GR_DONT_AUDIT) \
58317+ gr_handle_alertkill(current)
58318+
58319+enum {
58320+ FLOODING,
58321+ NO_FLOODING
58322+};
58323+
58324+extern char *gr_alert_log_fmt;
58325+extern char *gr_audit_log_fmt;
58326+extern char *gr_alert_log_buf;
58327+extern char *gr_audit_log_buf;
58328+
58329+static int gr_log_start(int audit)
58330+{
58331+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
58332+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
58333+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58334+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
58335+ unsigned long curr_secs = get_seconds();
58336+
58337+ if (audit == GR_DO_AUDIT)
58338+ goto set_fmt;
58339+
58340+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
58341+ grsec_alert_wtime = curr_secs;
58342+ grsec_alert_fyet = 0;
58343+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
58344+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
58345+ grsec_alert_fyet++;
58346+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
58347+ grsec_alert_wtime = curr_secs;
58348+ grsec_alert_fyet++;
58349+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
58350+ return FLOODING;
58351+ }
58352+ else return FLOODING;
58353+
58354+set_fmt:
58355+#endif
58356+ memset(buf, 0, PAGE_SIZE);
58357+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
58358+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
58359+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
58360+ } else if (current->signal->curr_ip) {
58361+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
58362+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
58363+ } else if (gr_acl_is_enabled()) {
58364+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
58365+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
58366+ } else {
58367+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
58368+ strcpy(buf, fmt);
58369+ }
58370+
58371+ return NO_FLOODING;
58372+}
58373+
58374+static void gr_log_middle(int audit, const char *msg, va_list ap)
58375+ __attribute__ ((format (printf, 2, 0)));
58376+
58377+static void gr_log_middle(int audit, const char *msg, va_list ap)
58378+{
58379+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58380+ unsigned int len = strlen(buf);
58381+
58382+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
58383+
58384+ return;
58385+}
58386+
58387+static void gr_log_middle_varargs(int audit, const char *msg, ...)
58388+ __attribute__ ((format (printf, 2, 3)));
58389+
58390+static void gr_log_middle_varargs(int audit, const char *msg, ...)
58391+{
58392+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58393+ unsigned int len = strlen(buf);
58394+ va_list ap;
58395+
58396+ va_start(ap, msg);
58397+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
58398+ va_end(ap);
58399+
58400+ return;
58401+}
58402+
58403+static void gr_log_end(int audit, int append_default)
58404+{
58405+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58406+
58407+ if (append_default) {
58408+ unsigned int len = strlen(buf);
58409+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
58410+ }
58411+
58412+ printk("%s\n", buf);
58413+
58414+ return;
58415+}
58416+
58417+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
58418+{
58419+ int logtype;
58420+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
58421+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
58422+ void *voidptr = NULL;
58423+ int num1 = 0, num2 = 0;
58424+ unsigned long ulong1 = 0, ulong2 = 0;
58425+ struct dentry *dentry = NULL;
58426+ struct vfsmount *mnt = NULL;
58427+ struct file *file = NULL;
58428+ struct task_struct *task = NULL;
58429+ const struct cred *cred, *pcred;
58430+ va_list ap;
58431+
58432+ BEGIN_LOCKS(audit);
58433+ logtype = gr_log_start(audit);
58434+ if (logtype == FLOODING) {
58435+ END_LOCKS(audit);
58436+ return;
58437+ }
58438+ va_start(ap, argtypes);
58439+ switch (argtypes) {
58440+ case GR_TTYSNIFF:
58441+ task = va_arg(ap, struct task_struct *);
58442+ 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);
58443+ break;
58444+ case GR_SYSCTL_HIDDEN:
58445+ str1 = va_arg(ap, char *);
58446+ gr_log_middle_varargs(audit, msg, result, str1);
58447+ break;
58448+ case GR_RBAC:
58449+ dentry = va_arg(ap, struct dentry *);
58450+ mnt = va_arg(ap, struct vfsmount *);
58451+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
58452+ break;
58453+ case GR_RBAC_STR:
58454+ dentry = va_arg(ap, struct dentry *);
58455+ mnt = va_arg(ap, struct vfsmount *);
58456+ str1 = va_arg(ap, char *);
58457+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
58458+ break;
58459+ case GR_STR_RBAC:
58460+ str1 = va_arg(ap, char *);
58461+ dentry = va_arg(ap, struct dentry *);
58462+ mnt = va_arg(ap, struct vfsmount *);
58463+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
58464+ break;
58465+ case GR_RBAC_MODE2:
58466+ dentry = va_arg(ap, struct dentry *);
58467+ mnt = va_arg(ap, struct vfsmount *);
58468+ str1 = va_arg(ap, char *);
58469+ str2 = va_arg(ap, char *);
58470+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
58471+ break;
58472+ case GR_RBAC_MODE3:
58473+ dentry = va_arg(ap, struct dentry *);
58474+ mnt = va_arg(ap, struct vfsmount *);
58475+ str1 = va_arg(ap, char *);
58476+ str2 = va_arg(ap, char *);
58477+ str3 = va_arg(ap, char *);
58478+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
58479+ break;
58480+ case GR_FILENAME:
58481+ dentry = va_arg(ap, struct dentry *);
58482+ mnt = va_arg(ap, struct vfsmount *);
58483+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
58484+ break;
58485+ case GR_STR_FILENAME:
58486+ str1 = va_arg(ap, char *);
58487+ dentry = va_arg(ap, struct dentry *);
58488+ mnt = va_arg(ap, struct vfsmount *);
58489+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
58490+ break;
58491+ case GR_FILENAME_STR:
58492+ dentry = va_arg(ap, struct dentry *);
58493+ mnt = va_arg(ap, struct vfsmount *);
58494+ str1 = va_arg(ap, char *);
58495+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
58496+ break;
58497+ case GR_FILENAME_TWO_INT:
58498+ dentry = va_arg(ap, struct dentry *);
58499+ mnt = va_arg(ap, struct vfsmount *);
58500+ num1 = va_arg(ap, int);
58501+ num2 = va_arg(ap, int);
58502+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
58503+ break;
58504+ case GR_FILENAME_TWO_INT_STR:
58505+ dentry = va_arg(ap, struct dentry *);
58506+ mnt = va_arg(ap, struct vfsmount *);
58507+ num1 = va_arg(ap, int);
58508+ num2 = va_arg(ap, int);
58509+ str1 = va_arg(ap, char *);
58510+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
58511+ break;
58512+ case GR_TEXTREL:
58513+ file = va_arg(ap, struct file *);
58514+ ulong1 = va_arg(ap, unsigned long);
58515+ ulong2 = va_arg(ap, unsigned long);
58516+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
58517+ break;
58518+ case GR_PTRACE:
58519+ task = va_arg(ap, struct task_struct *);
58520+ 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);
58521+ break;
58522+ case GR_RESOURCE:
58523+ task = va_arg(ap, struct task_struct *);
58524+ cred = __task_cred(task);
58525+ pcred = __task_cred(task->real_parent);
58526+ ulong1 = va_arg(ap, unsigned long);
58527+ str1 = va_arg(ap, char *);
58528+ ulong2 = va_arg(ap, unsigned long);
58529+ 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);
58530+ break;
58531+ case GR_CAP:
58532+ task = va_arg(ap, struct task_struct *);
58533+ cred = __task_cred(task);
58534+ pcred = __task_cred(task->real_parent);
58535+ str1 = va_arg(ap, char *);
58536+ 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);
58537+ break;
58538+ case GR_SIG:
58539+ str1 = va_arg(ap, char *);
58540+ voidptr = va_arg(ap, void *);
58541+ gr_log_middle_varargs(audit, msg, str1, voidptr);
58542+ break;
58543+ case GR_SIG2:
58544+ task = va_arg(ap, struct task_struct *);
58545+ cred = __task_cred(task);
58546+ pcred = __task_cred(task->real_parent);
58547+ num1 = va_arg(ap, int);
58548+ 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);
58549+ break;
58550+ case GR_CRASH1:
58551+ task = va_arg(ap, struct task_struct *);
58552+ cred = __task_cred(task);
58553+ pcred = __task_cred(task->real_parent);
58554+ ulong1 = va_arg(ap, unsigned long);
58555+ 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);
58556+ break;
58557+ case GR_CRASH2:
58558+ task = va_arg(ap, struct task_struct *);
58559+ cred = __task_cred(task);
58560+ pcred = __task_cred(task->real_parent);
58561+ ulong1 = va_arg(ap, unsigned long);
58562+ 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);
58563+ break;
58564+ case GR_RWXMAP:
58565+ file = va_arg(ap, struct file *);
58566+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
58567+ break;
58568+ case GR_PSACCT:
58569+ {
58570+ unsigned int wday, cday;
58571+ __u8 whr, chr;
58572+ __u8 wmin, cmin;
58573+ __u8 wsec, csec;
58574+ char cur_tty[64] = { 0 };
58575+ char parent_tty[64] = { 0 };
58576+
58577+ task = va_arg(ap, struct task_struct *);
58578+ wday = va_arg(ap, unsigned int);
58579+ cday = va_arg(ap, unsigned int);
58580+ whr = va_arg(ap, int);
58581+ chr = va_arg(ap, int);
58582+ wmin = va_arg(ap, int);
58583+ cmin = va_arg(ap, int);
58584+ wsec = va_arg(ap, int);
58585+ csec = va_arg(ap, int);
58586+ ulong1 = va_arg(ap, unsigned long);
58587+ cred = __task_cred(task);
58588+ pcred = __task_cred(task->real_parent);
58589+
58590+ 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);
58591+ }
58592+ break;
58593+ default:
58594+ gr_log_middle(audit, msg, ap);
58595+ }
58596+ va_end(ap);
58597+ // these don't need DEFAULTSECARGS printed on the end
58598+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
58599+ gr_log_end(audit, 0);
58600+ else
58601+ gr_log_end(audit, 1);
58602+ END_LOCKS(audit);
58603+}
58604diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
58605new file mode 100644
58606index 0000000..f536303
58607--- /dev/null
58608+++ b/grsecurity/grsec_mem.c
58609@@ -0,0 +1,40 @@
58610+#include <linux/kernel.h>
58611+#include <linux/sched.h>
58612+#include <linux/mm.h>
58613+#include <linux/mman.h>
58614+#include <linux/grinternal.h>
58615+
58616+void
58617+gr_handle_ioperm(void)
58618+{
58619+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
58620+ return;
58621+}
58622+
58623+void
58624+gr_handle_iopl(void)
58625+{
58626+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
58627+ return;
58628+}
58629+
58630+void
58631+gr_handle_mem_readwrite(u64 from, u64 to)
58632+{
58633+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
58634+ return;
58635+}
58636+
58637+void
58638+gr_handle_vm86(void)
58639+{
58640+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
58641+ return;
58642+}
58643+
58644+void
58645+gr_log_badprocpid(const char *entry)
58646+{
58647+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
58648+ return;
58649+}
58650diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
58651new file mode 100644
58652index 0000000..2131422
58653--- /dev/null
58654+++ b/grsecurity/grsec_mount.c
58655@@ -0,0 +1,62 @@
58656+#include <linux/kernel.h>
58657+#include <linux/sched.h>
58658+#include <linux/mount.h>
58659+#include <linux/grsecurity.h>
58660+#include <linux/grinternal.h>
58661+
58662+void
58663+gr_log_remount(const char *devname, const int retval)
58664+{
58665+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58666+ if (grsec_enable_mount && (retval >= 0))
58667+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
58668+#endif
58669+ return;
58670+}
58671+
58672+void
58673+gr_log_unmount(const char *devname, const int retval)
58674+{
58675+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58676+ if (grsec_enable_mount && (retval >= 0))
58677+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
58678+#endif
58679+ return;
58680+}
58681+
58682+void
58683+gr_log_mount(const char *from, const char *to, const int retval)
58684+{
58685+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58686+ if (grsec_enable_mount && (retval >= 0))
58687+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
58688+#endif
58689+ return;
58690+}
58691+
58692+int
58693+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
58694+{
58695+#ifdef CONFIG_GRKERNSEC_ROFS
58696+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
58697+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
58698+ return -EPERM;
58699+ } else
58700+ return 0;
58701+#endif
58702+ return 0;
58703+}
58704+
58705+int
58706+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
58707+{
58708+#ifdef CONFIG_GRKERNSEC_ROFS
58709+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
58710+ dentry->d_inode && S_ISBLK(dentry->d_inode->i_mode)) {
58711+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
58712+ return -EPERM;
58713+ } else
58714+ return 0;
58715+#endif
58716+ return 0;
58717+}
58718diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
58719new file mode 100644
58720index 0000000..a3b12a0
58721--- /dev/null
58722+++ b/grsecurity/grsec_pax.c
58723@@ -0,0 +1,36 @@
58724+#include <linux/kernel.h>
58725+#include <linux/sched.h>
58726+#include <linux/mm.h>
58727+#include <linux/file.h>
58728+#include <linux/grinternal.h>
58729+#include <linux/grsecurity.h>
58730+
58731+void
58732+gr_log_textrel(struct vm_area_struct * vma)
58733+{
58734+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
58735+ if (grsec_enable_audit_textrel)
58736+ gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
58737+#endif
58738+ return;
58739+}
58740+
58741+void
58742+gr_log_rwxmmap(struct file *file)
58743+{
58744+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58745+ if (grsec_enable_log_rwxmaps)
58746+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
58747+#endif
58748+ return;
58749+}
58750+
58751+void
58752+gr_log_rwxmprotect(struct file *file)
58753+{
58754+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58755+ if (grsec_enable_log_rwxmaps)
58756+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
58757+#endif
58758+ return;
58759+}
58760diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
58761new file mode 100644
58762index 0000000..f7f29aa
58763--- /dev/null
58764+++ b/grsecurity/grsec_ptrace.c
58765@@ -0,0 +1,30 @@
58766+#include <linux/kernel.h>
58767+#include <linux/sched.h>
58768+#include <linux/grinternal.h>
58769+#include <linux/security.h>
58770+
58771+void
58772+gr_audit_ptrace(struct task_struct *task)
58773+{
58774+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
58775+ if (grsec_enable_audit_ptrace)
58776+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
58777+#endif
58778+ return;
58779+}
58780+
58781+int
58782+gr_ptrace_readexec(struct file *file, int unsafe_flags)
58783+{
58784+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
58785+ const struct dentry *dentry = file->f_path.dentry;
58786+ const struct vfsmount *mnt = file->f_path.mnt;
58787+
58788+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
58789+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
58790+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
58791+ return -EACCES;
58792+ }
58793+#endif
58794+ return 0;
58795+}
58796diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
58797new file mode 100644
58798index 0000000..7a5b2de
58799--- /dev/null
58800+++ b/grsecurity/grsec_sig.c
58801@@ -0,0 +1,207 @@
58802+#include <linux/kernel.h>
58803+#include <linux/sched.h>
58804+#include <linux/delay.h>
58805+#include <linux/grsecurity.h>
58806+#include <linux/grinternal.h>
58807+#include <linux/hardirq.h>
58808+
58809+char *signames[] = {
58810+ [SIGSEGV] = "Segmentation fault",
58811+ [SIGILL] = "Illegal instruction",
58812+ [SIGABRT] = "Abort",
58813+ [SIGBUS] = "Invalid alignment/Bus error"
58814+};
58815+
58816+void
58817+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
58818+{
58819+#ifdef CONFIG_GRKERNSEC_SIGNAL
58820+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
58821+ (sig == SIGABRT) || (sig == SIGBUS))) {
58822+ if (t->pid == current->pid) {
58823+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
58824+ } else {
58825+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
58826+ }
58827+ }
58828+#endif
58829+ return;
58830+}
58831+
58832+int
58833+gr_handle_signal(const struct task_struct *p, const int sig)
58834+{
58835+#ifdef CONFIG_GRKERNSEC
58836+ /* ignore the 0 signal for protected task checks */
58837+ if (current->pid > 1 && sig && gr_check_protected_task(p)) {
58838+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
58839+ return -EPERM;
58840+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
58841+ return -EPERM;
58842+ }
58843+#endif
58844+ return 0;
58845+}
58846+
58847+#ifdef CONFIG_GRKERNSEC
58848+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
58849+
58850+int gr_fake_force_sig(int sig, struct task_struct *t)
58851+{
58852+ unsigned long int flags;
58853+ int ret, blocked, ignored;
58854+ struct k_sigaction *action;
58855+
58856+ spin_lock_irqsave(&t->sighand->siglock, flags);
58857+ action = &t->sighand->action[sig-1];
58858+ ignored = action->sa.sa_handler == SIG_IGN;
58859+ blocked = sigismember(&t->blocked, sig);
58860+ if (blocked || ignored) {
58861+ action->sa.sa_handler = SIG_DFL;
58862+ if (blocked) {
58863+ sigdelset(&t->blocked, sig);
58864+ recalc_sigpending_and_wake(t);
58865+ }
58866+ }
58867+ if (action->sa.sa_handler == SIG_DFL)
58868+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
58869+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
58870+
58871+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
58872+
58873+ return ret;
58874+}
58875+#endif
58876+
58877+#ifdef CONFIG_GRKERNSEC_BRUTE
58878+#define GR_USER_BAN_TIME (15 * 60)
58879+
58880+static int __get_dumpable(unsigned long mm_flags)
58881+{
58882+ int ret;
58883+
58884+ ret = mm_flags & MMF_DUMPABLE_MASK;
58885+ return (ret >= 2) ? 2 : ret;
58886+}
58887+#endif
58888+
58889+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags)
58890+{
58891+#ifdef CONFIG_GRKERNSEC_BRUTE
58892+ uid_t uid = 0;
58893+
58894+ if (!grsec_enable_brute)
58895+ return;
58896+
58897+ rcu_read_lock();
58898+ read_lock(&tasklist_lock);
58899+ read_lock(&grsec_exec_file_lock);
58900+ if (p->real_parent && p->real_parent->exec_file == p->exec_file)
58901+ p->real_parent->brute = 1;
58902+ else {
58903+ const struct cred *cred = __task_cred(p), *cred2;
58904+ struct task_struct *tsk, *tsk2;
58905+
58906+ if (!__get_dumpable(mm_flags) && cred->uid) {
58907+ struct user_struct *user;
58908+
58909+ uid = cred->uid;
58910+
58911+ /* this is put upon execution past expiration */
58912+ user = find_user(uid);
58913+ if (user == NULL)
58914+ goto unlock;
58915+ user->banned = 1;
58916+ user->ban_expires = get_seconds() + GR_USER_BAN_TIME;
58917+ if (user->ban_expires == ~0UL)
58918+ user->ban_expires--;
58919+
58920+ do_each_thread(tsk2, tsk) {
58921+ cred2 = __task_cred(tsk);
58922+ if (tsk != p && cred2->uid == uid)
58923+ gr_fake_force_sig(SIGKILL, tsk);
58924+ } while_each_thread(tsk2, tsk);
58925+ }
58926+ }
58927+unlock:
58928+ read_unlock(&grsec_exec_file_lock);
58929+ read_unlock(&tasklist_lock);
58930+ rcu_read_unlock();
58931+
58932+ if (uid)
58933+ printk(KERN_ALERT "grsec: bruteforce prevention initiated against uid %u, banning for %d minutes\n", uid, GR_USER_BAN_TIME / 60);
58934+
58935+#endif
58936+ return;
58937+}
58938+
58939+void gr_handle_brute_check(void)
58940+{
58941+#ifdef CONFIG_GRKERNSEC_BRUTE
58942+ if (current->brute)
58943+ msleep(30 * 1000);
58944+#endif
58945+ return;
58946+}
58947+
58948+void gr_handle_kernel_exploit(void)
58949+{
58950+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
58951+ const struct cred *cred;
58952+ struct task_struct *tsk, *tsk2;
58953+ struct user_struct *user;
58954+ uid_t uid;
58955+
58956+ if (in_irq() || in_serving_softirq() || in_nmi())
58957+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
58958+
58959+ uid = current_uid();
58960+
58961+ if (uid == 0)
58962+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
58963+ else {
58964+ /* kill all the processes of this user, hold a reference
58965+ to their creds struct, and prevent them from creating
58966+ another process until system reset
58967+ */
58968+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n", uid);
58969+ /* we intentionally leak this ref */
58970+ user = get_uid(current->cred->user);
58971+ if (user) {
58972+ user->banned = 1;
58973+ user->ban_expires = ~0UL;
58974+ }
58975+
58976+ read_lock(&tasklist_lock);
58977+ do_each_thread(tsk2, tsk) {
58978+ cred = __task_cred(tsk);
58979+ if (cred->uid == uid)
58980+ gr_fake_force_sig(SIGKILL, tsk);
58981+ } while_each_thread(tsk2, tsk);
58982+ read_unlock(&tasklist_lock);
58983+ }
58984+#endif
58985+}
58986+
58987+int __gr_process_user_ban(struct user_struct *user)
58988+{
58989+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
58990+ if (unlikely(user->banned)) {
58991+ if (user->ban_expires != ~0UL && time_after_eq(get_seconds(), user->ban_expires)) {
58992+ user->banned = 0;
58993+ user->ban_expires = 0;
58994+ free_uid(user);
58995+ } else
58996+ return -EPERM;
58997+ }
58998+#endif
58999+ return 0;
59000+}
59001+
59002+int gr_process_user_ban(void)
59003+{
59004+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
59005+ return __gr_process_user_ban(current->cred->user);
59006+#endif
59007+ return 0;
59008+}
59009diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
59010new file mode 100644
59011index 0000000..4030d57
59012--- /dev/null
59013+++ b/grsecurity/grsec_sock.c
59014@@ -0,0 +1,244 @@
59015+#include <linux/kernel.h>
59016+#include <linux/module.h>
59017+#include <linux/sched.h>
59018+#include <linux/file.h>
59019+#include <linux/net.h>
59020+#include <linux/in.h>
59021+#include <linux/ip.h>
59022+#include <net/sock.h>
59023+#include <net/inet_sock.h>
59024+#include <linux/grsecurity.h>
59025+#include <linux/grinternal.h>
59026+#include <linux/gracl.h>
59027+
59028+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
59029+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
59030+
59031+EXPORT_SYMBOL(gr_search_udp_recvmsg);
59032+EXPORT_SYMBOL(gr_search_udp_sendmsg);
59033+
59034+#ifdef CONFIG_UNIX_MODULE
59035+EXPORT_SYMBOL(gr_acl_handle_unix);
59036+EXPORT_SYMBOL(gr_acl_handle_mknod);
59037+EXPORT_SYMBOL(gr_handle_chroot_unix);
59038+EXPORT_SYMBOL(gr_handle_create);
59039+#endif
59040+
59041+#ifdef CONFIG_GRKERNSEC
59042+#define gr_conn_table_size 32749
59043+struct conn_table_entry {
59044+ struct conn_table_entry *next;
59045+ struct signal_struct *sig;
59046+};
59047+
59048+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
59049+DEFINE_SPINLOCK(gr_conn_table_lock);
59050+
59051+extern const char * gr_socktype_to_name(unsigned char type);
59052+extern const char * gr_proto_to_name(unsigned char proto);
59053+extern const char * gr_sockfamily_to_name(unsigned char family);
59054+
59055+static __inline__ int
59056+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
59057+{
59058+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
59059+}
59060+
59061+static __inline__ int
59062+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
59063+ __u16 sport, __u16 dport)
59064+{
59065+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
59066+ sig->gr_sport == sport && sig->gr_dport == dport))
59067+ return 1;
59068+ else
59069+ return 0;
59070+}
59071+
59072+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
59073+{
59074+ struct conn_table_entry **match;
59075+ unsigned int index;
59076+
59077+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
59078+ sig->gr_sport, sig->gr_dport,
59079+ gr_conn_table_size);
59080+
59081+ newent->sig = sig;
59082+
59083+ match = &gr_conn_table[index];
59084+ newent->next = *match;
59085+ *match = newent;
59086+
59087+ return;
59088+}
59089+
59090+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
59091+{
59092+ struct conn_table_entry *match, *last = NULL;
59093+ unsigned int index;
59094+
59095+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
59096+ sig->gr_sport, sig->gr_dport,
59097+ gr_conn_table_size);
59098+
59099+ match = gr_conn_table[index];
59100+ while (match && !conn_match(match->sig,
59101+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
59102+ sig->gr_dport)) {
59103+ last = match;
59104+ match = match->next;
59105+ }
59106+
59107+ if (match) {
59108+ if (last)
59109+ last->next = match->next;
59110+ else
59111+ gr_conn_table[index] = NULL;
59112+ kfree(match);
59113+ }
59114+
59115+ return;
59116+}
59117+
59118+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
59119+ __u16 sport, __u16 dport)
59120+{
59121+ struct conn_table_entry *match;
59122+ unsigned int index;
59123+
59124+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
59125+
59126+ match = gr_conn_table[index];
59127+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
59128+ match = match->next;
59129+
59130+ if (match)
59131+ return match->sig;
59132+ else
59133+ return NULL;
59134+}
59135+
59136+#endif
59137+
59138+void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
59139+{
59140+#ifdef CONFIG_GRKERNSEC
59141+ struct signal_struct *sig = task->signal;
59142+ struct conn_table_entry *newent;
59143+
59144+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
59145+ if (newent == NULL)
59146+ return;
59147+ /* no bh lock needed since we are called with bh disabled */
59148+ spin_lock(&gr_conn_table_lock);
59149+ gr_del_task_from_ip_table_nolock(sig);
59150+ sig->gr_saddr = inet->inet_rcv_saddr;
59151+ sig->gr_daddr = inet->inet_daddr;
59152+ sig->gr_sport = inet->inet_sport;
59153+ sig->gr_dport = inet->inet_dport;
59154+ gr_add_to_task_ip_table_nolock(sig, newent);
59155+ spin_unlock(&gr_conn_table_lock);
59156+#endif
59157+ return;
59158+}
59159+
59160+void gr_del_task_from_ip_table(struct task_struct *task)
59161+{
59162+#ifdef CONFIG_GRKERNSEC
59163+ spin_lock_bh(&gr_conn_table_lock);
59164+ gr_del_task_from_ip_table_nolock(task->signal);
59165+ spin_unlock_bh(&gr_conn_table_lock);
59166+#endif
59167+ return;
59168+}
59169+
59170+void
59171+gr_attach_curr_ip(const struct sock *sk)
59172+{
59173+#ifdef CONFIG_GRKERNSEC
59174+ struct signal_struct *p, *set;
59175+ const struct inet_sock *inet = inet_sk(sk);
59176+
59177+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
59178+ return;
59179+
59180+ set = current->signal;
59181+
59182+ spin_lock_bh(&gr_conn_table_lock);
59183+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
59184+ inet->inet_dport, inet->inet_sport);
59185+ if (unlikely(p != NULL)) {
59186+ set->curr_ip = p->curr_ip;
59187+ set->used_accept = 1;
59188+ gr_del_task_from_ip_table_nolock(p);
59189+ spin_unlock_bh(&gr_conn_table_lock);
59190+ return;
59191+ }
59192+ spin_unlock_bh(&gr_conn_table_lock);
59193+
59194+ set->curr_ip = inet->inet_daddr;
59195+ set->used_accept = 1;
59196+#endif
59197+ return;
59198+}
59199+
59200+int
59201+gr_handle_sock_all(const int family, const int type, const int protocol)
59202+{
59203+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
59204+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
59205+ (family != AF_UNIX)) {
59206+ if (family == AF_INET)
59207+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
59208+ else
59209+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
59210+ return -EACCES;
59211+ }
59212+#endif
59213+ return 0;
59214+}
59215+
59216+int
59217+gr_handle_sock_server(const struct sockaddr *sck)
59218+{
59219+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59220+ if (grsec_enable_socket_server &&
59221+ in_group_p(grsec_socket_server_gid) &&
59222+ sck && (sck->sa_family != AF_UNIX) &&
59223+ (sck->sa_family != AF_LOCAL)) {
59224+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
59225+ return -EACCES;
59226+ }
59227+#endif
59228+ return 0;
59229+}
59230+
59231+int
59232+gr_handle_sock_server_other(const struct sock *sck)
59233+{
59234+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59235+ if (grsec_enable_socket_server &&
59236+ in_group_p(grsec_socket_server_gid) &&
59237+ sck && (sck->sk_family != AF_UNIX) &&
59238+ (sck->sk_family != AF_LOCAL)) {
59239+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
59240+ return -EACCES;
59241+ }
59242+#endif
59243+ return 0;
59244+}
59245+
59246+int
59247+gr_handle_sock_client(const struct sockaddr *sck)
59248+{
59249+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
59250+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
59251+ sck && (sck->sa_family != AF_UNIX) &&
59252+ (sck->sa_family != AF_LOCAL)) {
59253+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
59254+ return -EACCES;
59255+ }
59256+#endif
59257+ return 0;
59258+}
59259diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
59260new file mode 100644
59261index 0000000..a1aedd7
59262--- /dev/null
59263+++ b/grsecurity/grsec_sysctl.c
59264@@ -0,0 +1,451 @@
59265+#include <linux/kernel.h>
59266+#include <linux/sched.h>
59267+#include <linux/sysctl.h>
59268+#include <linux/grsecurity.h>
59269+#include <linux/grinternal.h>
59270+
59271+int
59272+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
59273+{
59274+#ifdef CONFIG_GRKERNSEC_SYSCTL
59275+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
59276+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
59277+ return -EACCES;
59278+ }
59279+#endif
59280+ return 0;
59281+}
59282+
59283+#ifdef CONFIG_GRKERNSEC_ROFS
59284+static int __maybe_unused one = 1;
59285+#endif
59286+
59287+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
59288+struct ctl_table grsecurity_table[] = {
59289+#ifdef CONFIG_GRKERNSEC_SYSCTL
59290+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
59291+#ifdef CONFIG_GRKERNSEC_IO
59292+ {
59293+ .procname = "disable_priv_io",
59294+ .data = &grsec_disable_privio,
59295+ .maxlen = sizeof(int),
59296+ .mode = 0600,
59297+ .proc_handler = &proc_dointvec,
59298+ },
59299+#endif
59300+#endif
59301+#ifdef CONFIG_GRKERNSEC_LINK
59302+ {
59303+ .procname = "linking_restrictions",
59304+ .data = &grsec_enable_link,
59305+ .maxlen = sizeof(int),
59306+ .mode = 0600,
59307+ .proc_handler = &proc_dointvec,
59308+ },
59309+#endif
59310+#ifdef CONFIG_GRKERNSEC_BRUTE
59311+ {
59312+ .procname = "deter_bruteforce",
59313+ .data = &grsec_enable_brute,
59314+ .maxlen = sizeof(int),
59315+ .mode = 0600,
59316+ .proc_handler = &proc_dointvec,
59317+ },
59318+#endif
59319+#ifdef CONFIG_GRKERNSEC_FIFO
59320+ {
59321+ .procname = "fifo_restrictions",
59322+ .data = &grsec_enable_fifo,
59323+ .maxlen = sizeof(int),
59324+ .mode = 0600,
59325+ .proc_handler = &proc_dointvec,
59326+ },
59327+#endif
59328+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
59329+ {
59330+ .procname = "ptrace_readexec",
59331+ .data = &grsec_enable_ptrace_readexec,
59332+ .maxlen = sizeof(int),
59333+ .mode = 0600,
59334+ .proc_handler = &proc_dointvec,
59335+ },
59336+#endif
59337+#ifdef CONFIG_GRKERNSEC_SETXID
59338+ {
59339+ .procname = "consistent_setxid",
59340+ .data = &grsec_enable_setxid,
59341+ .maxlen = sizeof(int),
59342+ .mode = 0600,
59343+ .proc_handler = &proc_dointvec,
59344+ },
59345+#endif
59346+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
59347+ {
59348+ .procname = "ip_blackhole",
59349+ .data = &grsec_enable_blackhole,
59350+ .maxlen = sizeof(int),
59351+ .mode = 0600,
59352+ .proc_handler = &proc_dointvec,
59353+ },
59354+ {
59355+ .procname = "lastack_retries",
59356+ .data = &grsec_lastack_retries,
59357+ .maxlen = sizeof(int),
59358+ .mode = 0600,
59359+ .proc_handler = &proc_dointvec,
59360+ },
59361+#endif
59362+#ifdef CONFIG_GRKERNSEC_EXECLOG
59363+ {
59364+ .procname = "exec_logging",
59365+ .data = &grsec_enable_execlog,
59366+ .maxlen = sizeof(int),
59367+ .mode = 0600,
59368+ .proc_handler = &proc_dointvec,
59369+ },
59370+#endif
59371+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59372+ {
59373+ .procname = "rwxmap_logging",
59374+ .data = &grsec_enable_log_rwxmaps,
59375+ .maxlen = sizeof(int),
59376+ .mode = 0600,
59377+ .proc_handler = &proc_dointvec,
59378+ },
59379+#endif
59380+#ifdef CONFIG_GRKERNSEC_SIGNAL
59381+ {
59382+ .procname = "signal_logging",
59383+ .data = &grsec_enable_signal,
59384+ .maxlen = sizeof(int),
59385+ .mode = 0600,
59386+ .proc_handler = &proc_dointvec,
59387+ },
59388+#endif
59389+#ifdef CONFIG_GRKERNSEC_FORKFAIL
59390+ {
59391+ .procname = "forkfail_logging",
59392+ .data = &grsec_enable_forkfail,
59393+ .maxlen = sizeof(int),
59394+ .mode = 0600,
59395+ .proc_handler = &proc_dointvec,
59396+ },
59397+#endif
59398+#ifdef CONFIG_GRKERNSEC_TIME
59399+ {
59400+ .procname = "timechange_logging",
59401+ .data = &grsec_enable_time,
59402+ .maxlen = sizeof(int),
59403+ .mode = 0600,
59404+ .proc_handler = &proc_dointvec,
59405+ },
59406+#endif
59407+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
59408+ {
59409+ .procname = "chroot_deny_shmat",
59410+ .data = &grsec_enable_chroot_shmat,
59411+ .maxlen = sizeof(int),
59412+ .mode = 0600,
59413+ .proc_handler = &proc_dointvec,
59414+ },
59415+#endif
59416+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
59417+ {
59418+ .procname = "chroot_deny_unix",
59419+ .data = &grsec_enable_chroot_unix,
59420+ .maxlen = sizeof(int),
59421+ .mode = 0600,
59422+ .proc_handler = &proc_dointvec,
59423+ },
59424+#endif
59425+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
59426+ {
59427+ .procname = "chroot_deny_mount",
59428+ .data = &grsec_enable_chroot_mount,
59429+ .maxlen = sizeof(int),
59430+ .mode = 0600,
59431+ .proc_handler = &proc_dointvec,
59432+ },
59433+#endif
59434+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
59435+ {
59436+ .procname = "chroot_deny_fchdir",
59437+ .data = &grsec_enable_chroot_fchdir,
59438+ .maxlen = sizeof(int),
59439+ .mode = 0600,
59440+ .proc_handler = &proc_dointvec,
59441+ },
59442+#endif
59443+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
59444+ {
59445+ .procname = "chroot_deny_chroot",
59446+ .data = &grsec_enable_chroot_double,
59447+ .maxlen = sizeof(int),
59448+ .mode = 0600,
59449+ .proc_handler = &proc_dointvec,
59450+ },
59451+#endif
59452+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
59453+ {
59454+ .procname = "chroot_deny_pivot",
59455+ .data = &grsec_enable_chroot_pivot,
59456+ .maxlen = sizeof(int),
59457+ .mode = 0600,
59458+ .proc_handler = &proc_dointvec,
59459+ },
59460+#endif
59461+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
59462+ {
59463+ .procname = "chroot_enforce_chdir",
59464+ .data = &grsec_enable_chroot_chdir,
59465+ .maxlen = sizeof(int),
59466+ .mode = 0600,
59467+ .proc_handler = &proc_dointvec,
59468+ },
59469+#endif
59470+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
59471+ {
59472+ .procname = "chroot_deny_chmod",
59473+ .data = &grsec_enable_chroot_chmod,
59474+ .maxlen = sizeof(int),
59475+ .mode = 0600,
59476+ .proc_handler = &proc_dointvec,
59477+ },
59478+#endif
59479+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
59480+ {
59481+ .procname = "chroot_deny_mknod",
59482+ .data = &grsec_enable_chroot_mknod,
59483+ .maxlen = sizeof(int),
59484+ .mode = 0600,
59485+ .proc_handler = &proc_dointvec,
59486+ },
59487+#endif
59488+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
59489+ {
59490+ .procname = "chroot_restrict_nice",
59491+ .data = &grsec_enable_chroot_nice,
59492+ .maxlen = sizeof(int),
59493+ .mode = 0600,
59494+ .proc_handler = &proc_dointvec,
59495+ },
59496+#endif
59497+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
59498+ {
59499+ .procname = "chroot_execlog",
59500+ .data = &grsec_enable_chroot_execlog,
59501+ .maxlen = sizeof(int),
59502+ .mode = 0600,
59503+ .proc_handler = &proc_dointvec,
59504+ },
59505+#endif
59506+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
59507+ {
59508+ .procname = "chroot_caps",
59509+ .data = &grsec_enable_chroot_caps,
59510+ .maxlen = sizeof(int),
59511+ .mode = 0600,
59512+ .proc_handler = &proc_dointvec,
59513+ },
59514+#endif
59515+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
59516+ {
59517+ .procname = "chroot_deny_sysctl",
59518+ .data = &grsec_enable_chroot_sysctl,
59519+ .maxlen = sizeof(int),
59520+ .mode = 0600,
59521+ .proc_handler = &proc_dointvec,
59522+ },
59523+#endif
59524+#ifdef CONFIG_GRKERNSEC_TPE
59525+ {
59526+ .procname = "tpe",
59527+ .data = &grsec_enable_tpe,
59528+ .maxlen = sizeof(int),
59529+ .mode = 0600,
59530+ .proc_handler = &proc_dointvec,
59531+ },
59532+ {
59533+ .procname = "tpe_gid",
59534+ .data = &grsec_tpe_gid,
59535+ .maxlen = sizeof(int),
59536+ .mode = 0600,
59537+ .proc_handler = &proc_dointvec,
59538+ },
59539+#endif
59540+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59541+ {
59542+ .procname = "tpe_invert",
59543+ .data = &grsec_enable_tpe_invert,
59544+ .maxlen = sizeof(int),
59545+ .mode = 0600,
59546+ .proc_handler = &proc_dointvec,
59547+ },
59548+#endif
59549+#ifdef CONFIG_GRKERNSEC_TPE_ALL
59550+ {
59551+ .procname = "tpe_restrict_all",
59552+ .data = &grsec_enable_tpe_all,
59553+ .maxlen = sizeof(int),
59554+ .mode = 0600,
59555+ .proc_handler = &proc_dointvec,
59556+ },
59557+#endif
59558+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
59559+ {
59560+ .procname = "socket_all",
59561+ .data = &grsec_enable_socket_all,
59562+ .maxlen = sizeof(int),
59563+ .mode = 0600,
59564+ .proc_handler = &proc_dointvec,
59565+ },
59566+ {
59567+ .procname = "socket_all_gid",
59568+ .data = &grsec_socket_all_gid,
59569+ .maxlen = sizeof(int),
59570+ .mode = 0600,
59571+ .proc_handler = &proc_dointvec,
59572+ },
59573+#endif
59574+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
59575+ {
59576+ .procname = "socket_client",
59577+ .data = &grsec_enable_socket_client,
59578+ .maxlen = sizeof(int),
59579+ .mode = 0600,
59580+ .proc_handler = &proc_dointvec,
59581+ },
59582+ {
59583+ .procname = "socket_client_gid",
59584+ .data = &grsec_socket_client_gid,
59585+ .maxlen = sizeof(int),
59586+ .mode = 0600,
59587+ .proc_handler = &proc_dointvec,
59588+ },
59589+#endif
59590+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59591+ {
59592+ .procname = "socket_server",
59593+ .data = &grsec_enable_socket_server,
59594+ .maxlen = sizeof(int),
59595+ .mode = 0600,
59596+ .proc_handler = &proc_dointvec,
59597+ },
59598+ {
59599+ .procname = "socket_server_gid",
59600+ .data = &grsec_socket_server_gid,
59601+ .maxlen = sizeof(int),
59602+ .mode = 0600,
59603+ .proc_handler = &proc_dointvec,
59604+ },
59605+#endif
59606+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
59607+ {
59608+ .procname = "audit_group",
59609+ .data = &grsec_enable_group,
59610+ .maxlen = sizeof(int),
59611+ .mode = 0600,
59612+ .proc_handler = &proc_dointvec,
59613+ },
59614+ {
59615+ .procname = "audit_gid",
59616+ .data = &grsec_audit_gid,
59617+ .maxlen = sizeof(int),
59618+ .mode = 0600,
59619+ .proc_handler = &proc_dointvec,
59620+ },
59621+#endif
59622+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
59623+ {
59624+ .procname = "audit_chdir",
59625+ .data = &grsec_enable_chdir,
59626+ .maxlen = sizeof(int),
59627+ .mode = 0600,
59628+ .proc_handler = &proc_dointvec,
59629+ },
59630+#endif
59631+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
59632+ {
59633+ .procname = "audit_mount",
59634+ .data = &grsec_enable_mount,
59635+ .maxlen = sizeof(int),
59636+ .mode = 0600,
59637+ .proc_handler = &proc_dointvec,
59638+ },
59639+#endif
59640+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
59641+ {
59642+ .procname = "audit_textrel",
59643+ .data = &grsec_enable_audit_textrel,
59644+ .maxlen = sizeof(int),
59645+ .mode = 0600,
59646+ .proc_handler = &proc_dointvec,
59647+ },
59648+#endif
59649+#ifdef CONFIG_GRKERNSEC_DMESG
59650+ {
59651+ .procname = "dmesg",
59652+ .data = &grsec_enable_dmesg,
59653+ .maxlen = sizeof(int),
59654+ .mode = 0600,
59655+ .proc_handler = &proc_dointvec,
59656+ },
59657+#endif
59658+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
59659+ {
59660+ .procname = "chroot_findtask",
59661+ .data = &grsec_enable_chroot_findtask,
59662+ .maxlen = sizeof(int),
59663+ .mode = 0600,
59664+ .proc_handler = &proc_dointvec,
59665+ },
59666+#endif
59667+#ifdef CONFIG_GRKERNSEC_RESLOG
59668+ {
59669+ .procname = "resource_logging",
59670+ .data = &grsec_resource_logging,
59671+ .maxlen = sizeof(int),
59672+ .mode = 0600,
59673+ .proc_handler = &proc_dointvec,
59674+ },
59675+#endif
59676+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
59677+ {
59678+ .procname = "audit_ptrace",
59679+ .data = &grsec_enable_audit_ptrace,
59680+ .maxlen = sizeof(int),
59681+ .mode = 0600,
59682+ .proc_handler = &proc_dointvec,
59683+ },
59684+#endif
59685+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
59686+ {
59687+ .procname = "harden_ptrace",
59688+ .data = &grsec_enable_harden_ptrace,
59689+ .maxlen = sizeof(int),
59690+ .mode = 0600,
59691+ .proc_handler = &proc_dointvec,
59692+ },
59693+#endif
59694+ {
59695+ .procname = "grsec_lock",
59696+ .data = &grsec_lock,
59697+ .maxlen = sizeof(int),
59698+ .mode = 0600,
59699+ .proc_handler = &proc_dointvec,
59700+ },
59701+#endif
59702+#ifdef CONFIG_GRKERNSEC_ROFS
59703+ {
59704+ .procname = "romount_protect",
59705+ .data = &grsec_enable_rofs,
59706+ .maxlen = sizeof(int),
59707+ .mode = 0600,
59708+ .proc_handler = &proc_dointvec_minmax,
59709+ .extra1 = &one,
59710+ .extra2 = &one,
59711+ },
59712+#endif
59713+ { }
59714+};
59715+#endif
59716diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
59717new file mode 100644
59718index 0000000..0dc13c3
59719--- /dev/null
59720+++ b/grsecurity/grsec_time.c
59721@@ -0,0 +1,16 @@
59722+#include <linux/kernel.h>
59723+#include <linux/sched.h>
59724+#include <linux/grinternal.h>
59725+#include <linux/module.h>
59726+
59727+void
59728+gr_log_timechange(void)
59729+{
59730+#ifdef CONFIG_GRKERNSEC_TIME
59731+ if (grsec_enable_time)
59732+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
59733+#endif
59734+ return;
59735+}
59736+
59737+EXPORT_SYMBOL(gr_log_timechange);
59738diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
59739new file mode 100644
59740index 0000000..07e0dc0
59741--- /dev/null
59742+++ b/grsecurity/grsec_tpe.c
59743@@ -0,0 +1,73 @@
59744+#include <linux/kernel.h>
59745+#include <linux/sched.h>
59746+#include <linux/file.h>
59747+#include <linux/fs.h>
59748+#include <linux/grinternal.h>
59749+
59750+extern int gr_acl_tpe_check(void);
59751+
59752+int
59753+gr_tpe_allow(const struct file *file)
59754+{
59755+#ifdef CONFIG_GRKERNSEC
59756+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
59757+ const struct cred *cred = current_cred();
59758+ char *msg = NULL;
59759+ char *msg2 = NULL;
59760+
59761+ // never restrict root
59762+ if (!cred->uid)
59763+ return 1;
59764+
59765+ if (grsec_enable_tpe) {
59766+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59767+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
59768+ msg = "not being in trusted group";
59769+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
59770+ msg = "being in untrusted group";
59771+#else
59772+ if (in_group_p(grsec_tpe_gid))
59773+ msg = "being in untrusted group";
59774+#endif
59775+ }
59776+ if (!msg && gr_acl_tpe_check())
59777+ msg = "being in untrusted role";
59778+
59779+ // not in any affected group/role
59780+ if (!msg)
59781+ goto next_check;
59782+
59783+ if (inode->i_uid)
59784+ msg2 = "file in non-root-owned directory";
59785+ else if (inode->i_mode & S_IWOTH)
59786+ msg2 = "file in world-writable directory";
59787+ else if (inode->i_mode & S_IWGRP)
59788+ msg2 = "file in group-writable directory";
59789+
59790+ if (msg && msg2) {
59791+ char fullmsg[70] = {0};
59792+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
59793+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
59794+ return 0;
59795+ }
59796+ msg = NULL;
59797+next_check:
59798+#ifdef CONFIG_GRKERNSEC_TPE_ALL
59799+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
59800+ return 1;
59801+
59802+ if (inode->i_uid && (inode->i_uid != cred->uid))
59803+ msg = "directory not owned by user";
59804+ else if (inode->i_mode & S_IWOTH)
59805+ msg = "file in world-writable directory";
59806+ else if (inode->i_mode & S_IWGRP)
59807+ msg = "file in group-writable directory";
59808+
59809+ if (msg) {
59810+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
59811+ return 0;
59812+ }
59813+#endif
59814+#endif
59815+ return 1;
59816+}
59817diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
59818new file mode 100644
59819index 0000000..9f7b1ac
59820--- /dev/null
59821+++ b/grsecurity/grsum.c
59822@@ -0,0 +1,61 @@
59823+#include <linux/err.h>
59824+#include <linux/kernel.h>
59825+#include <linux/sched.h>
59826+#include <linux/mm.h>
59827+#include <linux/scatterlist.h>
59828+#include <linux/crypto.h>
59829+#include <linux/gracl.h>
59830+
59831+
59832+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
59833+#error "crypto and sha256 must be built into the kernel"
59834+#endif
59835+
59836+int
59837+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
59838+{
59839+ char *p;
59840+ struct crypto_hash *tfm;
59841+ struct hash_desc desc;
59842+ struct scatterlist sg;
59843+ unsigned char temp_sum[GR_SHA_LEN];
59844+ volatile int retval = 0;
59845+ volatile int dummy = 0;
59846+ unsigned int i;
59847+
59848+ sg_init_table(&sg, 1);
59849+
59850+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
59851+ if (IS_ERR(tfm)) {
59852+ /* should never happen, since sha256 should be built in */
59853+ return 1;
59854+ }
59855+
59856+ desc.tfm = tfm;
59857+ desc.flags = 0;
59858+
59859+ crypto_hash_init(&desc);
59860+
59861+ p = salt;
59862+ sg_set_buf(&sg, p, GR_SALT_LEN);
59863+ crypto_hash_update(&desc, &sg, sg.length);
59864+
59865+ p = entry->pw;
59866+ sg_set_buf(&sg, p, strlen(p));
59867+
59868+ crypto_hash_update(&desc, &sg, sg.length);
59869+
59870+ crypto_hash_final(&desc, temp_sum);
59871+
59872+ memset(entry->pw, 0, GR_PW_LEN);
59873+
59874+ for (i = 0; i < GR_SHA_LEN; i++)
59875+ if (sum[i] != temp_sum[i])
59876+ retval = 1;
59877+ else
59878+ dummy = 1; // waste a cycle
59879+
59880+ crypto_free_hash(tfm);
59881+
59882+ return retval;
59883+}
59884diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
59885index 6cd5b64..f620d2d 100644
59886--- a/include/acpi/acpi_bus.h
59887+++ b/include/acpi/acpi_bus.h
59888@@ -107,7 +107,7 @@ struct acpi_device_ops {
59889 acpi_op_bind bind;
59890 acpi_op_unbind unbind;
59891 acpi_op_notify notify;
59892-};
59893+} __no_const;
59894
59895 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
59896
59897diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
59898index b7babf0..71e4e74 100644
59899--- a/include/asm-generic/atomic-long.h
59900+++ b/include/asm-generic/atomic-long.h
59901@@ -22,6 +22,12 @@
59902
59903 typedef atomic64_t atomic_long_t;
59904
59905+#ifdef CONFIG_PAX_REFCOUNT
59906+typedef atomic64_unchecked_t atomic_long_unchecked_t;
59907+#else
59908+typedef atomic64_t atomic_long_unchecked_t;
59909+#endif
59910+
59911 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
59912
59913 static inline long atomic_long_read(atomic_long_t *l)
59914@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
59915 return (long)atomic64_read(v);
59916 }
59917
59918+#ifdef CONFIG_PAX_REFCOUNT
59919+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
59920+{
59921+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59922+
59923+ return (long)atomic64_read_unchecked(v);
59924+}
59925+#endif
59926+
59927 static inline void atomic_long_set(atomic_long_t *l, long i)
59928 {
59929 atomic64_t *v = (atomic64_t *)l;
59930@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
59931 atomic64_set(v, i);
59932 }
59933
59934+#ifdef CONFIG_PAX_REFCOUNT
59935+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
59936+{
59937+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59938+
59939+ atomic64_set_unchecked(v, i);
59940+}
59941+#endif
59942+
59943 static inline void atomic_long_inc(atomic_long_t *l)
59944 {
59945 atomic64_t *v = (atomic64_t *)l;
59946@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
59947 atomic64_inc(v);
59948 }
59949
59950+#ifdef CONFIG_PAX_REFCOUNT
59951+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
59952+{
59953+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59954+
59955+ atomic64_inc_unchecked(v);
59956+}
59957+#endif
59958+
59959 static inline void atomic_long_dec(atomic_long_t *l)
59960 {
59961 atomic64_t *v = (atomic64_t *)l;
59962@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
59963 atomic64_dec(v);
59964 }
59965
59966+#ifdef CONFIG_PAX_REFCOUNT
59967+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
59968+{
59969+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59970+
59971+ atomic64_dec_unchecked(v);
59972+}
59973+#endif
59974+
59975 static inline void atomic_long_add(long i, atomic_long_t *l)
59976 {
59977 atomic64_t *v = (atomic64_t *)l;
59978@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
59979 atomic64_add(i, v);
59980 }
59981
59982+#ifdef CONFIG_PAX_REFCOUNT
59983+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
59984+{
59985+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59986+
59987+ atomic64_add_unchecked(i, v);
59988+}
59989+#endif
59990+
59991 static inline void atomic_long_sub(long i, atomic_long_t *l)
59992 {
59993 atomic64_t *v = (atomic64_t *)l;
59994@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
59995 atomic64_sub(i, v);
59996 }
59997
59998+#ifdef CONFIG_PAX_REFCOUNT
59999+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
60000+{
60001+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60002+
60003+ atomic64_sub_unchecked(i, v);
60004+}
60005+#endif
60006+
60007 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
60008 {
60009 atomic64_t *v = (atomic64_t *)l;
60010@@ -115,6 +175,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
60011 return (long)atomic64_inc_return(v);
60012 }
60013
60014+#ifdef CONFIG_PAX_REFCOUNT
60015+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
60016+{
60017+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60018+
60019+ return (long)atomic64_inc_return_unchecked(v);
60020+}
60021+#endif
60022+
60023 static inline long atomic_long_dec_return(atomic_long_t *l)
60024 {
60025 atomic64_t *v = (atomic64_t *)l;
60026@@ -140,6 +209,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
60027
60028 typedef atomic_t atomic_long_t;
60029
60030+#ifdef CONFIG_PAX_REFCOUNT
60031+typedef atomic_unchecked_t atomic_long_unchecked_t;
60032+#else
60033+typedef atomic_t atomic_long_unchecked_t;
60034+#endif
60035+
60036 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
60037 static inline long atomic_long_read(atomic_long_t *l)
60038 {
60039@@ -148,6 +223,15 @@ static inline long atomic_long_read(atomic_long_t *l)
60040 return (long)atomic_read(v);
60041 }
60042
60043+#ifdef CONFIG_PAX_REFCOUNT
60044+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
60045+{
60046+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60047+
60048+ return (long)atomic_read_unchecked(v);
60049+}
60050+#endif
60051+
60052 static inline void atomic_long_set(atomic_long_t *l, long i)
60053 {
60054 atomic_t *v = (atomic_t *)l;
60055@@ -155,6 +239,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
60056 atomic_set(v, i);
60057 }
60058
60059+#ifdef CONFIG_PAX_REFCOUNT
60060+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
60061+{
60062+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60063+
60064+ atomic_set_unchecked(v, i);
60065+}
60066+#endif
60067+
60068 static inline void atomic_long_inc(atomic_long_t *l)
60069 {
60070 atomic_t *v = (atomic_t *)l;
60071@@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
60072 atomic_inc(v);
60073 }
60074
60075+#ifdef CONFIG_PAX_REFCOUNT
60076+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
60077+{
60078+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60079+
60080+ atomic_inc_unchecked(v);
60081+}
60082+#endif
60083+
60084 static inline void atomic_long_dec(atomic_long_t *l)
60085 {
60086 atomic_t *v = (atomic_t *)l;
60087@@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
60088 atomic_dec(v);
60089 }
60090
60091+#ifdef CONFIG_PAX_REFCOUNT
60092+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
60093+{
60094+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60095+
60096+ atomic_dec_unchecked(v);
60097+}
60098+#endif
60099+
60100 static inline void atomic_long_add(long i, atomic_long_t *l)
60101 {
60102 atomic_t *v = (atomic_t *)l;
60103@@ -176,6 +287,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
60104 atomic_add(i, v);
60105 }
60106
60107+#ifdef CONFIG_PAX_REFCOUNT
60108+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
60109+{
60110+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60111+
60112+ atomic_add_unchecked(i, v);
60113+}
60114+#endif
60115+
60116 static inline void atomic_long_sub(long i, atomic_long_t *l)
60117 {
60118 atomic_t *v = (atomic_t *)l;
60119@@ -183,6 +303,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
60120 atomic_sub(i, v);
60121 }
60122
60123+#ifdef CONFIG_PAX_REFCOUNT
60124+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
60125+{
60126+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60127+
60128+ atomic_sub_unchecked(i, v);
60129+}
60130+#endif
60131+
60132 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
60133 {
60134 atomic_t *v = (atomic_t *)l;
60135@@ -232,6 +361,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
60136 return (long)atomic_inc_return(v);
60137 }
60138
60139+#ifdef CONFIG_PAX_REFCOUNT
60140+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
60141+{
60142+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60143+
60144+ return (long)atomic_inc_return_unchecked(v);
60145+}
60146+#endif
60147+
60148 static inline long atomic_long_dec_return(atomic_long_t *l)
60149 {
60150 atomic_t *v = (atomic_t *)l;
60151@@ -255,4 +393,49 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
60152
60153 #endif /* BITS_PER_LONG == 64 */
60154
60155+#ifdef CONFIG_PAX_REFCOUNT
60156+static inline void pax_refcount_needs_these_functions(void)
60157+{
60158+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
60159+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
60160+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
60161+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
60162+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
60163+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
60164+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
60165+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
60166+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
60167+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
60168+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
60169+
60170+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
60171+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
60172+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
60173+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
60174+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
60175+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
60176+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
60177+}
60178+#else
60179+#define atomic_read_unchecked(v) atomic_read(v)
60180+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
60181+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
60182+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
60183+#define atomic_inc_unchecked(v) atomic_inc(v)
60184+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
60185+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
60186+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
60187+#define atomic_dec_unchecked(v) atomic_dec(v)
60188+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
60189+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
60190+
60191+#define atomic_long_read_unchecked(v) atomic_long_read(v)
60192+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
60193+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
60194+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
60195+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
60196+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
60197+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
60198+#endif
60199+
60200 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
60201diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
60202index b18ce4f..2ee2843 100644
60203--- a/include/asm-generic/atomic64.h
60204+++ b/include/asm-generic/atomic64.h
60205@@ -16,6 +16,8 @@ typedef struct {
60206 long long counter;
60207 } atomic64_t;
60208
60209+typedef atomic64_t atomic64_unchecked_t;
60210+
60211 #define ATOMIC64_INIT(i) { (i) }
60212
60213 extern long long atomic64_read(const atomic64_t *v);
60214@@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
60215 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
60216 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
60217
60218+#define atomic64_read_unchecked(v) atomic64_read(v)
60219+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
60220+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
60221+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
60222+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
60223+#define atomic64_inc_unchecked(v) atomic64_inc(v)
60224+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
60225+#define atomic64_dec_unchecked(v) atomic64_dec(v)
60226+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
60227+
60228 #endif /* _ASM_GENERIC_ATOMIC64_H */
60229diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
60230index 1bfcfe5..e04c5c9 100644
60231--- a/include/asm-generic/cache.h
60232+++ b/include/asm-generic/cache.h
60233@@ -6,7 +6,7 @@
60234 * cache lines need to provide their own cache.h.
60235 */
60236
60237-#define L1_CACHE_SHIFT 5
60238-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
60239+#define L1_CACHE_SHIFT 5UL
60240+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
60241
60242 #endif /* __ASM_GENERIC_CACHE_H */
60243diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
60244index 0d68a1e..b74a761 100644
60245--- a/include/asm-generic/emergency-restart.h
60246+++ b/include/asm-generic/emergency-restart.h
60247@@ -1,7 +1,7 @@
60248 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
60249 #define _ASM_GENERIC_EMERGENCY_RESTART_H
60250
60251-static inline void machine_emergency_restart(void)
60252+static inline __noreturn void machine_emergency_restart(void)
60253 {
60254 machine_restart(NULL);
60255 }
60256diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
60257index 0232ccb..13d9165 100644
60258--- a/include/asm-generic/kmap_types.h
60259+++ b/include/asm-generic/kmap_types.h
60260@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
60261 KMAP_D(17) KM_NMI,
60262 KMAP_D(18) KM_NMI_PTE,
60263 KMAP_D(19) KM_KDB,
60264+KMAP_D(20) KM_CLEARPAGE,
60265 /*
60266 * Remember to update debug_kmap_atomic() when adding new kmap types!
60267 */
60268-KMAP_D(20) KM_TYPE_NR
60269+KMAP_D(21) KM_TYPE_NR
60270 };
60271
60272 #undef KMAP_D
60273diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
60274index 9ceb03b..2efbcbd 100644
60275--- a/include/asm-generic/local.h
60276+++ b/include/asm-generic/local.h
60277@@ -39,6 +39,7 @@ typedef struct
60278 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
60279 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
60280 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
60281+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
60282
60283 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
60284 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
60285diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
60286index 725612b..9cc513a 100644
60287--- a/include/asm-generic/pgtable-nopmd.h
60288+++ b/include/asm-generic/pgtable-nopmd.h
60289@@ -1,14 +1,19 @@
60290 #ifndef _PGTABLE_NOPMD_H
60291 #define _PGTABLE_NOPMD_H
60292
60293-#ifndef __ASSEMBLY__
60294-
60295 #include <asm-generic/pgtable-nopud.h>
60296
60297-struct mm_struct;
60298-
60299 #define __PAGETABLE_PMD_FOLDED
60300
60301+#define PMD_SHIFT PUD_SHIFT
60302+#define PTRS_PER_PMD 1
60303+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
60304+#define PMD_MASK (~(PMD_SIZE-1))
60305+
60306+#ifndef __ASSEMBLY__
60307+
60308+struct mm_struct;
60309+
60310 /*
60311 * Having the pmd type consist of a pud gets the size right, and allows
60312 * us to conceptually access the pud entry that this pmd is folded into
60313@@ -16,11 +21,6 @@ struct mm_struct;
60314 */
60315 typedef struct { pud_t pud; } pmd_t;
60316
60317-#define PMD_SHIFT PUD_SHIFT
60318-#define PTRS_PER_PMD 1
60319-#define PMD_SIZE (1UL << PMD_SHIFT)
60320-#define PMD_MASK (~(PMD_SIZE-1))
60321-
60322 /*
60323 * The "pud_xxx()" functions here are trivial for a folded two-level
60324 * setup: the pmd is never bad, and a pmd always exists (as it's folded
60325diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
60326index 810431d..ccc3638 100644
60327--- a/include/asm-generic/pgtable-nopud.h
60328+++ b/include/asm-generic/pgtable-nopud.h
60329@@ -1,10 +1,15 @@
60330 #ifndef _PGTABLE_NOPUD_H
60331 #define _PGTABLE_NOPUD_H
60332
60333-#ifndef __ASSEMBLY__
60334-
60335 #define __PAGETABLE_PUD_FOLDED
60336
60337+#define PUD_SHIFT PGDIR_SHIFT
60338+#define PTRS_PER_PUD 1
60339+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
60340+#define PUD_MASK (~(PUD_SIZE-1))
60341+
60342+#ifndef __ASSEMBLY__
60343+
60344 /*
60345 * Having the pud type consist of a pgd gets the size right, and allows
60346 * us to conceptually access the pgd entry that this pud is folded into
60347@@ -12,11 +17,6 @@
60348 */
60349 typedef struct { pgd_t pgd; } pud_t;
60350
60351-#define PUD_SHIFT PGDIR_SHIFT
60352-#define PTRS_PER_PUD 1
60353-#define PUD_SIZE (1UL << PUD_SHIFT)
60354-#define PUD_MASK (~(PUD_SIZE-1))
60355-
60356 /*
60357 * The "pgd_xxx()" functions here are trivial for a folded two-level
60358 * setup: the pud is never bad, and a pud always exists (as it's folded
60359diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
60360index 76bff2b..c7a14e2 100644
60361--- a/include/asm-generic/pgtable.h
60362+++ b/include/asm-generic/pgtable.h
60363@@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd)
60364 #endif /* __HAVE_ARCH_PMD_WRITE */
60365 #endif
60366
60367+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
60368+static inline unsigned long pax_open_kernel(void) { return 0; }
60369+#endif
60370+
60371+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
60372+static inline unsigned long pax_close_kernel(void) { return 0; }
60373+#endif
60374+
60375 #endif /* !__ASSEMBLY__ */
60376
60377 #endif /* _ASM_GENERIC_PGTABLE_H */
60378diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
60379index ac68c99..b495b0a 100644
60380--- a/include/asm-generic/uaccess.h
60381+++ b/include/asm-generic/uaccess.h
60382@@ -76,6 +76,8 @@ extern unsigned long search_exception_table(unsigned long);
60383 */
60384 #ifndef __copy_from_user
60385 static inline __must_check long __copy_from_user(void *to,
60386+ const void __user * from, unsigned long n) __size_overflow(3);
60387+static inline __must_check long __copy_from_user(void *to,
60388 const void __user * from, unsigned long n)
60389 {
60390 if (__builtin_constant_p(n)) {
60391@@ -106,6 +108,8 @@ static inline __must_check long __copy_from_user(void *to,
60392
60393 #ifndef __copy_to_user
60394 static inline __must_check long __copy_to_user(void __user *to,
60395+ const void *from, unsigned long n) __size_overflow(3);
60396+static inline __must_check long __copy_to_user(void __user *to,
60397 const void *from, unsigned long n)
60398 {
60399 if (__builtin_constant_p(n)) {
60400@@ -224,6 +228,7 @@ extern int __put_user_bad(void) __attribute__((noreturn));
60401 -EFAULT; \
60402 })
60403
60404+static inline int __get_user_fn(size_t size, const void __user *ptr, void *x) __size_overflow(1);
60405 static inline int __get_user_fn(size_t size, const void __user *ptr, void *x)
60406 {
60407 size = __copy_from_user(x, ptr, size);
60408@@ -240,6 +245,7 @@ extern int __get_user_bad(void) __attribute__((noreturn));
60409 #define __copy_to_user_inatomic __copy_to_user
60410 #endif
60411
60412+static inline long copy_from_user(void *to, const void __user * from, unsigned long n) __size_overflow(3);
60413 static inline long copy_from_user(void *to,
60414 const void __user * from, unsigned long n)
60415 {
60416@@ -250,6 +256,7 @@ static inline long copy_from_user(void *to,
60417 return n;
60418 }
60419
60420+static inline long copy_to_user(void __user *to, const void *from, unsigned long n) __size_overflow(3);
60421 static inline long copy_to_user(void __user *to,
60422 const void *from, unsigned long n)
60423 {
60424@@ -265,6 +272,8 @@ static inline long copy_to_user(void __user *to,
60425 */
60426 #ifndef __strncpy_from_user
60427 static inline long
60428+__strncpy_from_user(char *dst, const char __user *src, unsigned long count) __size_overflow(3);
60429+static inline long
60430 __strncpy_from_user(char *dst, const char __user *src, long count)
60431 {
60432 char *tmp;
60433@@ -276,6 +285,8 @@ __strncpy_from_user(char *dst, const char __user *src, long count)
60434 #endif
60435
60436 static inline long
60437+strncpy_from_user(char *dst, const char __user *src, unsigned long count) __size_overflow(3);
60438+static inline long
60439 strncpy_from_user(char *dst, const char __user *src, long count)
60440 {
60441 if (!access_ok(VERIFY_READ, src, 1))
60442@@ -309,6 +320,8 @@ static inline long strlen_user(const char __user *src)
60443 */
60444 #ifndef __clear_user
60445 static inline __must_check unsigned long
60446+__clear_user(void __user *to, unsigned long n) __size_overflow(2);
60447+static inline __must_check unsigned long
60448 __clear_user(void __user *to, unsigned long n)
60449 {
60450 memset((void __force *)to, 0, n);
60451@@ -317,6 +330,8 @@ __clear_user(void __user *to, unsigned long n)
60452 #endif
60453
60454 static inline __must_check unsigned long
60455+clear_user(void __user *to, unsigned long n) __size_overflow(2);
60456+static inline __must_check unsigned long
60457 clear_user(void __user *to, unsigned long n)
60458 {
60459 might_sleep();
60460diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
60461index b5e2e4c..6a5373e 100644
60462--- a/include/asm-generic/vmlinux.lds.h
60463+++ b/include/asm-generic/vmlinux.lds.h
60464@@ -217,6 +217,7 @@
60465 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
60466 VMLINUX_SYMBOL(__start_rodata) = .; \
60467 *(.rodata) *(.rodata.*) \
60468+ *(.data..read_only) \
60469 *(__vermagic) /* Kernel version magic */ \
60470 . = ALIGN(8); \
60471 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
60472@@ -722,17 +723,18 @@
60473 * section in the linker script will go there too. @phdr should have
60474 * a leading colon.
60475 *
60476- * Note that this macros defines __per_cpu_load as an absolute symbol.
60477+ * Note that this macros defines per_cpu_load as an absolute symbol.
60478 * If there is no need to put the percpu section at a predetermined
60479 * address, use PERCPU_SECTION.
60480 */
60481 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
60482- VMLINUX_SYMBOL(__per_cpu_load) = .; \
60483- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
60484+ per_cpu_load = .; \
60485+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
60486 - LOAD_OFFSET) { \
60487+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
60488 PERCPU_INPUT(cacheline) \
60489 } phdr \
60490- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
60491+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
60492
60493 /**
60494 * PERCPU_SECTION - define output section for percpu area, simple version
60495diff --git a/include/drm/drmP.h b/include/drm/drmP.h
60496index bf4b2dc..2d0762f 100644
60497--- a/include/drm/drmP.h
60498+++ b/include/drm/drmP.h
60499@@ -72,6 +72,7 @@
60500 #include <linux/workqueue.h>
60501 #include <linux/poll.h>
60502 #include <asm/pgalloc.h>
60503+#include <asm/local.h>
60504 #include "drm.h"
60505
60506 #include <linux/idr.h>
60507@@ -1038,7 +1039,7 @@ struct drm_device {
60508
60509 /** \name Usage Counters */
60510 /*@{ */
60511- int open_count; /**< Outstanding files open */
60512+ local_t open_count; /**< Outstanding files open */
60513 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
60514 atomic_t vma_count; /**< Outstanding vma areas open */
60515 int buf_use; /**< Buffers in use -- cannot alloc */
60516@@ -1049,7 +1050,7 @@ struct drm_device {
60517 /*@{ */
60518 unsigned long counters;
60519 enum drm_stat_type types[15];
60520- atomic_t counts[15];
60521+ atomic_unchecked_t counts[15];
60522 /*@} */
60523
60524 struct list_head filelist;
60525diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
60526index 73b0712..0b7ef2f 100644
60527--- a/include/drm/drm_crtc_helper.h
60528+++ b/include/drm/drm_crtc_helper.h
60529@@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
60530
60531 /* disable crtc when not in use - more explicit than dpms off */
60532 void (*disable)(struct drm_crtc *crtc);
60533-};
60534+} __no_const;
60535
60536 struct drm_encoder_helper_funcs {
60537 void (*dpms)(struct drm_encoder *encoder, int mode);
60538@@ -95,7 +95,7 @@ struct drm_encoder_helper_funcs {
60539 struct drm_connector *connector);
60540 /* disable encoder when not in use - more explicit than dpms off */
60541 void (*disable)(struct drm_encoder *encoder);
60542-};
60543+} __no_const;
60544
60545 struct drm_connector_helper_funcs {
60546 int (*get_modes)(struct drm_connector *connector);
60547diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
60548index 26c1f78..6722682 100644
60549--- a/include/drm/ttm/ttm_memory.h
60550+++ b/include/drm/ttm/ttm_memory.h
60551@@ -47,7 +47,7 @@
60552
60553 struct ttm_mem_shrink {
60554 int (*do_shrink) (struct ttm_mem_shrink *);
60555-};
60556+} __no_const;
60557
60558 /**
60559 * struct ttm_mem_global - Global memory accounting structure.
60560diff --git a/include/linux/a.out.h b/include/linux/a.out.h
60561index e86dfca..40cc55f 100644
60562--- a/include/linux/a.out.h
60563+++ b/include/linux/a.out.h
60564@@ -39,6 +39,14 @@ enum machine_type {
60565 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
60566 };
60567
60568+/* Constants for the N_FLAGS field */
60569+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
60570+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
60571+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
60572+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
60573+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
60574+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
60575+
60576 #if !defined (N_MAGIC)
60577 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
60578 #endif
60579diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
60580index 49a83ca..df96b54 100644
60581--- a/include/linux/atmdev.h
60582+++ b/include/linux/atmdev.h
60583@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
60584 #endif
60585
60586 struct k_atm_aal_stats {
60587-#define __HANDLE_ITEM(i) atomic_t i
60588+#define __HANDLE_ITEM(i) atomic_unchecked_t i
60589 __AAL_STAT_ITEMS
60590 #undef __HANDLE_ITEM
60591 };
60592diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
60593index fd88a39..8a801b4 100644
60594--- a/include/linux/binfmts.h
60595+++ b/include/linux/binfmts.h
60596@@ -18,7 +18,7 @@ struct pt_regs;
60597 #define BINPRM_BUF_SIZE 128
60598
60599 #ifdef __KERNEL__
60600-#include <linux/list.h>
60601+#include <linux/sched.h>
60602
60603 #define CORENAME_MAX_SIZE 128
60604
60605@@ -58,6 +58,7 @@ struct linux_binprm {
60606 unsigned interp_flags;
60607 unsigned interp_data;
60608 unsigned long loader, exec;
60609+ char tcomm[TASK_COMM_LEN];
60610 };
60611
60612 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
60613@@ -88,6 +89,7 @@ struct linux_binfmt {
60614 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
60615 int (*load_shlib)(struct file *);
60616 int (*core_dump)(struct coredump_params *cprm);
60617+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
60618 unsigned long min_coredump; /* minimal dump size */
60619 };
60620
60621diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
60622index 0ed1eb0..3ab569b 100644
60623--- a/include/linux/blkdev.h
60624+++ b/include/linux/blkdev.h
60625@@ -1315,7 +1315,7 @@ struct block_device_operations {
60626 /* this callback is with swap_lock and sometimes page table lock held */
60627 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
60628 struct module *owner;
60629-};
60630+} __do_const;
60631
60632 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
60633 unsigned long);
60634diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
60635index 4d1a074..88f929a 100644
60636--- a/include/linux/blktrace_api.h
60637+++ b/include/linux/blktrace_api.h
60638@@ -162,7 +162,7 @@ struct blk_trace {
60639 struct dentry *dir;
60640 struct dentry *dropped_file;
60641 struct dentry *msg_file;
60642- atomic_t dropped;
60643+ atomic_unchecked_t dropped;
60644 };
60645
60646 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
60647diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
60648index 83195fb..0b0f77d 100644
60649--- a/include/linux/byteorder/little_endian.h
60650+++ b/include/linux/byteorder/little_endian.h
60651@@ -42,51 +42,51 @@
60652
60653 static inline __le64 __cpu_to_le64p(const __u64 *p)
60654 {
60655- return (__force __le64)*p;
60656+ return (__force const __le64)*p;
60657 }
60658 static inline __u64 __le64_to_cpup(const __le64 *p)
60659 {
60660- return (__force __u64)*p;
60661+ return (__force const __u64)*p;
60662 }
60663 static inline __le32 __cpu_to_le32p(const __u32 *p)
60664 {
60665- return (__force __le32)*p;
60666+ return (__force const __le32)*p;
60667 }
60668 static inline __u32 __le32_to_cpup(const __le32 *p)
60669 {
60670- return (__force __u32)*p;
60671+ return (__force const __u32)*p;
60672 }
60673 static inline __le16 __cpu_to_le16p(const __u16 *p)
60674 {
60675- return (__force __le16)*p;
60676+ return (__force const __le16)*p;
60677 }
60678 static inline __u16 __le16_to_cpup(const __le16 *p)
60679 {
60680- return (__force __u16)*p;
60681+ return (__force const __u16)*p;
60682 }
60683 static inline __be64 __cpu_to_be64p(const __u64 *p)
60684 {
60685- return (__force __be64)__swab64p(p);
60686+ return (__force const __be64)__swab64p(p);
60687 }
60688 static inline __u64 __be64_to_cpup(const __be64 *p)
60689 {
60690- return __swab64p((__u64 *)p);
60691+ return __swab64p((const __u64 *)p);
60692 }
60693 static inline __be32 __cpu_to_be32p(const __u32 *p)
60694 {
60695- return (__force __be32)__swab32p(p);
60696+ return (__force const __be32)__swab32p(p);
60697 }
60698 static inline __u32 __be32_to_cpup(const __be32 *p)
60699 {
60700- return __swab32p((__u32 *)p);
60701+ return __swab32p((const __u32 *)p);
60702 }
60703 static inline __be16 __cpu_to_be16p(const __u16 *p)
60704 {
60705- return (__force __be16)__swab16p(p);
60706+ return (__force const __be16)__swab16p(p);
60707 }
60708 static inline __u16 __be16_to_cpup(const __be16 *p)
60709 {
60710- return __swab16p((__u16 *)p);
60711+ return __swab16p((const __u16 *)p);
60712 }
60713 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
60714 #define __le64_to_cpus(x) do { (void)(x); } while (0)
60715diff --git a/include/linux/cache.h b/include/linux/cache.h
60716index 4c57065..4307975 100644
60717--- a/include/linux/cache.h
60718+++ b/include/linux/cache.h
60719@@ -16,6 +16,10 @@
60720 #define __read_mostly
60721 #endif
60722
60723+#ifndef __read_only
60724+#define __read_only __read_mostly
60725+#endif
60726+
60727 #ifndef ____cacheline_aligned
60728 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
60729 #endif
60730diff --git a/include/linux/capability.h b/include/linux/capability.h
60731index a63d13d..069bfd5 100644
60732--- a/include/linux/capability.h
60733+++ b/include/linux/capability.h
60734@@ -548,6 +548,9 @@ extern bool capable(int cap);
60735 extern bool ns_capable(struct user_namespace *ns, int cap);
60736 extern bool task_ns_capable(struct task_struct *t, int cap);
60737 extern bool nsown_capable(int cap);
60738+extern bool task_ns_capable_nolog(struct task_struct *t, int cap);
60739+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
60740+extern bool capable_nolog(int cap);
60741
60742 /* audit system wants to get cap info from files as well */
60743 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
60744diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
60745index 04ffb2e..6799180 100644
60746--- a/include/linux/cleancache.h
60747+++ b/include/linux/cleancache.h
60748@@ -31,7 +31,7 @@ struct cleancache_ops {
60749 void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
60750 void (*flush_inode)(int, struct cleancache_filekey);
60751 void (*flush_fs)(int);
60752-};
60753+} __no_const;
60754
60755 extern struct cleancache_ops
60756 cleancache_register_ops(struct cleancache_ops *ops);
60757diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
60758index dfadc96..d90deca 100644
60759--- a/include/linux/compiler-gcc4.h
60760+++ b/include/linux/compiler-gcc4.h
60761@@ -31,6 +31,15 @@
60762
60763
60764 #if __GNUC_MINOR__ >= 5
60765+
60766+#ifdef CONSTIFY_PLUGIN
60767+#define __no_const __attribute__((no_const))
60768+#define __do_const __attribute__((do_const))
60769+#endif
60770+
60771+#ifdef SIZE_OVERFLOW_PLUGIN
60772+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
60773+#endif
60774 /*
60775 * Mark a position in code as unreachable. This can be used to
60776 * suppress control flow warnings after asm blocks that transfer
60777@@ -46,6 +55,11 @@
60778 #define __noclone __attribute__((__noclone__))
60779
60780 #endif
60781+
60782+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
60783+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
60784+#define __bos0(ptr) __bos((ptr), 0)
60785+#define __bos1(ptr) __bos((ptr), 1)
60786 #endif
60787
60788 #if __GNUC_MINOR__ > 0
60789diff --git a/include/linux/compiler.h b/include/linux/compiler.h
60790index 320d6c9..1221a6b 100644
60791--- a/include/linux/compiler.h
60792+++ b/include/linux/compiler.h
60793@@ -5,31 +5,62 @@
60794
60795 #ifdef __CHECKER__
60796 # define __user __attribute__((noderef, address_space(1)))
60797+# define __force_user __force __user
60798 # define __kernel __attribute__((address_space(0)))
60799+# define __force_kernel __force __kernel
60800 # define __safe __attribute__((safe))
60801 # define __force __attribute__((force))
60802 # define __nocast __attribute__((nocast))
60803 # define __iomem __attribute__((noderef, address_space(2)))
60804+# define __force_iomem __force __iomem
60805 # define __acquires(x) __attribute__((context(x,0,1)))
60806 # define __releases(x) __attribute__((context(x,1,0)))
60807 # define __acquire(x) __context__(x,1)
60808 # define __release(x) __context__(x,-1)
60809 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
60810 # define __percpu __attribute__((noderef, address_space(3)))
60811+# define __force_percpu __force __percpu
60812 #ifdef CONFIG_SPARSE_RCU_POINTER
60813 # define __rcu __attribute__((noderef, address_space(4)))
60814+# define __force_rcu __force __rcu
60815 #else
60816 # define __rcu
60817+# define __force_rcu
60818 #endif
60819 extern void __chk_user_ptr(const volatile void __user *);
60820 extern void __chk_io_ptr(const volatile void __iomem *);
60821+#elif defined(CHECKER_PLUGIN)
60822+//# define __user
60823+//# define __force_user
60824+//# define __kernel
60825+//# define __force_kernel
60826+# define __safe
60827+# define __force
60828+# define __nocast
60829+# define __iomem
60830+# define __force_iomem
60831+# define __chk_user_ptr(x) (void)0
60832+# define __chk_io_ptr(x) (void)0
60833+# define __builtin_warning(x, y...) (1)
60834+# define __acquires(x)
60835+# define __releases(x)
60836+# define __acquire(x) (void)0
60837+# define __release(x) (void)0
60838+# define __cond_lock(x,c) (c)
60839+# define __percpu
60840+# define __force_percpu
60841+# define __rcu
60842+# define __force_rcu
60843 #else
60844 # define __user
60845+# define __force_user
60846 # define __kernel
60847+# define __force_kernel
60848 # define __safe
60849 # define __force
60850 # define __nocast
60851 # define __iomem
60852+# define __force_iomem
60853 # define __chk_user_ptr(x) (void)0
60854 # define __chk_io_ptr(x) (void)0
60855 # define __builtin_warning(x, y...) (1)
60856@@ -39,7 +70,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
60857 # define __release(x) (void)0
60858 # define __cond_lock(x,c) (c)
60859 # define __percpu
60860+# define __force_percpu
60861 # define __rcu
60862+# define __force_rcu
60863 #endif
60864
60865 #ifdef __KERNEL__
60866@@ -264,6 +297,17 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60867 # define __attribute_const__ /* unimplemented */
60868 #endif
60869
60870+#ifndef __no_const
60871+# define __no_const
60872+#endif
60873+
60874+#ifndef __do_const
60875+# define __do_const
60876+#endif
60877+
60878+#ifndef __size_overflow
60879+# define __size_overflow(...)
60880+#endif
60881 /*
60882 * Tell gcc if a function is cold. The compiler will assume any path
60883 * directly leading to the call is unlikely.
60884@@ -273,6 +317,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60885 #define __cold
60886 #endif
60887
60888+#ifndef __alloc_size
60889+#define __alloc_size(...)
60890+#endif
60891+
60892+#ifndef __bos
60893+#define __bos(ptr, arg)
60894+#endif
60895+
60896+#ifndef __bos0
60897+#define __bos0(ptr)
60898+#endif
60899+
60900+#ifndef __bos1
60901+#define __bos1(ptr)
60902+#endif
60903+
60904 /* Simple shorthand for a section definition */
60905 #ifndef __section
60906 # define __section(S) __attribute__ ((__section__(#S)))
60907@@ -306,6 +366,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60908 * use is to mediate communication between process-level code and irq/NMI
60909 * handlers, all running on the same CPU.
60910 */
60911-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
60912+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
60913+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
60914
60915 #endif /* __LINUX_COMPILER_H */
60916diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
60917index e9eaec5..bfeb9bb 100644
60918--- a/include/linux/cpuset.h
60919+++ b/include/linux/cpuset.h
60920@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void)
60921 * nodemask.
60922 */
60923 smp_mb();
60924- --ACCESS_ONCE(current->mems_allowed_change_disable);
60925+ --ACCESS_ONCE_RW(current->mems_allowed_change_disable);
60926 }
60927
60928 static inline void set_mems_allowed(nodemask_t nodemask)
60929diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h
60930index b936763..48685ee 100644
60931--- a/include/linux/crash_dump.h
60932+++ b/include/linux/crash_dump.h
60933@@ -14,7 +14,7 @@ extern unsigned long long elfcorehdr_addr;
60934 extern unsigned long long elfcorehdr_size;
60935
60936 extern ssize_t copy_oldmem_page(unsigned long, char *, size_t,
60937- unsigned long, int);
60938+ unsigned long, int) __size_overflow(3);
60939
60940 /* Architecture code defines this if there are other possible ELF
60941 * machine types, e.g. on bi-arch capable hardware. */
60942diff --git a/include/linux/cred.h b/include/linux/cred.h
60943index 4030896..8d6f342 100644
60944--- a/include/linux/cred.h
60945+++ b/include/linux/cred.h
60946@@ -207,6 +207,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
60947 static inline void validate_process_creds(void)
60948 {
60949 }
60950+static inline void validate_task_creds(struct task_struct *task)
60951+{
60952+}
60953 #endif
60954
60955 /**
60956diff --git a/include/linux/crypto.h b/include/linux/crypto.h
60957index 8a94217..15d49e3 100644
60958--- a/include/linux/crypto.h
60959+++ b/include/linux/crypto.h
60960@@ -365,7 +365,7 @@ struct cipher_tfm {
60961 const u8 *key, unsigned int keylen);
60962 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
60963 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
60964-};
60965+} __no_const;
60966
60967 struct hash_tfm {
60968 int (*init)(struct hash_desc *desc);
60969@@ -386,13 +386,13 @@ struct compress_tfm {
60970 int (*cot_decompress)(struct crypto_tfm *tfm,
60971 const u8 *src, unsigned int slen,
60972 u8 *dst, unsigned int *dlen);
60973-};
60974+} __no_const;
60975
60976 struct rng_tfm {
60977 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
60978 unsigned int dlen);
60979 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
60980-};
60981+} __no_const;
60982
60983 #define crt_ablkcipher crt_u.ablkcipher
60984 #define crt_aead crt_u.aead
60985diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
60986index 7925bf0..d5143d2 100644
60987--- a/include/linux/decompress/mm.h
60988+++ b/include/linux/decompress/mm.h
60989@@ -77,7 +77,7 @@ static void free(void *where)
60990 * warnings when not needed (indeed large_malloc / large_free are not
60991 * needed by inflate */
60992
60993-#define malloc(a) kmalloc(a, GFP_KERNEL)
60994+#define malloc(a) kmalloc((a), GFP_KERNEL)
60995 #define free(a) kfree(a)
60996
60997 #define large_malloc(a) vmalloc(a)
60998diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
60999index e13117c..e9fc938 100644
61000--- a/include/linux/dma-mapping.h
61001+++ b/include/linux/dma-mapping.h
61002@@ -46,7 +46,7 @@ struct dma_map_ops {
61003 u64 (*get_required_mask)(struct device *dev);
61004 #endif
61005 int is_phys;
61006-};
61007+} __do_const;
61008
61009 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
61010
61011diff --git a/include/linux/efi.h b/include/linux/efi.h
61012index 2362a0b..cfaf8fcc 100644
61013--- a/include/linux/efi.h
61014+++ b/include/linux/efi.h
61015@@ -446,7 +446,7 @@ struct efivar_operations {
61016 efi_get_variable_t *get_variable;
61017 efi_get_next_variable_t *get_next_variable;
61018 efi_set_variable_t *set_variable;
61019-};
61020+} __no_const;
61021
61022 struct efivars {
61023 /*
61024diff --git a/include/linux/elf.h b/include/linux/elf.h
61025index 31f0508..5421c01 100644
61026--- a/include/linux/elf.h
61027+++ b/include/linux/elf.h
61028@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
61029 #define PT_GNU_EH_FRAME 0x6474e550
61030
61031 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
61032+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
61033+
61034+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
61035+
61036+/* Constants for the e_flags field */
61037+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
61038+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
61039+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
61040+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
61041+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
61042+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
61043
61044 /*
61045 * Extended Numbering
61046@@ -106,6 +117,8 @@ typedef __s64 Elf64_Sxword;
61047 #define DT_DEBUG 21
61048 #define DT_TEXTREL 22
61049 #define DT_JMPREL 23
61050+#define DT_FLAGS 30
61051+ #define DF_TEXTREL 0x00000004
61052 #define DT_ENCODING 32
61053 #define OLD_DT_LOOS 0x60000000
61054 #define DT_LOOS 0x6000000d
61055@@ -252,6 +265,19 @@ typedef struct elf64_hdr {
61056 #define PF_W 0x2
61057 #define PF_X 0x1
61058
61059+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
61060+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
61061+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
61062+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
61063+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
61064+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
61065+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
61066+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
61067+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
61068+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
61069+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
61070+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
61071+
61072 typedef struct elf32_phdr{
61073 Elf32_Word p_type;
61074 Elf32_Off p_offset;
61075@@ -344,6 +370,8 @@ typedef struct elf64_shdr {
61076 #define EI_OSABI 7
61077 #define EI_PAD 8
61078
61079+#define EI_PAX 14
61080+
61081 #define ELFMAG0 0x7f /* EI_MAG */
61082 #define ELFMAG1 'E'
61083 #define ELFMAG2 'L'
61084@@ -423,6 +451,7 @@ extern Elf32_Dyn _DYNAMIC [];
61085 #define elf_note elf32_note
61086 #define elf_addr_t Elf32_Off
61087 #define Elf_Half Elf32_Half
61088+#define elf_dyn Elf32_Dyn
61089
61090 #else
61091
61092@@ -433,6 +462,7 @@ extern Elf64_Dyn _DYNAMIC [];
61093 #define elf_note elf64_note
61094 #define elf_addr_t Elf64_Off
61095 #define Elf_Half Elf64_Half
61096+#define elf_dyn Elf64_Dyn
61097
61098 #endif
61099
61100diff --git a/include/linux/filter.h b/include/linux/filter.h
61101index 8eeb205..d59bfa2 100644
61102--- a/include/linux/filter.h
61103+++ b/include/linux/filter.h
61104@@ -134,6 +134,7 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */
61105
61106 struct sk_buff;
61107 struct sock;
61108+struct bpf_jit_work;
61109
61110 struct sk_filter
61111 {
61112@@ -141,6 +142,9 @@ struct sk_filter
61113 unsigned int len; /* Number of filter blocks */
61114 unsigned int (*bpf_func)(const struct sk_buff *skb,
61115 const struct sock_filter *filter);
61116+#ifdef CONFIG_BPF_JIT
61117+ struct bpf_jit_work *work;
61118+#endif
61119 struct rcu_head rcu;
61120 struct sock_filter insns[0];
61121 };
61122diff --git a/include/linux/firewire.h b/include/linux/firewire.h
61123index 84ccf8e..2e9b14c 100644
61124--- a/include/linux/firewire.h
61125+++ b/include/linux/firewire.h
61126@@ -428,7 +428,7 @@ struct fw_iso_context {
61127 union {
61128 fw_iso_callback_t sc;
61129 fw_iso_mc_callback_t mc;
61130- } callback;
61131+ } __no_const callback;
61132 void *callback_data;
61133 };
61134
61135diff --git a/include/linux/fs.h b/include/linux/fs.h
61136index 10b2288..09180e4 100644
61137--- a/include/linux/fs.h
61138+++ b/include/linux/fs.h
61139@@ -1609,7 +1609,8 @@ struct file_operations {
61140 int (*setlease)(struct file *, long, struct file_lock **);
61141 long (*fallocate)(struct file *file, int mode, loff_t offset,
61142 loff_t len);
61143-};
61144+} __do_const;
61145+typedef struct file_operations __no_const file_operations_no_const;
61146
61147 struct inode_operations {
61148 struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
61149diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
61150index 003dc0f..3c4ea97 100644
61151--- a/include/linux/fs_struct.h
61152+++ b/include/linux/fs_struct.h
61153@@ -6,7 +6,7 @@
61154 #include <linux/seqlock.h>
61155
61156 struct fs_struct {
61157- int users;
61158+ atomic_t users;
61159 spinlock_t lock;
61160 seqcount_t seq;
61161 int umask;
61162diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
61163index ce31408..b1ad003 100644
61164--- a/include/linux/fscache-cache.h
61165+++ b/include/linux/fscache-cache.h
61166@@ -102,7 +102,7 @@ struct fscache_operation {
61167 fscache_operation_release_t release;
61168 };
61169
61170-extern atomic_t fscache_op_debug_id;
61171+extern atomic_unchecked_t fscache_op_debug_id;
61172 extern void fscache_op_work_func(struct work_struct *work);
61173
61174 extern void fscache_enqueue_operation(struct fscache_operation *);
61175@@ -122,7 +122,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
61176 {
61177 INIT_WORK(&op->work, fscache_op_work_func);
61178 atomic_set(&op->usage, 1);
61179- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
61180+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
61181 op->processor = processor;
61182 op->release = release;
61183 INIT_LIST_HEAD(&op->pend_link);
61184diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
61185index 2a53f10..0187fdf 100644
61186--- a/include/linux/fsnotify.h
61187+++ b/include/linux/fsnotify.h
61188@@ -314,7 +314,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
61189 */
61190 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
61191 {
61192- return kstrdup(name, GFP_KERNEL);
61193+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
61194 }
61195
61196 /*
61197diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
61198index 91d0e0a3..035666b 100644
61199--- a/include/linux/fsnotify_backend.h
61200+++ b/include/linux/fsnotify_backend.h
61201@@ -105,6 +105,7 @@ struct fsnotify_ops {
61202 void (*freeing_mark)(struct fsnotify_mark *mark, struct fsnotify_group *group);
61203 void (*free_event_priv)(struct fsnotify_event_private_data *priv);
61204 };
61205+typedef struct fsnotify_ops __no_const fsnotify_ops_no_const;
61206
61207 /*
61208 * A group is a "thing" that wants to receive notification about filesystem
61209diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
61210index c3da42d..c70e0df 100644
61211--- a/include/linux/ftrace_event.h
61212+++ b/include/linux/ftrace_event.h
61213@@ -97,7 +97,7 @@ struct trace_event_functions {
61214 trace_print_func raw;
61215 trace_print_func hex;
61216 trace_print_func binary;
61217-};
61218+} __no_const;
61219
61220 struct trace_event {
61221 struct hlist_node node;
61222@@ -254,7 +254,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
61223 extern int trace_add_event_call(struct ftrace_event_call *call);
61224 extern void trace_remove_event_call(struct ftrace_event_call *call);
61225
61226-#define is_signed_type(type) (((type)(-1)) < 0)
61227+#define is_signed_type(type) (((type)(-1)) < (type)1)
61228
61229 int trace_set_clr_event(const char *system, const char *event, int set);
61230
61231diff --git a/include/linux/genhd.h b/include/linux/genhd.h
61232index 6d18f35..ab71e2c 100644
61233--- a/include/linux/genhd.h
61234+++ b/include/linux/genhd.h
61235@@ -185,7 +185,7 @@ struct gendisk {
61236 struct kobject *slave_dir;
61237
61238 struct timer_rand_state *random;
61239- atomic_t sync_io; /* RAID */
61240+ atomic_unchecked_t sync_io; /* RAID */
61241 struct disk_events *ev;
61242 #ifdef CONFIG_BLK_DEV_INTEGRITY
61243 struct blk_integrity *integrity;
61244diff --git a/include/linux/gracl.h b/include/linux/gracl.h
61245new file mode 100644
61246index 0000000..8a130b6
61247--- /dev/null
61248+++ b/include/linux/gracl.h
61249@@ -0,0 +1,319 @@
61250+#ifndef GR_ACL_H
61251+#define GR_ACL_H
61252+
61253+#include <linux/grdefs.h>
61254+#include <linux/resource.h>
61255+#include <linux/capability.h>
61256+#include <linux/dcache.h>
61257+#include <asm/resource.h>
61258+
61259+/* Major status information */
61260+
61261+#define GR_VERSION "grsecurity 2.9"
61262+#define GRSECURITY_VERSION 0x2900
61263+
61264+enum {
61265+ GR_SHUTDOWN = 0,
61266+ GR_ENABLE = 1,
61267+ GR_SPROLE = 2,
61268+ GR_RELOAD = 3,
61269+ GR_SEGVMOD = 4,
61270+ GR_STATUS = 5,
61271+ GR_UNSPROLE = 6,
61272+ GR_PASSSET = 7,
61273+ GR_SPROLEPAM = 8,
61274+};
61275+
61276+/* Password setup definitions
61277+ * kernel/grhash.c */
61278+enum {
61279+ GR_PW_LEN = 128,
61280+ GR_SALT_LEN = 16,
61281+ GR_SHA_LEN = 32,
61282+};
61283+
61284+enum {
61285+ GR_SPROLE_LEN = 64,
61286+};
61287+
61288+enum {
61289+ GR_NO_GLOB = 0,
61290+ GR_REG_GLOB,
61291+ GR_CREATE_GLOB
61292+};
61293+
61294+#define GR_NLIMITS 32
61295+
61296+/* Begin Data Structures */
61297+
61298+struct sprole_pw {
61299+ unsigned char *rolename;
61300+ unsigned char salt[GR_SALT_LEN];
61301+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
61302+};
61303+
61304+struct name_entry {
61305+ __u32 key;
61306+ ino_t inode;
61307+ dev_t device;
61308+ char *name;
61309+ __u16 len;
61310+ __u8 deleted;
61311+ struct name_entry *prev;
61312+ struct name_entry *next;
61313+};
61314+
61315+struct inodev_entry {
61316+ struct name_entry *nentry;
61317+ struct inodev_entry *prev;
61318+ struct inodev_entry *next;
61319+};
61320+
61321+struct acl_role_db {
61322+ struct acl_role_label **r_hash;
61323+ __u32 r_size;
61324+};
61325+
61326+struct inodev_db {
61327+ struct inodev_entry **i_hash;
61328+ __u32 i_size;
61329+};
61330+
61331+struct name_db {
61332+ struct name_entry **n_hash;
61333+ __u32 n_size;
61334+};
61335+
61336+struct crash_uid {
61337+ uid_t uid;
61338+ unsigned long expires;
61339+};
61340+
61341+struct gr_hash_struct {
61342+ void **table;
61343+ void **nametable;
61344+ void *first;
61345+ __u32 table_size;
61346+ __u32 used_size;
61347+ int type;
61348+};
61349+
61350+/* Userspace Grsecurity ACL data structures */
61351+
61352+struct acl_subject_label {
61353+ char *filename;
61354+ ino_t inode;
61355+ dev_t device;
61356+ __u32 mode;
61357+ kernel_cap_t cap_mask;
61358+ kernel_cap_t cap_lower;
61359+ kernel_cap_t cap_invert_audit;
61360+
61361+ struct rlimit res[GR_NLIMITS];
61362+ __u32 resmask;
61363+
61364+ __u8 user_trans_type;
61365+ __u8 group_trans_type;
61366+ uid_t *user_transitions;
61367+ gid_t *group_transitions;
61368+ __u16 user_trans_num;
61369+ __u16 group_trans_num;
61370+
61371+ __u32 sock_families[2];
61372+ __u32 ip_proto[8];
61373+ __u32 ip_type;
61374+ struct acl_ip_label **ips;
61375+ __u32 ip_num;
61376+ __u32 inaddr_any_override;
61377+
61378+ __u32 crashes;
61379+ unsigned long expires;
61380+
61381+ struct acl_subject_label *parent_subject;
61382+ struct gr_hash_struct *hash;
61383+ struct acl_subject_label *prev;
61384+ struct acl_subject_label *next;
61385+
61386+ struct acl_object_label **obj_hash;
61387+ __u32 obj_hash_size;
61388+ __u16 pax_flags;
61389+};
61390+
61391+struct role_allowed_ip {
61392+ __u32 addr;
61393+ __u32 netmask;
61394+
61395+ struct role_allowed_ip *prev;
61396+ struct role_allowed_ip *next;
61397+};
61398+
61399+struct role_transition {
61400+ char *rolename;
61401+
61402+ struct role_transition *prev;
61403+ struct role_transition *next;
61404+};
61405+
61406+struct acl_role_label {
61407+ char *rolename;
61408+ uid_t uidgid;
61409+ __u16 roletype;
61410+
61411+ __u16 auth_attempts;
61412+ unsigned long expires;
61413+
61414+ struct acl_subject_label *root_label;
61415+ struct gr_hash_struct *hash;
61416+
61417+ struct acl_role_label *prev;
61418+ struct acl_role_label *next;
61419+
61420+ struct role_transition *transitions;
61421+ struct role_allowed_ip *allowed_ips;
61422+ uid_t *domain_children;
61423+ __u16 domain_child_num;
61424+
61425+ umode_t umask;
61426+
61427+ struct acl_subject_label **subj_hash;
61428+ __u32 subj_hash_size;
61429+};
61430+
61431+struct user_acl_role_db {
61432+ struct acl_role_label **r_table;
61433+ __u32 num_pointers; /* Number of allocations to track */
61434+ __u32 num_roles; /* Number of roles */
61435+ __u32 num_domain_children; /* Number of domain children */
61436+ __u32 num_subjects; /* Number of subjects */
61437+ __u32 num_objects; /* Number of objects */
61438+};
61439+
61440+struct acl_object_label {
61441+ char *filename;
61442+ ino_t inode;
61443+ dev_t device;
61444+ __u32 mode;
61445+
61446+ struct acl_subject_label *nested;
61447+ struct acl_object_label *globbed;
61448+
61449+ /* next two structures not used */
61450+
61451+ struct acl_object_label *prev;
61452+ struct acl_object_label *next;
61453+};
61454+
61455+struct acl_ip_label {
61456+ char *iface;
61457+ __u32 addr;
61458+ __u32 netmask;
61459+ __u16 low, high;
61460+ __u8 mode;
61461+ __u32 type;
61462+ __u32 proto[8];
61463+
61464+ /* next two structures not used */
61465+
61466+ struct acl_ip_label *prev;
61467+ struct acl_ip_label *next;
61468+};
61469+
61470+struct gr_arg {
61471+ struct user_acl_role_db role_db;
61472+ unsigned char pw[GR_PW_LEN];
61473+ unsigned char salt[GR_SALT_LEN];
61474+ unsigned char sum[GR_SHA_LEN];
61475+ unsigned char sp_role[GR_SPROLE_LEN];
61476+ struct sprole_pw *sprole_pws;
61477+ dev_t segv_device;
61478+ ino_t segv_inode;
61479+ uid_t segv_uid;
61480+ __u16 num_sprole_pws;
61481+ __u16 mode;
61482+};
61483+
61484+struct gr_arg_wrapper {
61485+ struct gr_arg *arg;
61486+ __u32 version;
61487+ __u32 size;
61488+};
61489+
61490+struct subject_map {
61491+ struct acl_subject_label *user;
61492+ struct acl_subject_label *kernel;
61493+ struct subject_map *prev;
61494+ struct subject_map *next;
61495+};
61496+
61497+struct acl_subj_map_db {
61498+ struct subject_map **s_hash;
61499+ __u32 s_size;
61500+};
61501+
61502+/* End Data Structures Section */
61503+
61504+/* Hash functions generated by empirical testing by Brad Spengler
61505+ Makes good use of the low bits of the inode. Generally 0-1 times
61506+ in loop for successful match. 0-3 for unsuccessful match.
61507+ Shift/add algorithm with modulus of table size and an XOR*/
61508+
61509+static __inline__ unsigned int
61510+rhash(const uid_t uid, const __u16 type, const unsigned int sz)
61511+{
61512+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
61513+}
61514+
61515+ static __inline__ unsigned int
61516+shash(const struct acl_subject_label *userp, const unsigned int sz)
61517+{
61518+ return ((const unsigned long)userp % sz);
61519+}
61520+
61521+static __inline__ unsigned int
61522+fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
61523+{
61524+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
61525+}
61526+
61527+static __inline__ unsigned int
61528+nhash(const char *name, const __u16 len, const unsigned int sz)
61529+{
61530+ return full_name_hash((const unsigned char *)name, len) % sz;
61531+}
61532+
61533+#define FOR_EACH_ROLE_START(role) \
61534+ role = role_list; \
61535+ while (role) {
61536+
61537+#define FOR_EACH_ROLE_END(role) \
61538+ role = role->prev; \
61539+ }
61540+
61541+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
61542+ subj = NULL; \
61543+ iter = 0; \
61544+ while (iter < role->subj_hash_size) { \
61545+ if (subj == NULL) \
61546+ subj = role->subj_hash[iter]; \
61547+ if (subj == NULL) { \
61548+ iter++; \
61549+ continue; \
61550+ }
61551+
61552+#define FOR_EACH_SUBJECT_END(subj,iter) \
61553+ subj = subj->next; \
61554+ if (subj == NULL) \
61555+ iter++; \
61556+ }
61557+
61558+
61559+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
61560+ subj = role->hash->first; \
61561+ while (subj != NULL) {
61562+
61563+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
61564+ subj = subj->next; \
61565+ }
61566+
61567+#endif
61568+
61569diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
61570new file mode 100644
61571index 0000000..323ecf2
61572--- /dev/null
61573+++ b/include/linux/gralloc.h
61574@@ -0,0 +1,9 @@
61575+#ifndef __GRALLOC_H
61576+#define __GRALLOC_H
61577+
61578+void acl_free_all(void);
61579+int acl_alloc_stack_init(unsigned long size);
61580+void *acl_alloc(unsigned long len);
61581+void *acl_alloc_num(unsigned long num, unsigned long len);
61582+
61583+#endif
61584diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
61585new file mode 100644
61586index 0000000..b30e9bc
61587--- /dev/null
61588+++ b/include/linux/grdefs.h
61589@@ -0,0 +1,140 @@
61590+#ifndef GRDEFS_H
61591+#define GRDEFS_H
61592+
61593+/* Begin grsecurity status declarations */
61594+
61595+enum {
61596+ GR_READY = 0x01,
61597+ GR_STATUS_INIT = 0x00 // disabled state
61598+};
61599+
61600+/* Begin ACL declarations */
61601+
61602+/* Role flags */
61603+
61604+enum {
61605+ GR_ROLE_USER = 0x0001,
61606+ GR_ROLE_GROUP = 0x0002,
61607+ GR_ROLE_DEFAULT = 0x0004,
61608+ GR_ROLE_SPECIAL = 0x0008,
61609+ GR_ROLE_AUTH = 0x0010,
61610+ GR_ROLE_NOPW = 0x0020,
61611+ GR_ROLE_GOD = 0x0040,
61612+ GR_ROLE_LEARN = 0x0080,
61613+ GR_ROLE_TPE = 0x0100,
61614+ GR_ROLE_DOMAIN = 0x0200,
61615+ GR_ROLE_PAM = 0x0400,
61616+ GR_ROLE_PERSIST = 0x0800
61617+};
61618+
61619+/* ACL Subject and Object mode flags */
61620+enum {
61621+ GR_DELETED = 0x80000000
61622+};
61623+
61624+/* ACL Object-only mode flags */
61625+enum {
61626+ GR_READ = 0x00000001,
61627+ GR_APPEND = 0x00000002,
61628+ GR_WRITE = 0x00000004,
61629+ GR_EXEC = 0x00000008,
61630+ GR_FIND = 0x00000010,
61631+ GR_INHERIT = 0x00000020,
61632+ GR_SETID = 0x00000040,
61633+ GR_CREATE = 0x00000080,
61634+ GR_DELETE = 0x00000100,
61635+ GR_LINK = 0x00000200,
61636+ GR_AUDIT_READ = 0x00000400,
61637+ GR_AUDIT_APPEND = 0x00000800,
61638+ GR_AUDIT_WRITE = 0x00001000,
61639+ GR_AUDIT_EXEC = 0x00002000,
61640+ GR_AUDIT_FIND = 0x00004000,
61641+ GR_AUDIT_INHERIT= 0x00008000,
61642+ GR_AUDIT_SETID = 0x00010000,
61643+ GR_AUDIT_CREATE = 0x00020000,
61644+ GR_AUDIT_DELETE = 0x00040000,
61645+ GR_AUDIT_LINK = 0x00080000,
61646+ GR_PTRACERD = 0x00100000,
61647+ GR_NOPTRACE = 0x00200000,
61648+ GR_SUPPRESS = 0x00400000,
61649+ GR_NOLEARN = 0x00800000,
61650+ GR_INIT_TRANSFER= 0x01000000
61651+};
61652+
61653+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
61654+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
61655+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
61656+
61657+/* ACL subject-only mode flags */
61658+enum {
61659+ GR_KILL = 0x00000001,
61660+ GR_VIEW = 0x00000002,
61661+ GR_PROTECTED = 0x00000004,
61662+ GR_LEARN = 0x00000008,
61663+ GR_OVERRIDE = 0x00000010,
61664+ /* just a placeholder, this mode is only used in userspace */
61665+ GR_DUMMY = 0x00000020,
61666+ GR_PROTSHM = 0x00000040,
61667+ GR_KILLPROC = 0x00000080,
61668+ GR_KILLIPPROC = 0x00000100,
61669+ /* just a placeholder, this mode is only used in userspace */
61670+ GR_NOTROJAN = 0x00000200,
61671+ GR_PROTPROCFD = 0x00000400,
61672+ GR_PROCACCT = 0x00000800,
61673+ GR_RELAXPTRACE = 0x00001000,
61674+ GR_NESTED = 0x00002000,
61675+ GR_INHERITLEARN = 0x00004000,
61676+ GR_PROCFIND = 0x00008000,
61677+ GR_POVERRIDE = 0x00010000,
61678+ GR_KERNELAUTH = 0x00020000,
61679+ GR_ATSECURE = 0x00040000,
61680+ GR_SHMEXEC = 0x00080000
61681+};
61682+
61683+enum {
61684+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
61685+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
61686+ GR_PAX_ENABLE_MPROTECT = 0x0004,
61687+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
61688+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
61689+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
61690+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
61691+ GR_PAX_DISABLE_MPROTECT = 0x0400,
61692+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
61693+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
61694+};
61695+
61696+enum {
61697+ GR_ID_USER = 0x01,
61698+ GR_ID_GROUP = 0x02,
61699+};
61700+
61701+enum {
61702+ GR_ID_ALLOW = 0x01,
61703+ GR_ID_DENY = 0x02,
61704+};
61705+
61706+#define GR_CRASH_RES 31
61707+#define GR_UIDTABLE_MAX 500
61708+
61709+/* begin resource learning section */
61710+enum {
61711+ GR_RLIM_CPU_BUMP = 60,
61712+ GR_RLIM_FSIZE_BUMP = 50000,
61713+ GR_RLIM_DATA_BUMP = 10000,
61714+ GR_RLIM_STACK_BUMP = 1000,
61715+ GR_RLIM_CORE_BUMP = 10000,
61716+ GR_RLIM_RSS_BUMP = 500000,
61717+ GR_RLIM_NPROC_BUMP = 1,
61718+ GR_RLIM_NOFILE_BUMP = 5,
61719+ GR_RLIM_MEMLOCK_BUMP = 50000,
61720+ GR_RLIM_AS_BUMP = 500000,
61721+ GR_RLIM_LOCKS_BUMP = 2,
61722+ GR_RLIM_SIGPENDING_BUMP = 5,
61723+ GR_RLIM_MSGQUEUE_BUMP = 10000,
61724+ GR_RLIM_NICE_BUMP = 1,
61725+ GR_RLIM_RTPRIO_BUMP = 1,
61726+ GR_RLIM_RTTIME_BUMP = 1000000
61727+};
61728+
61729+#endif
61730diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
61731new file mode 100644
61732index 0000000..da390f1
61733--- /dev/null
61734+++ b/include/linux/grinternal.h
61735@@ -0,0 +1,221 @@
61736+#ifndef __GRINTERNAL_H
61737+#define __GRINTERNAL_H
61738+
61739+#ifdef CONFIG_GRKERNSEC
61740+
61741+#include <linux/fs.h>
61742+#include <linux/mnt_namespace.h>
61743+#include <linux/nsproxy.h>
61744+#include <linux/gracl.h>
61745+#include <linux/grdefs.h>
61746+#include <linux/grmsg.h>
61747+
61748+void gr_add_learn_entry(const char *fmt, ...)
61749+ __attribute__ ((format (printf, 1, 2)));
61750+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
61751+ const struct vfsmount *mnt);
61752+__u32 gr_check_create(const struct dentry *new_dentry,
61753+ const struct dentry *parent,
61754+ const struct vfsmount *mnt, const __u32 mode);
61755+int gr_check_protected_task(const struct task_struct *task);
61756+__u32 to_gr_audit(const __u32 reqmode);
61757+int gr_set_acls(const int type);
61758+int gr_apply_subject_to_task(struct task_struct *task);
61759+int gr_acl_is_enabled(void);
61760+char gr_roletype_to_char(void);
61761+
61762+void gr_handle_alertkill(struct task_struct *task);
61763+char *gr_to_filename(const struct dentry *dentry,
61764+ const struct vfsmount *mnt);
61765+char *gr_to_filename1(const struct dentry *dentry,
61766+ const struct vfsmount *mnt);
61767+char *gr_to_filename2(const struct dentry *dentry,
61768+ const struct vfsmount *mnt);
61769+char *gr_to_filename3(const struct dentry *dentry,
61770+ const struct vfsmount *mnt);
61771+
61772+extern int grsec_enable_ptrace_readexec;
61773+extern int grsec_enable_harden_ptrace;
61774+extern int grsec_enable_link;
61775+extern int grsec_enable_fifo;
61776+extern int grsec_enable_execve;
61777+extern int grsec_enable_shm;
61778+extern int grsec_enable_execlog;
61779+extern int grsec_enable_signal;
61780+extern int grsec_enable_audit_ptrace;
61781+extern int grsec_enable_forkfail;
61782+extern int grsec_enable_time;
61783+extern int grsec_enable_rofs;
61784+extern int grsec_enable_chroot_shmat;
61785+extern int grsec_enable_chroot_mount;
61786+extern int grsec_enable_chroot_double;
61787+extern int grsec_enable_chroot_pivot;
61788+extern int grsec_enable_chroot_chdir;
61789+extern int grsec_enable_chroot_chmod;
61790+extern int grsec_enable_chroot_mknod;
61791+extern int grsec_enable_chroot_fchdir;
61792+extern int grsec_enable_chroot_nice;
61793+extern int grsec_enable_chroot_execlog;
61794+extern int grsec_enable_chroot_caps;
61795+extern int grsec_enable_chroot_sysctl;
61796+extern int grsec_enable_chroot_unix;
61797+extern int grsec_enable_tpe;
61798+extern int grsec_tpe_gid;
61799+extern int grsec_enable_tpe_all;
61800+extern int grsec_enable_tpe_invert;
61801+extern int grsec_enable_socket_all;
61802+extern int grsec_socket_all_gid;
61803+extern int grsec_enable_socket_client;
61804+extern int grsec_socket_client_gid;
61805+extern int grsec_enable_socket_server;
61806+extern int grsec_socket_server_gid;
61807+extern int grsec_audit_gid;
61808+extern int grsec_enable_group;
61809+extern int grsec_enable_audit_textrel;
61810+extern int grsec_enable_log_rwxmaps;
61811+extern int grsec_enable_mount;
61812+extern int grsec_enable_chdir;
61813+extern int grsec_resource_logging;
61814+extern int grsec_enable_blackhole;
61815+extern int grsec_lastack_retries;
61816+extern int grsec_enable_brute;
61817+extern int grsec_lock;
61818+
61819+extern spinlock_t grsec_alert_lock;
61820+extern unsigned long grsec_alert_wtime;
61821+extern unsigned long grsec_alert_fyet;
61822+
61823+extern spinlock_t grsec_audit_lock;
61824+
61825+extern rwlock_t grsec_exec_file_lock;
61826+
61827+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
61828+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
61829+ (tsk)->exec_file->f_vfsmnt) : "/")
61830+
61831+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
61832+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
61833+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
61834+
61835+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
61836+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
61837+ (tsk)->exec_file->f_vfsmnt) : "/")
61838+
61839+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
61840+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
61841+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
61842+
61843+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
61844+
61845+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
61846+
61847+#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
61848+ (task)->pid, (cred)->uid, \
61849+ (cred)->euid, (cred)->gid, (cred)->egid, \
61850+ gr_parent_task_fullpath(task), \
61851+ (task)->real_parent->comm, (task)->real_parent->pid, \
61852+ (pcred)->uid, (pcred)->euid, \
61853+ (pcred)->gid, (pcred)->egid
61854+
61855+#define GR_CHROOT_CAPS {{ \
61856+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
61857+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
61858+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
61859+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
61860+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
61861+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
61862+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
61863+
61864+#define security_learn(normal_msg,args...) \
61865+({ \
61866+ read_lock(&grsec_exec_file_lock); \
61867+ gr_add_learn_entry(normal_msg "\n", ## args); \
61868+ read_unlock(&grsec_exec_file_lock); \
61869+})
61870+
61871+enum {
61872+ GR_DO_AUDIT,
61873+ GR_DONT_AUDIT,
61874+ /* used for non-audit messages that we shouldn't kill the task on */
61875+ GR_DONT_AUDIT_GOOD
61876+};
61877+
61878+enum {
61879+ GR_TTYSNIFF,
61880+ GR_RBAC,
61881+ GR_RBAC_STR,
61882+ GR_STR_RBAC,
61883+ GR_RBAC_MODE2,
61884+ GR_RBAC_MODE3,
61885+ GR_FILENAME,
61886+ GR_SYSCTL_HIDDEN,
61887+ GR_NOARGS,
61888+ GR_ONE_INT,
61889+ GR_ONE_INT_TWO_STR,
61890+ GR_ONE_STR,
61891+ GR_STR_INT,
61892+ GR_TWO_STR_INT,
61893+ GR_TWO_INT,
61894+ GR_TWO_U64,
61895+ GR_THREE_INT,
61896+ GR_FIVE_INT_TWO_STR,
61897+ GR_TWO_STR,
61898+ GR_THREE_STR,
61899+ GR_FOUR_STR,
61900+ GR_STR_FILENAME,
61901+ GR_FILENAME_STR,
61902+ GR_FILENAME_TWO_INT,
61903+ GR_FILENAME_TWO_INT_STR,
61904+ GR_TEXTREL,
61905+ GR_PTRACE,
61906+ GR_RESOURCE,
61907+ GR_CAP,
61908+ GR_SIG,
61909+ GR_SIG2,
61910+ GR_CRASH1,
61911+ GR_CRASH2,
61912+ GR_PSACCT,
61913+ GR_RWXMAP
61914+};
61915+
61916+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
61917+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
61918+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
61919+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
61920+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
61921+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
61922+#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)
61923+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
61924+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
61925+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
61926+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
61927+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
61928+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
61929+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
61930+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
61931+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
61932+#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)
61933+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
61934+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
61935+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
61936+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
61937+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
61938+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
61939+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
61940+#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)
61941+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
61942+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
61943+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
61944+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
61945+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
61946+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
61947+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
61948+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
61949+#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)
61950+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
61951+
61952+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
61953+
61954+#endif
61955+
61956+#endif
61957diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
61958new file mode 100644
61959index 0000000..ae576a1
61960--- /dev/null
61961+++ b/include/linux/grmsg.h
61962@@ -0,0 +1,109 @@
61963+#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"
61964+#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"
61965+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
61966+#define GR_STOPMOD_MSG "denied modification of module state by "
61967+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
61968+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
61969+#define GR_IOPERM_MSG "denied use of ioperm() by "
61970+#define GR_IOPL_MSG "denied use of iopl() by "
61971+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
61972+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
61973+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
61974+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
61975+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
61976+#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"
61977+#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"
61978+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
61979+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
61980+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
61981+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
61982+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
61983+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
61984+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
61985+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
61986+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
61987+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
61988+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
61989+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
61990+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
61991+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
61992+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
61993+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
61994+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
61995+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
61996+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
61997+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
61998+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
61999+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
62000+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
62001+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
62002+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
62003+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
62004+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
62005+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
62006+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
62007+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
62008+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
62009+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
62010+#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
62011+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
62012+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
62013+#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"
62014+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
62015+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
62016+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
62017+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
62018+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
62019+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
62020+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
62021+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
62022+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
62023+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
62024+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
62025+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
62026+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
62027+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
62028+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
62029+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
62030+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
62031+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
62032+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
62033+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
62034+#define GR_FAILFORK_MSG "failed fork with errno %s by "
62035+#define GR_NICE_CHROOT_MSG "denied priority change by "
62036+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
62037+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
62038+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
62039+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
62040+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
62041+#define GR_TIME_MSG "time set by "
62042+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
62043+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
62044+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
62045+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
62046+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
62047+#define GR_BIND_MSG "denied bind() by "
62048+#define GR_CONNECT_MSG "denied connect() by "
62049+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
62050+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
62051+#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"
62052+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
62053+#define GR_CAP_ACL_MSG "use of %s denied for "
62054+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
62055+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
62056+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
62057+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
62058+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
62059+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
62060+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
62061+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
62062+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
62063+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
62064+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
62065+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
62066+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
62067+#define GR_VM86_MSG "denied use of vm86 by "
62068+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
62069+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
62070+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
62071+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
62072diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
62073new file mode 100644
62074index 0000000..2ccf677
62075--- /dev/null
62076+++ b/include/linux/grsecurity.h
62077@@ -0,0 +1,229 @@
62078+#ifndef GR_SECURITY_H
62079+#define GR_SECURITY_H
62080+#include <linux/fs.h>
62081+#include <linux/fs_struct.h>
62082+#include <linux/binfmts.h>
62083+#include <linux/gracl.h>
62084+
62085+/* notify of brain-dead configs */
62086+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
62087+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
62088+#endif
62089+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
62090+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
62091+#endif
62092+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
62093+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
62094+#endif
62095+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
62096+#error "CONFIG_PAX enabled, but no PaX options are enabled."
62097+#endif
62098+
62099+#include <linux/compat.h>
62100+
62101+struct user_arg_ptr {
62102+#ifdef CONFIG_COMPAT
62103+ bool is_compat;
62104+#endif
62105+ union {
62106+ const char __user *const __user *native;
62107+#ifdef CONFIG_COMPAT
62108+ compat_uptr_t __user *compat;
62109+#endif
62110+ } ptr;
62111+};
62112+
62113+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
62114+void gr_handle_brute_check(void);
62115+void gr_handle_kernel_exploit(void);
62116+int gr_process_user_ban(void);
62117+
62118+char gr_roletype_to_char(void);
62119+
62120+int gr_acl_enable_at_secure(void);
62121+
62122+int gr_check_user_change(int real, int effective, int fs);
62123+int gr_check_group_change(int real, int effective, int fs);
62124+
62125+void gr_del_task_from_ip_table(struct task_struct *p);
62126+
62127+int gr_pid_is_chrooted(struct task_struct *p);
62128+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
62129+int gr_handle_chroot_nice(void);
62130+int gr_handle_chroot_sysctl(const int op);
62131+int gr_handle_chroot_setpriority(struct task_struct *p,
62132+ const int niceval);
62133+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
62134+int gr_handle_chroot_chroot(const struct dentry *dentry,
62135+ const struct vfsmount *mnt);
62136+void gr_handle_chroot_chdir(struct path *path);
62137+int gr_handle_chroot_chmod(const struct dentry *dentry,
62138+ const struct vfsmount *mnt, const int mode);
62139+int gr_handle_chroot_mknod(const struct dentry *dentry,
62140+ const struct vfsmount *mnt, const int mode);
62141+int gr_handle_chroot_mount(const struct dentry *dentry,
62142+ const struct vfsmount *mnt,
62143+ const char *dev_name);
62144+int gr_handle_chroot_pivot(void);
62145+int gr_handle_chroot_unix(const pid_t pid);
62146+
62147+int gr_handle_rawio(const struct inode *inode);
62148+
62149+void gr_handle_ioperm(void);
62150+void gr_handle_iopl(void);
62151+
62152+umode_t gr_acl_umask(void);
62153+
62154+int gr_tpe_allow(const struct file *file);
62155+
62156+void gr_set_chroot_entries(struct task_struct *task, struct path *path);
62157+void gr_clear_chroot_entries(struct task_struct *task);
62158+
62159+void gr_log_forkfail(const int retval);
62160+void gr_log_timechange(void);
62161+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
62162+void gr_log_chdir(const struct dentry *dentry,
62163+ const struct vfsmount *mnt);
62164+void gr_log_chroot_exec(const struct dentry *dentry,
62165+ const struct vfsmount *mnt);
62166+void gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv);
62167+void gr_log_remount(const char *devname, const int retval);
62168+void gr_log_unmount(const char *devname, const int retval);
62169+void gr_log_mount(const char *from, const char *to, const int retval);
62170+void gr_log_textrel(struct vm_area_struct *vma);
62171+void gr_log_rwxmmap(struct file *file);
62172+void gr_log_rwxmprotect(struct file *file);
62173+
62174+int gr_handle_follow_link(const struct inode *parent,
62175+ const struct inode *inode,
62176+ const struct dentry *dentry,
62177+ const struct vfsmount *mnt);
62178+int gr_handle_fifo(const struct dentry *dentry,
62179+ const struct vfsmount *mnt,
62180+ const struct dentry *dir, const int flag,
62181+ const int acc_mode);
62182+int gr_handle_hardlink(const struct dentry *dentry,
62183+ const struct vfsmount *mnt,
62184+ struct inode *inode,
62185+ const int mode, const char *to);
62186+
62187+int gr_is_capable(const int cap);
62188+int gr_is_capable_nolog(const int cap);
62189+void gr_learn_resource(const struct task_struct *task, const int limit,
62190+ const unsigned long wanted, const int gt);
62191+void gr_copy_label(struct task_struct *tsk);
62192+void gr_handle_crash(struct task_struct *task, const int sig);
62193+int gr_handle_signal(const struct task_struct *p, const int sig);
62194+int gr_check_crash_uid(const uid_t uid);
62195+int gr_check_protected_task(const struct task_struct *task);
62196+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
62197+int gr_acl_handle_mmap(const struct file *file,
62198+ const unsigned long prot);
62199+int gr_acl_handle_mprotect(const struct file *file,
62200+ const unsigned long prot);
62201+int gr_check_hidden_task(const struct task_struct *tsk);
62202+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
62203+ const struct vfsmount *mnt);
62204+__u32 gr_acl_handle_utime(const struct dentry *dentry,
62205+ const struct vfsmount *mnt);
62206+__u32 gr_acl_handle_access(const struct dentry *dentry,
62207+ const struct vfsmount *mnt, const int fmode);
62208+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
62209+ const struct vfsmount *mnt, umode_t *mode);
62210+__u32 gr_acl_handle_chown(const struct dentry *dentry,
62211+ const struct vfsmount *mnt);
62212+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
62213+ const struct vfsmount *mnt);
62214+int gr_handle_ptrace(struct task_struct *task, const long request);
62215+int gr_handle_proc_ptrace(struct task_struct *task);
62216+__u32 gr_acl_handle_execve(const struct dentry *dentry,
62217+ const struct vfsmount *mnt);
62218+int gr_check_crash_exec(const struct file *filp);
62219+int gr_acl_is_enabled(void);
62220+void gr_set_kernel_label(struct task_struct *task);
62221+void gr_set_role_label(struct task_struct *task, const uid_t uid,
62222+ const gid_t gid);
62223+int gr_set_proc_label(const struct dentry *dentry,
62224+ const struct vfsmount *mnt,
62225+ const int unsafe_flags);
62226+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
62227+ const struct vfsmount *mnt);
62228+__u32 gr_acl_handle_open(const struct dentry *dentry,
62229+ const struct vfsmount *mnt, int acc_mode);
62230+__u32 gr_acl_handle_creat(const struct dentry *dentry,
62231+ const struct dentry *p_dentry,
62232+ const struct vfsmount *p_mnt,
62233+ int open_flags, int acc_mode, const int imode);
62234+void gr_handle_create(const struct dentry *dentry,
62235+ const struct vfsmount *mnt);
62236+void gr_handle_proc_create(const struct dentry *dentry,
62237+ const struct inode *inode);
62238+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
62239+ const struct dentry *parent_dentry,
62240+ const struct vfsmount *parent_mnt,
62241+ const int mode);
62242+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
62243+ const struct dentry *parent_dentry,
62244+ const struct vfsmount *parent_mnt);
62245+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
62246+ const struct vfsmount *mnt);
62247+void gr_handle_delete(const ino_t ino, const dev_t dev);
62248+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
62249+ const struct vfsmount *mnt);
62250+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
62251+ const struct dentry *parent_dentry,
62252+ const struct vfsmount *parent_mnt,
62253+ const char *from);
62254+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
62255+ const struct dentry *parent_dentry,
62256+ const struct vfsmount *parent_mnt,
62257+ const struct dentry *old_dentry,
62258+ const struct vfsmount *old_mnt, const char *to);
62259+int gr_acl_handle_rename(struct dentry *new_dentry,
62260+ struct dentry *parent_dentry,
62261+ const struct vfsmount *parent_mnt,
62262+ struct dentry *old_dentry,
62263+ struct inode *old_parent_inode,
62264+ struct vfsmount *old_mnt, const char *newname);
62265+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
62266+ struct dentry *old_dentry,
62267+ struct dentry *new_dentry,
62268+ struct vfsmount *mnt, const __u8 replace);
62269+__u32 gr_check_link(const struct dentry *new_dentry,
62270+ const struct dentry *parent_dentry,
62271+ const struct vfsmount *parent_mnt,
62272+ const struct dentry *old_dentry,
62273+ const struct vfsmount *old_mnt);
62274+int gr_acl_handle_filldir(const struct file *file, const char *name,
62275+ const unsigned int namelen, const ino_t ino);
62276+
62277+__u32 gr_acl_handle_unix(const struct dentry *dentry,
62278+ const struct vfsmount *mnt);
62279+void gr_acl_handle_exit(void);
62280+void gr_acl_handle_psacct(struct task_struct *task, const long code);
62281+int gr_acl_handle_procpidmem(const struct task_struct *task);
62282+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
62283+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
62284+void gr_audit_ptrace(struct task_struct *task);
62285+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
62286+
62287+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
62288+
62289+#ifdef CONFIG_GRKERNSEC
62290+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
62291+void gr_handle_vm86(void);
62292+void gr_handle_mem_readwrite(u64 from, u64 to);
62293+
62294+void gr_log_badprocpid(const char *entry);
62295+
62296+extern int grsec_enable_dmesg;
62297+extern int grsec_disable_privio;
62298+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
62299+extern int grsec_enable_chroot_findtask;
62300+#endif
62301+#ifdef CONFIG_GRKERNSEC_SETXID
62302+extern int grsec_enable_setxid;
62303+#endif
62304+#endif
62305+
62306+#endif
62307diff --git a/include/linux/grsock.h b/include/linux/grsock.h
62308new file mode 100644
62309index 0000000..e7ffaaf
62310--- /dev/null
62311+++ b/include/linux/grsock.h
62312@@ -0,0 +1,19 @@
62313+#ifndef __GRSOCK_H
62314+#define __GRSOCK_H
62315+
62316+extern void gr_attach_curr_ip(const struct sock *sk);
62317+extern int gr_handle_sock_all(const int family, const int type,
62318+ const int protocol);
62319+extern int gr_handle_sock_server(const struct sockaddr *sck);
62320+extern int gr_handle_sock_server_other(const struct sock *sck);
62321+extern int gr_handle_sock_client(const struct sockaddr *sck);
62322+extern int gr_search_connect(struct socket * sock,
62323+ struct sockaddr_in * addr);
62324+extern int gr_search_bind(struct socket * sock,
62325+ struct sockaddr_in * addr);
62326+extern int gr_search_listen(struct socket * sock);
62327+extern int gr_search_accept(struct socket * sock);
62328+extern int gr_search_socket(const int domain, const int type,
62329+ const int protocol);
62330+
62331+#endif
62332diff --git a/include/linux/hid.h b/include/linux/hid.h
62333index c235e4e..f0cf7a0 100644
62334--- a/include/linux/hid.h
62335+++ b/include/linux/hid.h
62336@@ -679,7 +679,7 @@ struct hid_ll_driver {
62337 unsigned int code, int value);
62338
62339 int (*parse)(struct hid_device *hdev);
62340-};
62341+} __no_const;
62342
62343 #define PM_HINT_FULLON 1<<5
62344 #define PM_HINT_NORMAL 1<<1
62345diff --git a/include/linux/highmem.h b/include/linux/highmem.h
62346index 3a93f73..b19d0b3 100644
62347--- a/include/linux/highmem.h
62348+++ b/include/linux/highmem.h
62349@@ -185,6 +185,18 @@ static inline void clear_highpage(struct page *page)
62350 kunmap_atomic(kaddr, KM_USER0);
62351 }
62352
62353+static inline void sanitize_highpage(struct page *page)
62354+{
62355+ void *kaddr;
62356+ unsigned long flags;
62357+
62358+ local_irq_save(flags);
62359+ kaddr = kmap_atomic(page, KM_CLEARPAGE);
62360+ clear_page(kaddr);
62361+ kunmap_atomic(kaddr, KM_CLEARPAGE);
62362+ local_irq_restore(flags);
62363+}
62364+
62365 static inline void zero_user_segments(struct page *page,
62366 unsigned start1, unsigned end1,
62367 unsigned start2, unsigned end2)
62368diff --git a/include/linux/i2c.h b/include/linux/i2c.h
62369index 07d103a..04ec65b 100644
62370--- a/include/linux/i2c.h
62371+++ b/include/linux/i2c.h
62372@@ -364,6 +364,7 @@ struct i2c_algorithm {
62373 /* To determine what the adapter supports */
62374 u32 (*functionality) (struct i2c_adapter *);
62375 };
62376+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
62377
62378 /*
62379 * i2c_adapter is the structure used to identify a physical i2c bus along
62380diff --git a/include/linux/i2o.h b/include/linux/i2o.h
62381index a6deef4..c56a7f2 100644
62382--- a/include/linux/i2o.h
62383+++ b/include/linux/i2o.h
62384@@ -564,7 +564,7 @@ struct i2o_controller {
62385 struct i2o_device *exec; /* Executive */
62386 #if BITS_PER_LONG == 64
62387 spinlock_t context_list_lock; /* lock for context_list */
62388- atomic_t context_list_counter; /* needed for unique contexts */
62389+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
62390 struct list_head context_list; /* list of context id's
62391 and pointers */
62392 #endif
62393diff --git a/include/linux/init.h b/include/linux/init.h
62394index 9146f39..885354d 100644
62395--- a/include/linux/init.h
62396+++ b/include/linux/init.h
62397@@ -293,13 +293,13 @@ void __init parse_early_options(char *cmdline);
62398
62399 /* Each module must use one module_init(). */
62400 #define module_init(initfn) \
62401- static inline initcall_t __inittest(void) \
62402+ static inline __used initcall_t __inittest(void) \
62403 { return initfn; } \
62404 int init_module(void) __attribute__((alias(#initfn)));
62405
62406 /* This is only required if you want to be unloadable. */
62407 #define module_exit(exitfn) \
62408- static inline exitcall_t __exittest(void) \
62409+ static inline __used exitcall_t __exittest(void) \
62410 { return exitfn; } \
62411 void cleanup_module(void) __attribute__((alias(#exitfn)));
62412
62413diff --git a/include/linux/init_task.h b/include/linux/init_task.h
62414index 32574ee..00d4ef1 100644
62415--- a/include/linux/init_task.h
62416+++ b/include/linux/init_task.h
62417@@ -128,6 +128,12 @@ extern struct cred init_cred;
62418
62419 #define INIT_TASK_COMM "swapper"
62420
62421+#ifdef CONFIG_X86
62422+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
62423+#else
62424+#define INIT_TASK_THREAD_INFO
62425+#endif
62426+
62427 /*
62428 * INIT_TASK is used to set up the first task table, touch at
62429 * your own risk!. Base=0, limit=0x1fffff (=2MB)
62430@@ -166,6 +172,7 @@ extern struct cred init_cred;
62431 RCU_INIT_POINTER(.cred, &init_cred), \
62432 .comm = INIT_TASK_COMM, \
62433 .thread = INIT_THREAD, \
62434+ INIT_TASK_THREAD_INFO \
62435 .fs = &init_fs, \
62436 .files = &init_files, \
62437 .signal = &init_signals, \
62438diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
62439index e6ca56d..8583707 100644
62440--- a/include/linux/intel-iommu.h
62441+++ b/include/linux/intel-iommu.h
62442@@ -296,7 +296,7 @@ struct iommu_flush {
62443 u8 fm, u64 type);
62444 void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
62445 unsigned int size_order, u64 type);
62446-};
62447+} __no_const;
62448
62449 enum {
62450 SR_DMAR_FECTL_REG,
62451diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
62452index a64b00e..464d8bc 100644
62453--- a/include/linux/interrupt.h
62454+++ b/include/linux/interrupt.h
62455@@ -441,7 +441,7 @@ enum
62456 /* map softirq index to softirq name. update 'softirq_to_name' in
62457 * kernel/softirq.c when adding a new softirq.
62458 */
62459-extern char *softirq_to_name[NR_SOFTIRQS];
62460+extern const char * const softirq_to_name[NR_SOFTIRQS];
62461
62462 /* softirq mask and active fields moved to irq_cpustat_t in
62463 * asm/hardirq.h to get better cache usage. KAO
62464@@ -449,12 +449,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
62465
62466 struct softirq_action
62467 {
62468- void (*action)(struct softirq_action *);
62469+ void (*action)(void);
62470 };
62471
62472 asmlinkage void do_softirq(void);
62473 asmlinkage void __do_softirq(void);
62474-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
62475+extern void open_softirq(int nr, void (*action)(void));
62476 extern void softirq_init(void);
62477 static inline void __raise_softirq_irqoff(unsigned int nr)
62478 {
62479diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
62480index 3875719..4cd454c 100644
62481--- a/include/linux/kallsyms.h
62482+++ b/include/linux/kallsyms.h
62483@@ -15,7 +15,8 @@
62484
62485 struct module;
62486
62487-#ifdef CONFIG_KALLSYMS
62488+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
62489+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
62490 /* Lookup the address for a symbol. Returns 0 if not found. */
62491 unsigned long kallsyms_lookup_name(const char *name);
62492
62493@@ -99,6 +100,16 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
62494 /* Stupid that this does nothing, but I didn't create this mess. */
62495 #define __print_symbol(fmt, addr)
62496 #endif /*CONFIG_KALLSYMS*/
62497+#else /* when included by kallsyms.c, vsnprintf.c, or
62498+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
62499+extern void __print_symbol(const char *fmt, unsigned long address);
62500+extern int sprint_backtrace(char *buffer, unsigned long address);
62501+extern int sprint_symbol(char *buffer, unsigned long address);
62502+const char *kallsyms_lookup(unsigned long addr,
62503+ unsigned long *symbolsize,
62504+ unsigned long *offset,
62505+ char **modname, char *namebuf);
62506+#endif
62507
62508 /* This macro allows us to keep printk typechecking */
62509 static __printf(1, 2)
62510diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
62511index fa39183..40160be 100644
62512--- a/include/linux/kgdb.h
62513+++ b/include/linux/kgdb.h
62514@@ -53,7 +53,7 @@ extern int kgdb_connected;
62515 extern int kgdb_io_module_registered;
62516
62517 extern atomic_t kgdb_setting_breakpoint;
62518-extern atomic_t kgdb_cpu_doing_single_step;
62519+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
62520
62521 extern struct task_struct *kgdb_usethread;
62522 extern struct task_struct *kgdb_contthread;
62523@@ -251,7 +251,7 @@ struct kgdb_arch {
62524 void (*disable_hw_break)(struct pt_regs *regs);
62525 void (*remove_all_hw_break)(void);
62526 void (*correct_hw_break)(void);
62527-};
62528+} __do_const;
62529
62530 /**
62531 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
62532@@ -276,7 +276,7 @@ struct kgdb_io {
62533 void (*pre_exception) (void);
62534 void (*post_exception) (void);
62535 int is_console;
62536-};
62537+} __do_const;
62538
62539 extern struct kgdb_arch arch_kgdb_ops;
62540
62541diff --git a/include/linux/kmod.h b/include/linux/kmod.h
62542index b16f653..eb908f4 100644
62543--- a/include/linux/kmod.h
62544+++ b/include/linux/kmod.h
62545@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
62546 * usually useless though. */
62547 extern __printf(2, 3)
62548 int __request_module(bool wait, const char *name, ...);
62549+extern __printf(3, 4)
62550+int ___request_module(bool wait, char *param_name, const char *name, ...);
62551 #define request_module(mod...) __request_module(true, mod)
62552 #define request_module_nowait(mod...) __request_module(false, mod)
62553 #define try_then_request_module(x, mod...) \
62554diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
62555index d526231..c9599fc 100644
62556--- a/include/linux/kvm_host.h
62557+++ b/include/linux/kvm_host.h
62558@@ -308,7 +308,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
62559 void vcpu_load(struct kvm_vcpu *vcpu);
62560 void vcpu_put(struct kvm_vcpu *vcpu);
62561
62562-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
62563+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
62564 struct module *module);
62565 void kvm_exit(void);
62566
62567@@ -385,20 +385,20 @@ void kvm_get_pfn(pfn_t pfn);
62568 int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset,
62569 int len);
62570 int kvm_read_guest_atomic(struct kvm *kvm, gpa_t gpa, void *data,
62571- unsigned long len);
62572-int kvm_read_guest(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len);
62573+ unsigned long len) __size_overflow(4);
62574+int kvm_read_guest(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len) __size_overflow(2,4);
62575 int kvm_read_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_write_guest_page(struct kvm *kvm, gfn_t gfn, const void *data,
62579 int offset, int len);
62580 int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data,
62581- unsigned long len);
62582+ unsigned long len) __size_overflow(2,4);
62583 int kvm_write_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62584- void *data, unsigned long len);
62585+ void *data, unsigned long len) __size_overflow(4);
62586 int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62587 gpa_t gpa);
62588 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len);
62589-int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len);
62590+int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len) __size_overflow(2,3);
62591 struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);
62592 int kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn);
62593 unsigned long kvm_host_page_size(struct kvm *kvm, gfn_t gfn);
62594@@ -454,7 +454,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
62595 struct kvm_guest_debug *dbg);
62596 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
62597
62598-int kvm_arch_init(void *opaque);
62599+int kvm_arch_init(const void *opaque);
62600 void kvm_arch_exit(void);
62601
62602 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
62603@@ -690,7 +690,7 @@ int kvm_setup_default_irq_routing(struct kvm *kvm);
62604 int kvm_set_irq_routing(struct kvm *kvm,
62605 const struct kvm_irq_routing_entry *entries,
62606 unsigned nr,
62607- unsigned flags);
62608+ unsigned flags) __size_overflow(3);
62609 void kvm_free_irq_routing(struct kvm *kvm);
62610
62611 #else
62612diff --git a/include/linux/libata.h b/include/linux/libata.h
62613index cafc09a..d7e7829 100644
62614--- a/include/linux/libata.h
62615+++ b/include/linux/libata.h
62616@@ -909,7 +909,7 @@ struct ata_port_operations {
62617 * fields must be pointers.
62618 */
62619 const struct ata_port_operations *inherits;
62620-};
62621+} __do_const;
62622
62623 struct ata_port_info {
62624 unsigned long flags;
62625diff --git a/include/linux/mca.h b/include/linux/mca.h
62626index 3797270..7765ede 100644
62627--- a/include/linux/mca.h
62628+++ b/include/linux/mca.h
62629@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
62630 int region);
62631 void * (*mca_transform_memory)(struct mca_device *,
62632 void *memory);
62633-};
62634+} __no_const;
62635
62636 struct mca_bus {
62637 u64 default_dma_mask;
62638diff --git a/include/linux/memory.h b/include/linux/memory.h
62639index 935699b..11042cc 100644
62640--- a/include/linux/memory.h
62641+++ b/include/linux/memory.h
62642@@ -144,7 +144,7 @@ struct memory_accessor {
62643 size_t count);
62644 ssize_t (*write)(struct memory_accessor *, const char *buf,
62645 off_t offset, size_t count);
62646-};
62647+} __no_const;
62648
62649 /*
62650 * Kernel text modification mutex, used for code patching. Users of this lock
62651diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
62652index 9970337..9444122 100644
62653--- a/include/linux/mfd/abx500.h
62654+++ b/include/linux/mfd/abx500.h
62655@@ -188,6 +188,7 @@ struct abx500_ops {
62656 int (*event_registers_startup_state_get) (struct device *, u8 *);
62657 int (*startup_irq_enabled) (struct device *, unsigned int);
62658 };
62659+typedef struct abx500_ops __no_const abx500_ops_no_const;
62660
62661 int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
62662 void abx500_remove_ops(struct device *dev);
62663diff --git a/include/linux/mm.h b/include/linux/mm.h
62664index 4baadd1..2e0b45e 100644
62665--- a/include/linux/mm.h
62666+++ b/include/linux/mm.h
62667@@ -115,7 +115,14 @@ extern unsigned int kobjsize(const void *objp);
62668
62669 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
62670 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
62671+
62672+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
62673+#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
62674+#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
62675+#else
62676 #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
62677+#endif
62678+
62679 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
62680 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
62681
62682@@ -1012,34 +1019,6 @@ int set_page_dirty(struct page *page);
62683 int set_page_dirty_lock(struct page *page);
62684 int clear_page_dirty_for_io(struct page *page);
62685
62686-/* Is the vma a continuation of the stack vma above it? */
62687-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
62688-{
62689- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
62690-}
62691-
62692-static inline int stack_guard_page_start(struct vm_area_struct *vma,
62693- unsigned long addr)
62694-{
62695- return (vma->vm_flags & VM_GROWSDOWN) &&
62696- (vma->vm_start == addr) &&
62697- !vma_growsdown(vma->vm_prev, addr);
62698-}
62699-
62700-/* Is the vma a continuation of the stack vma below it? */
62701-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
62702-{
62703- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
62704-}
62705-
62706-static inline int stack_guard_page_end(struct vm_area_struct *vma,
62707- unsigned long addr)
62708-{
62709- return (vma->vm_flags & VM_GROWSUP) &&
62710- (vma->vm_end == addr) &&
62711- !vma_growsup(vma->vm_next, addr);
62712-}
62713-
62714 extern unsigned long move_page_tables(struct vm_area_struct *vma,
62715 unsigned long old_addr, struct vm_area_struct *new_vma,
62716 unsigned long new_addr, unsigned long len);
62717@@ -1134,6 +1113,15 @@ static inline void sync_mm_rss(struct task_struct *task, struct mm_struct *mm)
62718 }
62719 #endif
62720
62721+#ifdef CONFIG_MMU
62722+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
62723+#else
62724+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
62725+{
62726+ return __pgprot(0);
62727+}
62728+#endif
62729+
62730 int vma_wants_writenotify(struct vm_area_struct *vma);
62731
62732 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
62733@@ -1419,6 +1407,7 @@ out:
62734 }
62735
62736 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
62737+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
62738
62739 extern unsigned long do_brk(unsigned long, unsigned long);
62740
62741@@ -1476,6 +1465,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
62742 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
62743 struct vm_area_struct **pprev);
62744
62745+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
62746+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
62747+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
62748+
62749 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
62750 NULL if none. Assume start_addr < end_addr. */
62751 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
62752@@ -1492,15 +1485,6 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
62753 return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
62754 }
62755
62756-#ifdef CONFIG_MMU
62757-pgprot_t vm_get_page_prot(unsigned long vm_flags);
62758-#else
62759-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
62760-{
62761- return __pgprot(0);
62762-}
62763-#endif
62764-
62765 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
62766 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
62767 unsigned long pfn, unsigned long size, pgprot_t);
62768@@ -1614,7 +1598,7 @@ extern int unpoison_memory(unsigned long pfn);
62769 extern int sysctl_memory_failure_early_kill;
62770 extern int sysctl_memory_failure_recovery;
62771 extern void shake_page(struct page *p, int access);
62772-extern atomic_long_t mce_bad_pages;
62773+extern atomic_long_unchecked_t mce_bad_pages;
62774 extern int soft_offline_page(struct page *page, int flags);
62775
62776 extern void dump_page(struct page *page);
62777@@ -1628,5 +1612,11 @@ extern void copy_user_huge_page(struct page *dst, struct page *src,
62778 unsigned int pages_per_huge_page);
62779 #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
62780
62781+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
62782+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
62783+#else
62784+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
62785+#endif
62786+
62787 #endif /* __KERNEL__ */
62788 #endif /* _LINUX_MM_H */
62789diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
62790index 5b42f1b..759e4b4 100644
62791--- a/include/linux/mm_types.h
62792+++ b/include/linux/mm_types.h
62793@@ -253,6 +253,8 @@ struct vm_area_struct {
62794 #ifdef CONFIG_NUMA
62795 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
62796 #endif
62797+
62798+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
62799 };
62800
62801 struct core_thread {
62802@@ -389,6 +391,24 @@ struct mm_struct {
62803 #ifdef CONFIG_CPUMASK_OFFSTACK
62804 struct cpumask cpumask_allocation;
62805 #endif
62806+
62807+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
62808+ unsigned long pax_flags;
62809+#endif
62810+
62811+#ifdef CONFIG_PAX_DLRESOLVE
62812+ unsigned long call_dl_resolve;
62813+#endif
62814+
62815+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
62816+ unsigned long call_syscall;
62817+#endif
62818+
62819+#ifdef CONFIG_PAX_ASLR
62820+ unsigned long delta_mmap; /* randomized offset */
62821+ unsigned long delta_stack; /* randomized offset */
62822+#endif
62823+
62824 };
62825
62826 static inline void mm_init_cpumask(struct mm_struct *mm)
62827diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
62828index 1d1b1e1..2a13c78 100644
62829--- a/include/linux/mmu_notifier.h
62830+++ b/include/linux/mmu_notifier.h
62831@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
62832 */
62833 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
62834 ({ \
62835- pte_t __pte; \
62836+ pte_t ___pte; \
62837 struct vm_area_struct *___vma = __vma; \
62838 unsigned long ___address = __address; \
62839- __pte = ptep_clear_flush(___vma, ___address, __ptep); \
62840+ ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
62841 mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
62842- __pte; \
62843+ ___pte; \
62844 })
62845
62846 #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
62847diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
62848index 188cb2f..d78409b 100644
62849--- a/include/linux/mmzone.h
62850+++ b/include/linux/mmzone.h
62851@@ -369,7 +369,7 @@ struct zone {
62852 unsigned long flags; /* zone flags, see below */
62853
62854 /* Zone statistics */
62855- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
62856+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
62857
62858 /*
62859 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
62860diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
62861index 468819c..17b9db3 100644
62862--- a/include/linux/mod_devicetable.h
62863+++ b/include/linux/mod_devicetable.h
62864@@ -12,7 +12,7 @@
62865 typedef unsigned long kernel_ulong_t;
62866 #endif
62867
62868-#define PCI_ANY_ID (~0)
62869+#define PCI_ANY_ID ((__u16)~0)
62870
62871 struct pci_device_id {
62872 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
62873@@ -131,7 +131,7 @@ struct usb_device_id {
62874 #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100
62875 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
62876
62877-#define HID_ANY_ID (~0)
62878+#define HID_ANY_ID (~0U)
62879
62880 struct hid_device_id {
62881 __u16 bus;
62882diff --git a/include/linux/module.h b/include/linux/module.h
62883index 3cb7839..511cb87 100644
62884--- a/include/linux/module.h
62885+++ b/include/linux/module.h
62886@@ -17,6 +17,7 @@
62887 #include <linux/moduleparam.h>
62888 #include <linux/tracepoint.h>
62889 #include <linux/export.h>
62890+#include <linux/fs.h>
62891
62892 #include <linux/percpu.h>
62893 #include <asm/module.h>
62894@@ -261,19 +262,16 @@ struct module
62895 int (*init)(void);
62896
62897 /* If this is non-NULL, vfree after init() returns */
62898- void *module_init;
62899+ void *module_init_rx, *module_init_rw;
62900
62901 /* Here is the actual code + data, vfree'd on unload. */
62902- void *module_core;
62903+ void *module_core_rx, *module_core_rw;
62904
62905 /* Here are the sizes of the init and core sections */
62906- unsigned int init_size, core_size;
62907+ unsigned int init_size_rw, core_size_rw;
62908
62909 /* The size of the executable code in each section. */
62910- unsigned int init_text_size, core_text_size;
62911-
62912- /* Size of RO sections of the module (text+rodata) */
62913- unsigned int init_ro_size, core_ro_size;
62914+ unsigned int init_size_rx, core_size_rx;
62915
62916 /* Arch-specific module values */
62917 struct mod_arch_specific arch;
62918@@ -329,6 +327,10 @@ struct module
62919 #ifdef CONFIG_EVENT_TRACING
62920 struct ftrace_event_call **trace_events;
62921 unsigned int num_trace_events;
62922+ struct file_operations trace_id;
62923+ struct file_operations trace_enable;
62924+ struct file_operations trace_format;
62925+ struct file_operations trace_filter;
62926 #endif
62927 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
62928 unsigned int num_ftrace_callsites;
62929@@ -379,16 +381,46 @@ bool is_module_address(unsigned long addr);
62930 bool is_module_percpu_address(unsigned long addr);
62931 bool is_module_text_address(unsigned long addr);
62932
62933+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
62934+{
62935+
62936+#ifdef CONFIG_PAX_KERNEXEC
62937+ if (ktla_ktva(addr) >= (unsigned long)start &&
62938+ ktla_ktva(addr) < (unsigned long)start + size)
62939+ return 1;
62940+#endif
62941+
62942+ return ((void *)addr >= start && (void *)addr < start + size);
62943+}
62944+
62945+static inline int within_module_core_rx(unsigned long addr, struct module *mod)
62946+{
62947+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
62948+}
62949+
62950+static inline int within_module_core_rw(unsigned long addr, struct module *mod)
62951+{
62952+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
62953+}
62954+
62955+static inline int within_module_init_rx(unsigned long addr, struct module *mod)
62956+{
62957+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
62958+}
62959+
62960+static inline int within_module_init_rw(unsigned long addr, struct module *mod)
62961+{
62962+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
62963+}
62964+
62965 static inline int within_module_core(unsigned long addr, struct module *mod)
62966 {
62967- return (unsigned long)mod->module_core <= addr &&
62968- addr < (unsigned long)mod->module_core + mod->core_size;
62969+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
62970 }
62971
62972 static inline int within_module_init(unsigned long addr, struct module *mod)
62973 {
62974- return (unsigned long)mod->module_init <= addr &&
62975- addr < (unsigned long)mod->module_init + mod->init_size;
62976+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
62977 }
62978
62979 /* Search for module by name: must hold module_mutex. */
62980diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
62981index b2be02e..edb10c9 100644
62982--- a/include/linux/moduleloader.h
62983+++ b/include/linux/moduleloader.h
62984@@ -23,11 +23,23 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
62985
62986 /* Allocator used for allocating struct module, core sections and init
62987 sections. Returns NULL on failure. */
62988-void *module_alloc(unsigned long size);
62989+void *module_alloc(unsigned long size) __size_overflow(1);
62990+
62991+#ifdef CONFIG_PAX_KERNEXEC
62992+void *module_alloc_exec(unsigned long size);
62993+#else
62994+#define module_alloc_exec(x) module_alloc(x)
62995+#endif
62996
62997 /* Free memory returned from module_alloc. */
62998 void module_free(struct module *mod, void *module_region);
62999
63000+#ifdef CONFIG_PAX_KERNEXEC
63001+void module_free_exec(struct module *mod, void *module_region);
63002+#else
63003+#define module_free_exec(x, y) module_free((x), (y))
63004+#endif
63005+
63006 /* Apply the given relocation to the (simplified) ELF. Return -error
63007 or 0. */
63008 int apply_relocate(Elf_Shdr *sechdrs,
63009diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
63010index 7939f63..ec6df57 100644
63011--- a/include/linux/moduleparam.h
63012+++ b/include/linux/moduleparam.h
63013@@ -260,7 +260,7 @@ static inline void __kernel_param_unlock(void)
63014 * @len is usually just sizeof(string).
63015 */
63016 #define module_param_string(name, string, len, perm) \
63017- static const struct kparam_string __param_string_##name \
63018+ static const struct kparam_string __param_string_##name __used \
63019 = { len, string }; \
63020 __module_param_call(MODULE_PARAM_PREFIX, name, \
63021 &param_ops_string, \
63022@@ -395,7 +395,7 @@ extern int param_get_invbool(char *buffer, const struct kernel_param *kp);
63023 * module_param_named() for why this might be necessary.
63024 */
63025 #define module_param_array_named(name, array, type, nump, perm) \
63026- static const struct kparam_array __param_arr_##name \
63027+ static const struct kparam_array __param_arr_##name __used \
63028 = { .max = ARRAY_SIZE(array), .num = nump, \
63029 .ops = &param_ops_##type, \
63030 .elemsize = sizeof(array[0]), .elem = array }; \
63031diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
63032index a9e6ba4..0f9e29b 100644
63033--- a/include/linux/mtd/map.h
63034+++ b/include/linux/mtd/map.h
63035@@ -25,6 +25,7 @@
63036 #include <linux/types.h>
63037 #include <linux/list.h>
63038 #include <linux/string.h>
63039+#include <linux/kernel.h>
63040 #include <linux/bug.h>
63041
63042
63043diff --git a/include/linux/namei.h b/include/linux/namei.h
63044index ffc0213..2c1f2cb 100644
63045--- a/include/linux/namei.h
63046+++ b/include/linux/namei.h
63047@@ -24,7 +24,7 @@ struct nameidata {
63048 unsigned seq;
63049 int last_type;
63050 unsigned depth;
63051- char *saved_names[MAX_NESTED_LINKS + 1];
63052+ const char *saved_names[MAX_NESTED_LINKS + 1];
63053
63054 /* Intent data */
63055 union {
63056@@ -94,12 +94,12 @@ extern int follow_up(struct path *);
63057 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
63058 extern void unlock_rename(struct dentry *, struct dentry *);
63059
63060-static inline void nd_set_link(struct nameidata *nd, char *path)
63061+static inline void nd_set_link(struct nameidata *nd, const char *path)
63062 {
63063 nd->saved_names[nd->depth] = path;
63064 }
63065
63066-static inline char *nd_get_link(struct nameidata *nd)
63067+static inline const char *nd_get_link(const struct nameidata *nd)
63068 {
63069 return nd->saved_names[nd->depth];
63070 }
63071diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
63072index a82ad4d..90d15b7 100644
63073--- a/include/linux/netdevice.h
63074+++ b/include/linux/netdevice.h
63075@@ -949,6 +949,7 @@ struct net_device_ops {
63076 int (*ndo_set_features)(struct net_device *dev,
63077 u32 features);
63078 };
63079+typedef struct net_device_ops __no_const net_device_ops_no_const;
63080
63081 /*
63082 * The DEVICE structure.
63083@@ -1088,7 +1089,7 @@ struct net_device {
63084 int iflink;
63085
63086 struct net_device_stats stats;
63087- atomic_long_t rx_dropped; /* dropped packets by core network
63088+ atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
63089 * Do not use this in drivers.
63090 */
63091
63092diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
63093new file mode 100644
63094index 0000000..33f4af8
63095--- /dev/null
63096+++ b/include/linux/netfilter/xt_gradm.h
63097@@ -0,0 +1,9 @@
63098+#ifndef _LINUX_NETFILTER_XT_GRADM_H
63099+#define _LINUX_NETFILTER_XT_GRADM_H 1
63100+
63101+struct xt_gradm_mtinfo {
63102+ __u16 flags;
63103+ __u16 invflags;
63104+};
63105+
63106+#endif
63107diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h
63108index c65a18a..0c05f3a 100644
63109--- a/include/linux/of_pdt.h
63110+++ b/include/linux/of_pdt.h
63111@@ -32,7 +32,7 @@ struct of_pdt_ops {
63112
63113 /* return 0 on success; fill in 'len' with number of bytes in path */
63114 int (*pkg2path)(phandle node, char *buf, const int buflen, int *len);
63115-};
63116+} __no_const;
63117
63118 extern void *prom_early_alloc(unsigned long size);
63119
63120diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
63121index a4c5624..2dabfb7 100644
63122--- a/include/linux/oprofile.h
63123+++ b/include/linux/oprofile.h
63124@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
63125 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
63126 char const * name, ulong * val);
63127
63128-/** Create a file for read-only access to an atomic_t. */
63129+/** Create a file for read-only access to an atomic_unchecked_t. */
63130 int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
63131- char const * name, atomic_t * val);
63132+ char const * name, atomic_unchecked_t * val);
63133
63134 /** create a directory */
63135 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
63136@@ -163,7 +163,7 @@ ssize_t oprofilefs_ulong_to_user(unsigned long val, char __user * buf, size_t co
63137 * Read an ASCII string for a number from a userspace buffer and fill *val on success.
63138 * Returns 0 on success, < 0 on error.
63139 */
63140-int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count);
63141+int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count) __size_overflow(3);
63142
63143 /** lock for read/write safety */
63144 extern raw_spinlock_t oprofilefs_lock;
63145diff --git a/include/linux/padata.h b/include/linux/padata.h
63146index 4633b2f..988bc08 100644
63147--- a/include/linux/padata.h
63148+++ b/include/linux/padata.h
63149@@ -129,7 +129,7 @@ struct parallel_data {
63150 struct padata_instance *pinst;
63151 struct padata_parallel_queue __percpu *pqueue;
63152 struct padata_serial_queue __percpu *squeue;
63153- atomic_t seq_nr;
63154+ atomic_unchecked_t seq_nr;
63155 atomic_t reorder_objects;
63156 atomic_t refcnt;
63157 unsigned int max_seq_nr;
63158diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
63159index b1f8912..c955bff 100644
63160--- a/include/linux/perf_event.h
63161+++ b/include/linux/perf_event.h
63162@@ -748,8 +748,8 @@ struct perf_event {
63163
63164 enum perf_event_active_state state;
63165 unsigned int attach_state;
63166- local64_t count;
63167- atomic64_t child_count;
63168+ local64_t count; /* PaX: fix it one day */
63169+ atomic64_unchecked_t child_count;
63170
63171 /*
63172 * These are the total time in nanoseconds that the event
63173@@ -800,8 +800,8 @@ struct perf_event {
63174 * These accumulate total time (in nanoseconds) that children
63175 * events have been enabled and running, respectively.
63176 */
63177- atomic64_t child_total_time_enabled;
63178- atomic64_t child_total_time_running;
63179+ atomic64_unchecked_t child_total_time_enabled;
63180+ atomic64_unchecked_t child_total_time_running;
63181
63182 /*
63183 * Protect attach/detach and child_list:
63184diff --git a/include/linux/personality.h b/include/linux/personality.h
63185index 8fc7dd1a..c19d89e 100644
63186--- a/include/linux/personality.h
63187+++ b/include/linux/personality.h
63188@@ -44,6 +44,7 @@ enum {
63189 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
63190 ADDR_NO_RANDOMIZE | \
63191 ADDR_COMPAT_LAYOUT | \
63192+ ADDR_LIMIT_3GB | \
63193 MMAP_PAGE_ZERO)
63194
63195 /*
63196diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
63197index 77257c9..51d473a 100644
63198--- a/include/linux/pipe_fs_i.h
63199+++ b/include/linux/pipe_fs_i.h
63200@@ -46,9 +46,9 @@ struct pipe_buffer {
63201 struct pipe_inode_info {
63202 wait_queue_head_t wait;
63203 unsigned int nrbufs, curbuf, buffers;
63204- unsigned int readers;
63205- unsigned int writers;
63206- unsigned int waiting_writers;
63207+ atomic_t readers;
63208+ atomic_t writers;
63209+ atomic_t waiting_writers;
63210 unsigned int r_counter;
63211 unsigned int w_counter;
63212 struct page *tmp_page;
63213diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
63214index d3085e7..fd01052 100644
63215--- a/include/linux/pm_runtime.h
63216+++ b/include/linux/pm_runtime.h
63217@@ -95,7 +95,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
63218
63219 static inline void pm_runtime_mark_last_busy(struct device *dev)
63220 {
63221- ACCESS_ONCE(dev->power.last_busy) = jiffies;
63222+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
63223 }
63224
63225 #else /* !CONFIG_PM_RUNTIME */
63226diff --git a/include/linux/poison.h b/include/linux/poison.h
63227index 79159de..f1233a9 100644
63228--- a/include/linux/poison.h
63229+++ b/include/linux/poison.h
63230@@ -19,8 +19,8 @@
63231 * under normal circumstances, used to verify that nobody uses
63232 * non-initialized list entries.
63233 */
63234-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
63235-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
63236+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
63237+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
63238
63239 /********** include/linux/timer.h **********/
63240 /*
63241diff --git a/include/linux/preempt.h b/include/linux/preempt.h
63242index 58969b2..ead129b 100644
63243--- a/include/linux/preempt.h
63244+++ b/include/linux/preempt.h
63245@@ -123,7 +123,7 @@ struct preempt_ops {
63246 void (*sched_in)(struct preempt_notifier *notifier, int cpu);
63247 void (*sched_out)(struct preempt_notifier *notifier,
63248 struct task_struct *next);
63249-};
63250+} __no_const;
63251
63252 /**
63253 * preempt_notifier - key for installing preemption notifiers
63254diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
63255index 643b96c..ef55a9c 100644
63256--- a/include/linux/proc_fs.h
63257+++ b/include/linux/proc_fs.h
63258@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *proc_create(const char *name, mode_t mode,
63259 return proc_create_data(name, mode, parent, proc_fops, NULL);
63260 }
63261
63262+static inline struct proc_dir_entry *proc_create_grsec(const char *name, mode_t mode,
63263+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
63264+{
63265+#ifdef CONFIG_GRKERNSEC_PROC_USER
63266+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
63267+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63268+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
63269+#else
63270+ return proc_create_data(name, mode, parent, proc_fops, NULL);
63271+#endif
63272+}
63273+
63274+
63275 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
63276 mode_t mode, struct proc_dir_entry *base,
63277 read_proc_t *read_proc, void * data)
63278@@ -258,7 +271,7 @@ union proc_op {
63279 int (*proc_show)(struct seq_file *m,
63280 struct pid_namespace *ns, struct pid *pid,
63281 struct task_struct *task);
63282-};
63283+} __no_const;
63284
63285 struct ctl_table_header;
63286 struct ctl_table;
63287diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
63288index 800f113..e9ee2e3 100644
63289--- a/include/linux/ptrace.h
63290+++ b/include/linux/ptrace.h
63291@@ -129,10 +129,12 @@ extern void __ptrace_unlink(struct task_struct *child);
63292 extern void exit_ptrace(struct task_struct *tracer);
63293 #define PTRACE_MODE_READ 1
63294 #define PTRACE_MODE_ATTACH 2
63295-/* Returns 0 on success, -errno on denial. */
63296-extern int __ptrace_may_access(struct task_struct *task, unsigned int mode);
63297 /* Returns true on success, false on denial. */
63298 extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
63299+/* Returns true on success, false on denial. */
63300+extern bool ptrace_may_access_log(struct task_struct *task, unsigned int mode);
63301+/* Returns true on success, false on denial. */
63302+extern bool ptrace_may_access_nolock(struct task_struct *task, unsigned int mode);
63303
63304 static inline int ptrace_reparented(struct task_struct *child)
63305 {
63306diff --git a/include/linux/random.h b/include/linux/random.h
63307index 8f74538..02a1012 100644
63308--- a/include/linux/random.h
63309+++ b/include/linux/random.h
63310@@ -69,12 +69,17 @@ void srandom32(u32 seed);
63311
63312 u32 prandom32(struct rnd_state *);
63313
63314+static inline unsigned long pax_get_random_long(void)
63315+{
63316+ return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
63317+}
63318+
63319 /*
63320 * Handle minimum values for seeds
63321 */
63322 static inline u32 __seed(u32 x, u32 m)
63323 {
63324- return (x < m) ? x + m : x;
63325+ return (x <= m) ? x + m + 1 : x;
63326 }
63327
63328 /**
63329diff --git a/include/linux/reboot.h b/include/linux/reboot.h
63330index e0879a7..a12f962 100644
63331--- a/include/linux/reboot.h
63332+++ b/include/linux/reboot.h
63333@@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
63334 * Architecture-specific implementations of sys_reboot commands.
63335 */
63336
63337-extern void machine_restart(char *cmd);
63338-extern void machine_halt(void);
63339-extern void machine_power_off(void);
63340+extern void machine_restart(char *cmd) __noreturn;
63341+extern void machine_halt(void) __noreturn;
63342+extern void machine_power_off(void) __noreturn;
63343
63344 extern void machine_shutdown(void);
63345 struct pt_regs;
63346@@ -65,9 +65,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
63347 */
63348
63349 extern void kernel_restart_prepare(char *cmd);
63350-extern void kernel_restart(char *cmd);
63351-extern void kernel_halt(void);
63352-extern void kernel_power_off(void);
63353+extern void kernel_restart(char *cmd) __noreturn;
63354+extern void kernel_halt(void) __noreturn;
63355+extern void kernel_power_off(void) __noreturn;
63356
63357 extern int C_A_D; /* for sysctl */
63358 void ctrl_alt_del(void);
63359@@ -81,7 +81,7 @@ extern int orderly_poweroff(bool force);
63360 * Emergency restart, callable from an interrupt handler.
63361 */
63362
63363-extern void emergency_restart(void);
63364+extern void emergency_restart(void) __noreturn;
63365 #include <asm/emergency-restart.h>
63366
63367 #endif
63368diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
63369index 96d465f..b084e05 100644
63370--- a/include/linux/reiserfs_fs.h
63371+++ b/include/linux/reiserfs_fs.h
63372@@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
63373 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
63374
63375 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
63376-#define get_generation(s) atomic_read (&fs_generation(s))
63377+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
63378 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
63379 #define __fs_changed(gen,s) (gen != get_generation (s))
63380 #define fs_changed(gen,s) \
63381diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
63382index 52c83b6..18ed7eb 100644
63383--- a/include/linux/reiserfs_fs_sb.h
63384+++ b/include/linux/reiserfs_fs_sb.h
63385@@ -386,7 +386,7 @@ struct reiserfs_sb_info {
63386 /* Comment? -Hans */
63387 wait_queue_head_t s_wait;
63388 /* To be obsoleted soon by per buffer seals.. -Hans */
63389- atomic_t s_generation_counter; // increased by one every time the
63390+ atomic_unchecked_t s_generation_counter; // increased by one every time the
63391 // tree gets re-balanced
63392 unsigned long s_properties; /* File system properties. Currently holds
63393 on-disk FS format */
63394diff --git a/include/linux/relay.h b/include/linux/relay.h
63395index 14a86bc..17d0700 100644
63396--- a/include/linux/relay.h
63397+++ b/include/linux/relay.h
63398@@ -159,7 +159,7 @@ struct rchan_callbacks
63399 * The callback should return 0 if successful, negative if not.
63400 */
63401 int (*remove_buf_file)(struct dentry *dentry);
63402-};
63403+} __no_const;
63404
63405 /*
63406 * CONFIG_RELAY kernel API, kernel/relay.c
63407diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
63408index c6c6084..5bf1212 100644
63409--- a/include/linux/rfkill.h
63410+++ b/include/linux/rfkill.h
63411@@ -147,6 +147,7 @@ struct rfkill_ops {
63412 void (*query)(struct rfkill *rfkill, void *data);
63413 int (*set_block)(void *data, bool blocked);
63414 };
63415+typedef struct rfkill_ops __no_const rfkill_ops_no_const;
63416
63417 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
63418 /**
63419diff --git a/include/linux/rio.h b/include/linux/rio.h
63420index 4d50611..c6858a2 100644
63421--- a/include/linux/rio.h
63422+++ b/include/linux/rio.h
63423@@ -315,7 +315,7 @@ struct rio_ops {
63424 int mbox, void *buffer, size_t len);
63425 int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
63426 void *(*get_inb_message)(struct rio_mport *mport, int mbox);
63427-};
63428+} __no_const;
63429
63430 #define RIO_RESOURCE_MEM 0x00000100
63431 #define RIO_RESOURCE_DOORBELL 0x00000200
63432diff --git a/include/linux/rmap.h b/include/linux/rmap.h
63433index 2148b12..519b820 100644
63434--- a/include/linux/rmap.h
63435+++ b/include/linux/rmap.h
63436@@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struct anon_vma *anon_vma)
63437 void anon_vma_init(void); /* create anon_vma_cachep */
63438 int anon_vma_prepare(struct vm_area_struct *);
63439 void unlink_anon_vmas(struct vm_area_struct *);
63440-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
63441-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
63442+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
63443+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
63444 void __anon_vma_link(struct vm_area_struct *);
63445
63446 static inline void anon_vma_merge(struct vm_area_struct *vma,
63447diff --git a/include/linux/sched.h b/include/linux/sched.h
63448index 1c4f3e9..342eb1f 100644
63449--- a/include/linux/sched.h
63450+++ b/include/linux/sched.h
63451@@ -101,6 +101,7 @@ struct bio_list;
63452 struct fs_struct;
63453 struct perf_event_context;
63454 struct blk_plug;
63455+struct linux_binprm;
63456
63457 /*
63458 * List of flags we want to share for kernel threads,
63459@@ -380,10 +381,13 @@ struct user_namespace;
63460 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
63461
63462 extern int sysctl_max_map_count;
63463+extern unsigned long sysctl_heap_stack_gap;
63464
63465 #include <linux/aio.h>
63466
63467 #ifdef CONFIG_MMU
63468+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
63469+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
63470 extern void arch_pick_mmap_layout(struct mm_struct *mm);
63471 extern unsigned long
63472 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
63473@@ -629,6 +633,17 @@ struct signal_struct {
63474 #ifdef CONFIG_TASKSTATS
63475 struct taskstats *stats;
63476 #endif
63477+
63478+#ifdef CONFIG_GRKERNSEC
63479+ u32 curr_ip;
63480+ u32 saved_ip;
63481+ u32 gr_saddr;
63482+ u32 gr_daddr;
63483+ u16 gr_sport;
63484+ u16 gr_dport;
63485+ u8 used_accept:1;
63486+#endif
63487+
63488 #ifdef CONFIG_AUDIT
63489 unsigned audit_tty;
63490 struct tty_audit_buf *tty_audit_buf;
63491@@ -710,6 +725,11 @@ struct user_struct {
63492 struct key *session_keyring; /* UID's default session keyring */
63493 #endif
63494
63495+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
63496+ unsigned int banned;
63497+ unsigned long ban_expires;
63498+#endif
63499+
63500 /* Hash table maintenance information */
63501 struct hlist_node uidhash_node;
63502 uid_t uid;
63503@@ -1337,8 +1357,8 @@ struct task_struct {
63504 struct list_head thread_group;
63505
63506 struct completion *vfork_done; /* for vfork() */
63507- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
63508- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63509+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
63510+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63511
63512 cputime_t utime, stime, utimescaled, stimescaled;
63513 cputime_t gtime;
63514@@ -1354,13 +1374,6 @@ struct task_struct {
63515 struct task_cputime cputime_expires;
63516 struct list_head cpu_timers[3];
63517
63518-/* process credentials */
63519- const struct cred __rcu *real_cred; /* objective and real subjective task
63520- * credentials (COW) */
63521- const struct cred __rcu *cred; /* effective (overridable) subjective task
63522- * credentials (COW) */
63523- struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
63524-
63525 char comm[TASK_COMM_LEN]; /* executable name excluding path
63526 - access with [gs]et_task_comm (which lock
63527 it with task_lock())
63528@@ -1377,8 +1390,16 @@ struct task_struct {
63529 #endif
63530 /* CPU-specific state of this task */
63531 struct thread_struct thread;
63532+/* thread_info moved to task_struct */
63533+#ifdef CONFIG_X86
63534+ struct thread_info tinfo;
63535+#endif
63536 /* filesystem information */
63537 struct fs_struct *fs;
63538+
63539+ const struct cred __rcu *cred; /* effective (overridable) subjective task
63540+ * credentials (COW) */
63541+
63542 /* open file information */
63543 struct files_struct *files;
63544 /* namespaces */
63545@@ -1425,6 +1446,11 @@ struct task_struct {
63546 struct rt_mutex_waiter *pi_blocked_on;
63547 #endif
63548
63549+/* process credentials */
63550+ const struct cred __rcu *real_cred; /* objective and real subjective task
63551+ * credentials (COW) */
63552+ struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
63553+
63554 #ifdef CONFIG_DEBUG_MUTEXES
63555 /* mutex deadlock detection */
63556 struct mutex_waiter *blocked_on;
63557@@ -1540,6 +1566,27 @@ struct task_struct {
63558 unsigned long default_timer_slack_ns;
63559
63560 struct list_head *scm_work_list;
63561+
63562+#ifdef CONFIG_GRKERNSEC
63563+ /* grsecurity */
63564+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63565+ u64 exec_id;
63566+#endif
63567+#ifdef CONFIG_GRKERNSEC_SETXID
63568+ const struct cred *delayed_cred;
63569+#endif
63570+ struct dentry *gr_chroot_dentry;
63571+ struct acl_subject_label *acl;
63572+ struct acl_role_label *role;
63573+ struct file *exec_file;
63574+ u16 acl_role_id;
63575+ /* is this the task that authenticated to the special role */
63576+ u8 acl_sp_role;
63577+ u8 is_writable;
63578+ u8 brute;
63579+ u8 gr_is_chrooted;
63580+#endif
63581+
63582 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
63583 /* Index of current stored address in ret_stack */
63584 int curr_ret_stack;
63585@@ -1574,6 +1621,51 @@ struct task_struct {
63586 #endif
63587 };
63588
63589+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
63590+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
63591+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
63592+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
63593+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
63594+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
63595+
63596+#ifdef CONFIG_PAX_SOFTMODE
63597+extern int pax_softmode;
63598+#endif
63599+
63600+extern int pax_check_flags(unsigned long *);
63601+
63602+/* if tsk != current then task_lock must be held on it */
63603+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
63604+static inline unsigned long pax_get_flags(struct task_struct *tsk)
63605+{
63606+ if (likely(tsk->mm))
63607+ return tsk->mm->pax_flags;
63608+ else
63609+ return 0UL;
63610+}
63611+
63612+/* if tsk != current then task_lock must be held on it */
63613+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
63614+{
63615+ if (likely(tsk->mm)) {
63616+ tsk->mm->pax_flags = flags;
63617+ return 0;
63618+ }
63619+ return -EINVAL;
63620+}
63621+#endif
63622+
63623+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
63624+extern void pax_set_initial_flags(struct linux_binprm *bprm);
63625+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
63626+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
63627+#endif
63628+
63629+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
63630+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
63631+extern void pax_report_refcount_overflow(struct pt_regs *regs);
63632+extern __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type);
63633+
63634 /* Future-safe accessor for struct task_struct's cpus_allowed. */
63635 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
63636
63637@@ -2081,7 +2173,9 @@ void yield(void);
63638 extern struct exec_domain default_exec_domain;
63639
63640 union thread_union {
63641+#ifndef CONFIG_X86
63642 struct thread_info thread_info;
63643+#endif
63644 unsigned long stack[THREAD_SIZE/sizeof(long)];
63645 };
63646
63647@@ -2114,6 +2208,7 @@ extern struct pid_namespace init_pid_ns;
63648 */
63649
63650 extern struct task_struct *find_task_by_vpid(pid_t nr);
63651+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
63652 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
63653 struct pid_namespace *ns);
63654
63655@@ -2235,6 +2330,12 @@ static inline void mmdrop(struct mm_struct * mm)
63656 extern void mmput(struct mm_struct *);
63657 /* Grab a reference to a task's mm, if it is not already going away */
63658 extern struct mm_struct *get_task_mm(struct task_struct *task);
63659+/*
63660+ * Grab a reference to a task's mm, if it is not already going away
63661+ * and ptrace_may_access with the mode parameter passed to it
63662+ * succeeds.
63663+ */
63664+extern struct mm_struct *mm_access(struct task_struct *task, unsigned int mode);
63665 /* Remove the current tasks stale references to the old mm_struct */
63666 extern void mm_release(struct task_struct *, struct mm_struct *);
63667 /* Allocate a new mm structure and copy contents from tsk->mm */
63668@@ -2251,7 +2352,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
63669 extern void exit_itimers(struct signal_struct *);
63670 extern void flush_itimer_signals(void);
63671
63672-extern NORET_TYPE void do_group_exit(int);
63673+extern __noreturn void do_group_exit(int);
63674
63675 extern void daemonize(const char *, ...);
63676 extern int allow_signal(int);
63677@@ -2416,13 +2517,17 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
63678
63679 #endif
63680
63681-static inline int object_is_on_stack(void *obj)
63682+static inline int object_starts_on_stack(void *obj)
63683 {
63684- void *stack = task_stack_page(current);
63685+ const void *stack = task_stack_page(current);
63686
63687 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
63688 }
63689
63690+#ifdef CONFIG_PAX_USERCOPY
63691+extern int object_is_on_stack(const void *obj, unsigned long len);
63692+#endif
63693+
63694 extern void thread_info_cache_init(void);
63695
63696 #ifdef CONFIG_DEBUG_STACK_USAGE
63697diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
63698index 899fbb4..1cb4138 100644
63699--- a/include/linux/screen_info.h
63700+++ b/include/linux/screen_info.h
63701@@ -43,7 +43,8 @@ struct screen_info {
63702 __u16 pages; /* 0x32 */
63703 __u16 vesa_attributes; /* 0x34 */
63704 __u32 capabilities; /* 0x36 */
63705- __u8 _reserved[6]; /* 0x3a */
63706+ __u16 vesapm_size; /* 0x3a */
63707+ __u8 _reserved[4]; /* 0x3c */
63708 } __attribute__((packed));
63709
63710 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
63711diff --git a/include/linux/security.h b/include/linux/security.h
63712index e8c619d..e0cbd1c 100644
63713--- a/include/linux/security.h
63714+++ b/include/linux/security.h
63715@@ -37,6 +37,7 @@
63716 #include <linux/xfrm.h>
63717 #include <linux/slab.h>
63718 #include <linux/xattr.h>
63719+#include <linux/grsecurity.h>
63720 #include <net/flow.h>
63721
63722 /* Maximum number of letters for an LSM name string */
63723diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
63724index 0b69a46..b2ffa4c 100644
63725--- a/include/linux/seq_file.h
63726+++ b/include/linux/seq_file.h
63727@@ -24,6 +24,9 @@ struct seq_file {
63728 struct mutex lock;
63729 const struct seq_operations *op;
63730 int poll_event;
63731+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63732+ u64 exec_id;
63733+#endif
63734 void *private;
63735 };
63736
63737@@ -33,6 +36,7 @@ struct seq_operations {
63738 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
63739 int (*show) (struct seq_file *m, void *v);
63740 };
63741+typedef struct seq_operations __no_const seq_operations_no_const;
63742
63743 #define SEQ_SKIP 1
63744
63745diff --git a/include/linux/shm.h b/include/linux/shm.h
63746index 92808b8..c28cac4 100644
63747--- a/include/linux/shm.h
63748+++ b/include/linux/shm.h
63749@@ -98,6 +98,10 @@ struct shmid_kernel /* private to the kernel */
63750
63751 /* The task created the shm object. NULL if the task is dead. */
63752 struct task_struct *shm_creator;
63753+#ifdef CONFIG_GRKERNSEC
63754+ time_t shm_createtime;
63755+ pid_t shm_lapid;
63756+#endif
63757 };
63758
63759 /* shm_mode upper byte flags */
63760diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
63761index fe86488..1563c1c 100644
63762--- a/include/linux/skbuff.h
63763+++ b/include/linux/skbuff.h
63764@@ -642,7 +642,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
63765 */
63766 static inline int skb_queue_empty(const struct sk_buff_head *list)
63767 {
63768- return list->next == (struct sk_buff *)list;
63769+ return list->next == (const struct sk_buff *)list;
63770 }
63771
63772 /**
63773@@ -655,7 +655,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
63774 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
63775 const struct sk_buff *skb)
63776 {
63777- return skb->next == (struct sk_buff *)list;
63778+ return skb->next == (const struct sk_buff *)list;
63779 }
63780
63781 /**
63782@@ -668,7 +668,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
63783 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
63784 const struct sk_buff *skb)
63785 {
63786- return skb->prev == (struct sk_buff *)list;
63787+ return skb->prev == (const struct sk_buff *)list;
63788 }
63789
63790 /**
63791@@ -1523,7 +1523,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
63792 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
63793 */
63794 #ifndef NET_SKB_PAD
63795-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
63796+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
63797 #endif
63798
63799 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
63800diff --git a/include/linux/slab.h b/include/linux/slab.h
63801index 573c809..07e1f43 100644
63802--- a/include/linux/slab.h
63803+++ b/include/linux/slab.h
63804@@ -11,12 +11,20 @@
63805
63806 #include <linux/gfp.h>
63807 #include <linux/types.h>
63808+#include <linux/err.h>
63809
63810 /*
63811 * Flags to pass to kmem_cache_create().
63812 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
63813 */
63814 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
63815+
63816+#ifdef CONFIG_PAX_USERCOPY
63817+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
63818+#else
63819+#define SLAB_USERCOPY 0x00000000UL
63820+#endif
63821+
63822 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
63823 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
63824 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
63825@@ -87,10 +95,13 @@
63826 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
63827 * Both make kfree a no-op.
63828 */
63829-#define ZERO_SIZE_PTR ((void *)16)
63830+#define ZERO_SIZE_PTR \
63831+({ \
63832+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
63833+ (void *)(-MAX_ERRNO-1L); \
63834+})
63835
63836-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
63837- (unsigned long)ZERO_SIZE_PTR)
63838+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
63839
63840 /*
63841 * struct kmem_cache related prototypes
63842@@ -156,11 +167,12 @@ unsigned int kmem_cache_size(struct kmem_cache *);
63843 /*
63844 * Common kmalloc functions provided by all allocators
63845 */
63846-void * __must_check __krealloc(const void *, size_t, gfp_t);
63847-void * __must_check krealloc(const void *, size_t, gfp_t);
63848+void * __must_check __krealloc(const void *, size_t, gfp_t) __size_overflow(2);
63849+void * __must_check krealloc(const void *, size_t, gfp_t) __size_overflow(2);
63850 void kfree(const void *);
63851 void kzfree(const void *);
63852 size_t ksize(const void *);
63853+void check_object_size(const void *ptr, unsigned long n, bool to);
63854
63855 /*
63856 * Allocator specific definitions. These are mainly used to establish optimized
63857@@ -287,7 +299,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
63858 */
63859 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
63860 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
63861-extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
63862+extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long) __size_overflow(1);
63863 #define kmalloc_track_caller(size, flags) \
63864 __kmalloc_track_caller(size, flags, _RET_IP_)
63865 #else
63866@@ -306,7 +318,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
63867 */
63868 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
63869 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
63870-extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
63871+extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long) __size_overflow(1);
63872 #define kmalloc_node_track_caller(size, flags, node) \
63873 __kmalloc_node_track_caller(size, flags, node, \
63874 _RET_IP_)
63875diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
63876index d00e0ba..d61fb1f 100644
63877--- a/include/linux/slab_def.h
63878+++ b/include/linux/slab_def.h
63879@@ -68,10 +68,10 @@ struct kmem_cache {
63880 unsigned long node_allocs;
63881 unsigned long node_frees;
63882 unsigned long node_overflow;
63883- atomic_t allochit;
63884- atomic_t allocmiss;
63885- atomic_t freehit;
63886- atomic_t freemiss;
63887+ atomic_unchecked_t allochit;
63888+ atomic_unchecked_t allocmiss;
63889+ atomic_unchecked_t freehit;
63890+ atomic_unchecked_t freemiss;
63891
63892 /*
63893 * If debugging is enabled, then the allocator can add additional
63894@@ -109,7 +109,7 @@ struct cache_sizes {
63895 extern struct cache_sizes malloc_sizes[];
63896
63897 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
63898-void *__kmalloc(size_t size, gfp_t flags);
63899+void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63900
63901 #ifdef CONFIG_TRACING
63902 extern void *kmem_cache_alloc_trace(size_t size,
63903@@ -127,6 +127,7 @@ static inline size_t slab_buffer_size(struct kmem_cache *cachep)
63904 }
63905 #endif
63906
63907+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63908 static __always_inline void *kmalloc(size_t size, gfp_t flags)
63909 {
63910 struct kmem_cache *cachep;
63911@@ -162,7 +163,7 @@ found:
63912 }
63913
63914 #ifdef CONFIG_NUMA
63915-extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
63916+extern void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63917 extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
63918
63919 #ifdef CONFIG_TRACING
63920@@ -181,6 +182,7 @@ kmem_cache_alloc_node_trace(size_t size,
63921 }
63922 #endif
63923
63924+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63925 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63926 {
63927 struct kmem_cache *cachep;
63928diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
63929index 0ec00b3..65e7e0e 100644
63930--- a/include/linux/slob_def.h
63931+++ b/include/linux/slob_def.h
63932@@ -9,8 +9,9 @@ static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
63933 return kmem_cache_alloc_node(cachep, flags, -1);
63934 }
63935
63936-void *__kmalloc_node(size_t size, gfp_t flags, int node);
63937+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63938
63939+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63940 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63941 {
63942 return __kmalloc_node(size, flags, node);
63943@@ -24,11 +25,13 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63944 * kmalloc is the normal method of allocating memory
63945 * in the kernel.
63946 */
63947+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63948 static __always_inline void *kmalloc(size_t size, gfp_t flags)
63949 {
63950 return __kmalloc_node(size, flags, -1);
63951 }
63952
63953+static __always_inline void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63954 static __always_inline void *__kmalloc(size_t size, gfp_t flags)
63955 {
63956 return kmalloc(size, flags);
63957diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
63958index a32bcfd..d26bd6e 100644
63959--- a/include/linux/slub_def.h
63960+++ b/include/linux/slub_def.h
63961@@ -89,7 +89,7 @@ struct kmem_cache {
63962 struct kmem_cache_order_objects max;
63963 struct kmem_cache_order_objects min;
63964 gfp_t allocflags; /* gfp flags to use on each alloc */
63965- int refcount; /* Refcount for slab cache destroy */
63966+ atomic_t refcount; /* Refcount for slab cache destroy */
63967 void (*ctor)(void *);
63968 int inuse; /* Offset to metadata */
63969 int align; /* Alignment */
63970@@ -204,6 +204,7 @@ static __always_inline int kmalloc_index(size_t size)
63971 * This ought to end up with a global pointer to the right cache
63972 * in kmalloc_caches.
63973 */
63974+static __always_inline struct kmem_cache *kmalloc_slab(size_t size) __size_overflow(1);
63975 static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
63976 {
63977 int index = kmalloc_index(size);
63978@@ -215,9 +216,11 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
63979 }
63980
63981 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
63982-void *__kmalloc(size_t size, gfp_t flags);
63983+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
63984
63985 static __always_inline void *
63986+kmalloc_order(size_t size, gfp_t flags, unsigned int order) __size_overflow(1);
63987+static __always_inline void *
63988 kmalloc_order(size_t size, gfp_t flags, unsigned int order)
63989 {
63990 void *ret = (void *) __get_free_pages(flags | __GFP_COMP, order);
63991@@ -256,12 +259,14 @@ kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order)
63992 }
63993 #endif
63994
63995+static __always_inline void *kmalloc_large(size_t size, gfp_t flags) __size_overflow(1);
63996 static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
63997 {
63998 unsigned int order = get_order(size);
63999 return kmalloc_order_trace(size, flags, order);
64000 }
64001
64002+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
64003 static __always_inline void *kmalloc(size_t size, gfp_t flags)
64004 {
64005 if (__builtin_constant_p(size)) {
64006@@ -281,7 +286,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
64007 }
64008
64009 #ifdef CONFIG_NUMA
64010-void *__kmalloc_node(size_t size, gfp_t flags, int node);
64011+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
64012 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
64013
64014 #ifdef CONFIG_TRACING
64015@@ -298,6 +303,7 @@ kmem_cache_alloc_node_trace(struct kmem_cache *s,
64016 }
64017 #endif
64018
64019+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
64020 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
64021 {
64022 if (__builtin_constant_p(size) &&
64023diff --git a/include/linux/sonet.h b/include/linux/sonet.h
64024index de8832d..0147b46 100644
64025--- a/include/linux/sonet.h
64026+++ b/include/linux/sonet.h
64027@@ -61,7 +61,7 @@ struct sonet_stats {
64028 #include <linux/atomic.h>
64029
64030 struct k_sonet_stats {
64031-#define __HANDLE_ITEM(i) atomic_t i
64032+#define __HANDLE_ITEM(i) atomic_unchecked_t i
64033 __SONET_ITEMS
64034 #undef __HANDLE_ITEM
64035 };
64036diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
64037index 3d8f9c4..69f1c0a 100644
64038--- a/include/linux/sunrpc/clnt.h
64039+++ b/include/linux/sunrpc/clnt.h
64040@@ -172,9 +172,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
64041 {
64042 switch (sap->sa_family) {
64043 case AF_INET:
64044- return ntohs(((struct sockaddr_in *)sap)->sin_port);
64045+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
64046 case AF_INET6:
64047- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
64048+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
64049 }
64050 return 0;
64051 }
64052@@ -207,7 +207,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
64053 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
64054 const struct sockaddr *src)
64055 {
64056- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
64057+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
64058 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
64059
64060 dsin->sin_family = ssin->sin_family;
64061@@ -310,7 +310,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
64062 if (sa->sa_family != AF_INET6)
64063 return 0;
64064
64065- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
64066+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
64067 }
64068
64069 #endif /* __KERNEL__ */
64070diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
64071index e775689..9e206d9 100644
64072--- a/include/linux/sunrpc/sched.h
64073+++ b/include/linux/sunrpc/sched.h
64074@@ -105,6 +105,7 @@ struct rpc_call_ops {
64075 void (*rpc_call_done)(struct rpc_task *, void *);
64076 void (*rpc_release)(void *);
64077 };
64078+typedef struct rpc_call_ops __no_const rpc_call_ops_no_const;
64079
64080 struct rpc_task_setup {
64081 struct rpc_task *task;
64082diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
64083index c14fe86..393245e 100644
64084--- a/include/linux/sunrpc/svc_rdma.h
64085+++ b/include/linux/sunrpc/svc_rdma.h
64086@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
64087 extern unsigned int svcrdma_max_requests;
64088 extern unsigned int svcrdma_max_req_size;
64089
64090-extern atomic_t rdma_stat_recv;
64091-extern atomic_t rdma_stat_read;
64092-extern atomic_t rdma_stat_write;
64093-extern atomic_t rdma_stat_sq_starve;
64094-extern atomic_t rdma_stat_rq_starve;
64095-extern atomic_t rdma_stat_rq_poll;
64096-extern atomic_t rdma_stat_rq_prod;
64097-extern atomic_t rdma_stat_sq_poll;
64098-extern atomic_t rdma_stat_sq_prod;
64099+extern atomic_unchecked_t rdma_stat_recv;
64100+extern atomic_unchecked_t rdma_stat_read;
64101+extern atomic_unchecked_t rdma_stat_write;
64102+extern atomic_unchecked_t rdma_stat_sq_starve;
64103+extern atomic_unchecked_t rdma_stat_rq_starve;
64104+extern atomic_unchecked_t rdma_stat_rq_poll;
64105+extern atomic_unchecked_t rdma_stat_rq_prod;
64106+extern atomic_unchecked_t rdma_stat_sq_poll;
64107+extern atomic_unchecked_t rdma_stat_sq_prod;
64108
64109 #define RPCRDMA_VERSION 1
64110
64111diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
64112index 703cfa33..0b8ca72ac 100644
64113--- a/include/linux/sysctl.h
64114+++ b/include/linux/sysctl.h
64115@@ -155,7 +155,11 @@ enum
64116 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
64117 };
64118
64119-
64120+#ifdef CONFIG_PAX_SOFTMODE
64121+enum {
64122+ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
64123+};
64124+#endif
64125
64126 /* CTL_VM names: */
64127 enum
64128@@ -968,6 +972,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
64129
64130 extern int proc_dostring(struct ctl_table *, int,
64131 void __user *, size_t *, loff_t *);
64132+extern int proc_dostring_modpriv(struct ctl_table *, int,
64133+ void __user *, size_t *, loff_t *);
64134 extern int proc_dointvec(struct ctl_table *, int,
64135 void __user *, size_t *, loff_t *);
64136 extern int proc_dointvec_minmax(struct ctl_table *, int,
64137diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
64138index a71a292..51bd91d 100644
64139--- a/include/linux/tracehook.h
64140+++ b/include/linux/tracehook.h
64141@@ -54,12 +54,12 @@ struct linux_binprm;
64142 /*
64143 * ptrace report for syscall entry and exit looks identical.
64144 */
64145-static inline void ptrace_report_syscall(struct pt_regs *regs)
64146+static inline int ptrace_report_syscall(struct pt_regs *regs)
64147 {
64148 int ptrace = current->ptrace;
64149
64150 if (!(ptrace & PT_PTRACED))
64151- return;
64152+ return 0;
64153
64154 ptrace_notify(SIGTRAP | ((ptrace & PT_TRACESYSGOOD) ? 0x80 : 0));
64155
64156@@ -72,6 +72,8 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
64157 send_sig(current->exit_code, current, 1);
64158 current->exit_code = 0;
64159 }
64160+
64161+ return fatal_signal_pending(current);
64162 }
64163
64164 /**
64165@@ -96,8 +98,7 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
64166 static inline __must_check int tracehook_report_syscall_entry(
64167 struct pt_regs *regs)
64168 {
64169- ptrace_report_syscall(regs);
64170- return 0;
64171+ return ptrace_report_syscall(regs);
64172 }
64173
64174 /**
64175diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
64176index ff7dc08..893e1bd 100644
64177--- a/include/linux/tty_ldisc.h
64178+++ b/include/linux/tty_ldisc.h
64179@@ -148,7 +148,7 @@ struct tty_ldisc_ops {
64180
64181 struct module *owner;
64182
64183- int refcount;
64184+ atomic_t refcount;
64185 };
64186
64187 struct tty_ldisc {
64188diff --git a/include/linux/types.h b/include/linux/types.h
64189index 57a9723..dbe234a 100644
64190--- a/include/linux/types.h
64191+++ b/include/linux/types.h
64192@@ -213,10 +213,26 @@ typedef struct {
64193 int counter;
64194 } atomic_t;
64195
64196+#ifdef CONFIG_PAX_REFCOUNT
64197+typedef struct {
64198+ int counter;
64199+} atomic_unchecked_t;
64200+#else
64201+typedef atomic_t atomic_unchecked_t;
64202+#endif
64203+
64204 #ifdef CONFIG_64BIT
64205 typedef struct {
64206 long counter;
64207 } atomic64_t;
64208+
64209+#ifdef CONFIG_PAX_REFCOUNT
64210+typedef struct {
64211+ long counter;
64212+} atomic64_unchecked_t;
64213+#else
64214+typedef atomic64_t atomic64_unchecked_t;
64215+#endif
64216 #endif
64217
64218 struct list_head {
64219diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
64220index 5ca0951..53a2fff 100644
64221--- a/include/linux/uaccess.h
64222+++ b/include/linux/uaccess.h
64223@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
64224 long ret; \
64225 mm_segment_t old_fs = get_fs(); \
64226 \
64227- set_fs(KERNEL_DS); \
64228 pagefault_disable(); \
64229- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
64230- pagefault_enable(); \
64231+ set_fs(KERNEL_DS); \
64232+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
64233 set_fs(old_fs); \
64234+ pagefault_enable(); \
64235 ret; \
64236 })
64237
64238@@ -105,7 +105,7 @@ extern long __probe_kernel_read(void *dst, const void *src, size_t size);
64239 * Safely write to address @dst from the buffer at @src. If a kernel fault
64240 * happens, handle that and return -EFAULT.
64241 */
64242-extern long notrace probe_kernel_write(void *dst, const void *src, size_t size);
64243+extern long notrace probe_kernel_write(void *dst, const void *src, size_t size) __size_overflow(3);
64244 extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
64245
64246 #endif /* __LINUX_UACCESS_H__ */
64247diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
64248index 99c1b4d..bb94261 100644
64249--- a/include/linux/unaligned/access_ok.h
64250+++ b/include/linux/unaligned/access_ok.h
64251@@ -6,32 +6,32 @@
64252
64253 static inline u16 get_unaligned_le16(const void *p)
64254 {
64255- return le16_to_cpup((__le16 *)p);
64256+ return le16_to_cpup((const __le16 *)p);
64257 }
64258
64259 static inline u32 get_unaligned_le32(const void *p)
64260 {
64261- return le32_to_cpup((__le32 *)p);
64262+ return le32_to_cpup((const __le32 *)p);
64263 }
64264
64265 static inline u64 get_unaligned_le64(const void *p)
64266 {
64267- return le64_to_cpup((__le64 *)p);
64268+ return le64_to_cpup((const __le64 *)p);
64269 }
64270
64271 static inline u16 get_unaligned_be16(const void *p)
64272 {
64273- return be16_to_cpup((__be16 *)p);
64274+ return be16_to_cpup((const __be16 *)p);
64275 }
64276
64277 static inline u32 get_unaligned_be32(const void *p)
64278 {
64279- return be32_to_cpup((__be32 *)p);
64280+ return be32_to_cpup((const __be32 *)p);
64281 }
64282
64283 static inline u64 get_unaligned_be64(const void *p)
64284 {
64285- return be64_to_cpup((__be64 *)p);
64286+ return be64_to_cpup((const __be64 *)p);
64287 }
64288
64289 static inline void put_unaligned_le16(u16 val, void *p)
64290diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
64291index e5a40c3..20ab0f6 100644
64292--- a/include/linux/usb/renesas_usbhs.h
64293+++ b/include/linux/usb/renesas_usbhs.h
64294@@ -39,7 +39,7 @@ enum {
64295 */
64296 struct renesas_usbhs_driver_callback {
64297 int (*notify_hotplug)(struct platform_device *pdev);
64298-};
64299+} __no_const;
64300
64301 /*
64302 * callback functions for platform
64303@@ -89,7 +89,7 @@ struct renesas_usbhs_platform_callback {
64304 * VBUS control is needed for Host
64305 */
64306 int (*set_vbus)(struct platform_device *pdev, int enable);
64307-};
64308+} __no_const;
64309
64310 /*
64311 * parameters for renesas usbhs
64312diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
64313index 6f8fbcf..8259001 100644
64314--- a/include/linux/vermagic.h
64315+++ b/include/linux/vermagic.h
64316@@ -25,9 +25,35 @@
64317 #define MODULE_ARCH_VERMAGIC ""
64318 #endif
64319
64320+#ifdef CONFIG_PAX_REFCOUNT
64321+#define MODULE_PAX_REFCOUNT "REFCOUNT "
64322+#else
64323+#define MODULE_PAX_REFCOUNT ""
64324+#endif
64325+
64326+#ifdef CONSTIFY_PLUGIN
64327+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
64328+#else
64329+#define MODULE_CONSTIFY_PLUGIN ""
64330+#endif
64331+
64332+#ifdef STACKLEAK_PLUGIN
64333+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
64334+#else
64335+#define MODULE_STACKLEAK_PLUGIN ""
64336+#endif
64337+
64338+#ifdef CONFIG_GRKERNSEC
64339+#define MODULE_GRSEC "GRSEC "
64340+#else
64341+#define MODULE_GRSEC ""
64342+#endif
64343+
64344 #define VERMAGIC_STRING \
64345 UTS_RELEASE " " \
64346 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
64347 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
64348- MODULE_ARCH_VERMAGIC
64349+ MODULE_ARCH_VERMAGIC \
64350+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
64351+ MODULE_GRSEC
64352
64353diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
64354index 4bde182..c42a656 100644
64355--- a/include/linux/vmalloc.h
64356+++ b/include/linux/vmalloc.h
64357@@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
64358 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
64359 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
64360 #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
64361+
64362+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
64363+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
64364+#endif
64365+
64366 /* bits [20..32] reserved for arch specific ioremap internals */
64367
64368 /*
64369@@ -51,18 +56,18 @@ static inline void vmalloc_init(void)
64370 }
64371 #endif
64372
64373-extern void *vmalloc(unsigned long size);
64374-extern void *vzalloc(unsigned long size);
64375-extern void *vmalloc_user(unsigned long size);
64376-extern void *vmalloc_node(unsigned long size, int node);
64377-extern void *vzalloc_node(unsigned long size, int node);
64378-extern void *vmalloc_exec(unsigned long size);
64379-extern void *vmalloc_32(unsigned long size);
64380-extern void *vmalloc_32_user(unsigned long size);
64381-extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
64382+extern void *vmalloc(unsigned long size) __size_overflow(1);
64383+extern void *vzalloc(unsigned long size) __size_overflow(1);
64384+extern void *vmalloc_user(unsigned long size) __size_overflow(1);
64385+extern void *vmalloc_node(unsigned long size, int node) __size_overflow(1);
64386+extern void *vzalloc_node(unsigned long size, int node) __size_overflow(1);
64387+extern void *vmalloc_exec(unsigned long size) __size_overflow(1);
64388+extern void *vmalloc_32(unsigned long size) __size_overflow(1);
64389+extern void *vmalloc_32_user(unsigned long size) __size_overflow(1);
64390+extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) __size_overflow(1);
64391 extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
64392 unsigned long start, unsigned long end, gfp_t gfp_mask,
64393- pgprot_t prot, int node, void *caller);
64394+ pgprot_t prot, int node, void *caller) __size_overflow(1);
64395 extern void vfree(const void *addr);
64396
64397 extern void *vmap(struct page **pages, unsigned int count,
64398@@ -123,8 +128,8 @@ extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes);
64399 extern void free_vm_area(struct vm_struct *area);
64400
64401 /* for /dev/kmem */
64402-extern long vread(char *buf, char *addr, unsigned long count);
64403-extern long vwrite(char *buf, char *addr, unsigned long count);
64404+extern long vread(char *buf, char *addr, unsigned long count) __size_overflow(3);
64405+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
64406
64407 /*
64408 * Internals. Dont't use..
64409diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
64410index 65efb92..137adbb 100644
64411--- a/include/linux/vmstat.h
64412+++ b/include/linux/vmstat.h
64413@@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(int cpu)
64414 /*
64415 * Zone based page accounting with per cpu differentials.
64416 */
64417-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64418+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64419
64420 static inline void zone_page_state_add(long x, struct zone *zone,
64421 enum zone_stat_item item)
64422 {
64423- atomic_long_add(x, &zone->vm_stat[item]);
64424- atomic_long_add(x, &vm_stat[item]);
64425+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
64426+ atomic_long_add_unchecked(x, &vm_stat[item]);
64427 }
64428
64429 static inline unsigned long global_page_state(enum zone_stat_item item)
64430 {
64431- long x = atomic_long_read(&vm_stat[item]);
64432+ long x = atomic_long_read_unchecked(&vm_stat[item]);
64433 #ifdef CONFIG_SMP
64434 if (x < 0)
64435 x = 0;
64436@@ -109,7 +109,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
64437 static inline unsigned long zone_page_state(struct zone *zone,
64438 enum zone_stat_item item)
64439 {
64440- long x = atomic_long_read(&zone->vm_stat[item]);
64441+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64442 #ifdef CONFIG_SMP
64443 if (x < 0)
64444 x = 0;
64445@@ -126,7 +126,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
64446 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
64447 enum zone_stat_item item)
64448 {
64449- long x = atomic_long_read(&zone->vm_stat[item]);
64450+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64451
64452 #ifdef CONFIG_SMP
64453 int cpu;
64454@@ -221,8 +221,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
64455
64456 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
64457 {
64458- atomic_long_inc(&zone->vm_stat[item]);
64459- atomic_long_inc(&vm_stat[item]);
64460+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
64461+ atomic_long_inc_unchecked(&vm_stat[item]);
64462 }
64463
64464 static inline void __inc_zone_page_state(struct page *page,
64465@@ -233,8 +233,8 @@ static inline void __inc_zone_page_state(struct page *page,
64466
64467 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
64468 {
64469- atomic_long_dec(&zone->vm_stat[item]);
64470- atomic_long_dec(&vm_stat[item]);
64471+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
64472+ atomic_long_dec_unchecked(&vm_stat[item]);
64473 }
64474
64475 static inline void __dec_zone_page_state(struct page *page,
64476diff --git a/include/linux/xattr.h b/include/linux/xattr.h
64477index e5d1220..ef6e406 100644
64478--- a/include/linux/xattr.h
64479+++ b/include/linux/xattr.h
64480@@ -57,6 +57,11 @@
64481 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
64482 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
64483
64484+/* User namespace */
64485+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
64486+#define XATTR_PAX_FLAGS_SUFFIX "flags"
64487+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
64488+
64489 #ifdef __KERNEL__
64490
64491 #include <linux/types.h>
64492diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
64493index 4aeff96..b378cdc 100644
64494--- a/include/media/saa7146_vv.h
64495+++ b/include/media/saa7146_vv.h
64496@@ -163,7 +163,7 @@ struct saa7146_ext_vv
64497 int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
64498
64499 /* the extension can override this */
64500- struct v4l2_ioctl_ops ops;
64501+ v4l2_ioctl_ops_no_const ops;
64502 /* pointer to the saa7146 core ops */
64503 const struct v4l2_ioctl_ops *core_ops;
64504
64505diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
64506index c7c40f1..4f01585 100644
64507--- a/include/media/v4l2-dev.h
64508+++ b/include/media/v4l2-dev.h
64509@@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority local);
64510
64511
64512 struct v4l2_file_operations {
64513- struct module *owner;
64514+ struct module * const owner;
64515 ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
64516 ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
64517 unsigned int (*poll) (struct file *, struct poll_table_struct *);
64518@@ -68,6 +68,7 @@ struct v4l2_file_operations {
64519 int (*open) (struct file *);
64520 int (*release) (struct file *);
64521 };
64522+typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
64523
64524 /*
64525 * Newer version of video_device, handled by videodev2.c
64526diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
64527index 4d1c74a..65e1221 100644
64528--- a/include/media/v4l2-ioctl.h
64529+++ b/include/media/v4l2-ioctl.h
64530@@ -274,7 +274,7 @@ struct v4l2_ioctl_ops {
64531 long (*vidioc_default) (struct file *file, void *fh,
64532 bool valid_prio, int cmd, void *arg);
64533 };
64534-
64535+typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
64536
64537 /* v4l debugging and diagnostics */
64538
64539diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
64540index 8d55251..dfe5b0a 100644
64541--- a/include/net/caif/caif_hsi.h
64542+++ b/include/net/caif/caif_hsi.h
64543@@ -98,7 +98,7 @@ struct cfhsi_drv {
64544 void (*rx_done_cb) (struct cfhsi_drv *drv);
64545 void (*wake_up_cb) (struct cfhsi_drv *drv);
64546 void (*wake_down_cb) (struct cfhsi_drv *drv);
64547-};
64548+} __no_const;
64549
64550 /* Structure implemented by HSI device. */
64551 struct cfhsi_dev {
64552diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
64553index 9e5425b..8136ffc 100644
64554--- a/include/net/caif/cfctrl.h
64555+++ b/include/net/caif/cfctrl.h
64556@@ -52,7 +52,7 @@ struct cfctrl_rsp {
64557 void (*radioset_rsp)(void);
64558 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
64559 struct cflayer *client_layer);
64560-};
64561+} __no_const;
64562
64563 /* Link Setup Parameters for CAIF-Links. */
64564 struct cfctrl_link_param {
64565@@ -101,8 +101,8 @@ struct cfctrl_request_info {
64566 struct cfctrl {
64567 struct cfsrvl serv;
64568 struct cfctrl_rsp res;
64569- atomic_t req_seq_no;
64570- atomic_t rsp_seq_no;
64571+ atomic_unchecked_t req_seq_no;
64572+ atomic_unchecked_t rsp_seq_no;
64573 struct list_head list;
64574 /* Protects from simultaneous access to first_req list */
64575 spinlock_t info_list_lock;
64576diff --git a/include/net/flow.h b/include/net/flow.h
64577index 2a7eefd..3250f3b 100644
64578--- a/include/net/flow.h
64579+++ b/include/net/flow.h
64580@@ -218,6 +218,6 @@ extern struct flow_cache_object *flow_cache_lookup(
64581
64582 extern void flow_cache_flush(void);
64583 extern void flow_cache_flush_deferred(void);
64584-extern atomic_t flow_cache_genid;
64585+extern atomic_unchecked_t flow_cache_genid;
64586
64587 #endif
64588diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
64589index e9ff3fc..9d3e5c7 100644
64590--- a/include/net/inetpeer.h
64591+++ b/include/net/inetpeer.h
64592@@ -48,8 +48,8 @@ struct inet_peer {
64593 */
64594 union {
64595 struct {
64596- atomic_t rid; /* Frag reception counter */
64597- atomic_t ip_id_count; /* IP ID for the next packet */
64598+ atomic_unchecked_t rid; /* Frag reception counter */
64599+ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
64600 __u32 tcp_ts;
64601 __u32 tcp_ts_stamp;
64602 };
64603@@ -113,11 +113,11 @@ static inline int inet_getid(struct inet_peer *p, int more)
64604 more++;
64605 inet_peer_refcheck(p);
64606 do {
64607- old = atomic_read(&p->ip_id_count);
64608+ old = atomic_read_unchecked(&p->ip_id_count);
64609 new = old + more;
64610 if (!new)
64611 new = 1;
64612- } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
64613+ } while (atomic_cmpxchg_unchecked(&p->ip_id_count, old, new) != old);
64614 return new;
64615 }
64616
64617diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
64618index 10422ef..662570f 100644
64619--- a/include/net/ip_fib.h
64620+++ b/include/net/ip_fib.h
64621@@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
64622
64623 #define FIB_RES_SADDR(net, res) \
64624 ((FIB_RES_NH(res).nh_saddr_genid == \
64625- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
64626+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
64627 FIB_RES_NH(res).nh_saddr : \
64628 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
64629 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
64630diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
64631index e5a7b9a..f4fc44b 100644
64632--- a/include/net/ip_vs.h
64633+++ b/include/net/ip_vs.h
64634@@ -509,7 +509,7 @@ struct ip_vs_conn {
64635 struct ip_vs_conn *control; /* Master control connection */
64636 atomic_t n_control; /* Number of controlled ones */
64637 struct ip_vs_dest *dest; /* real server */
64638- atomic_t in_pkts; /* incoming packet counter */
64639+ atomic_unchecked_t in_pkts; /* incoming packet counter */
64640
64641 /* packet transmitter for different forwarding methods. If it
64642 mangles the packet, it must return NF_DROP or better NF_STOLEN,
64643@@ -647,7 +647,7 @@ struct ip_vs_dest {
64644 __be16 port; /* port number of the server */
64645 union nf_inet_addr addr; /* IP address of the server */
64646 volatile unsigned flags; /* dest status flags */
64647- atomic_t conn_flags; /* flags to copy to conn */
64648+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
64649 atomic_t weight; /* server weight */
64650
64651 atomic_t refcnt; /* reference counter */
64652diff --git a/include/net/irda/ircomm_core.h b/include/net/irda/ircomm_core.h
64653index 69b610a..fe3962c 100644
64654--- a/include/net/irda/ircomm_core.h
64655+++ b/include/net/irda/ircomm_core.h
64656@@ -51,7 +51,7 @@ typedef struct {
64657 int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
64658 int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
64659 struct ircomm_info *);
64660-} call_t;
64661+} __no_const call_t;
64662
64663 struct ircomm_cb {
64664 irda_queue_t queue;
64665diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
64666index 59ba38bc..d515662 100644
64667--- a/include/net/irda/ircomm_tty.h
64668+++ b/include/net/irda/ircomm_tty.h
64669@@ -35,6 +35,7 @@
64670 #include <linux/termios.h>
64671 #include <linux/timer.h>
64672 #include <linux/tty.h> /* struct tty_struct */
64673+#include <asm/local.h>
64674
64675 #include <net/irda/irias_object.h>
64676 #include <net/irda/ircomm_core.h>
64677@@ -105,8 +106,8 @@ struct ircomm_tty_cb {
64678 unsigned short close_delay;
64679 unsigned short closing_wait; /* time to wait before closing */
64680
64681- int open_count;
64682- int blocked_open; /* # of blocked opens */
64683+ local_t open_count;
64684+ local_t blocked_open; /* # of blocked opens */
64685
64686 /* Protect concurent access to :
64687 * o self->open_count
64688diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
64689index f2419cf..473679f 100644
64690--- a/include/net/iucv/af_iucv.h
64691+++ b/include/net/iucv/af_iucv.h
64692@@ -139,7 +139,7 @@ struct iucv_sock {
64693 struct iucv_sock_list {
64694 struct hlist_head head;
64695 rwlock_t lock;
64696- atomic_t autobind_name;
64697+ atomic_unchecked_t autobind_name;
64698 };
64699
64700 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
64701diff --git a/include/net/neighbour.h b/include/net/neighbour.h
64702index 2720884..3aa5c25 100644
64703--- a/include/net/neighbour.h
64704+++ b/include/net/neighbour.h
64705@@ -122,7 +122,7 @@ struct neigh_ops {
64706 void (*error_report)(struct neighbour *, struct sk_buff *);
64707 int (*output)(struct neighbour *, struct sk_buff *);
64708 int (*connected_output)(struct neighbour *, struct sk_buff *);
64709-};
64710+} __do_const;
64711
64712 struct pneigh_entry {
64713 struct pneigh_entry *next;
64714diff --git a/include/net/netlink.h b/include/net/netlink.h
64715index cb1f350..3279d2c 100644
64716--- a/include/net/netlink.h
64717+++ b/include/net/netlink.h
64718@@ -569,7 +569,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
64719 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
64720 {
64721 if (mark)
64722- skb_trim(skb, (unsigned char *) mark - skb->data);
64723+ skb_trim(skb, (const unsigned char *) mark - skb->data);
64724 }
64725
64726 /**
64727diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
64728index d786b4f..4c3dd41 100644
64729--- a/include/net/netns/ipv4.h
64730+++ b/include/net/netns/ipv4.h
64731@@ -56,8 +56,8 @@ struct netns_ipv4 {
64732
64733 unsigned int sysctl_ping_group_range[2];
64734
64735- atomic_t rt_genid;
64736- atomic_t dev_addr_genid;
64737+ atomic_unchecked_t rt_genid;
64738+ atomic_unchecked_t dev_addr_genid;
64739
64740 #ifdef CONFIG_IP_MROUTE
64741 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
64742diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
64743index 6a72a58..e6a127d 100644
64744--- a/include/net/sctp/sctp.h
64745+++ b/include/net/sctp/sctp.h
64746@@ -318,9 +318,9 @@ do { \
64747
64748 #else /* SCTP_DEBUG */
64749
64750-#define SCTP_DEBUG_PRINTK(whatever...)
64751-#define SCTP_DEBUG_PRINTK_CONT(fmt, args...)
64752-#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
64753+#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
64754+#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0)
64755+#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
64756 #define SCTP_ENABLE_DEBUG
64757 #define SCTP_DISABLE_DEBUG
64758 #define SCTP_ASSERT(expr, str, func)
64759diff --git a/include/net/sock.h b/include/net/sock.h
64760index 32e3937..87a1dbc 100644
64761--- a/include/net/sock.h
64762+++ b/include/net/sock.h
64763@@ -277,7 +277,7 @@ struct sock {
64764 #ifdef CONFIG_RPS
64765 __u32 sk_rxhash;
64766 #endif
64767- atomic_t sk_drops;
64768+ atomic_unchecked_t sk_drops;
64769 int sk_rcvbuf;
64770
64771 struct sk_filter __rcu *sk_filter;
64772@@ -1402,7 +1402,7 @@ static inline void sk_nocaps_add(struct sock *sk, int flags)
64773 }
64774
64775 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
64776- char __user *from, char *to,
64777+ char __user *from, unsigned char *to,
64778 int copy, int offset)
64779 {
64780 if (skb->ip_summed == CHECKSUM_NONE) {
64781diff --git a/include/net/tcp.h b/include/net/tcp.h
64782index bb18c4d..bb87972 100644
64783--- a/include/net/tcp.h
64784+++ b/include/net/tcp.h
64785@@ -1409,7 +1409,7 @@ struct tcp_seq_afinfo {
64786 char *name;
64787 sa_family_t family;
64788 const struct file_operations *seq_fops;
64789- struct seq_operations seq_ops;
64790+ seq_operations_no_const seq_ops;
64791 };
64792
64793 struct tcp_iter_state {
64794diff --git a/include/net/udp.h b/include/net/udp.h
64795index 3b285f4..0219639 100644
64796--- a/include/net/udp.h
64797+++ b/include/net/udp.h
64798@@ -237,7 +237,7 @@ struct udp_seq_afinfo {
64799 sa_family_t family;
64800 struct udp_table *udp_table;
64801 const struct file_operations *seq_fops;
64802- struct seq_operations seq_ops;
64803+ seq_operations_no_const seq_ops;
64804 };
64805
64806 struct udp_iter_state {
64807diff --git a/include/net/xfrm.h b/include/net/xfrm.h
64808index b203e14..1df3991 100644
64809--- a/include/net/xfrm.h
64810+++ b/include/net/xfrm.h
64811@@ -505,7 +505,7 @@ struct xfrm_policy {
64812 struct timer_list timer;
64813
64814 struct flow_cache_object flo;
64815- atomic_t genid;
64816+ atomic_unchecked_t genid;
64817 u32 priority;
64818 u32 index;
64819 struct xfrm_mark mark;
64820diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
64821index 1a046b1..ee0bef0 100644
64822--- a/include/rdma/iw_cm.h
64823+++ b/include/rdma/iw_cm.h
64824@@ -122,7 +122,7 @@ struct iw_cm_verbs {
64825 int backlog);
64826
64827 int (*destroy_listen)(struct iw_cm_id *cm_id);
64828-};
64829+} __no_const;
64830
64831 /**
64832 * iw_create_cm_id - Create an IW CM identifier.
64833diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
64834index 5d1a758..1dbf795 100644
64835--- a/include/scsi/libfc.h
64836+++ b/include/scsi/libfc.h
64837@@ -748,6 +748,7 @@ struct libfc_function_template {
64838 */
64839 void (*disc_stop_final) (struct fc_lport *);
64840 };
64841+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
64842
64843 /**
64844 * struct fc_disc - Discovery context
64845@@ -851,7 +852,7 @@ struct fc_lport {
64846 struct fc_vport *vport;
64847
64848 /* Operational Information */
64849- struct libfc_function_template tt;
64850+ libfc_function_template_no_const tt;
64851 u8 link_up;
64852 u8 qfull;
64853 enum fc_lport_state state;
64854diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
64855index 5591ed5..13eb457 100644
64856--- a/include/scsi/scsi_device.h
64857+++ b/include/scsi/scsi_device.h
64858@@ -161,9 +161,9 @@ struct scsi_device {
64859 unsigned int max_device_blocked; /* what device_blocked counts down from */
64860 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
64861
64862- atomic_t iorequest_cnt;
64863- atomic_t iodone_cnt;
64864- atomic_t ioerr_cnt;
64865+ atomic_unchecked_t iorequest_cnt;
64866+ atomic_unchecked_t iodone_cnt;
64867+ atomic_unchecked_t ioerr_cnt;
64868
64869 struct device sdev_gendev,
64870 sdev_dev;
64871diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
64872index 2a65167..91e01f8 100644
64873--- a/include/scsi/scsi_transport_fc.h
64874+++ b/include/scsi/scsi_transport_fc.h
64875@@ -711,7 +711,7 @@ struct fc_function_template {
64876 unsigned long show_host_system_hostname:1;
64877
64878 unsigned long disable_target_scan:1;
64879-};
64880+} __do_const;
64881
64882
64883 /**
64884diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
64885index 030b87c..98a6954 100644
64886--- a/include/sound/ak4xxx-adda.h
64887+++ b/include/sound/ak4xxx-adda.h
64888@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
64889 void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
64890 unsigned char val);
64891 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
64892-};
64893+} __no_const;
64894
64895 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
64896
64897diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
64898index 8c05e47..2b5df97 100644
64899--- a/include/sound/hwdep.h
64900+++ b/include/sound/hwdep.h
64901@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
64902 struct snd_hwdep_dsp_status *status);
64903 int (*dsp_load)(struct snd_hwdep *hw,
64904 struct snd_hwdep_dsp_image *image);
64905-};
64906+} __no_const;
64907
64908 struct snd_hwdep {
64909 struct snd_card *card;
64910diff --git a/include/sound/info.h b/include/sound/info.h
64911index 5492cc4..1a65278 100644
64912--- a/include/sound/info.h
64913+++ b/include/sound/info.h
64914@@ -44,7 +44,7 @@ struct snd_info_entry_text {
64915 struct snd_info_buffer *buffer);
64916 void (*write)(struct snd_info_entry *entry,
64917 struct snd_info_buffer *buffer);
64918-};
64919+} __no_const;
64920
64921 struct snd_info_entry_ops {
64922 int (*open)(struct snd_info_entry *entry,
64923diff --git a/include/sound/pcm.h b/include/sound/pcm.h
64924index 0cf91b2..b70cae4 100644
64925--- a/include/sound/pcm.h
64926+++ b/include/sound/pcm.h
64927@@ -81,6 +81,7 @@ struct snd_pcm_ops {
64928 int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
64929 int (*ack)(struct snd_pcm_substream *substream);
64930 };
64931+typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
64932
64933 /*
64934 *
64935diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h
64936index af1b49e..a5d55a5 100644
64937--- a/include/sound/sb16_csp.h
64938+++ b/include/sound/sb16_csp.h
64939@@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
64940 int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
64941 int (*csp_stop) (struct snd_sb_csp * p);
64942 int (*csp_qsound_transfer) (struct snd_sb_csp * p);
64943-};
64944+} __no_const;
64945
64946 /*
64947 * CSP private data
64948diff --git a/include/sound/soc.h b/include/sound/soc.h
64949index 11cfb59..e3f93f4 100644
64950--- a/include/sound/soc.h
64951+++ b/include/sound/soc.h
64952@@ -683,7 +683,7 @@ struct snd_soc_platform_driver {
64953 /* platform IO - used for platform DAPM */
64954 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
64955 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
64956-};
64957+} __do_const;
64958
64959 struct snd_soc_platform {
64960 const char *name;
64961diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
64962index 444cd6b..3327cc5 100644
64963--- a/include/sound/ymfpci.h
64964+++ b/include/sound/ymfpci.h
64965@@ -358,7 +358,7 @@ struct snd_ymfpci {
64966 spinlock_t reg_lock;
64967 spinlock_t voice_lock;
64968 wait_queue_head_t interrupt_sleep;
64969- atomic_t interrupt_sleep_count;
64970+ atomic_unchecked_t interrupt_sleep_count;
64971 struct snd_info_entry *proc_entry;
64972 const struct firmware *dsp_microcode;
64973 const struct firmware *controller_microcode;
64974diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
64975index 94bbec3..3a8c6b0 100644
64976--- a/include/target/target_core_base.h
64977+++ b/include/target/target_core_base.h
64978@@ -346,7 +346,7 @@ struct t10_reservation_ops {
64979 int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
64980 int (*t10_pr_register)(struct se_cmd *);
64981 int (*t10_pr_clear)(struct se_cmd *);
64982-};
64983+} __no_const;
64984
64985 struct t10_reservation {
64986 /* Reservation effects all target ports */
64987@@ -465,8 +465,8 @@ struct se_cmd {
64988 atomic_t t_se_count;
64989 atomic_t t_task_cdbs_left;
64990 atomic_t t_task_cdbs_ex_left;
64991- atomic_t t_task_cdbs_sent;
64992- atomic_t t_transport_aborted;
64993+ atomic_unchecked_t t_task_cdbs_sent;
64994+ atomic_unchecked_t t_transport_aborted;
64995 atomic_t t_transport_active;
64996 atomic_t t_transport_complete;
64997 atomic_t t_transport_queue_active;
64998@@ -705,7 +705,7 @@ struct se_device {
64999 /* Active commands on this virtual SE device */
65000 atomic_t simple_cmds;
65001 atomic_t depth_left;
65002- atomic_t dev_ordered_id;
65003+ atomic_unchecked_t dev_ordered_id;
65004 atomic_t execute_tasks;
65005 atomic_t dev_ordered_sync;
65006 atomic_t dev_qf_count;
65007diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
65008index 1c09820..7f5ec79 100644
65009--- a/include/trace/events/irq.h
65010+++ b/include/trace/events/irq.h
65011@@ -36,7 +36,7 @@ struct softirq_action;
65012 */
65013 TRACE_EVENT(irq_handler_entry,
65014
65015- TP_PROTO(int irq, struct irqaction *action),
65016+ TP_PROTO(int irq, const struct irqaction *action),
65017
65018 TP_ARGS(irq, action),
65019
65020@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
65021 */
65022 TRACE_EVENT(irq_handler_exit,
65023
65024- TP_PROTO(int irq, struct irqaction *action, int ret),
65025+ TP_PROTO(int irq, const struct irqaction *action, int ret),
65026
65027 TP_ARGS(irq, action, ret),
65028
65029diff --git a/include/video/udlfb.h b/include/video/udlfb.h
65030index c41f308..6918de3 100644
65031--- a/include/video/udlfb.h
65032+++ b/include/video/udlfb.h
65033@@ -52,10 +52,10 @@ struct dlfb_data {
65034 u32 pseudo_palette[256];
65035 int blank_mode; /*one of FB_BLANK_ */
65036 /* blit-only rendering path metrics, exposed through sysfs */
65037- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
65038- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
65039- atomic_t bytes_sent; /* to usb, after compression including overhead */
65040- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
65041+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
65042+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
65043+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
65044+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
65045 };
65046
65047 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
65048diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
65049index 0993a22..32ba2fe 100644
65050--- a/include/video/uvesafb.h
65051+++ b/include/video/uvesafb.h
65052@@ -177,6 +177,7 @@ struct uvesafb_par {
65053 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
65054 u8 pmi_setpal; /* PMI for palette changes */
65055 u16 *pmi_base; /* protected mode interface location */
65056+ u8 *pmi_code; /* protected mode code location */
65057 void *pmi_start;
65058 void *pmi_pal;
65059 u8 *vbe_state_orig; /*
65060diff --git a/init/Kconfig b/init/Kconfig
65061index 43298f9..2f56c12 100644
65062--- a/init/Kconfig
65063+++ b/init/Kconfig
65064@@ -1214,7 +1214,7 @@ config SLUB_DEBUG
65065
65066 config COMPAT_BRK
65067 bool "Disable heap randomization"
65068- default y
65069+ default n
65070 help
65071 Randomizing heap placement makes heap exploits harder, but it
65072 also breaks ancient binaries (including anything libc5 based).
65073diff --git a/init/do_mounts.c b/init/do_mounts.c
65074index db6e5ee..7677ff7 100644
65075--- a/init/do_mounts.c
65076+++ b/init/do_mounts.c
65077@@ -325,11 +325,11 @@ static void __init get_fs_names(char *page)
65078
65079 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
65080 {
65081- int err = sys_mount(name, "/root", fs, flags, data);
65082+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
65083 if (err)
65084 return err;
65085
65086- sys_chdir((const char __user __force *)"/root");
65087+ sys_chdir((const char __force_user*)"/root");
65088 ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
65089 printk(KERN_INFO
65090 "VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
65091@@ -448,18 +448,18 @@ void __init change_floppy(char *fmt, ...)
65092 va_start(args, fmt);
65093 vsprintf(buf, fmt, args);
65094 va_end(args);
65095- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
65096+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
65097 if (fd >= 0) {
65098 sys_ioctl(fd, FDEJECT, 0);
65099 sys_close(fd);
65100 }
65101 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
65102- fd = sys_open("/dev/console", O_RDWR, 0);
65103+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
65104 if (fd >= 0) {
65105 sys_ioctl(fd, TCGETS, (long)&termios);
65106 termios.c_lflag &= ~ICANON;
65107 sys_ioctl(fd, TCSETSF, (long)&termios);
65108- sys_read(fd, &c, 1);
65109+ sys_read(fd, (char __user *)&c, 1);
65110 termios.c_lflag |= ICANON;
65111 sys_ioctl(fd, TCSETSF, (long)&termios);
65112 sys_close(fd);
65113@@ -553,6 +553,6 @@ void __init prepare_namespace(void)
65114 mount_root();
65115 out:
65116 devtmpfs_mount("dev");
65117- sys_mount(".", "/", NULL, MS_MOVE, NULL);
65118- sys_chroot((const char __user __force *)".");
65119+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
65120+ sys_chroot((const char __force_user *)".");
65121 }
65122diff --git a/init/do_mounts.h b/init/do_mounts.h
65123index f5b978a..69dbfe8 100644
65124--- a/init/do_mounts.h
65125+++ b/init/do_mounts.h
65126@@ -15,15 +15,15 @@ extern int root_mountflags;
65127
65128 static inline int create_dev(char *name, dev_t dev)
65129 {
65130- sys_unlink(name);
65131- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
65132+ sys_unlink((char __force_user *)name);
65133+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
65134 }
65135
65136 #if BITS_PER_LONG == 32
65137 static inline u32 bstat(char *name)
65138 {
65139 struct stat64 stat;
65140- if (sys_stat64(name, &stat) != 0)
65141+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
65142 return 0;
65143 if (!S_ISBLK(stat.st_mode))
65144 return 0;
65145@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
65146 static inline u32 bstat(char *name)
65147 {
65148 struct stat stat;
65149- if (sys_newstat(name, &stat) != 0)
65150+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
65151 return 0;
65152 if (!S_ISBLK(stat.st_mode))
65153 return 0;
65154diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
65155index 3098a38..253064e 100644
65156--- a/init/do_mounts_initrd.c
65157+++ b/init/do_mounts_initrd.c
65158@@ -44,13 +44,13 @@ static void __init handle_initrd(void)
65159 create_dev("/dev/root.old", Root_RAM0);
65160 /* mount initrd on rootfs' /root */
65161 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
65162- sys_mkdir("/old", 0700);
65163- root_fd = sys_open("/", 0, 0);
65164- old_fd = sys_open("/old", 0, 0);
65165+ sys_mkdir((const char __force_user *)"/old", 0700);
65166+ root_fd = sys_open((const char __force_user *)"/", 0, 0);
65167+ old_fd = sys_open((const char __force_user *)"/old", 0, 0);
65168 /* move initrd over / and chdir/chroot in initrd root */
65169- sys_chdir("/root");
65170- sys_mount(".", "/", NULL, MS_MOVE, NULL);
65171- sys_chroot(".");
65172+ sys_chdir((const char __force_user *)"/root");
65173+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
65174+ sys_chroot((const char __force_user *)".");
65175
65176 /*
65177 * In case that a resume from disk is carried out by linuxrc or one of
65178@@ -67,15 +67,15 @@ static void __init handle_initrd(void)
65179
65180 /* move initrd to rootfs' /old */
65181 sys_fchdir(old_fd);
65182- sys_mount("/", ".", NULL, MS_MOVE, NULL);
65183+ sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
65184 /* switch root and cwd back to / of rootfs */
65185 sys_fchdir(root_fd);
65186- sys_chroot(".");
65187+ sys_chroot((const char __force_user *)".");
65188 sys_close(old_fd);
65189 sys_close(root_fd);
65190
65191 if (new_decode_dev(real_root_dev) == Root_RAM0) {
65192- sys_chdir("/old");
65193+ sys_chdir((const char __force_user *)"/old");
65194 return;
65195 }
65196
65197@@ -83,17 +83,17 @@ static void __init handle_initrd(void)
65198 mount_root();
65199
65200 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
65201- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
65202+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
65203 if (!error)
65204 printk("okay\n");
65205 else {
65206- int fd = sys_open("/dev/root.old", O_RDWR, 0);
65207+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
65208 if (error == -ENOENT)
65209 printk("/initrd does not exist. Ignored.\n");
65210 else
65211 printk("failed\n");
65212 printk(KERN_NOTICE "Unmounting old root\n");
65213- sys_umount("/old", MNT_DETACH);
65214+ sys_umount((char __force_user *)"/old", MNT_DETACH);
65215 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
65216 if (fd < 0) {
65217 error = fd;
65218@@ -116,11 +116,11 @@ int __init initrd_load(void)
65219 * mounted in the normal path.
65220 */
65221 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
65222- sys_unlink("/initrd.image");
65223+ sys_unlink((const char __force_user *)"/initrd.image");
65224 handle_initrd();
65225 return 1;
65226 }
65227 }
65228- sys_unlink("/initrd.image");
65229+ sys_unlink((const char __force_user *)"/initrd.image");
65230 return 0;
65231 }
65232diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
65233index 32c4799..c27ee74 100644
65234--- a/init/do_mounts_md.c
65235+++ b/init/do_mounts_md.c
65236@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
65237 partitioned ? "_d" : "", minor,
65238 md_setup_args[ent].device_names);
65239
65240- fd = sys_open(name, 0, 0);
65241+ fd = sys_open((char __force_user *)name, 0, 0);
65242 if (fd < 0) {
65243 printk(KERN_ERR "md: open failed - cannot start "
65244 "array %s\n", name);
65245@@ -233,7 +233,7 @@ static void __init md_setup_drive(void)
65246 * array without it
65247 */
65248 sys_close(fd);
65249- fd = sys_open(name, 0, 0);
65250+ fd = sys_open((char __force_user *)name, 0, 0);
65251 sys_ioctl(fd, BLKRRPART, 0);
65252 }
65253 sys_close(fd);
65254@@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
65255
65256 wait_for_device_probe();
65257
65258- fd = sys_open((const char __user __force *) "/dev/md0", 0, 0);
65259+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
65260 if (fd >= 0) {
65261 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
65262 sys_close(fd);
65263diff --git a/init/initramfs.c b/init/initramfs.c
65264index 2531811..040d4d4 100644
65265--- a/init/initramfs.c
65266+++ b/init/initramfs.c
65267@@ -74,7 +74,7 @@ static void __init free_hash(void)
65268 }
65269 }
65270
65271-static long __init do_utime(char __user *filename, time_t mtime)
65272+static long __init do_utime(__force char __user *filename, time_t mtime)
65273 {
65274 struct timespec t[2];
65275
65276@@ -109,7 +109,7 @@ static void __init dir_utime(void)
65277 struct dir_entry *de, *tmp;
65278 list_for_each_entry_safe(de, tmp, &dir_list, list) {
65279 list_del(&de->list);
65280- do_utime(de->name, de->mtime);
65281+ do_utime((char __force_user *)de->name, de->mtime);
65282 kfree(de->name);
65283 kfree(de);
65284 }
65285@@ -271,7 +271,7 @@ static int __init maybe_link(void)
65286 if (nlink >= 2) {
65287 char *old = find_link(major, minor, ino, mode, collected);
65288 if (old)
65289- return (sys_link(old, collected) < 0) ? -1 : 1;
65290+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
65291 }
65292 return 0;
65293 }
65294@@ -280,11 +280,11 @@ static void __init clean_path(char *path, mode_t mode)
65295 {
65296 struct stat st;
65297
65298- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
65299+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
65300 if (S_ISDIR(st.st_mode))
65301- sys_rmdir(path);
65302+ sys_rmdir((char __force_user *)path);
65303 else
65304- sys_unlink(path);
65305+ sys_unlink((char __force_user *)path);
65306 }
65307 }
65308
65309@@ -305,7 +305,7 @@ static int __init do_name(void)
65310 int openflags = O_WRONLY|O_CREAT;
65311 if (ml != 1)
65312 openflags |= O_TRUNC;
65313- wfd = sys_open(collected, openflags, mode);
65314+ wfd = sys_open((char __force_user *)collected, openflags, mode);
65315
65316 if (wfd >= 0) {
65317 sys_fchown(wfd, uid, gid);
65318@@ -317,17 +317,17 @@ static int __init do_name(void)
65319 }
65320 }
65321 } else if (S_ISDIR(mode)) {
65322- sys_mkdir(collected, mode);
65323- sys_chown(collected, uid, gid);
65324- sys_chmod(collected, mode);
65325+ sys_mkdir((char __force_user *)collected, mode);
65326+ sys_chown((char __force_user *)collected, uid, gid);
65327+ sys_chmod((char __force_user *)collected, mode);
65328 dir_add(collected, mtime);
65329 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
65330 S_ISFIFO(mode) || S_ISSOCK(mode)) {
65331 if (maybe_link() == 0) {
65332- sys_mknod(collected, mode, rdev);
65333- sys_chown(collected, uid, gid);
65334- sys_chmod(collected, mode);
65335- do_utime(collected, mtime);
65336+ sys_mknod((char __force_user *)collected, mode, rdev);
65337+ sys_chown((char __force_user *)collected, uid, gid);
65338+ sys_chmod((char __force_user *)collected, mode);
65339+ do_utime((char __force_user *)collected, mtime);
65340 }
65341 }
65342 return 0;
65343@@ -336,15 +336,15 @@ static int __init do_name(void)
65344 static int __init do_copy(void)
65345 {
65346 if (count >= body_len) {
65347- sys_write(wfd, victim, body_len);
65348+ sys_write(wfd, (char __force_user *)victim, body_len);
65349 sys_close(wfd);
65350- do_utime(vcollected, mtime);
65351+ do_utime((char __force_user *)vcollected, mtime);
65352 kfree(vcollected);
65353 eat(body_len);
65354 state = SkipIt;
65355 return 0;
65356 } else {
65357- sys_write(wfd, victim, count);
65358+ sys_write(wfd, (char __force_user *)victim, count);
65359 body_len -= count;
65360 eat(count);
65361 return 1;
65362@@ -355,9 +355,9 @@ static int __init do_symlink(void)
65363 {
65364 collected[N_ALIGN(name_len) + body_len] = '\0';
65365 clean_path(collected, 0);
65366- sys_symlink(collected + N_ALIGN(name_len), collected);
65367- sys_lchown(collected, uid, gid);
65368- do_utime(collected, mtime);
65369+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
65370+ sys_lchown((char __force_user *)collected, uid, gid);
65371+ do_utime((char __force_user *)collected, mtime);
65372 state = SkipIt;
65373 next_state = Reset;
65374 return 0;
65375diff --git a/init/main.c b/init/main.c
65376index 217ed23..ec5406f 100644
65377--- a/init/main.c
65378+++ b/init/main.c
65379@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) { }
65380 extern void tc_init(void);
65381 #endif
65382
65383+extern void grsecurity_init(void);
65384+
65385 /*
65386 * Debug helper: via this flag we know that we are in 'early bootup code'
65387 * where only the boot processor is running with IRQ disabled. This means
65388@@ -149,6 +151,49 @@ static int __init set_reset_devices(char *str)
65389
65390 __setup("reset_devices", set_reset_devices);
65391
65392+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
65393+extern char pax_enter_kernel_user[];
65394+extern char pax_exit_kernel_user[];
65395+extern pgdval_t clone_pgd_mask;
65396+#endif
65397+
65398+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
65399+static int __init setup_pax_nouderef(char *str)
65400+{
65401+#ifdef CONFIG_X86_32
65402+ unsigned int cpu;
65403+ struct desc_struct *gdt;
65404+
65405+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
65406+ gdt = get_cpu_gdt_table(cpu);
65407+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
65408+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
65409+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
65410+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
65411+ }
65412+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
65413+#else
65414+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
65415+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
65416+ clone_pgd_mask = ~(pgdval_t)0UL;
65417+#endif
65418+
65419+ return 0;
65420+}
65421+early_param("pax_nouderef", setup_pax_nouderef);
65422+#endif
65423+
65424+#ifdef CONFIG_PAX_SOFTMODE
65425+int pax_softmode;
65426+
65427+static int __init setup_pax_softmode(char *str)
65428+{
65429+ get_option(&str, &pax_softmode);
65430+ return 1;
65431+}
65432+__setup("pax_softmode=", setup_pax_softmode);
65433+#endif
65434+
65435 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
65436 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
65437 static const char *panic_later, *panic_param;
65438@@ -681,6 +726,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
65439 {
65440 int count = preempt_count();
65441 int ret;
65442+ const char *msg1 = "", *msg2 = "";
65443
65444 if (initcall_debug)
65445 ret = do_one_initcall_debug(fn);
65446@@ -693,15 +739,15 @@ int __init_or_module do_one_initcall(initcall_t fn)
65447 sprintf(msgbuf, "error code %d ", ret);
65448
65449 if (preempt_count() != count) {
65450- strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
65451+ msg1 = " preemption imbalance";
65452 preempt_count() = count;
65453 }
65454 if (irqs_disabled()) {
65455- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
65456+ msg2 = " disabled interrupts";
65457 local_irq_enable();
65458 }
65459- if (msgbuf[0]) {
65460- printk("initcall %pF returned with %s\n", fn, msgbuf);
65461+ if (msgbuf[0] || *msg1 || *msg2) {
65462+ printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
65463 }
65464
65465 return ret;
65466@@ -820,7 +866,7 @@ static int __init kernel_init(void * unused)
65467 do_basic_setup();
65468
65469 /* Open the /dev/console on the rootfs, this should never fail */
65470- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
65471+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
65472 printk(KERN_WARNING "Warning: unable to open an initial console.\n");
65473
65474 (void) sys_dup(0);
65475@@ -833,11 +879,13 @@ static int __init kernel_init(void * unused)
65476 if (!ramdisk_execute_command)
65477 ramdisk_execute_command = "/init";
65478
65479- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
65480+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
65481 ramdisk_execute_command = NULL;
65482 prepare_namespace();
65483 }
65484
65485+ grsecurity_init();
65486+
65487 /*
65488 * Ok, we have completed the initial bootup, and
65489 * we're essentially up and running. Get rid of the
65490diff --git a/ipc/mqueue.c b/ipc/mqueue.c
65491index 5b4293d..f179875 100644
65492--- a/ipc/mqueue.c
65493+++ b/ipc/mqueue.c
65494@@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
65495 mq_bytes = (mq_msg_tblsz +
65496 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
65497
65498+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
65499 spin_lock(&mq_lock);
65500 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
65501 u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
65502diff --git a/ipc/msg.c b/ipc/msg.c
65503index 7385de2..a8180e08 100644
65504--- a/ipc/msg.c
65505+++ b/ipc/msg.c
65506@@ -309,18 +309,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
65507 return security_msg_queue_associate(msq, msgflg);
65508 }
65509
65510+static struct ipc_ops msg_ops = {
65511+ .getnew = newque,
65512+ .associate = msg_security,
65513+ .more_checks = NULL
65514+};
65515+
65516 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
65517 {
65518 struct ipc_namespace *ns;
65519- struct ipc_ops msg_ops;
65520 struct ipc_params msg_params;
65521
65522 ns = current->nsproxy->ipc_ns;
65523
65524- msg_ops.getnew = newque;
65525- msg_ops.associate = msg_security;
65526- msg_ops.more_checks = NULL;
65527-
65528 msg_params.key = key;
65529 msg_params.flg = msgflg;
65530
65531diff --git a/ipc/sem.c b/ipc/sem.c
65532index 5215a81..cfc0cac 100644
65533--- a/ipc/sem.c
65534+++ b/ipc/sem.c
65535@@ -364,10 +364,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
65536 return 0;
65537 }
65538
65539+static struct ipc_ops sem_ops = {
65540+ .getnew = newary,
65541+ .associate = sem_security,
65542+ .more_checks = sem_more_checks
65543+};
65544+
65545 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
65546 {
65547 struct ipc_namespace *ns;
65548- struct ipc_ops sem_ops;
65549 struct ipc_params sem_params;
65550
65551 ns = current->nsproxy->ipc_ns;
65552@@ -375,10 +380,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
65553 if (nsems < 0 || nsems > ns->sc_semmsl)
65554 return -EINVAL;
65555
65556- sem_ops.getnew = newary;
65557- sem_ops.associate = sem_security;
65558- sem_ops.more_checks = sem_more_checks;
65559-
65560 sem_params.key = key;
65561 sem_params.flg = semflg;
65562 sem_params.u.nsems = nsems;
65563diff --git a/ipc/shm.c b/ipc/shm.c
65564index b76be5b..859e750 100644
65565--- a/ipc/shm.c
65566+++ b/ipc/shm.c
65567@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
65568 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
65569 #endif
65570
65571+#ifdef CONFIG_GRKERNSEC
65572+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
65573+ const time_t shm_createtime, const uid_t cuid,
65574+ const int shmid);
65575+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
65576+ const time_t shm_createtime);
65577+#endif
65578+
65579 void shm_init_ns(struct ipc_namespace *ns)
65580 {
65581 ns->shm_ctlmax = SHMMAX;
65582@@ -508,6 +516,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
65583 shp->shm_lprid = 0;
65584 shp->shm_atim = shp->shm_dtim = 0;
65585 shp->shm_ctim = get_seconds();
65586+#ifdef CONFIG_GRKERNSEC
65587+ {
65588+ struct timespec timeval;
65589+ do_posix_clock_monotonic_gettime(&timeval);
65590+
65591+ shp->shm_createtime = timeval.tv_sec;
65592+ }
65593+#endif
65594 shp->shm_segsz = size;
65595 shp->shm_nattch = 0;
65596 shp->shm_file = file;
65597@@ -559,18 +575,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
65598 return 0;
65599 }
65600
65601+static struct ipc_ops shm_ops = {
65602+ .getnew = newseg,
65603+ .associate = shm_security,
65604+ .more_checks = shm_more_checks
65605+};
65606+
65607 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
65608 {
65609 struct ipc_namespace *ns;
65610- struct ipc_ops shm_ops;
65611 struct ipc_params shm_params;
65612
65613 ns = current->nsproxy->ipc_ns;
65614
65615- shm_ops.getnew = newseg;
65616- shm_ops.associate = shm_security;
65617- shm_ops.more_checks = shm_more_checks;
65618-
65619 shm_params.key = key;
65620 shm_params.flg = shmflg;
65621 shm_params.u.size = size;
65622@@ -988,6 +1005,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
65623 f_mode = FMODE_READ | FMODE_WRITE;
65624 }
65625 if (shmflg & SHM_EXEC) {
65626+
65627+#ifdef CONFIG_PAX_MPROTECT
65628+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
65629+ goto out;
65630+#endif
65631+
65632 prot |= PROT_EXEC;
65633 acc_mode |= S_IXUGO;
65634 }
65635@@ -1011,9 +1034,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
65636 if (err)
65637 goto out_unlock;
65638
65639+#ifdef CONFIG_GRKERNSEC
65640+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
65641+ shp->shm_perm.cuid, shmid) ||
65642+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
65643+ err = -EACCES;
65644+ goto out_unlock;
65645+ }
65646+#endif
65647+
65648 path = shp->shm_file->f_path;
65649 path_get(&path);
65650 shp->shm_nattch++;
65651+#ifdef CONFIG_GRKERNSEC
65652+ shp->shm_lapid = current->pid;
65653+#endif
65654 size = i_size_read(path.dentry->d_inode);
65655 shm_unlock(shp);
65656
65657diff --git a/kernel/acct.c b/kernel/acct.c
65658index fa7eb3d..7faf116 100644
65659--- a/kernel/acct.c
65660+++ b/kernel/acct.c
65661@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
65662 */
65663 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
65664 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
65665- file->f_op->write(file, (char *)&ac,
65666+ file->f_op->write(file, (char __force_user *)&ac,
65667 sizeof(acct_t), &file->f_pos);
65668 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
65669 set_fs(fs);
65670diff --git a/kernel/audit.c b/kernel/audit.c
65671index 09fae26..ed71d5b 100644
65672--- a/kernel/audit.c
65673+++ b/kernel/audit.c
65674@@ -115,7 +115,7 @@ u32 audit_sig_sid = 0;
65675 3) suppressed due to audit_rate_limit
65676 4) suppressed due to audit_backlog_limit
65677 */
65678-static atomic_t audit_lost = ATOMIC_INIT(0);
65679+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
65680
65681 /* The netlink socket. */
65682 static struct sock *audit_sock;
65683@@ -237,7 +237,7 @@ void audit_log_lost(const char *message)
65684 unsigned long now;
65685 int print;
65686
65687- atomic_inc(&audit_lost);
65688+ atomic_inc_unchecked(&audit_lost);
65689
65690 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
65691
65692@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
65693 printk(KERN_WARNING
65694 "audit: audit_lost=%d audit_rate_limit=%d "
65695 "audit_backlog_limit=%d\n",
65696- atomic_read(&audit_lost),
65697+ atomic_read_unchecked(&audit_lost),
65698 audit_rate_limit,
65699 audit_backlog_limit);
65700 audit_panic(message);
65701@@ -689,7 +689,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
65702 status_set.pid = audit_pid;
65703 status_set.rate_limit = audit_rate_limit;
65704 status_set.backlog_limit = audit_backlog_limit;
65705- status_set.lost = atomic_read(&audit_lost);
65706+ status_set.lost = atomic_read_unchecked(&audit_lost);
65707 status_set.backlog = skb_queue_len(&audit_skb_queue);
65708 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
65709 &status_set, sizeof(status_set));
65710@@ -1260,12 +1260,13 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
65711 avail = audit_expand(ab,
65712 max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail));
65713 if (!avail)
65714- goto out;
65715+ goto out_va_end;
65716 len = vsnprintf(skb_tail_pointer(skb), avail, fmt, args2);
65717 }
65718- va_end(args2);
65719 if (len > 0)
65720 skb_put(skb, len);
65721+out_va_end:
65722+ va_end(args2);
65723 out:
65724 return;
65725 }
65726diff --git a/kernel/auditsc.c b/kernel/auditsc.c
65727index 47b7fc1..c003c33 100644
65728--- a/kernel/auditsc.c
65729+++ b/kernel/auditsc.c
65730@@ -1166,8 +1166,8 @@ static void audit_log_execve_info(struct audit_context *context,
65731 struct audit_buffer **ab,
65732 struct audit_aux_data_execve *axi)
65733 {
65734- int i;
65735- size_t len, len_sent = 0;
65736+ int i, len;
65737+ size_t len_sent = 0;
65738 const char __user *p;
65739 char *buf;
65740
65741@@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
65742 }
65743
65744 /* global counter which is incremented every time something logs in */
65745-static atomic_t session_id = ATOMIC_INIT(0);
65746+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
65747
65748 /**
65749 * audit_set_loginuid - set a task's audit_context loginuid
65750@@ -2131,7 +2131,7 @@ static atomic_t session_id = ATOMIC_INIT(0);
65751 */
65752 int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
65753 {
65754- unsigned int sessionid = atomic_inc_return(&session_id);
65755+ unsigned int sessionid = atomic_inc_return_unchecked(&session_id);
65756 struct audit_context *context = task->audit_context;
65757
65758 if (context && context->in_syscall) {
65759diff --git a/kernel/capability.c b/kernel/capability.c
65760index b463871..fa3ea1f 100644
65761--- a/kernel/capability.c
65762+++ b/kernel/capability.c
65763@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
65764 * before modification is attempted and the application
65765 * fails.
65766 */
65767+ if (tocopy > ARRAY_SIZE(kdata))
65768+ return -EFAULT;
65769+
65770 if (copy_to_user(dataptr, kdata, tocopy
65771 * sizeof(struct __user_cap_data_struct))) {
65772 return -EFAULT;
65773@@ -374,7 +377,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
65774 BUG();
65775 }
65776
65777- if (security_capable(ns, current_cred(), cap) == 0) {
65778+ if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable(cap)) {
65779 current->flags |= PF_SUPERPRIV;
65780 return true;
65781 }
65782@@ -382,6 +385,27 @@ bool ns_capable(struct user_namespace *ns, int cap)
65783 }
65784 EXPORT_SYMBOL(ns_capable);
65785
65786+bool ns_capable_nolog(struct user_namespace *ns, int cap)
65787+{
65788+ if (unlikely(!cap_valid(cap))) {
65789+ printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
65790+ BUG();
65791+ }
65792+
65793+ if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable_nolog(cap)) {
65794+ current->flags |= PF_SUPERPRIV;
65795+ return true;
65796+ }
65797+ return false;
65798+}
65799+EXPORT_SYMBOL(ns_capable_nolog);
65800+
65801+bool capable_nolog(int cap)
65802+{
65803+ return ns_capable_nolog(&init_user_ns, cap);
65804+}
65805+EXPORT_SYMBOL(capable_nolog);
65806+
65807 /**
65808 * task_ns_capable - Determine whether current task has a superior
65809 * capability targeted at a specific task's user namespace.
65810@@ -396,6 +420,12 @@ bool task_ns_capable(struct task_struct *t, int cap)
65811 }
65812 EXPORT_SYMBOL(task_ns_capable);
65813
65814+bool task_ns_capable_nolog(struct task_struct *t, int cap)
65815+{
65816+ return ns_capable_nolog(task_cred_xxx(t, user)->user_ns, cap);
65817+}
65818+EXPORT_SYMBOL(task_ns_capable_nolog);
65819+
65820 /**
65821 * nsown_capable - Check superior capability to one's own user_ns
65822 * @cap: The capability in question
65823diff --git a/kernel/compat.c b/kernel/compat.c
65824index f346ced..aa2b1f4 100644
65825--- a/kernel/compat.c
65826+++ b/kernel/compat.c
65827@@ -13,6 +13,7 @@
65828
65829 #include <linux/linkage.h>
65830 #include <linux/compat.h>
65831+#include <linux/module.h>
65832 #include <linux/errno.h>
65833 #include <linux/time.h>
65834 #include <linux/signal.h>
65835@@ -168,7 +169,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
65836 mm_segment_t oldfs;
65837 long ret;
65838
65839- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
65840+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
65841 oldfs = get_fs();
65842 set_fs(KERNEL_DS);
65843 ret = hrtimer_nanosleep_restart(restart);
65844@@ -200,7 +201,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
65845 oldfs = get_fs();
65846 set_fs(KERNEL_DS);
65847 ret = hrtimer_nanosleep(&tu,
65848- rmtp ? (struct timespec __user *)&rmt : NULL,
65849+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
65850 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
65851 set_fs(oldfs);
65852
65853@@ -309,7 +310,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
65854 mm_segment_t old_fs = get_fs();
65855
65856 set_fs(KERNEL_DS);
65857- ret = sys_sigpending((old_sigset_t __user *) &s);
65858+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
65859 set_fs(old_fs);
65860 if (ret == 0)
65861 ret = put_user(s, set);
65862@@ -332,8 +333,8 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set,
65863 old_fs = get_fs();
65864 set_fs(KERNEL_DS);
65865 ret = sys_sigprocmask(how,
65866- set ? (old_sigset_t __user *) &s : NULL,
65867- oset ? (old_sigset_t __user *) &s : NULL);
65868+ set ? (old_sigset_t __force_user *) &s : NULL,
65869+ oset ? (old_sigset_t __force_user *) &s : NULL);
65870 set_fs(old_fs);
65871 if (ret == 0)
65872 if (oset)
65873@@ -370,7 +371,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
65874 mm_segment_t old_fs = get_fs();
65875
65876 set_fs(KERNEL_DS);
65877- ret = sys_old_getrlimit(resource, &r);
65878+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
65879 set_fs(old_fs);
65880
65881 if (!ret) {
65882@@ -442,7 +443,7 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
65883 mm_segment_t old_fs = get_fs();
65884
65885 set_fs(KERNEL_DS);
65886- ret = sys_getrusage(who, (struct rusage __user *) &r);
65887+ ret = sys_getrusage(who, (struct rusage __force_user *) &r);
65888 set_fs(old_fs);
65889
65890 if (ret)
65891@@ -469,8 +470,8 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
65892 set_fs (KERNEL_DS);
65893 ret = sys_wait4(pid,
65894 (stat_addr ?
65895- (unsigned int __user *) &status : NULL),
65896- options, (struct rusage __user *) &r);
65897+ (unsigned int __force_user *) &status : NULL),
65898+ options, (struct rusage __force_user *) &r);
65899 set_fs (old_fs);
65900
65901 if (ret > 0) {
65902@@ -495,8 +496,8 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,
65903 memset(&info, 0, sizeof(info));
65904
65905 set_fs(KERNEL_DS);
65906- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
65907- uru ? (struct rusage __user *)&ru : NULL);
65908+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
65909+ uru ? (struct rusage __force_user *)&ru : NULL);
65910 set_fs(old_fs);
65911
65912 if ((ret < 0) || (info.si_signo == 0))
65913@@ -626,8 +627,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
65914 oldfs = get_fs();
65915 set_fs(KERNEL_DS);
65916 err = sys_timer_settime(timer_id, flags,
65917- (struct itimerspec __user *) &newts,
65918- (struct itimerspec __user *) &oldts);
65919+ (struct itimerspec __force_user *) &newts,
65920+ (struct itimerspec __force_user *) &oldts);
65921 set_fs(oldfs);
65922 if (!err && old && put_compat_itimerspec(old, &oldts))
65923 return -EFAULT;
65924@@ -644,7 +645,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
65925 oldfs = get_fs();
65926 set_fs(KERNEL_DS);
65927 err = sys_timer_gettime(timer_id,
65928- (struct itimerspec __user *) &ts);
65929+ (struct itimerspec __force_user *) &ts);
65930 set_fs(oldfs);
65931 if (!err && put_compat_itimerspec(setting, &ts))
65932 return -EFAULT;
65933@@ -663,7 +664,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
65934 oldfs = get_fs();
65935 set_fs(KERNEL_DS);
65936 err = sys_clock_settime(which_clock,
65937- (struct timespec __user *) &ts);
65938+ (struct timespec __force_user *) &ts);
65939 set_fs(oldfs);
65940 return err;
65941 }
65942@@ -678,7 +679,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
65943 oldfs = get_fs();
65944 set_fs(KERNEL_DS);
65945 err = sys_clock_gettime(which_clock,
65946- (struct timespec __user *) &ts);
65947+ (struct timespec __force_user *) &ts);
65948 set_fs(oldfs);
65949 if (!err && put_compat_timespec(&ts, tp))
65950 return -EFAULT;
65951@@ -698,7 +699,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
65952
65953 oldfs = get_fs();
65954 set_fs(KERNEL_DS);
65955- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
65956+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
65957 set_fs(oldfs);
65958
65959 err = compat_put_timex(utp, &txc);
65960@@ -718,7 +719,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
65961 oldfs = get_fs();
65962 set_fs(KERNEL_DS);
65963 err = sys_clock_getres(which_clock,
65964- (struct timespec __user *) &ts);
65965+ (struct timespec __force_user *) &ts);
65966 set_fs(oldfs);
65967 if (!err && tp && put_compat_timespec(&ts, tp))
65968 return -EFAULT;
65969@@ -730,9 +731,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
65970 long err;
65971 mm_segment_t oldfs;
65972 struct timespec tu;
65973- struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
65974+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
65975
65976- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
65977+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
65978 oldfs = get_fs();
65979 set_fs(KERNEL_DS);
65980 err = clock_nanosleep_restart(restart);
65981@@ -764,8 +765,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
65982 oldfs = get_fs();
65983 set_fs(KERNEL_DS);
65984 err = sys_clock_nanosleep(which_clock, flags,
65985- (struct timespec __user *) &in,
65986- (struct timespec __user *) &out);
65987+ (struct timespec __force_user *) &in,
65988+ (struct timespec __force_user *) &out);
65989 set_fs(oldfs);
65990
65991 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
65992diff --git a/kernel/configs.c b/kernel/configs.c
65993index 42e8fa0..9e7406b 100644
65994--- a/kernel/configs.c
65995+++ b/kernel/configs.c
65996@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
65997 struct proc_dir_entry *entry;
65998
65999 /* create the current config file */
66000+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
66001+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
66002+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
66003+ &ikconfig_file_ops);
66004+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66005+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
66006+ &ikconfig_file_ops);
66007+#endif
66008+#else
66009 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
66010 &ikconfig_file_ops);
66011+#endif
66012+
66013 if (!entry)
66014 return -ENOMEM;
66015
66016diff --git a/kernel/cred.c b/kernel/cred.c
66017index 5791612..a3c04dc 100644
66018--- a/kernel/cred.c
66019+++ b/kernel/cred.c
66020@@ -204,6 +204,15 @@ void exit_creds(struct task_struct *tsk)
66021 validate_creds(cred);
66022 put_cred(cred);
66023 }
66024+
66025+#ifdef CONFIG_GRKERNSEC_SETXID
66026+ cred = (struct cred *) tsk->delayed_cred;
66027+ if (cred) {
66028+ tsk->delayed_cred = NULL;
66029+ validate_creds(cred);
66030+ put_cred(cred);
66031+ }
66032+#endif
66033 }
66034
66035 /**
66036@@ -470,7 +479,7 @@ error_put:
66037 * Always returns 0 thus allowing this function to be tail-called at the end
66038 * of, say, sys_setgid().
66039 */
66040-int commit_creds(struct cred *new)
66041+static int __commit_creds(struct cred *new)
66042 {
66043 struct task_struct *task = current;
66044 const struct cred *old = task->real_cred;
66045@@ -489,6 +498,8 @@ int commit_creds(struct cred *new)
66046
66047 get_cred(new); /* we will require a ref for the subj creds too */
66048
66049+ gr_set_role_label(task, new->uid, new->gid);
66050+
66051 /* dumpability changes */
66052 if (old->euid != new->euid ||
66053 old->egid != new->egid ||
66054@@ -538,6 +549,92 @@ int commit_creds(struct cred *new)
66055 put_cred(old);
66056 return 0;
66057 }
66058+#ifdef CONFIG_GRKERNSEC_SETXID
66059+extern int set_user(struct cred *new);
66060+
66061+void gr_delayed_cred_worker(void)
66062+{
66063+ const struct cred *new = current->delayed_cred;
66064+ struct cred *ncred;
66065+
66066+ current->delayed_cred = NULL;
66067+
66068+ if (current_uid() && new != NULL) {
66069+ // from doing get_cred on it when queueing this
66070+ put_cred(new);
66071+ return;
66072+ } else if (new == NULL)
66073+ return;
66074+
66075+ ncred = prepare_creds();
66076+ if (!ncred)
66077+ goto die;
66078+ // uids
66079+ ncred->uid = new->uid;
66080+ ncred->euid = new->euid;
66081+ ncred->suid = new->suid;
66082+ ncred->fsuid = new->fsuid;
66083+ // gids
66084+ ncred->gid = new->gid;
66085+ ncred->egid = new->egid;
66086+ ncred->sgid = new->sgid;
66087+ ncred->fsgid = new->fsgid;
66088+ // groups
66089+ if (set_groups(ncred, new->group_info) < 0) {
66090+ abort_creds(ncred);
66091+ goto die;
66092+ }
66093+ // caps
66094+ ncred->securebits = new->securebits;
66095+ ncred->cap_inheritable = new->cap_inheritable;
66096+ ncred->cap_permitted = new->cap_permitted;
66097+ ncred->cap_effective = new->cap_effective;
66098+ ncred->cap_bset = new->cap_bset;
66099+
66100+ if (set_user(ncred)) {
66101+ abort_creds(ncred);
66102+ goto die;
66103+ }
66104+
66105+ // from doing get_cred on it when queueing this
66106+ put_cred(new);
66107+
66108+ __commit_creds(ncred);
66109+ return;
66110+die:
66111+ // from doing get_cred on it when queueing this
66112+ put_cred(new);
66113+ do_group_exit(SIGKILL);
66114+}
66115+#endif
66116+
66117+int commit_creds(struct cred *new)
66118+{
66119+#ifdef CONFIG_GRKERNSEC_SETXID
66120+ struct task_struct *t;
66121+
66122+ /* we won't get called with tasklist_lock held for writing
66123+ and interrupts disabled as the cred struct in that case is
66124+ init_cred
66125+ */
66126+ if (grsec_enable_setxid && !current_is_single_threaded() &&
66127+ !current_uid() && new->uid) {
66128+ rcu_read_lock();
66129+ read_lock(&tasklist_lock);
66130+ for (t = next_thread(current); t != current;
66131+ t = next_thread(t)) {
66132+ if (t->delayed_cred == NULL) {
66133+ t->delayed_cred = get_cred(new);
66134+ set_tsk_need_resched(t);
66135+ }
66136+ }
66137+ read_unlock(&tasklist_lock);
66138+ rcu_read_unlock();
66139+ }
66140+#endif
66141+ return __commit_creds(new);
66142+}
66143+
66144 EXPORT_SYMBOL(commit_creds);
66145
66146 /**
66147diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
66148index 0d7c087..01b8cef 100644
66149--- a/kernel/debug/debug_core.c
66150+++ b/kernel/debug/debug_core.c
66151@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
66152 */
66153 static atomic_t masters_in_kgdb;
66154 static atomic_t slaves_in_kgdb;
66155-static atomic_t kgdb_break_tasklet_var;
66156+static atomic_unchecked_t kgdb_break_tasklet_var;
66157 atomic_t kgdb_setting_breakpoint;
66158
66159 struct task_struct *kgdb_usethread;
66160@@ -129,7 +129,7 @@ int kgdb_single_step;
66161 static pid_t kgdb_sstep_pid;
66162
66163 /* to keep track of the CPU which is doing the single stepping*/
66164-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
66165+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
66166
66167 /*
66168 * If you are debugging a problem where roundup (the collection of
66169@@ -542,7 +542,7 @@ return_normal:
66170 * kernel will only try for the value of sstep_tries before
66171 * giving up and continuing on.
66172 */
66173- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
66174+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
66175 (kgdb_info[cpu].task &&
66176 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
66177 atomic_set(&kgdb_active, -1);
66178@@ -636,8 +636,8 @@ cpu_master_loop:
66179 }
66180
66181 kgdb_restore:
66182- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
66183- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
66184+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
66185+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
66186 if (kgdb_info[sstep_cpu].task)
66187 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
66188 else
66189@@ -834,18 +834,18 @@ static void kgdb_unregister_callbacks(void)
66190 static void kgdb_tasklet_bpt(unsigned long ing)
66191 {
66192 kgdb_breakpoint();
66193- atomic_set(&kgdb_break_tasklet_var, 0);
66194+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
66195 }
66196
66197 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
66198
66199 void kgdb_schedule_breakpoint(void)
66200 {
66201- if (atomic_read(&kgdb_break_tasklet_var) ||
66202+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
66203 atomic_read(&kgdb_active) != -1 ||
66204 atomic_read(&kgdb_setting_breakpoint))
66205 return;
66206- atomic_inc(&kgdb_break_tasklet_var);
66207+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
66208 tasklet_schedule(&kgdb_tasklet_breakpoint);
66209 }
66210 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
66211diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
66212index 63786e7..0780cac 100644
66213--- a/kernel/debug/kdb/kdb_main.c
66214+++ b/kernel/debug/kdb/kdb_main.c
66215@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const char **argv)
66216 list_for_each_entry(mod, kdb_modules, list) {
66217
66218 kdb_printf("%-20s%8u 0x%p ", mod->name,
66219- mod->core_size, (void *)mod);
66220+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
66221 #ifdef CONFIG_MODULE_UNLOAD
66222 kdb_printf("%4d ", module_refcount(mod));
66223 #endif
66224@@ -1990,7 +1990,7 @@ static int kdb_lsmod(int argc, const char **argv)
66225 kdb_printf(" (Loading)");
66226 else
66227 kdb_printf(" (Live)");
66228- kdb_printf(" 0x%p", mod->module_core);
66229+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
66230
66231 #ifdef CONFIG_MODULE_UNLOAD
66232 {
66233diff --git a/kernel/events/core.c b/kernel/events/core.c
66234index 58690af..d903d75 100644
66235--- a/kernel/events/core.c
66236+++ b/kernel/events/core.c
66237@@ -173,7 +173,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
66238 return 0;
66239 }
66240
66241-static atomic64_t perf_event_id;
66242+static atomic64_unchecked_t perf_event_id;
66243
66244 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
66245 enum event_type_t event_type);
66246@@ -2540,7 +2540,7 @@ static void __perf_event_read(void *info)
66247
66248 static inline u64 perf_event_count(struct perf_event *event)
66249 {
66250- return local64_read(&event->count) + atomic64_read(&event->child_count);
66251+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
66252 }
66253
66254 static u64 perf_event_read(struct perf_event *event)
66255@@ -3065,9 +3065,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
66256 mutex_lock(&event->child_mutex);
66257 total += perf_event_read(event);
66258 *enabled += event->total_time_enabled +
66259- atomic64_read(&event->child_total_time_enabled);
66260+ atomic64_read_unchecked(&event->child_total_time_enabled);
66261 *running += event->total_time_running +
66262- atomic64_read(&event->child_total_time_running);
66263+ atomic64_read_unchecked(&event->child_total_time_running);
66264
66265 list_for_each_entry(child, &event->child_list, child_list) {
66266 total += perf_event_read(child);
66267@@ -3474,10 +3474,10 @@ void perf_event_update_userpage(struct perf_event *event)
66268 userpg->offset -= local64_read(&event->hw.prev_count);
66269
66270 userpg->time_enabled = enabled +
66271- atomic64_read(&event->child_total_time_enabled);
66272+ atomic64_read_unchecked(&event->child_total_time_enabled);
66273
66274 userpg->time_running = running +
66275- atomic64_read(&event->child_total_time_running);
66276+ atomic64_read_unchecked(&event->child_total_time_running);
66277
66278 barrier();
66279 ++userpg->lock;
66280@@ -3906,11 +3906,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
66281 values[n++] = perf_event_count(event);
66282 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
66283 values[n++] = enabled +
66284- atomic64_read(&event->child_total_time_enabled);
66285+ atomic64_read_unchecked(&event->child_total_time_enabled);
66286 }
66287 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
66288 values[n++] = running +
66289- atomic64_read(&event->child_total_time_running);
66290+ atomic64_read_unchecked(&event->child_total_time_running);
66291 }
66292 if (read_format & PERF_FORMAT_ID)
66293 values[n++] = primary_event_id(event);
66294@@ -4561,12 +4561,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
66295 * need to add enough zero bytes after the string to handle
66296 * the 64bit alignment we do later.
66297 */
66298- buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
66299+ buf = kzalloc(PATH_MAX, GFP_KERNEL);
66300 if (!buf) {
66301 name = strncpy(tmp, "//enomem", sizeof(tmp));
66302 goto got_name;
66303 }
66304- name = d_path(&file->f_path, buf, PATH_MAX);
66305+ name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
66306 if (IS_ERR(name)) {
66307 name = strncpy(tmp, "//toolong", sizeof(tmp));
66308 goto got_name;
66309@@ -5921,7 +5921,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
66310 event->parent = parent_event;
66311
66312 event->ns = get_pid_ns(current->nsproxy->pid_ns);
66313- event->id = atomic64_inc_return(&perf_event_id);
66314+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
66315
66316 event->state = PERF_EVENT_STATE_INACTIVE;
66317
66318@@ -6443,10 +6443,10 @@ static void sync_child_event(struct perf_event *child_event,
66319 /*
66320 * Add back the child's count to the parent's count:
66321 */
66322- atomic64_add(child_val, &parent_event->child_count);
66323- atomic64_add(child_event->total_time_enabled,
66324+ atomic64_add_unchecked(child_val, &parent_event->child_count);
66325+ atomic64_add_unchecked(child_event->total_time_enabled,
66326 &parent_event->child_total_time_enabled);
66327- atomic64_add(child_event->total_time_running,
66328+ atomic64_add_unchecked(child_event->total_time_running,
66329 &parent_event->child_total_time_running);
66330
66331 /*
66332diff --git a/kernel/exit.c b/kernel/exit.c
66333index e6e01b9..0a21b0a 100644
66334--- a/kernel/exit.c
66335+++ b/kernel/exit.c
66336@@ -57,6 +57,10 @@
66337 #include <asm/pgtable.h>
66338 #include <asm/mmu_context.h>
66339
66340+#ifdef CONFIG_GRKERNSEC
66341+extern rwlock_t grsec_exec_file_lock;
66342+#endif
66343+
66344 static void exit_mm(struct task_struct * tsk);
66345
66346 static void __unhash_process(struct task_struct *p, bool group_dead)
66347@@ -168,6 +172,10 @@ void release_task(struct task_struct * p)
66348 struct task_struct *leader;
66349 int zap_leader;
66350 repeat:
66351+#ifdef CONFIG_NET
66352+ gr_del_task_from_ip_table(p);
66353+#endif
66354+
66355 /* don't need to get the RCU readlock here - the process is dead and
66356 * can't be modifying its own credentials. But shut RCU-lockdep up */
66357 rcu_read_lock();
66358@@ -380,7 +388,7 @@ int allow_signal(int sig)
66359 * know it'll be handled, so that they don't get converted to
66360 * SIGKILL or just silently dropped.
66361 */
66362- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
66363+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
66364 recalc_sigpending();
66365 spin_unlock_irq(&current->sighand->siglock);
66366 return 0;
66367@@ -416,6 +424,17 @@ void daemonize(const char *name, ...)
66368 vsnprintf(current->comm, sizeof(current->comm), name, args);
66369 va_end(args);
66370
66371+#ifdef CONFIG_GRKERNSEC
66372+ write_lock(&grsec_exec_file_lock);
66373+ if (current->exec_file) {
66374+ fput(current->exec_file);
66375+ current->exec_file = NULL;
66376+ }
66377+ write_unlock(&grsec_exec_file_lock);
66378+#endif
66379+
66380+ gr_set_kernel_label(current);
66381+
66382 /*
66383 * If we were started as result of loading a module, close all of the
66384 * user space pages. We don't need them, and if we didn't close them
66385@@ -893,6 +912,8 @@ NORET_TYPE void do_exit(long code)
66386 struct task_struct *tsk = current;
66387 int group_dead;
66388
66389+ set_fs(USER_DS);
66390+
66391 profile_task_exit(tsk);
66392
66393 WARN_ON(blk_needs_flush_plug(tsk));
66394@@ -909,7 +930,6 @@ NORET_TYPE void do_exit(long code)
66395 * mm_release()->clear_child_tid() from writing to a user-controlled
66396 * kernel address.
66397 */
66398- set_fs(USER_DS);
66399
66400 ptrace_event(PTRACE_EVENT_EXIT, code);
66401
66402@@ -971,6 +991,9 @@ NORET_TYPE void do_exit(long code)
66403 tsk->exit_code = code;
66404 taskstats_exit(tsk, group_dead);
66405
66406+ gr_acl_handle_psacct(tsk, code);
66407+ gr_acl_handle_exit();
66408+
66409 exit_mm(tsk);
66410
66411 if (group_dead)
66412@@ -1068,7 +1091,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
66413 * Take down every thread in the group. This is called by fatal signals
66414 * as well as by sys_exit_group (below).
66415 */
66416-NORET_TYPE void
66417+__noreturn void
66418 do_group_exit(int exit_code)
66419 {
66420 struct signal_struct *sig = current->signal;
66421diff --git a/kernel/fork.c b/kernel/fork.c
66422index 0acf42c0..9e40e2e 100644
66423--- a/kernel/fork.c
66424+++ b/kernel/fork.c
66425@@ -281,7 +281,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
66426 *stackend = STACK_END_MAGIC; /* for overflow detection */
66427
66428 #ifdef CONFIG_CC_STACKPROTECTOR
66429- tsk->stack_canary = get_random_int();
66430+ tsk->stack_canary = pax_get_random_long();
66431 #endif
66432
66433 /*
66434@@ -305,13 +305,77 @@ out:
66435 }
66436
66437 #ifdef CONFIG_MMU
66438+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct vm_area_struct *mpnt)
66439+{
66440+ struct vm_area_struct *tmp;
66441+ unsigned long charge;
66442+ struct mempolicy *pol;
66443+ struct file *file;
66444+
66445+ charge = 0;
66446+ if (mpnt->vm_flags & VM_ACCOUNT) {
66447+ unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
66448+ if (security_vm_enough_memory(len))
66449+ goto fail_nomem;
66450+ charge = len;
66451+ }
66452+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
66453+ if (!tmp)
66454+ goto fail_nomem;
66455+ *tmp = *mpnt;
66456+ tmp->vm_mm = mm;
66457+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
66458+ pol = mpol_dup(vma_policy(mpnt));
66459+ if (IS_ERR(pol))
66460+ goto fail_nomem_policy;
66461+ vma_set_policy(tmp, pol);
66462+ if (anon_vma_fork(tmp, mpnt))
66463+ goto fail_nomem_anon_vma_fork;
66464+ tmp->vm_flags &= ~VM_LOCKED;
66465+ tmp->vm_next = tmp->vm_prev = NULL;
66466+ tmp->vm_mirror = NULL;
66467+ file = tmp->vm_file;
66468+ if (file) {
66469+ struct inode *inode = file->f_path.dentry->d_inode;
66470+ struct address_space *mapping = file->f_mapping;
66471+
66472+ get_file(file);
66473+ if (tmp->vm_flags & VM_DENYWRITE)
66474+ atomic_dec(&inode->i_writecount);
66475+ mutex_lock(&mapping->i_mmap_mutex);
66476+ if (tmp->vm_flags & VM_SHARED)
66477+ mapping->i_mmap_writable++;
66478+ flush_dcache_mmap_lock(mapping);
66479+ /* insert tmp into the share list, just after mpnt */
66480+ vma_prio_tree_add(tmp, mpnt);
66481+ flush_dcache_mmap_unlock(mapping);
66482+ mutex_unlock(&mapping->i_mmap_mutex);
66483+ }
66484+
66485+ /*
66486+ * Clear hugetlb-related page reserves for children. This only
66487+ * affects MAP_PRIVATE mappings. Faults generated by the child
66488+ * are not guaranteed to succeed, even if read-only
66489+ */
66490+ if (is_vm_hugetlb_page(tmp))
66491+ reset_vma_resv_huge_pages(tmp);
66492+
66493+ return tmp;
66494+
66495+fail_nomem_anon_vma_fork:
66496+ mpol_put(pol);
66497+fail_nomem_policy:
66498+ kmem_cache_free(vm_area_cachep, tmp);
66499+fail_nomem:
66500+ vm_unacct_memory(charge);
66501+ return NULL;
66502+}
66503+
66504 static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66505 {
66506 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
66507 struct rb_node **rb_link, *rb_parent;
66508 int retval;
66509- unsigned long charge;
66510- struct mempolicy *pol;
66511
66512 down_write(&oldmm->mmap_sem);
66513 flush_cache_dup_mm(oldmm);
66514@@ -323,8 +387,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66515 mm->locked_vm = 0;
66516 mm->mmap = NULL;
66517 mm->mmap_cache = NULL;
66518- mm->free_area_cache = oldmm->mmap_base;
66519- mm->cached_hole_size = ~0UL;
66520+ mm->free_area_cache = oldmm->free_area_cache;
66521+ mm->cached_hole_size = oldmm->cached_hole_size;
66522 mm->map_count = 0;
66523 cpumask_clear(mm_cpumask(mm));
66524 mm->mm_rb = RB_ROOT;
66525@@ -340,8 +404,6 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66526
66527 prev = NULL;
66528 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
66529- struct file *file;
66530-
66531 if (mpnt->vm_flags & VM_DONTCOPY) {
66532 long pages = vma_pages(mpnt);
66533 mm->total_vm -= pages;
66534@@ -349,53 +411,11 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66535 -pages);
66536 continue;
66537 }
66538- charge = 0;
66539- if (mpnt->vm_flags & VM_ACCOUNT) {
66540- unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
66541- if (security_vm_enough_memory(len))
66542- goto fail_nomem;
66543- charge = len;
66544+ tmp = dup_vma(mm, mpnt);
66545+ if (!tmp) {
66546+ retval = -ENOMEM;
66547+ goto out;
66548 }
66549- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
66550- if (!tmp)
66551- goto fail_nomem;
66552- *tmp = *mpnt;
66553- INIT_LIST_HEAD(&tmp->anon_vma_chain);
66554- pol = mpol_dup(vma_policy(mpnt));
66555- retval = PTR_ERR(pol);
66556- if (IS_ERR(pol))
66557- goto fail_nomem_policy;
66558- vma_set_policy(tmp, pol);
66559- tmp->vm_mm = mm;
66560- if (anon_vma_fork(tmp, mpnt))
66561- goto fail_nomem_anon_vma_fork;
66562- tmp->vm_flags &= ~VM_LOCKED;
66563- tmp->vm_next = tmp->vm_prev = NULL;
66564- file = tmp->vm_file;
66565- if (file) {
66566- struct inode *inode = file->f_path.dentry->d_inode;
66567- struct address_space *mapping = file->f_mapping;
66568-
66569- get_file(file);
66570- if (tmp->vm_flags & VM_DENYWRITE)
66571- atomic_dec(&inode->i_writecount);
66572- mutex_lock(&mapping->i_mmap_mutex);
66573- if (tmp->vm_flags & VM_SHARED)
66574- mapping->i_mmap_writable++;
66575- flush_dcache_mmap_lock(mapping);
66576- /* insert tmp into the share list, just after mpnt */
66577- vma_prio_tree_add(tmp, mpnt);
66578- flush_dcache_mmap_unlock(mapping);
66579- mutex_unlock(&mapping->i_mmap_mutex);
66580- }
66581-
66582- /*
66583- * Clear hugetlb-related page reserves for children. This only
66584- * affects MAP_PRIVATE mappings. Faults generated by the child
66585- * are not guaranteed to succeed, even if read-only
66586- */
66587- if (is_vm_hugetlb_page(tmp))
66588- reset_vma_resv_huge_pages(tmp);
66589
66590 /*
66591 * Link in the new vma and copy the page table entries.
66592@@ -418,6 +438,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66593 if (retval)
66594 goto out;
66595 }
66596+
66597+#ifdef CONFIG_PAX_SEGMEXEC
66598+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
66599+ struct vm_area_struct *mpnt_m;
66600+
66601+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
66602+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
66603+
66604+ if (!mpnt->vm_mirror)
66605+ continue;
66606+
66607+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
66608+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
66609+ mpnt->vm_mirror = mpnt_m;
66610+ } else {
66611+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
66612+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
66613+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
66614+ mpnt->vm_mirror->vm_mirror = mpnt;
66615+ }
66616+ }
66617+ BUG_ON(mpnt_m);
66618+ }
66619+#endif
66620+
66621 /* a new mm has just been created */
66622 arch_dup_mmap(oldmm, mm);
66623 retval = 0;
66624@@ -426,14 +471,6 @@ out:
66625 flush_tlb_mm(oldmm);
66626 up_write(&oldmm->mmap_sem);
66627 return retval;
66628-fail_nomem_anon_vma_fork:
66629- mpol_put(pol);
66630-fail_nomem_policy:
66631- kmem_cache_free(vm_area_cachep, tmp);
66632-fail_nomem:
66633- retval = -ENOMEM;
66634- vm_unacct_memory(charge);
66635- goto out;
66636 }
66637
66638 static inline int mm_alloc_pgd(struct mm_struct *mm)
66639@@ -645,6 +682,26 @@ struct mm_struct *get_task_mm(struct task_struct *task)
66640 }
66641 EXPORT_SYMBOL_GPL(get_task_mm);
66642
66643+struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
66644+{
66645+ struct mm_struct *mm;
66646+ int err;
66647+
66648+ err = mutex_lock_killable(&task->signal->cred_guard_mutex);
66649+ if (err)
66650+ return ERR_PTR(err);
66651+
66652+ mm = get_task_mm(task);
66653+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
66654+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
66655+ mmput(mm);
66656+ mm = ERR_PTR(-EACCES);
66657+ }
66658+ mutex_unlock(&task->signal->cred_guard_mutex);
66659+
66660+ return mm;
66661+}
66662+
66663 /* Please note the differences between mmput and mm_release.
66664 * mmput is called whenever we stop holding onto a mm_struct,
66665 * error success whatever.
66666@@ -830,13 +887,14 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
66667 spin_unlock(&fs->lock);
66668 return -EAGAIN;
66669 }
66670- fs->users++;
66671+ atomic_inc(&fs->users);
66672 spin_unlock(&fs->lock);
66673 return 0;
66674 }
66675 tsk->fs = copy_fs_struct(fs);
66676 if (!tsk->fs)
66677 return -ENOMEM;
66678+ gr_set_chroot_entries(tsk, &tsk->fs->root);
66679 return 0;
66680 }
66681
66682@@ -1100,6 +1158,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
66683 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
66684 #endif
66685 retval = -EAGAIN;
66686+
66687+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
66688+
66689 if (atomic_read(&p->real_cred->user->processes) >=
66690 task_rlimit(p, RLIMIT_NPROC)) {
66691 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
66692@@ -1259,6 +1320,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
66693 if (clone_flags & CLONE_THREAD)
66694 p->tgid = current->tgid;
66695
66696+ gr_copy_label(p);
66697+
66698 p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
66699 /*
66700 * Clear TID on mm_release()?
66701@@ -1421,6 +1484,8 @@ bad_fork_cleanup_count:
66702 bad_fork_free:
66703 free_task(p);
66704 fork_out:
66705+ gr_log_forkfail(retval);
66706+
66707 return ERR_PTR(retval);
66708 }
66709
66710@@ -1521,6 +1586,8 @@ long do_fork(unsigned long clone_flags,
66711 if (clone_flags & CLONE_PARENT_SETTID)
66712 put_user(nr, parent_tidptr);
66713
66714+ gr_handle_brute_check();
66715+
66716 if (clone_flags & CLONE_VFORK) {
66717 p->vfork_done = &vfork;
66718 init_completion(&vfork);
66719@@ -1630,7 +1697,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
66720 return 0;
66721
66722 /* don't need lock here; in the worst case we'll do useless copy */
66723- if (fs->users == 1)
66724+ if (atomic_read(&fs->users) == 1)
66725 return 0;
66726
66727 *new_fsp = copy_fs_struct(fs);
66728@@ -1719,7 +1786,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
66729 fs = current->fs;
66730 spin_lock(&fs->lock);
66731 current->fs = new_fs;
66732- if (--fs->users)
66733+ gr_set_chroot_entries(current, &current->fs->root);
66734+ if (atomic_dec_return(&fs->users))
66735 new_fs = NULL;
66736 else
66737 new_fs = fs;
66738diff --git a/kernel/futex.c b/kernel/futex.c
66739index 1614be2..37abc7e 100644
66740--- a/kernel/futex.c
66741+++ b/kernel/futex.c
66742@@ -54,6 +54,7 @@
66743 #include <linux/mount.h>
66744 #include <linux/pagemap.h>
66745 #include <linux/syscalls.h>
66746+#include <linux/ptrace.h>
66747 #include <linux/signal.h>
66748 #include <linux/export.h>
66749 #include <linux/magic.h>
66750@@ -238,6 +239,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
66751 struct page *page, *page_head;
66752 int err, ro = 0;
66753
66754+#ifdef CONFIG_PAX_SEGMEXEC
66755+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
66756+ return -EFAULT;
66757+#endif
66758+
66759 /*
66760 * The futex address must be "naturally" aligned.
66761 */
66762@@ -2459,6 +2465,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
66763 if (!p)
66764 goto err_unlock;
66765 ret = -EPERM;
66766+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66767+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
66768+ goto err_unlock;
66769+#endif
66770 pcred = __task_cred(p);
66771 /* If victim is in different user_ns, then uids are not
66772 comparable, so we must have CAP_SYS_PTRACE */
66773@@ -2724,6 +2734,7 @@ static int __init futex_init(void)
66774 {
66775 u32 curval;
66776 int i;
66777+ mm_segment_t oldfs;
66778
66779 /*
66780 * This will fail and we want it. Some arch implementations do
66781@@ -2735,8 +2746,11 @@ static int __init futex_init(void)
66782 * implementation, the non-functional ones will return
66783 * -ENOSYS.
66784 */
66785+ oldfs = get_fs();
66786+ set_fs(USER_DS);
66787 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
66788 futex_cmpxchg_enabled = 1;
66789+ set_fs(oldfs);
66790
66791 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
66792 plist_head_init(&futex_queues[i].chain);
66793diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
66794index 5f9e689..582d46d 100644
66795--- a/kernel/futex_compat.c
66796+++ b/kernel/futex_compat.c
66797@@ -10,6 +10,7 @@
66798 #include <linux/compat.h>
66799 #include <linux/nsproxy.h>
66800 #include <linux/futex.h>
66801+#include <linux/ptrace.h>
66802
66803 #include <asm/uaccess.h>
66804
66805@@ -136,7 +137,8 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
66806 {
66807 struct compat_robust_list_head __user *head;
66808 unsigned long ret;
66809- const struct cred *cred = current_cred(), *pcred;
66810+ const struct cred *cred = current_cred();
66811+ const struct cred *pcred;
66812
66813 if (!futex_cmpxchg_enabled)
66814 return -ENOSYS;
66815@@ -152,6 +154,10 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
66816 if (!p)
66817 goto err_unlock;
66818 ret = -EPERM;
66819+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66820+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
66821+ goto err_unlock;
66822+#endif
66823 pcred = __task_cred(p);
66824 /* If victim is in different user_ns, then uids are not
66825 comparable, so we must have CAP_SYS_PTRACE */
66826diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
66827index 9b22d03..6295b62 100644
66828--- a/kernel/gcov/base.c
66829+++ b/kernel/gcov/base.c
66830@@ -102,11 +102,6 @@ void gcov_enable_events(void)
66831 }
66832
66833 #ifdef CONFIG_MODULES
66834-static inline int within(void *addr, void *start, unsigned long size)
66835-{
66836- return ((addr >= start) && (addr < start + size));
66837-}
66838-
66839 /* Update list and generate events when modules are unloaded. */
66840 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
66841 void *data)
66842@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
66843 prev = NULL;
66844 /* Remove entries located in module from linked list. */
66845 for (info = gcov_info_head; info; info = info->next) {
66846- if (within(info, mod->module_core, mod->core_size)) {
66847+ if (within_module_core_rw((unsigned long)info, mod)) {
66848 if (prev)
66849 prev->next = info->next;
66850 else
66851diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
66852index ae34bf5..4e2f3d0 100644
66853--- a/kernel/hrtimer.c
66854+++ b/kernel/hrtimer.c
66855@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
66856 local_irq_restore(flags);
66857 }
66858
66859-static void run_hrtimer_softirq(struct softirq_action *h)
66860+static void run_hrtimer_softirq(void)
66861 {
66862 hrtimer_peek_ahead_timers();
66863 }
66864diff --git a/kernel/jump_label.c b/kernel/jump_label.c
66865index 66ff710..05a5128 100644
66866--- a/kernel/jump_label.c
66867+++ b/kernel/jump_label.c
66868@@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
66869
66870 size = (((unsigned long)stop - (unsigned long)start)
66871 / sizeof(struct jump_entry));
66872+ pax_open_kernel();
66873 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
66874+ pax_close_kernel();
66875 }
66876
66877 static void jump_label_update(struct jump_label_key *key, int enable);
66878@@ -303,10 +305,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
66879 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
66880 struct jump_entry *iter;
66881
66882+ pax_open_kernel();
66883 for (iter = iter_start; iter < iter_stop; iter++) {
66884 if (within_module_init(iter->code, mod))
66885 iter->code = 0;
66886 }
66887+ pax_close_kernel();
66888 }
66889
66890 static int
66891diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
66892index 079f1d3..a407562 100644
66893--- a/kernel/kallsyms.c
66894+++ b/kernel/kallsyms.c
66895@@ -11,6 +11,9 @@
66896 * Changed the compression method from stem compression to "table lookup"
66897 * compression (see scripts/kallsyms.c for a more complete description)
66898 */
66899+#ifdef CONFIG_GRKERNSEC_HIDESYM
66900+#define __INCLUDED_BY_HIDESYM 1
66901+#endif
66902 #include <linux/kallsyms.h>
66903 #include <linux/module.h>
66904 #include <linux/init.h>
66905@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
66906
66907 static inline int is_kernel_inittext(unsigned long addr)
66908 {
66909+ if (system_state != SYSTEM_BOOTING)
66910+ return 0;
66911+
66912 if (addr >= (unsigned long)_sinittext
66913 && addr <= (unsigned long)_einittext)
66914 return 1;
66915 return 0;
66916 }
66917
66918+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66919+#ifdef CONFIG_MODULES
66920+static inline int is_module_text(unsigned long addr)
66921+{
66922+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
66923+ return 1;
66924+
66925+ addr = ktla_ktva(addr);
66926+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
66927+}
66928+#else
66929+static inline int is_module_text(unsigned long addr)
66930+{
66931+ return 0;
66932+}
66933+#endif
66934+#endif
66935+
66936 static inline int is_kernel_text(unsigned long addr)
66937 {
66938 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
66939@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
66940
66941 static inline int is_kernel(unsigned long addr)
66942 {
66943+
66944+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66945+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
66946+ return 1;
66947+
66948+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
66949+#else
66950 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
66951+#endif
66952+
66953 return 1;
66954 return in_gate_area_no_mm(addr);
66955 }
66956
66957 static int is_ksym_addr(unsigned long addr)
66958 {
66959+
66960+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66961+ if (is_module_text(addr))
66962+ return 0;
66963+#endif
66964+
66965 if (all_var)
66966 return is_kernel(addr);
66967
66968@@ -454,7 +493,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
66969
66970 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
66971 {
66972- iter->name[0] = '\0';
66973 iter->nameoff = get_symbol_offset(new_pos);
66974 iter->pos = new_pos;
66975 }
66976@@ -502,6 +540,11 @@ static int s_show(struct seq_file *m, void *p)
66977 {
66978 struct kallsym_iter *iter = m->private;
66979
66980+#ifdef CONFIG_GRKERNSEC_HIDESYM
66981+ if (current_uid())
66982+ return 0;
66983+#endif
66984+
66985 /* Some debugging symbols have no name. Ignore them. */
66986 if (!iter->name[0])
66987 return 0;
66988@@ -540,7 +583,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
66989 struct kallsym_iter *iter;
66990 int ret;
66991
66992- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
66993+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
66994 if (!iter)
66995 return -ENOMEM;
66996 reset_iter(iter, 0);
66997diff --git a/kernel/kexec.c b/kernel/kexec.c
66998index dc7bc08..4601964 100644
66999--- a/kernel/kexec.c
67000+++ b/kernel/kexec.c
67001@@ -1048,7 +1048,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
67002 unsigned long flags)
67003 {
67004 struct compat_kexec_segment in;
67005- struct kexec_segment out, __user *ksegments;
67006+ struct kexec_segment out;
67007+ struct kexec_segment __user *ksegments;
67008 unsigned long i, result;
67009
67010 /* Don't allow clients that don't understand the native
67011diff --git a/kernel/kmod.c b/kernel/kmod.c
67012index a4bea97..7a1ae9a 100644
67013--- a/kernel/kmod.c
67014+++ b/kernel/kmod.c
67015@@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe";
67016 * If module auto-loading support is disabled then this function
67017 * becomes a no-operation.
67018 */
67019-int __request_module(bool wait, const char *fmt, ...)
67020+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
67021 {
67022- va_list args;
67023 char module_name[MODULE_NAME_LEN];
67024 unsigned int max_modprobes;
67025 int ret;
67026- char *argv[] = { modprobe_path, "-q", "--", module_name, NULL };
67027+ char *argv[] = { modprobe_path, "-q", "--", module_name, module_param, NULL };
67028 static char *envp[] = { "HOME=/",
67029 "TERM=linux",
67030 "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
67031@@ -88,9 +87,7 @@ int __request_module(bool wait, const char *fmt, ...)
67032 #define MAX_KMOD_CONCURRENT 50 /* Completely arbitrary value - KAO */
67033 static int kmod_loop_msg;
67034
67035- va_start(args, fmt);
67036- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
67037- va_end(args);
67038+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
67039 if (ret >= MODULE_NAME_LEN)
67040 return -ENAMETOOLONG;
67041
67042@@ -98,6 +95,20 @@ int __request_module(bool wait, const char *fmt, ...)
67043 if (ret)
67044 return ret;
67045
67046+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67047+ if (!current_uid()) {
67048+ /* hack to workaround consolekit/udisks stupidity */
67049+ read_lock(&tasklist_lock);
67050+ if (!strcmp(current->comm, "mount") &&
67051+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
67052+ read_unlock(&tasklist_lock);
67053+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
67054+ return -EPERM;
67055+ }
67056+ read_unlock(&tasklist_lock);
67057+ }
67058+#endif
67059+
67060 /* If modprobe needs a service that is in a module, we get a recursive
67061 * loop. Limit the number of running kmod threads to max_threads/2 or
67062 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
67063@@ -133,6 +144,47 @@ int __request_module(bool wait, const char *fmt, ...)
67064 atomic_dec(&kmod_concurrent);
67065 return ret;
67066 }
67067+
67068+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
67069+{
67070+ va_list args;
67071+ int ret;
67072+
67073+ va_start(args, fmt);
67074+ ret = ____request_module(wait, module_param, fmt, args);
67075+ va_end(args);
67076+
67077+ return ret;
67078+}
67079+
67080+int __request_module(bool wait, const char *fmt, ...)
67081+{
67082+ va_list args;
67083+ int ret;
67084+
67085+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67086+ if (current_uid()) {
67087+ char module_param[MODULE_NAME_LEN];
67088+
67089+ memset(module_param, 0, sizeof(module_param));
67090+
67091+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", current_uid());
67092+
67093+ va_start(args, fmt);
67094+ ret = ____request_module(wait, module_param, fmt, args);
67095+ va_end(args);
67096+
67097+ return ret;
67098+ }
67099+#endif
67100+
67101+ va_start(args, fmt);
67102+ ret = ____request_module(wait, NULL, fmt, args);
67103+ va_end(args);
67104+
67105+ return ret;
67106+}
67107+
67108 EXPORT_SYMBOL(__request_module);
67109 #endif /* CONFIG_MODULES */
67110
67111@@ -222,7 +274,7 @@ static int wait_for_helper(void *data)
67112 *
67113 * Thus the __user pointer cast is valid here.
67114 */
67115- sys_wait4(pid, (int __user *)&ret, 0, NULL);
67116+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
67117
67118 /*
67119 * If ret is 0, either ____call_usermodehelper failed and the
67120diff --git a/kernel/kprobes.c b/kernel/kprobes.c
67121index bc90b87..43c7d8c 100644
67122--- a/kernel/kprobes.c
67123+++ b/kernel/kprobes.c
67124@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
67125 * kernel image and loaded module images reside. This is required
67126 * so x86_64 can correctly handle the %rip-relative fixups.
67127 */
67128- kip->insns = module_alloc(PAGE_SIZE);
67129+ kip->insns = module_alloc_exec(PAGE_SIZE);
67130 if (!kip->insns) {
67131 kfree(kip);
67132 return NULL;
67133@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
67134 */
67135 if (!list_is_singular(&kip->list)) {
67136 list_del(&kip->list);
67137- module_free(NULL, kip->insns);
67138+ module_free_exec(NULL, kip->insns);
67139 kfree(kip);
67140 }
67141 return 1;
67142@@ -1955,7 +1955,7 @@ static int __init init_kprobes(void)
67143 {
67144 int i, err = 0;
67145 unsigned long offset = 0, size = 0;
67146- char *modname, namebuf[128];
67147+ char *modname, namebuf[KSYM_NAME_LEN];
67148 const char *symbol_name;
67149 void *addr;
67150 struct kprobe_blackpoint *kb;
67151@@ -2081,7 +2081,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
67152 const char *sym = NULL;
67153 unsigned int i = *(loff_t *) v;
67154 unsigned long offset = 0;
67155- char *modname, namebuf[128];
67156+ char *modname, namebuf[KSYM_NAME_LEN];
67157
67158 head = &kprobe_table[i];
67159 preempt_disable();
67160diff --git a/kernel/lockdep.c b/kernel/lockdep.c
67161index b2e08c9..01d8049 100644
67162--- a/kernel/lockdep.c
67163+++ b/kernel/lockdep.c
67164@@ -592,6 +592,10 @@ static int static_obj(void *obj)
67165 end = (unsigned long) &_end,
67166 addr = (unsigned long) obj;
67167
67168+#ifdef CONFIG_PAX_KERNEXEC
67169+ start = ktla_ktva(start);
67170+#endif
67171+
67172 /*
67173 * static variable?
67174 */
67175@@ -731,6 +735,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
67176 if (!static_obj(lock->key)) {
67177 debug_locks_off();
67178 printk("INFO: trying to register non-static key.\n");
67179+ printk("lock:%pS key:%pS.\n", lock, lock->key);
67180 printk("the code is fine but needs lockdep annotation.\n");
67181 printk("turning off the locking correctness validator.\n");
67182 dump_stack();
67183@@ -3042,7 +3047,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
67184 if (!class)
67185 return 0;
67186 }
67187- atomic_inc((atomic_t *)&class->ops);
67188+ atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
67189 if (very_verbose(class)) {
67190 printk("\nacquire class [%p] %s", class->key, class->name);
67191 if (class->name_version > 1)
67192diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
67193index 91c32a0..b2c71c5 100644
67194--- a/kernel/lockdep_proc.c
67195+++ b/kernel/lockdep_proc.c
67196@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
67197
67198 static void print_name(struct seq_file *m, struct lock_class *class)
67199 {
67200- char str[128];
67201+ char str[KSYM_NAME_LEN];
67202 const char *name = class->name;
67203
67204 if (!name) {
67205diff --git a/kernel/module.c b/kernel/module.c
67206index 178333c..04e3408 100644
67207--- a/kernel/module.c
67208+++ b/kernel/module.c
67209@@ -58,6 +58,7 @@
67210 #include <linux/jump_label.h>
67211 #include <linux/pfn.h>
67212 #include <linux/bsearch.h>
67213+#include <linux/grsecurity.h>
67214
67215 #define CREATE_TRACE_POINTS
67216 #include <trace/events/module.h>
67217@@ -119,7 +120,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
67218
67219 /* Bounds of module allocation, for speeding __module_address.
67220 * Protected by module_mutex. */
67221-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
67222+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
67223+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
67224
67225 int register_module_notifier(struct notifier_block * nb)
67226 {
67227@@ -284,7 +286,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
67228 return true;
67229
67230 list_for_each_entry_rcu(mod, &modules, list) {
67231- struct symsearch arr[] = {
67232+ struct symsearch modarr[] = {
67233 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
67234 NOT_GPL_ONLY, false },
67235 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
67236@@ -306,7 +308,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
67237 #endif
67238 };
67239
67240- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
67241+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
67242 return true;
67243 }
67244 return false;
67245@@ -438,7 +440,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
67246 static int percpu_modalloc(struct module *mod,
67247 unsigned long size, unsigned long align)
67248 {
67249- if (align > PAGE_SIZE) {
67250+ if (align-1 >= PAGE_SIZE) {
67251 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
67252 mod->name, align, PAGE_SIZE);
67253 align = PAGE_SIZE;
67254@@ -1183,7 +1185,7 @@ resolve_symbol_wait(struct module *mod,
67255 */
67256 #ifdef CONFIG_SYSFS
67257
67258-#ifdef CONFIG_KALLSYMS
67259+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
67260 static inline bool sect_empty(const Elf_Shdr *sect)
67261 {
67262 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
67263@@ -1649,21 +1651,21 @@ static void set_section_ro_nx(void *base,
67264
67265 static void unset_module_core_ro_nx(struct module *mod)
67266 {
67267- set_page_attributes(mod->module_core + mod->core_text_size,
67268- mod->module_core + mod->core_size,
67269+ set_page_attributes(mod->module_core_rw,
67270+ mod->module_core_rw + mod->core_size_rw,
67271 set_memory_x);
67272- set_page_attributes(mod->module_core,
67273- mod->module_core + mod->core_ro_size,
67274+ set_page_attributes(mod->module_core_rx,
67275+ mod->module_core_rx + mod->core_size_rx,
67276 set_memory_rw);
67277 }
67278
67279 static void unset_module_init_ro_nx(struct module *mod)
67280 {
67281- set_page_attributes(mod->module_init + mod->init_text_size,
67282- mod->module_init + mod->init_size,
67283+ set_page_attributes(mod->module_init_rw,
67284+ mod->module_init_rw + mod->init_size_rw,
67285 set_memory_x);
67286- set_page_attributes(mod->module_init,
67287- mod->module_init + mod->init_ro_size,
67288+ set_page_attributes(mod->module_init_rx,
67289+ mod->module_init_rx + mod->init_size_rx,
67290 set_memory_rw);
67291 }
67292
67293@@ -1674,14 +1676,14 @@ void set_all_modules_text_rw(void)
67294
67295 mutex_lock(&module_mutex);
67296 list_for_each_entry_rcu(mod, &modules, list) {
67297- if ((mod->module_core) && (mod->core_text_size)) {
67298- set_page_attributes(mod->module_core,
67299- mod->module_core + mod->core_text_size,
67300+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
67301+ set_page_attributes(mod->module_core_rx,
67302+ mod->module_core_rx + mod->core_size_rx,
67303 set_memory_rw);
67304 }
67305- if ((mod->module_init) && (mod->init_text_size)) {
67306- set_page_attributes(mod->module_init,
67307- mod->module_init + mod->init_text_size,
67308+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
67309+ set_page_attributes(mod->module_init_rx,
67310+ mod->module_init_rx + mod->init_size_rx,
67311 set_memory_rw);
67312 }
67313 }
67314@@ -1695,14 +1697,14 @@ void set_all_modules_text_ro(void)
67315
67316 mutex_lock(&module_mutex);
67317 list_for_each_entry_rcu(mod, &modules, list) {
67318- if ((mod->module_core) && (mod->core_text_size)) {
67319- set_page_attributes(mod->module_core,
67320- mod->module_core + mod->core_text_size,
67321+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
67322+ set_page_attributes(mod->module_core_rx,
67323+ mod->module_core_rx + mod->core_size_rx,
67324 set_memory_ro);
67325 }
67326- if ((mod->module_init) && (mod->init_text_size)) {
67327- set_page_attributes(mod->module_init,
67328- mod->module_init + mod->init_text_size,
67329+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
67330+ set_page_attributes(mod->module_init_rx,
67331+ mod->module_init_rx + mod->init_size_rx,
67332 set_memory_ro);
67333 }
67334 }
67335@@ -1748,16 +1750,19 @@ static void free_module(struct module *mod)
67336
67337 /* This may be NULL, but that's OK */
67338 unset_module_init_ro_nx(mod);
67339- module_free(mod, mod->module_init);
67340+ module_free(mod, mod->module_init_rw);
67341+ module_free_exec(mod, mod->module_init_rx);
67342 kfree(mod->args);
67343 percpu_modfree(mod);
67344
67345 /* Free lock-classes: */
67346- lockdep_free_key_range(mod->module_core, mod->core_size);
67347+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
67348+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
67349
67350 /* Finally, free the core (containing the module structure) */
67351 unset_module_core_ro_nx(mod);
67352- module_free(mod, mod->module_core);
67353+ module_free_exec(mod, mod->module_core_rx);
67354+ module_free(mod, mod->module_core_rw);
67355
67356 #ifdef CONFIG_MPU
67357 update_protections(current->mm);
67358@@ -1826,10 +1831,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67359 unsigned int i;
67360 int ret = 0;
67361 const struct kernel_symbol *ksym;
67362+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67363+ int is_fs_load = 0;
67364+ int register_filesystem_found = 0;
67365+ char *p;
67366+
67367+ p = strstr(mod->args, "grsec_modharden_fs");
67368+ if (p) {
67369+ char *endptr = p + strlen("grsec_modharden_fs");
67370+ /* copy \0 as well */
67371+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
67372+ is_fs_load = 1;
67373+ }
67374+#endif
67375
67376 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
67377 const char *name = info->strtab + sym[i].st_name;
67378
67379+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67380+ /* it's a real shame this will never get ripped and copied
67381+ upstream! ;(
67382+ */
67383+ if (is_fs_load && !strcmp(name, "register_filesystem"))
67384+ register_filesystem_found = 1;
67385+#endif
67386+
67387 switch (sym[i].st_shndx) {
67388 case SHN_COMMON:
67389 /* We compiled with -fno-common. These are not
67390@@ -1850,7 +1876,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67391 ksym = resolve_symbol_wait(mod, info, name);
67392 /* Ok if resolved. */
67393 if (ksym && !IS_ERR(ksym)) {
67394+ pax_open_kernel();
67395 sym[i].st_value = ksym->value;
67396+ pax_close_kernel();
67397 break;
67398 }
67399
67400@@ -1869,11 +1897,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67401 secbase = (unsigned long)mod_percpu(mod);
67402 else
67403 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
67404+ pax_open_kernel();
67405 sym[i].st_value += secbase;
67406+ pax_close_kernel();
67407 break;
67408 }
67409 }
67410
67411+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67412+ if (is_fs_load && !register_filesystem_found) {
67413+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
67414+ ret = -EPERM;
67415+ }
67416+#endif
67417+
67418 return ret;
67419 }
67420
67421@@ -1977,22 +2014,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
67422 || s->sh_entsize != ~0UL
67423 || strstarts(sname, ".init"))
67424 continue;
67425- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
67426+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67427+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
67428+ else
67429+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
67430 DEBUGP("\t%s\n", name);
67431 }
67432- switch (m) {
67433- case 0: /* executable */
67434- mod->core_size = debug_align(mod->core_size);
67435- mod->core_text_size = mod->core_size;
67436- break;
67437- case 1: /* RO: text and ro-data */
67438- mod->core_size = debug_align(mod->core_size);
67439- mod->core_ro_size = mod->core_size;
67440- break;
67441- case 3: /* whole core */
67442- mod->core_size = debug_align(mod->core_size);
67443- break;
67444- }
67445 }
67446
67447 DEBUGP("Init section allocation order:\n");
67448@@ -2006,23 +2033,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
67449 || s->sh_entsize != ~0UL
67450 || !strstarts(sname, ".init"))
67451 continue;
67452- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
67453- | INIT_OFFSET_MASK);
67454+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67455+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
67456+ else
67457+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
67458+ s->sh_entsize |= INIT_OFFSET_MASK;
67459 DEBUGP("\t%s\n", sname);
67460 }
67461- switch (m) {
67462- case 0: /* executable */
67463- mod->init_size = debug_align(mod->init_size);
67464- mod->init_text_size = mod->init_size;
67465- break;
67466- case 1: /* RO: text and ro-data */
67467- mod->init_size = debug_align(mod->init_size);
67468- mod->init_ro_size = mod->init_size;
67469- break;
67470- case 3: /* whole init */
67471- mod->init_size = debug_align(mod->init_size);
67472- break;
67473- }
67474 }
67475 }
67476
67477@@ -2187,7 +2204,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
67478
67479 /* Put symbol section at end of init part of module. */
67480 symsect->sh_flags |= SHF_ALLOC;
67481- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
67482+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
67483 info->index.sym) | INIT_OFFSET_MASK;
67484 DEBUGP("\t%s\n", info->secstrings + symsect->sh_name);
67485
67486@@ -2204,19 +2221,19 @@ static void layout_symtab(struct module *mod, struct load_info *info)
67487 }
67488
67489 /* Append room for core symbols at end of core part. */
67490- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
67491- mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
67492+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
67493+ mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
67494
67495 /* Put string table section at end of init part of module. */
67496 strsect->sh_flags |= SHF_ALLOC;
67497- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
67498+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
67499 info->index.str) | INIT_OFFSET_MASK;
67500 DEBUGP("\t%s\n", info->secstrings + strsect->sh_name);
67501
67502 /* Append room for core symbols' strings at end of core part. */
67503- info->stroffs = mod->core_size;
67504+ info->stroffs = mod->core_size_rx;
67505 __set_bit(0, info->strmap);
67506- mod->core_size += bitmap_weight(info->strmap, strsect->sh_size);
67507+ mod->core_size_rx += bitmap_weight(info->strmap, strsect->sh_size);
67508 }
67509
67510 static void add_kallsyms(struct module *mod, const struct load_info *info)
67511@@ -2232,11 +2249,13 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
67512 /* Make sure we get permanent strtab: don't use info->strtab. */
67513 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
67514
67515+ pax_open_kernel();
67516+
67517 /* Set types up while we still have access to sections. */
67518 for (i = 0; i < mod->num_symtab; i++)
67519 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
67520
67521- mod->core_symtab = dst = mod->module_core + info->symoffs;
67522+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
67523 src = mod->symtab;
67524 *dst = *src;
67525 for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
67526@@ -2249,10 +2268,12 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
67527 }
67528 mod->core_num_syms = ndst;
67529
67530- mod->core_strtab = s = mod->module_core + info->stroffs;
67531+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
67532 for (*s = 0, i = 1; i < info->sechdrs[info->index.str].sh_size; ++i)
67533 if (test_bit(i, info->strmap))
67534 *++s = mod->strtab[i];
67535+
67536+ pax_close_kernel();
67537 }
67538 #else
67539 static inline void layout_symtab(struct module *mod, struct load_info *info)
67540@@ -2286,17 +2307,33 @@ void * __weak module_alloc(unsigned long size)
67541 return size == 0 ? NULL : vmalloc_exec(size);
67542 }
67543
67544-static void *module_alloc_update_bounds(unsigned long size)
67545+static void *module_alloc_update_bounds_rw(unsigned long size)
67546 {
67547 void *ret = module_alloc(size);
67548
67549 if (ret) {
67550 mutex_lock(&module_mutex);
67551 /* Update module bounds. */
67552- if ((unsigned long)ret < module_addr_min)
67553- module_addr_min = (unsigned long)ret;
67554- if ((unsigned long)ret + size > module_addr_max)
67555- module_addr_max = (unsigned long)ret + size;
67556+ if ((unsigned long)ret < module_addr_min_rw)
67557+ module_addr_min_rw = (unsigned long)ret;
67558+ if ((unsigned long)ret + size > module_addr_max_rw)
67559+ module_addr_max_rw = (unsigned long)ret + size;
67560+ mutex_unlock(&module_mutex);
67561+ }
67562+ return ret;
67563+}
67564+
67565+static void *module_alloc_update_bounds_rx(unsigned long size)
67566+{
67567+ void *ret = module_alloc_exec(size);
67568+
67569+ if (ret) {
67570+ mutex_lock(&module_mutex);
67571+ /* Update module bounds. */
67572+ if ((unsigned long)ret < module_addr_min_rx)
67573+ module_addr_min_rx = (unsigned long)ret;
67574+ if ((unsigned long)ret + size > module_addr_max_rx)
67575+ module_addr_max_rx = (unsigned long)ret + size;
67576 mutex_unlock(&module_mutex);
67577 }
67578 return ret;
67579@@ -2474,8 +2511,14 @@ static struct module *setup_load_info(struct load_info *info)
67580 static int check_modinfo(struct module *mod, struct load_info *info)
67581 {
67582 const char *modmagic = get_modinfo(info, "vermagic");
67583+ const char *license = get_modinfo(info, "license");
67584 int err;
67585
67586+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
67587+ if (!license || !license_is_gpl_compatible(license))
67588+ return -ENOEXEC;
67589+#endif
67590+
67591 /* This is allowed: modprobe --force will invalidate it. */
67592 if (!modmagic) {
67593 err = try_to_force_load(mod, "bad vermagic");
67594@@ -2498,7 +2541,7 @@ static int check_modinfo(struct module *mod, struct load_info *info)
67595 }
67596
67597 /* Set up license info based on the info section */
67598- set_license(mod, get_modinfo(info, "license"));
67599+ set_license(mod, license);
67600
67601 return 0;
67602 }
67603@@ -2592,7 +2635,7 @@ static int move_module(struct module *mod, struct load_info *info)
67604 void *ptr;
67605
67606 /* Do the allocs. */
67607- ptr = module_alloc_update_bounds(mod->core_size);
67608+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
67609 /*
67610 * The pointer to this block is stored in the module structure
67611 * which is inside the block. Just mark it as not being a
67612@@ -2602,23 +2645,50 @@ static int move_module(struct module *mod, struct load_info *info)
67613 if (!ptr)
67614 return -ENOMEM;
67615
67616- memset(ptr, 0, mod->core_size);
67617- mod->module_core = ptr;
67618+ memset(ptr, 0, mod->core_size_rw);
67619+ mod->module_core_rw = ptr;
67620
67621- ptr = module_alloc_update_bounds(mod->init_size);
67622+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
67623 /*
67624 * The pointer to this block is stored in the module structure
67625 * which is inside the block. This block doesn't need to be
67626 * scanned as it contains data and code that will be freed
67627 * after the module is initialized.
67628 */
67629- kmemleak_ignore(ptr);
67630- if (!ptr && mod->init_size) {
67631- module_free(mod, mod->module_core);
67632+ kmemleak_not_leak(ptr);
67633+ if (!ptr && mod->init_size_rw) {
67634+ module_free(mod, mod->module_core_rw);
67635 return -ENOMEM;
67636 }
67637- memset(ptr, 0, mod->init_size);
67638- mod->module_init = ptr;
67639+ memset(ptr, 0, mod->init_size_rw);
67640+ mod->module_init_rw = ptr;
67641+
67642+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
67643+ kmemleak_not_leak(ptr);
67644+ if (!ptr) {
67645+ module_free(mod, mod->module_init_rw);
67646+ module_free(mod, mod->module_core_rw);
67647+ return -ENOMEM;
67648+ }
67649+
67650+ pax_open_kernel();
67651+ memset(ptr, 0, mod->core_size_rx);
67652+ pax_close_kernel();
67653+ mod->module_core_rx = ptr;
67654+
67655+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
67656+ kmemleak_not_leak(ptr);
67657+ if (!ptr && mod->init_size_rx) {
67658+ module_free_exec(mod, mod->module_core_rx);
67659+ module_free(mod, mod->module_init_rw);
67660+ module_free(mod, mod->module_core_rw);
67661+ return -ENOMEM;
67662+ }
67663+
67664+ pax_open_kernel();
67665+ memset(ptr, 0, mod->init_size_rx);
67666+ pax_close_kernel();
67667+ mod->module_init_rx = ptr;
67668
67669 /* Transfer each section which specifies SHF_ALLOC */
67670 DEBUGP("final section addresses:\n");
67671@@ -2629,16 +2699,45 @@ static int move_module(struct module *mod, struct load_info *info)
67672 if (!(shdr->sh_flags & SHF_ALLOC))
67673 continue;
67674
67675- if (shdr->sh_entsize & INIT_OFFSET_MASK)
67676- dest = mod->module_init
67677- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67678- else
67679- dest = mod->module_core + shdr->sh_entsize;
67680+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
67681+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
67682+ dest = mod->module_init_rw
67683+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67684+ else
67685+ dest = mod->module_init_rx
67686+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67687+ } else {
67688+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
67689+ dest = mod->module_core_rw + shdr->sh_entsize;
67690+ else
67691+ dest = mod->module_core_rx + shdr->sh_entsize;
67692+ }
67693+
67694+ if (shdr->sh_type != SHT_NOBITS) {
67695+
67696+#ifdef CONFIG_PAX_KERNEXEC
67697+#ifdef CONFIG_X86_64
67698+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
67699+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
67700+#endif
67701+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
67702+ pax_open_kernel();
67703+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
67704+ pax_close_kernel();
67705+ } else
67706+#endif
67707
67708- if (shdr->sh_type != SHT_NOBITS)
67709 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
67710+ }
67711 /* Update sh_addr to point to copy in image. */
67712- shdr->sh_addr = (unsigned long)dest;
67713+
67714+#ifdef CONFIG_PAX_KERNEXEC
67715+ if (shdr->sh_flags & SHF_EXECINSTR)
67716+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
67717+ else
67718+#endif
67719+
67720+ shdr->sh_addr = (unsigned long)dest;
67721 DEBUGP("\t0x%lx %s\n",
67722 shdr->sh_addr, info->secstrings + shdr->sh_name);
67723 }
67724@@ -2689,12 +2788,12 @@ static void flush_module_icache(const struct module *mod)
67725 * Do it before processing of module parameters, so the module
67726 * can provide parameter accessor functions of its own.
67727 */
67728- if (mod->module_init)
67729- flush_icache_range((unsigned long)mod->module_init,
67730- (unsigned long)mod->module_init
67731- + mod->init_size);
67732- flush_icache_range((unsigned long)mod->module_core,
67733- (unsigned long)mod->module_core + mod->core_size);
67734+ if (mod->module_init_rx)
67735+ flush_icache_range((unsigned long)mod->module_init_rx,
67736+ (unsigned long)mod->module_init_rx
67737+ + mod->init_size_rx);
67738+ flush_icache_range((unsigned long)mod->module_core_rx,
67739+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
67740
67741 set_fs(old_fs);
67742 }
67743@@ -2774,8 +2873,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
67744 {
67745 kfree(info->strmap);
67746 percpu_modfree(mod);
67747- module_free(mod, mod->module_init);
67748- module_free(mod, mod->module_core);
67749+ module_free_exec(mod, mod->module_init_rx);
67750+ module_free_exec(mod, mod->module_core_rx);
67751+ module_free(mod, mod->module_init_rw);
67752+ module_free(mod, mod->module_core_rw);
67753 }
67754
67755 int __weak module_finalize(const Elf_Ehdr *hdr,
67756@@ -2839,9 +2940,38 @@ static struct module *load_module(void __user *umod,
67757 if (err)
67758 goto free_unload;
67759
67760+ /* Now copy in args */
67761+ mod->args = strndup_user(uargs, ~0UL >> 1);
67762+ if (IS_ERR(mod->args)) {
67763+ err = PTR_ERR(mod->args);
67764+ goto free_unload;
67765+ }
67766+
67767 /* Set up MODINFO_ATTR fields */
67768 setup_modinfo(mod, &info);
67769
67770+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67771+ {
67772+ char *p, *p2;
67773+
67774+ if (strstr(mod->args, "grsec_modharden_netdev")) {
67775+ 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);
67776+ err = -EPERM;
67777+ goto free_modinfo;
67778+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
67779+ p += strlen("grsec_modharden_normal");
67780+ p2 = strstr(p, "_");
67781+ if (p2) {
67782+ *p2 = '\0';
67783+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
67784+ *p2 = '_';
67785+ }
67786+ err = -EPERM;
67787+ goto free_modinfo;
67788+ }
67789+ }
67790+#endif
67791+
67792 /* Fix up syms, so that st_value is a pointer to location. */
67793 err = simplify_symbols(mod, &info);
67794 if (err < 0)
67795@@ -2857,13 +2987,6 @@ static struct module *load_module(void __user *umod,
67796
67797 flush_module_icache(mod);
67798
67799- /* Now copy in args */
67800- mod->args = strndup_user(uargs, ~0UL >> 1);
67801- if (IS_ERR(mod->args)) {
67802- err = PTR_ERR(mod->args);
67803- goto free_arch_cleanup;
67804- }
67805-
67806 /* Mark state as coming so strong_try_module_get() ignores us. */
67807 mod->state = MODULE_STATE_COMING;
67808
67809@@ -2921,11 +3044,10 @@ static struct module *load_module(void __user *umod,
67810 unlock:
67811 mutex_unlock(&module_mutex);
67812 synchronize_sched();
67813- kfree(mod->args);
67814- free_arch_cleanup:
67815 module_arch_cleanup(mod);
67816 free_modinfo:
67817 free_modinfo(mod);
67818+ kfree(mod->args);
67819 free_unload:
67820 module_unload_free(mod);
67821 free_module:
67822@@ -2966,16 +3088,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
67823 MODULE_STATE_COMING, mod);
67824
67825 /* Set RO and NX regions for core */
67826- set_section_ro_nx(mod->module_core,
67827- mod->core_text_size,
67828- mod->core_ro_size,
67829- mod->core_size);
67830+ set_section_ro_nx(mod->module_core_rx,
67831+ mod->core_size_rx,
67832+ mod->core_size_rx,
67833+ mod->core_size_rx);
67834
67835 /* Set RO and NX regions for init */
67836- set_section_ro_nx(mod->module_init,
67837- mod->init_text_size,
67838- mod->init_ro_size,
67839- mod->init_size);
67840+ set_section_ro_nx(mod->module_init_rx,
67841+ mod->init_size_rx,
67842+ mod->init_size_rx,
67843+ mod->init_size_rx);
67844
67845 do_mod_ctors(mod);
67846 /* Start the module */
67847@@ -3021,11 +3143,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
67848 mod->strtab = mod->core_strtab;
67849 #endif
67850 unset_module_init_ro_nx(mod);
67851- module_free(mod, mod->module_init);
67852- mod->module_init = NULL;
67853- mod->init_size = 0;
67854- mod->init_ro_size = 0;
67855- mod->init_text_size = 0;
67856+ module_free(mod, mod->module_init_rw);
67857+ module_free_exec(mod, mod->module_init_rx);
67858+ mod->module_init_rw = NULL;
67859+ mod->module_init_rx = NULL;
67860+ mod->init_size_rw = 0;
67861+ mod->init_size_rx = 0;
67862 mutex_unlock(&module_mutex);
67863
67864 return 0;
67865@@ -3056,10 +3179,16 @@ static const char *get_ksymbol(struct module *mod,
67866 unsigned long nextval;
67867
67868 /* At worse, next value is at end of module */
67869- if (within_module_init(addr, mod))
67870- nextval = (unsigned long)mod->module_init+mod->init_text_size;
67871+ if (within_module_init_rx(addr, mod))
67872+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
67873+ else if (within_module_init_rw(addr, mod))
67874+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
67875+ else if (within_module_core_rx(addr, mod))
67876+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
67877+ else if (within_module_core_rw(addr, mod))
67878+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
67879 else
67880- nextval = (unsigned long)mod->module_core+mod->core_text_size;
67881+ return NULL;
67882
67883 /* Scan for closest preceding symbol, and next symbol. (ELF
67884 starts real symbols at 1). */
67885@@ -3307,7 +3436,7 @@ static int m_show(struct seq_file *m, void *p)
67886 char buf[8];
67887
67888 seq_printf(m, "%s %u",
67889- mod->name, mod->init_size + mod->core_size);
67890+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
67891 print_unload_info(m, mod);
67892
67893 /* Informative for users. */
67894@@ -3316,7 +3445,7 @@ static int m_show(struct seq_file *m, void *p)
67895 mod->state == MODULE_STATE_COMING ? "Loading":
67896 "Live");
67897 /* Used by oprofile and other similar tools. */
67898- seq_printf(m, " 0x%pK", mod->module_core);
67899+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
67900
67901 /* Taints info */
67902 if (mod->taints)
67903@@ -3352,7 +3481,17 @@ static const struct file_operations proc_modules_operations = {
67904
67905 static int __init proc_modules_init(void)
67906 {
67907+#ifndef CONFIG_GRKERNSEC_HIDESYM
67908+#ifdef CONFIG_GRKERNSEC_PROC_USER
67909+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
67910+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67911+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
67912+#else
67913 proc_create("modules", 0, NULL, &proc_modules_operations);
67914+#endif
67915+#else
67916+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
67917+#endif
67918 return 0;
67919 }
67920 module_init(proc_modules_init);
67921@@ -3411,12 +3550,12 @@ struct module *__module_address(unsigned long addr)
67922 {
67923 struct module *mod;
67924
67925- if (addr < module_addr_min || addr > module_addr_max)
67926+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
67927+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
67928 return NULL;
67929
67930 list_for_each_entry_rcu(mod, &modules, list)
67931- if (within_module_core(addr, mod)
67932- || within_module_init(addr, mod))
67933+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
67934 return mod;
67935 return NULL;
67936 }
67937@@ -3450,11 +3589,20 @@ bool is_module_text_address(unsigned long addr)
67938 */
67939 struct module *__module_text_address(unsigned long addr)
67940 {
67941- struct module *mod = __module_address(addr);
67942+ struct module *mod;
67943+
67944+#ifdef CONFIG_X86_32
67945+ addr = ktla_ktva(addr);
67946+#endif
67947+
67948+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
67949+ return NULL;
67950+
67951+ mod = __module_address(addr);
67952+
67953 if (mod) {
67954 /* Make sure it's within the text section. */
67955- if (!within(addr, mod->module_init, mod->init_text_size)
67956- && !within(addr, mod->module_core, mod->core_text_size))
67957+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
67958 mod = NULL;
67959 }
67960 return mod;
67961diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
67962index 7e3443f..b2a1e6b 100644
67963--- a/kernel/mutex-debug.c
67964+++ b/kernel/mutex-debug.c
67965@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
67966 }
67967
67968 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
67969- struct thread_info *ti)
67970+ struct task_struct *task)
67971 {
67972 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
67973
67974 /* Mark the current thread as blocked on the lock: */
67975- ti->task->blocked_on = waiter;
67976+ task->blocked_on = waiter;
67977 }
67978
67979 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
67980- struct thread_info *ti)
67981+ struct task_struct *task)
67982 {
67983 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
67984- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
67985- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
67986- ti->task->blocked_on = NULL;
67987+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
67988+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
67989+ task->blocked_on = NULL;
67990
67991 list_del_init(&waiter->list);
67992 waiter->task = NULL;
67993diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
67994index 0799fd3..d06ae3b 100644
67995--- a/kernel/mutex-debug.h
67996+++ b/kernel/mutex-debug.h
67997@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
67998 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
67999 extern void debug_mutex_add_waiter(struct mutex *lock,
68000 struct mutex_waiter *waiter,
68001- struct thread_info *ti);
68002+ struct task_struct *task);
68003 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
68004- struct thread_info *ti);
68005+ struct task_struct *task);
68006 extern void debug_mutex_unlock(struct mutex *lock);
68007 extern void debug_mutex_init(struct mutex *lock, const char *name,
68008 struct lock_class_key *key);
68009diff --git a/kernel/mutex.c b/kernel/mutex.c
68010index 89096dd..f91ebc5 100644
68011--- a/kernel/mutex.c
68012+++ b/kernel/mutex.c
68013@@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
68014 spin_lock_mutex(&lock->wait_lock, flags);
68015
68016 debug_mutex_lock_common(lock, &waiter);
68017- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
68018+ debug_mutex_add_waiter(lock, &waiter, task);
68019
68020 /* add waiting tasks to the end of the waitqueue (FIFO): */
68021 list_add_tail(&waiter.list, &lock->wait_list);
68022@@ -227,8 +227,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
68023 * TASK_UNINTERRUPTIBLE case.)
68024 */
68025 if (unlikely(signal_pending_state(state, task))) {
68026- mutex_remove_waiter(lock, &waiter,
68027- task_thread_info(task));
68028+ mutex_remove_waiter(lock, &waiter, task);
68029 mutex_release(&lock->dep_map, 1, ip);
68030 spin_unlock_mutex(&lock->wait_lock, flags);
68031
68032@@ -249,7 +248,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
68033 done:
68034 lock_acquired(&lock->dep_map, ip);
68035 /* got the lock - rejoice! */
68036- mutex_remove_waiter(lock, &waiter, current_thread_info());
68037+ mutex_remove_waiter(lock, &waiter, task);
68038 mutex_set_owner(lock);
68039
68040 /* set it to 0 if there are no waiters left: */
68041diff --git a/kernel/padata.c b/kernel/padata.c
68042index b452599..5d68f4e 100644
68043--- a/kernel/padata.c
68044+++ b/kernel/padata.c
68045@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_instance *pinst,
68046 padata->pd = pd;
68047 padata->cb_cpu = cb_cpu;
68048
68049- if (unlikely(atomic_read(&pd->seq_nr) == pd->max_seq_nr))
68050- atomic_set(&pd->seq_nr, -1);
68051+ if (unlikely(atomic_read_unchecked(&pd->seq_nr) == pd->max_seq_nr))
68052+ atomic_set_unchecked(&pd->seq_nr, -1);
68053
68054- padata->seq_nr = atomic_inc_return(&pd->seq_nr);
68055+ padata->seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
68056
68057 target_cpu = padata_cpu_hash(padata);
68058 queue = per_cpu_ptr(pd->pqueue, target_cpu);
68059@@ -444,7 +444,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
68060 padata_init_pqueues(pd);
68061 padata_init_squeues(pd);
68062 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
68063- atomic_set(&pd->seq_nr, -1);
68064+ atomic_set_unchecked(&pd->seq_nr, -1);
68065 atomic_set(&pd->reorder_objects, 0);
68066 atomic_set(&pd->refcnt, 0);
68067 pd->pinst = pinst;
68068diff --git a/kernel/panic.c b/kernel/panic.c
68069index 3458469..342c500 100644
68070--- a/kernel/panic.c
68071+++ b/kernel/panic.c
68072@@ -78,7 +78,11 @@ NORET_TYPE void panic(const char * fmt, ...)
68073 va_end(args);
68074 printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
68075 #ifdef CONFIG_DEBUG_BUGVERBOSE
68076- dump_stack();
68077+ /*
68078+ * Avoid nested stack-dumping if a panic occurs during oops processing
68079+ */
68080+ if (!oops_in_progress)
68081+ dump_stack();
68082 #endif
68083
68084 /*
68085@@ -382,7 +386,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
68086 const char *board;
68087
68088 printk(KERN_WARNING "------------[ cut here ]------------\n");
68089- printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
68090+ printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
68091 board = dmi_get_system_info(DMI_PRODUCT_NAME);
68092 if (board)
68093 printk(KERN_WARNING "Hardware name: %s\n", board);
68094@@ -437,7 +441,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
68095 */
68096 void __stack_chk_fail(void)
68097 {
68098- panic("stack-protector: Kernel stack is corrupted in: %p\n",
68099+ dump_stack();
68100+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
68101 __builtin_return_address(0));
68102 }
68103 EXPORT_SYMBOL(__stack_chk_fail);
68104diff --git a/kernel/pid.c b/kernel/pid.c
68105index fa5f722..0c93e57 100644
68106--- a/kernel/pid.c
68107+++ b/kernel/pid.c
68108@@ -33,6 +33,7 @@
68109 #include <linux/rculist.h>
68110 #include <linux/bootmem.h>
68111 #include <linux/hash.h>
68112+#include <linux/security.h>
68113 #include <linux/pid_namespace.h>
68114 #include <linux/init_task.h>
68115 #include <linux/syscalls.h>
68116@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
68117
68118 int pid_max = PID_MAX_DEFAULT;
68119
68120-#define RESERVED_PIDS 300
68121+#define RESERVED_PIDS 500
68122
68123 int pid_max_min = RESERVED_PIDS + 1;
68124 int pid_max_max = PID_MAX_LIMIT;
68125@@ -418,10 +419,18 @@ EXPORT_SYMBOL(pid_task);
68126 */
68127 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
68128 {
68129+ struct task_struct *task;
68130+
68131 rcu_lockdep_assert(rcu_read_lock_held(),
68132 "find_task_by_pid_ns() needs rcu_read_lock()"
68133 " protection");
68134- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
68135+
68136+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
68137+
68138+ if (gr_pid_is_chrooted(task))
68139+ return NULL;
68140+
68141+ return task;
68142 }
68143
68144 struct task_struct *find_task_by_vpid(pid_t vnr)
68145@@ -429,6 +438,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
68146 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
68147 }
68148
68149+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
68150+{
68151+ rcu_lockdep_assert(rcu_read_lock_held(),
68152+ "find_task_by_pid_ns() needs rcu_read_lock()"
68153+ " protection");
68154+ return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
68155+}
68156+
68157 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
68158 {
68159 struct pid *pid;
68160diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
68161index e7cb76d..75eceb3 100644
68162--- a/kernel/posix-cpu-timers.c
68163+++ b/kernel/posix-cpu-timers.c
68164@@ -6,6 +6,7 @@
68165 #include <linux/posix-timers.h>
68166 #include <linux/errno.h>
68167 #include <linux/math64.h>
68168+#include <linux/security.h>
68169 #include <asm/uaccess.h>
68170 #include <linux/kernel_stat.h>
68171 #include <trace/events/timer.h>
68172@@ -1606,14 +1607,14 @@ struct k_clock clock_posix_cpu = {
68173
68174 static __init int init_posix_cpu_timers(void)
68175 {
68176- struct k_clock process = {
68177+ static struct k_clock process = {
68178 .clock_getres = process_cpu_clock_getres,
68179 .clock_get = process_cpu_clock_get,
68180 .timer_create = process_cpu_timer_create,
68181 .nsleep = process_cpu_nsleep,
68182 .nsleep_restart = process_cpu_nsleep_restart,
68183 };
68184- struct k_clock thread = {
68185+ static struct k_clock thread = {
68186 .clock_getres = thread_cpu_clock_getres,
68187 .clock_get = thread_cpu_clock_get,
68188 .timer_create = thread_cpu_timer_create,
68189diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
68190index 69185ae..cc2847a 100644
68191--- a/kernel/posix-timers.c
68192+++ b/kernel/posix-timers.c
68193@@ -43,6 +43,7 @@
68194 #include <linux/idr.h>
68195 #include <linux/posix-clock.h>
68196 #include <linux/posix-timers.h>
68197+#include <linux/grsecurity.h>
68198 #include <linux/syscalls.h>
68199 #include <linux/wait.h>
68200 #include <linux/workqueue.h>
68201@@ -129,7 +130,7 @@ static DEFINE_SPINLOCK(idr_lock);
68202 * which we beg off on and pass to do_sys_settimeofday().
68203 */
68204
68205-static struct k_clock posix_clocks[MAX_CLOCKS];
68206+static struct k_clock *posix_clocks[MAX_CLOCKS];
68207
68208 /*
68209 * These ones are defined below.
68210@@ -227,7 +228,7 @@ static int posix_get_boottime(const clockid_t which_clock, struct timespec *tp)
68211 */
68212 static __init int init_posix_timers(void)
68213 {
68214- struct k_clock clock_realtime = {
68215+ static struct k_clock clock_realtime = {
68216 .clock_getres = hrtimer_get_res,
68217 .clock_get = posix_clock_realtime_get,
68218 .clock_set = posix_clock_realtime_set,
68219@@ -239,7 +240,7 @@ static __init int init_posix_timers(void)
68220 .timer_get = common_timer_get,
68221 .timer_del = common_timer_del,
68222 };
68223- struct k_clock clock_monotonic = {
68224+ static struct k_clock clock_monotonic = {
68225 .clock_getres = hrtimer_get_res,
68226 .clock_get = posix_ktime_get_ts,
68227 .nsleep = common_nsleep,
68228@@ -249,19 +250,19 @@ static __init int init_posix_timers(void)
68229 .timer_get = common_timer_get,
68230 .timer_del = common_timer_del,
68231 };
68232- struct k_clock clock_monotonic_raw = {
68233+ static struct k_clock clock_monotonic_raw = {
68234 .clock_getres = hrtimer_get_res,
68235 .clock_get = posix_get_monotonic_raw,
68236 };
68237- struct k_clock clock_realtime_coarse = {
68238+ static struct k_clock clock_realtime_coarse = {
68239 .clock_getres = posix_get_coarse_res,
68240 .clock_get = posix_get_realtime_coarse,
68241 };
68242- struct k_clock clock_monotonic_coarse = {
68243+ static struct k_clock clock_monotonic_coarse = {
68244 .clock_getres = posix_get_coarse_res,
68245 .clock_get = posix_get_monotonic_coarse,
68246 };
68247- struct k_clock clock_boottime = {
68248+ static struct k_clock clock_boottime = {
68249 .clock_getres = hrtimer_get_res,
68250 .clock_get = posix_get_boottime,
68251 .nsleep = common_nsleep,
68252@@ -473,7 +474,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
68253 return;
68254 }
68255
68256- posix_clocks[clock_id] = *new_clock;
68257+ posix_clocks[clock_id] = new_clock;
68258 }
68259 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
68260
68261@@ -519,9 +520,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
68262 return (id & CLOCKFD_MASK) == CLOCKFD ?
68263 &clock_posix_dynamic : &clock_posix_cpu;
68264
68265- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
68266+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
68267 return NULL;
68268- return &posix_clocks[id];
68269+ return posix_clocks[id];
68270 }
68271
68272 static int common_timer_create(struct k_itimer *new_timer)
68273@@ -959,6 +960,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
68274 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
68275 return -EFAULT;
68276
68277+ /* only the CLOCK_REALTIME clock can be set, all other clocks
68278+ have their clock_set fptr set to a nosettime dummy function
68279+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
68280+ call common_clock_set, which calls do_sys_settimeofday, which
68281+ we hook
68282+ */
68283+
68284 return kc->clock_set(which_clock, &new_tp);
68285 }
68286
68287diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
68288index d523593..68197a4 100644
68289--- a/kernel/power/poweroff.c
68290+++ b/kernel/power/poweroff.c
68291@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = {
68292 .enable_mask = SYSRQ_ENABLE_BOOT,
68293 };
68294
68295-static int pm_sysrq_init(void)
68296+static int __init pm_sysrq_init(void)
68297 {
68298 register_sysrq_key('o', &sysrq_poweroff_op);
68299 return 0;
68300diff --git a/kernel/power/process.c b/kernel/power/process.c
68301index 3d4b954..11af930 100644
68302--- a/kernel/power/process.c
68303+++ b/kernel/power/process.c
68304@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_only)
68305 u64 elapsed_csecs64;
68306 unsigned int elapsed_csecs;
68307 bool wakeup = false;
68308+ bool timedout = false;
68309
68310 do_gettimeofday(&start);
68311
68312@@ -51,6 +52,8 @@ static int try_to_freeze_tasks(bool sig_only)
68313
68314 while (true) {
68315 todo = 0;
68316+ if (time_after(jiffies, end_time))
68317+ timedout = true;
68318 read_lock(&tasklist_lock);
68319 do_each_thread(g, p) {
68320 if (frozen(p) || !freezable(p))
68321@@ -71,9 +74,13 @@ static int try_to_freeze_tasks(bool sig_only)
68322 * try_to_stop() after schedule() in ptrace/signal
68323 * stop sees TIF_FREEZE.
68324 */
68325- if (!task_is_stopped_or_traced(p) &&
68326- !freezer_should_skip(p))
68327+ if (!task_is_stopped_or_traced(p) && !freezer_should_skip(p)) {
68328 todo++;
68329+ if (timedout) {
68330+ printk(KERN_ERR "Task refusing to freeze:\n");
68331+ sched_show_task(p);
68332+ }
68333+ }
68334 } while_each_thread(g, p);
68335 read_unlock(&tasklist_lock);
68336
68337@@ -82,7 +89,7 @@ static int try_to_freeze_tasks(bool sig_only)
68338 todo += wq_busy;
68339 }
68340
68341- if (!todo || time_after(jiffies, end_time))
68342+ if (!todo || timedout)
68343 break;
68344
68345 if (pm_wakeup_pending()) {
68346diff --git a/kernel/printk.c b/kernel/printk.c
68347index 7982a0a..2095fdc 100644
68348--- a/kernel/printk.c
68349+++ b/kernel/printk.c
68350@@ -313,6 +313,11 @@ static int check_syslog_permissions(int type, bool from_file)
68351 if (from_file && type != SYSLOG_ACTION_OPEN)
68352 return 0;
68353
68354+#ifdef CONFIG_GRKERNSEC_DMESG
68355+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
68356+ return -EPERM;
68357+#endif
68358+
68359 if (syslog_action_restricted(type)) {
68360 if (capable(CAP_SYSLOG))
68361 return 0;
68362diff --git a/kernel/profile.c b/kernel/profile.c
68363index 76b8e77..a2930e8 100644
68364--- a/kernel/profile.c
68365+++ b/kernel/profile.c
68366@@ -39,7 +39,7 @@ struct profile_hit {
68367 /* Oprofile timer tick hook */
68368 static int (*timer_hook)(struct pt_regs *) __read_mostly;
68369
68370-static atomic_t *prof_buffer;
68371+static atomic_unchecked_t *prof_buffer;
68372 static unsigned long prof_len, prof_shift;
68373
68374 int prof_on __read_mostly;
68375@@ -281,7 +281,7 @@ static void profile_flip_buffers(void)
68376 hits[i].pc = 0;
68377 continue;
68378 }
68379- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
68380+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68381 hits[i].hits = hits[i].pc = 0;
68382 }
68383 }
68384@@ -342,9 +342,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
68385 * Add the current hit(s) and flush the write-queue out
68386 * to the global buffer:
68387 */
68388- atomic_add(nr_hits, &prof_buffer[pc]);
68389+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
68390 for (i = 0; i < NR_PROFILE_HIT; ++i) {
68391- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
68392+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68393 hits[i].pc = hits[i].hits = 0;
68394 }
68395 out:
68396@@ -419,7 +419,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
68397 {
68398 unsigned long pc;
68399 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
68400- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68401+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68402 }
68403 #endif /* !CONFIG_SMP */
68404
68405@@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
68406 return -EFAULT;
68407 buf++; p++; count--; read++;
68408 }
68409- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
68410+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
68411 if (copy_to_user(buf, (void *)pnt, count))
68412 return -EFAULT;
68413 read += count;
68414@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
68415 }
68416 #endif
68417 profile_discard_flip_buffers();
68418- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
68419+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
68420 return count;
68421 }
68422
68423diff --git a/kernel/ptrace.c b/kernel/ptrace.c
68424index 78ab24a..332c915 100644
68425--- a/kernel/ptrace.c
68426+++ b/kernel/ptrace.c
68427@@ -172,7 +172,8 @@ int ptrace_check_attach(struct task_struct *child, bool ignore_state)
68428 return ret;
68429 }
68430
68431-int __ptrace_may_access(struct task_struct *task, unsigned int mode)
68432+static int __ptrace_may_access(struct task_struct *task, unsigned int mode,
68433+ unsigned int log)
68434 {
68435 const struct cred *cred = current_cred(), *tcred;
68436
68437@@ -198,7 +199,8 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
68438 cred->gid == tcred->sgid &&
68439 cred->gid == tcred->gid))
68440 goto ok;
68441- if (ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE))
68442+ if ((!log && ns_capable_nolog(tcred->user->user_ns, CAP_SYS_PTRACE)) ||
68443+ (log && ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE)))
68444 goto ok;
68445 rcu_read_unlock();
68446 return -EPERM;
68447@@ -207,7 +209,9 @@ ok:
68448 smp_rmb();
68449 if (task->mm)
68450 dumpable = get_dumpable(task->mm);
68451- if (!dumpable && !task_ns_capable(task, CAP_SYS_PTRACE))
68452+ if (!dumpable &&
68453+ ((!log && !task_ns_capable_nolog(task, CAP_SYS_PTRACE)) ||
68454+ (log && !task_ns_capable(task, CAP_SYS_PTRACE))))
68455 return -EPERM;
68456
68457 return security_ptrace_access_check(task, mode);
68458@@ -217,7 +221,21 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
68459 {
68460 int err;
68461 task_lock(task);
68462- err = __ptrace_may_access(task, mode);
68463+ err = __ptrace_may_access(task, mode, 0);
68464+ task_unlock(task);
68465+ return !err;
68466+}
68467+
68468+bool ptrace_may_access_nolock(struct task_struct *task, unsigned int mode)
68469+{
68470+ return __ptrace_may_access(task, mode, 0);
68471+}
68472+
68473+bool ptrace_may_access_log(struct task_struct *task, unsigned int mode)
68474+{
68475+ int err;
68476+ task_lock(task);
68477+ err = __ptrace_may_access(task, mode, 1);
68478 task_unlock(task);
68479 return !err;
68480 }
68481@@ -262,7 +280,7 @@ static int ptrace_attach(struct task_struct *task, long request,
68482 goto out;
68483
68484 task_lock(task);
68485- retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
68486+ retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH, 1);
68487 task_unlock(task);
68488 if (retval)
68489 goto unlock_creds;
68490@@ -277,7 +295,7 @@ static int ptrace_attach(struct task_struct *task, long request,
68491 task->ptrace = PT_PTRACED;
68492 if (seize)
68493 task->ptrace |= PT_SEIZED;
68494- if (task_ns_capable(task, CAP_SYS_PTRACE))
68495+ if (task_ns_capable_nolog(task, CAP_SYS_PTRACE))
68496 task->ptrace |= PT_PTRACE_CAP;
68497
68498 __ptrace_link(task, current);
68499@@ -483,7 +501,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
68500 break;
68501 return -EIO;
68502 }
68503- if (copy_to_user(dst, buf, retval))
68504+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
68505 return -EFAULT;
68506 copied += retval;
68507 src += retval;
68508@@ -680,7 +698,7 @@ int ptrace_request(struct task_struct *child, long request,
68509 bool seized = child->ptrace & PT_SEIZED;
68510 int ret = -EIO;
68511 siginfo_t siginfo, *si;
68512- void __user *datavp = (void __user *) data;
68513+ void __user *datavp = (__force void __user *) data;
68514 unsigned long __user *datalp = datavp;
68515 unsigned long flags;
68516
68517@@ -882,14 +900,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
68518 goto out;
68519 }
68520
68521+ if (gr_handle_ptrace(child, request)) {
68522+ ret = -EPERM;
68523+ goto out_put_task_struct;
68524+ }
68525+
68526 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
68527 ret = ptrace_attach(child, request, data);
68528 /*
68529 * Some architectures need to do book-keeping after
68530 * a ptrace attach.
68531 */
68532- if (!ret)
68533+ if (!ret) {
68534 arch_ptrace_attach(child);
68535+ gr_audit_ptrace(child);
68536+ }
68537 goto out_put_task_struct;
68538 }
68539
68540@@ -915,7 +940,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
68541 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
68542 if (copied != sizeof(tmp))
68543 return -EIO;
68544- return put_user(tmp, (unsigned long __user *)data);
68545+ return put_user(tmp, (__force unsigned long __user *)data);
68546 }
68547
68548 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
68549@@ -1025,14 +1050,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
68550 goto out;
68551 }
68552
68553+ if (gr_handle_ptrace(child, request)) {
68554+ ret = -EPERM;
68555+ goto out_put_task_struct;
68556+ }
68557+
68558 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
68559 ret = ptrace_attach(child, request, data);
68560 /*
68561 * Some architectures need to do book-keeping after
68562 * a ptrace attach.
68563 */
68564- if (!ret)
68565+ if (!ret) {
68566 arch_ptrace_attach(child);
68567+ gr_audit_ptrace(child);
68568+ }
68569 goto out_put_task_struct;
68570 }
68571
68572diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
68573index 636af6d..8af70ab 100644
68574--- a/kernel/rcutiny.c
68575+++ b/kernel/rcutiny.c
68576@@ -46,7 +46,7 @@
68577 struct rcu_ctrlblk;
68578 static void invoke_rcu_callbacks(void);
68579 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
68580-static void rcu_process_callbacks(struct softirq_action *unused);
68581+static void rcu_process_callbacks(void);
68582 static void __call_rcu(struct rcu_head *head,
68583 void (*func)(struct rcu_head *rcu),
68584 struct rcu_ctrlblk *rcp);
68585@@ -186,7 +186,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
68586 RCU_TRACE(trace_rcu_batch_end(rcp->name, cb_count));
68587 }
68588
68589-static void rcu_process_callbacks(struct softirq_action *unused)
68590+static void rcu_process_callbacks(void)
68591 {
68592 __rcu_process_callbacks(&rcu_sched_ctrlblk);
68593 __rcu_process_callbacks(&rcu_bh_ctrlblk);
68594diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
68595index 764825c..3aa6ac4 100644
68596--- a/kernel/rcutorture.c
68597+++ b/kernel/rcutorture.c
68598@@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
68599 { 0 };
68600 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
68601 { 0 };
68602-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
68603-static atomic_t n_rcu_torture_alloc;
68604-static atomic_t n_rcu_torture_alloc_fail;
68605-static atomic_t n_rcu_torture_free;
68606-static atomic_t n_rcu_torture_mberror;
68607-static atomic_t n_rcu_torture_error;
68608+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
68609+static atomic_unchecked_t n_rcu_torture_alloc;
68610+static atomic_unchecked_t n_rcu_torture_alloc_fail;
68611+static atomic_unchecked_t n_rcu_torture_free;
68612+static atomic_unchecked_t n_rcu_torture_mberror;
68613+static atomic_unchecked_t n_rcu_torture_error;
68614 static long n_rcu_torture_boost_ktrerror;
68615 static long n_rcu_torture_boost_rterror;
68616 static long n_rcu_torture_boost_failure;
68617@@ -223,11 +223,11 @@ rcu_torture_alloc(void)
68618
68619 spin_lock_bh(&rcu_torture_lock);
68620 if (list_empty(&rcu_torture_freelist)) {
68621- atomic_inc(&n_rcu_torture_alloc_fail);
68622+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
68623 spin_unlock_bh(&rcu_torture_lock);
68624 return NULL;
68625 }
68626- atomic_inc(&n_rcu_torture_alloc);
68627+ atomic_inc_unchecked(&n_rcu_torture_alloc);
68628 p = rcu_torture_freelist.next;
68629 list_del_init(p);
68630 spin_unlock_bh(&rcu_torture_lock);
68631@@ -240,7 +240,7 @@ rcu_torture_alloc(void)
68632 static void
68633 rcu_torture_free(struct rcu_torture *p)
68634 {
68635- atomic_inc(&n_rcu_torture_free);
68636+ atomic_inc_unchecked(&n_rcu_torture_free);
68637 spin_lock_bh(&rcu_torture_lock);
68638 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
68639 spin_unlock_bh(&rcu_torture_lock);
68640@@ -360,7 +360,7 @@ rcu_torture_cb(struct rcu_head *p)
68641 i = rp->rtort_pipe_count;
68642 if (i > RCU_TORTURE_PIPE_LEN)
68643 i = RCU_TORTURE_PIPE_LEN;
68644- atomic_inc(&rcu_torture_wcount[i]);
68645+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68646 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
68647 rp->rtort_mbtest = 0;
68648 rcu_torture_free(rp);
68649@@ -407,7 +407,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
68650 i = rp->rtort_pipe_count;
68651 if (i > RCU_TORTURE_PIPE_LEN)
68652 i = RCU_TORTURE_PIPE_LEN;
68653- atomic_inc(&rcu_torture_wcount[i]);
68654+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68655 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
68656 rp->rtort_mbtest = 0;
68657 list_del(&rp->rtort_free);
68658@@ -872,7 +872,7 @@ rcu_torture_writer(void *arg)
68659 i = old_rp->rtort_pipe_count;
68660 if (i > RCU_TORTURE_PIPE_LEN)
68661 i = RCU_TORTURE_PIPE_LEN;
68662- atomic_inc(&rcu_torture_wcount[i]);
68663+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68664 old_rp->rtort_pipe_count++;
68665 cur_ops->deferred_free(old_rp);
68666 }
68667@@ -940,7 +940,7 @@ static void rcu_torture_timer(unsigned long unused)
68668 return;
68669 }
68670 if (p->rtort_mbtest == 0)
68671- atomic_inc(&n_rcu_torture_mberror);
68672+ atomic_inc_unchecked(&n_rcu_torture_mberror);
68673 spin_lock(&rand_lock);
68674 cur_ops->read_delay(&rand);
68675 n_rcu_torture_timers++;
68676@@ -1001,7 +1001,7 @@ rcu_torture_reader(void *arg)
68677 continue;
68678 }
68679 if (p->rtort_mbtest == 0)
68680- atomic_inc(&n_rcu_torture_mberror);
68681+ atomic_inc_unchecked(&n_rcu_torture_mberror);
68682 cur_ops->read_delay(&rand);
68683 preempt_disable();
68684 pipe_count = p->rtort_pipe_count;
68685@@ -1060,16 +1060,16 @@ rcu_torture_printk(char *page)
68686 rcu_torture_current,
68687 rcu_torture_current_version,
68688 list_empty(&rcu_torture_freelist),
68689- atomic_read(&n_rcu_torture_alloc),
68690- atomic_read(&n_rcu_torture_alloc_fail),
68691- atomic_read(&n_rcu_torture_free),
68692- atomic_read(&n_rcu_torture_mberror),
68693+ atomic_read_unchecked(&n_rcu_torture_alloc),
68694+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
68695+ atomic_read_unchecked(&n_rcu_torture_free),
68696+ atomic_read_unchecked(&n_rcu_torture_mberror),
68697 n_rcu_torture_boost_ktrerror,
68698 n_rcu_torture_boost_rterror,
68699 n_rcu_torture_boost_failure,
68700 n_rcu_torture_boosts,
68701 n_rcu_torture_timers);
68702- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
68703+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
68704 n_rcu_torture_boost_ktrerror != 0 ||
68705 n_rcu_torture_boost_rterror != 0 ||
68706 n_rcu_torture_boost_failure != 0)
68707@@ -1077,7 +1077,7 @@ rcu_torture_printk(char *page)
68708 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
68709 if (i > 1) {
68710 cnt += sprintf(&page[cnt], "!!! ");
68711- atomic_inc(&n_rcu_torture_error);
68712+ atomic_inc_unchecked(&n_rcu_torture_error);
68713 WARN_ON_ONCE(1);
68714 }
68715 cnt += sprintf(&page[cnt], "Reader Pipe: ");
68716@@ -1091,7 +1091,7 @@ rcu_torture_printk(char *page)
68717 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
68718 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
68719 cnt += sprintf(&page[cnt], " %d",
68720- atomic_read(&rcu_torture_wcount[i]));
68721+ atomic_read_unchecked(&rcu_torture_wcount[i]));
68722 }
68723 cnt += sprintf(&page[cnt], "\n");
68724 if (cur_ops->stats)
68725@@ -1401,7 +1401,7 @@ rcu_torture_cleanup(void)
68726
68727 if (cur_ops->cleanup)
68728 cur_ops->cleanup();
68729- if (atomic_read(&n_rcu_torture_error))
68730+ if (atomic_read_unchecked(&n_rcu_torture_error))
68731 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
68732 else
68733 rcu_torture_print_module_parms(cur_ops, "End of test: SUCCESS");
68734@@ -1465,17 +1465,17 @@ rcu_torture_init(void)
68735
68736 rcu_torture_current = NULL;
68737 rcu_torture_current_version = 0;
68738- atomic_set(&n_rcu_torture_alloc, 0);
68739- atomic_set(&n_rcu_torture_alloc_fail, 0);
68740- atomic_set(&n_rcu_torture_free, 0);
68741- atomic_set(&n_rcu_torture_mberror, 0);
68742- atomic_set(&n_rcu_torture_error, 0);
68743+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
68744+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
68745+ atomic_set_unchecked(&n_rcu_torture_free, 0);
68746+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
68747+ atomic_set_unchecked(&n_rcu_torture_error, 0);
68748 n_rcu_torture_boost_ktrerror = 0;
68749 n_rcu_torture_boost_rterror = 0;
68750 n_rcu_torture_boost_failure = 0;
68751 n_rcu_torture_boosts = 0;
68752 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
68753- atomic_set(&rcu_torture_wcount[i], 0);
68754+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
68755 for_each_possible_cpu(cpu) {
68756 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
68757 per_cpu(rcu_torture_count, cpu)[i] = 0;
68758diff --git a/kernel/rcutree.c b/kernel/rcutree.c
68759index 6b76d81..7afc1b3 100644
68760--- a/kernel/rcutree.c
68761+++ b/kernel/rcutree.c
68762@@ -367,9 +367,9 @@ void rcu_enter_nohz(void)
68763 trace_rcu_dyntick("Start");
68764 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
68765 smp_mb__before_atomic_inc(); /* See above. */
68766- atomic_inc(&rdtp->dynticks);
68767+ atomic_inc_unchecked(&rdtp->dynticks);
68768 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
68769- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
68770+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
68771 local_irq_restore(flags);
68772 }
68773
68774@@ -391,10 +391,10 @@ void rcu_exit_nohz(void)
68775 return;
68776 }
68777 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
68778- atomic_inc(&rdtp->dynticks);
68779+ atomic_inc_unchecked(&rdtp->dynticks);
68780 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
68781 smp_mb__after_atomic_inc(); /* See above. */
68782- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
68783+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
68784 trace_rcu_dyntick("End");
68785 local_irq_restore(flags);
68786 }
68787@@ -411,14 +411,14 @@ void rcu_nmi_enter(void)
68788 struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
68789
68790 if (rdtp->dynticks_nmi_nesting == 0 &&
68791- (atomic_read(&rdtp->dynticks) & 0x1))
68792+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
68793 return;
68794 rdtp->dynticks_nmi_nesting++;
68795 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
68796- atomic_inc(&rdtp->dynticks);
68797+ atomic_inc_unchecked(&rdtp->dynticks);
68798 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
68799 smp_mb__after_atomic_inc(); /* See above. */
68800- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
68801+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
68802 }
68803
68804 /**
68805@@ -437,9 +437,9 @@ void rcu_nmi_exit(void)
68806 return;
68807 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
68808 smp_mb__before_atomic_inc(); /* See above. */
68809- atomic_inc(&rdtp->dynticks);
68810+ atomic_inc_unchecked(&rdtp->dynticks);
68811 smp_mb__after_atomic_inc(); /* Force delay to next write. */
68812- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
68813+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
68814 }
68815
68816 /**
68817@@ -474,7 +474,7 @@ void rcu_irq_exit(void)
68818 */
68819 static int dyntick_save_progress_counter(struct rcu_data *rdp)
68820 {
68821- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
68822+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
68823 return 0;
68824 }
68825
68826@@ -489,7 +489,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
68827 unsigned int curr;
68828 unsigned int snap;
68829
68830- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
68831+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
68832 snap = (unsigned int)rdp->dynticks_snap;
68833
68834 /*
68835@@ -1552,7 +1552,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
68836 /*
68837 * Do RCU core processing for the current CPU.
68838 */
68839-static void rcu_process_callbacks(struct softirq_action *unused)
68840+static void rcu_process_callbacks(void)
68841 {
68842 trace_rcu_utilization("Start RCU core");
68843 __rcu_process_callbacks(&rcu_sched_state,
68844diff --git a/kernel/rcutree.h b/kernel/rcutree.h
68845index 849ce9e..74bc9de 100644
68846--- a/kernel/rcutree.h
68847+++ b/kernel/rcutree.h
68848@@ -86,7 +86,7 @@
68849 struct rcu_dynticks {
68850 int dynticks_nesting; /* Track irq/process nesting level. */
68851 int dynticks_nmi_nesting; /* Track NMI nesting level. */
68852- atomic_t dynticks; /* Even value for dynticks-idle, else odd. */
68853+ atomic_unchecked_t dynticks; /* Even value for dynticks-idle, else odd. */
68854 };
68855
68856 /* RCU's kthread states for tracing. */
68857diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
68858index 4b9b9f8..2326053 100644
68859--- a/kernel/rcutree_plugin.h
68860+++ b/kernel/rcutree_plugin.h
68861@@ -842,7 +842,7 @@ void synchronize_rcu_expedited(void)
68862
68863 /* Clean up and exit. */
68864 smp_mb(); /* ensure expedited GP seen before counter increment. */
68865- ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
68866+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
68867 unlock_mb_ret:
68868 mutex_unlock(&sync_rcu_preempt_exp_mutex);
68869 mb_ret:
68870@@ -1815,8 +1815,8 @@ EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
68871
68872 #else /* #ifndef CONFIG_SMP */
68873
68874-static atomic_t sync_sched_expedited_started = ATOMIC_INIT(0);
68875-static atomic_t sync_sched_expedited_done = ATOMIC_INIT(0);
68876+static atomic_unchecked_t sync_sched_expedited_started = ATOMIC_INIT(0);
68877+static atomic_unchecked_t sync_sched_expedited_done = ATOMIC_INIT(0);
68878
68879 static int synchronize_sched_expedited_cpu_stop(void *data)
68880 {
68881@@ -1871,7 +1871,7 @@ void synchronize_sched_expedited(void)
68882 int firstsnap, s, snap, trycount = 0;
68883
68884 /* Note that atomic_inc_return() implies full memory barrier. */
68885- firstsnap = snap = atomic_inc_return(&sync_sched_expedited_started);
68886+ firstsnap = snap = atomic_inc_return_unchecked(&sync_sched_expedited_started);
68887 get_online_cpus();
68888
68889 /*
68890@@ -1892,7 +1892,7 @@ void synchronize_sched_expedited(void)
68891 }
68892
68893 /* Check to see if someone else did our work for us. */
68894- s = atomic_read(&sync_sched_expedited_done);
68895+ s = atomic_read_unchecked(&sync_sched_expedited_done);
68896 if (UINT_CMP_GE((unsigned)s, (unsigned)firstsnap)) {
68897 smp_mb(); /* ensure test happens before caller kfree */
68898 return;
68899@@ -1907,7 +1907,7 @@ void synchronize_sched_expedited(void)
68900 * grace period works for us.
68901 */
68902 get_online_cpus();
68903- snap = atomic_read(&sync_sched_expedited_started) - 1;
68904+ snap = atomic_read_unchecked(&sync_sched_expedited_started) - 1;
68905 smp_mb(); /* ensure read is before try_stop_cpus(). */
68906 }
68907
68908@@ -1918,12 +1918,12 @@ void synchronize_sched_expedited(void)
68909 * than we did beat us to the punch.
68910 */
68911 do {
68912- s = atomic_read(&sync_sched_expedited_done);
68913+ s = atomic_read_unchecked(&sync_sched_expedited_done);
68914 if (UINT_CMP_GE((unsigned)s, (unsigned)snap)) {
68915 smp_mb(); /* ensure test happens before caller kfree */
68916 break;
68917 }
68918- } while (atomic_cmpxchg(&sync_sched_expedited_done, s, snap) != s);
68919+ } while (atomic_cmpxchg_unchecked(&sync_sched_expedited_done, s, snap) != s);
68920
68921 put_online_cpus();
68922 }
68923@@ -1985,7 +1985,7 @@ int rcu_needs_cpu(int cpu)
68924 for_each_online_cpu(thatcpu) {
68925 if (thatcpu == cpu)
68926 continue;
68927- snap = atomic_add_return(0, &per_cpu(rcu_dynticks,
68928+ snap = atomic_add_return_unchecked(0, &per_cpu(rcu_dynticks,
68929 thatcpu).dynticks);
68930 smp_mb(); /* Order sampling of snap with end of grace period. */
68931 if ((snap & 0x1) != 0) {
68932diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
68933index 9feffa4..54058df 100644
68934--- a/kernel/rcutree_trace.c
68935+++ b/kernel/rcutree_trace.c
68936@@ -69,7 +69,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
68937 rdp->qs_pending);
68938 #ifdef CONFIG_NO_HZ
68939 seq_printf(m, " dt=%d/%d/%d df=%lu",
68940- atomic_read(&rdp->dynticks->dynticks),
68941+ atomic_read_unchecked(&rdp->dynticks->dynticks),
68942 rdp->dynticks->dynticks_nesting,
68943 rdp->dynticks->dynticks_nmi_nesting,
68944 rdp->dynticks_fqs);
68945@@ -143,7 +143,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp)
68946 rdp->qs_pending);
68947 #ifdef CONFIG_NO_HZ
68948 seq_printf(m, ",%d,%d,%d,%lu",
68949- atomic_read(&rdp->dynticks->dynticks),
68950+ atomic_read_unchecked(&rdp->dynticks->dynticks),
68951 rdp->dynticks->dynticks_nesting,
68952 rdp->dynticks->dynticks_nmi_nesting,
68953 rdp->dynticks_fqs);
68954diff --git a/kernel/resource.c b/kernel/resource.c
68955index 7640b3a..5879283 100644
68956--- a/kernel/resource.c
68957+++ b/kernel/resource.c
68958@@ -141,8 +141,18 @@ static const struct file_operations proc_iomem_operations = {
68959
68960 static int __init ioresources_init(void)
68961 {
68962+#ifdef CONFIG_GRKERNSEC_PROC_ADD
68963+#ifdef CONFIG_GRKERNSEC_PROC_USER
68964+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
68965+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
68966+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
68967+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
68968+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
68969+#endif
68970+#else
68971 proc_create("ioports", 0, NULL, &proc_ioports_operations);
68972 proc_create("iomem", 0, NULL, &proc_iomem_operations);
68973+#endif
68974 return 0;
68975 }
68976 __initcall(ioresources_init);
68977diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
68978index 3d9f31c..7fefc9e 100644
68979--- a/kernel/rtmutex-tester.c
68980+++ b/kernel/rtmutex-tester.c
68981@@ -20,7 +20,7 @@
68982 #define MAX_RT_TEST_MUTEXES 8
68983
68984 static spinlock_t rttest_lock;
68985-static atomic_t rttest_event;
68986+static atomic_unchecked_t rttest_event;
68987
68988 struct test_thread_data {
68989 int opcode;
68990@@ -61,7 +61,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68991
68992 case RTTEST_LOCKCONT:
68993 td->mutexes[td->opdata] = 1;
68994- td->event = atomic_add_return(1, &rttest_event);
68995+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68996 return 0;
68997
68998 case RTTEST_RESET:
68999@@ -74,7 +74,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
69000 return 0;
69001
69002 case RTTEST_RESETEVENT:
69003- atomic_set(&rttest_event, 0);
69004+ atomic_set_unchecked(&rttest_event, 0);
69005 return 0;
69006
69007 default:
69008@@ -91,9 +91,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
69009 return ret;
69010
69011 td->mutexes[id] = 1;
69012- td->event = atomic_add_return(1, &rttest_event);
69013+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69014 rt_mutex_lock(&mutexes[id]);
69015- td->event = atomic_add_return(1, &rttest_event);
69016+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69017 td->mutexes[id] = 4;
69018 return 0;
69019
69020@@ -104,9 +104,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
69021 return ret;
69022
69023 td->mutexes[id] = 1;
69024- td->event = atomic_add_return(1, &rttest_event);
69025+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69026 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
69027- td->event = atomic_add_return(1, &rttest_event);
69028+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69029 td->mutexes[id] = ret ? 0 : 4;
69030 return ret ? -EINTR : 0;
69031
69032@@ -115,9 +115,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
69033 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
69034 return ret;
69035
69036- td->event = atomic_add_return(1, &rttest_event);
69037+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69038 rt_mutex_unlock(&mutexes[id]);
69039- td->event = atomic_add_return(1, &rttest_event);
69040+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69041 td->mutexes[id] = 0;
69042 return 0;
69043
69044@@ -164,7 +164,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
69045 break;
69046
69047 td->mutexes[dat] = 2;
69048- td->event = atomic_add_return(1, &rttest_event);
69049+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69050 break;
69051
69052 default:
69053@@ -184,7 +184,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
69054 return;
69055
69056 td->mutexes[dat] = 3;
69057- td->event = atomic_add_return(1, &rttest_event);
69058+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69059 break;
69060
69061 case RTTEST_LOCKNOWAIT:
69062@@ -196,7 +196,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
69063 return;
69064
69065 td->mutexes[dat] = 1;
69066- td->event = atomic_add_return(1, &rttest_event);
69067+ td->event = atomic_add_return_unchecked(1, &rttest_event);
69068 return;
69069
69070 default:
69071diff --git a/kernel/sched.c b/kernel/sched.c
69072index d6b149c..896cbb8 100644
69073--- a/kernel/sched.c
69074+++ b/kernel/sched.c
69075@@ -4389,6 +4389,19 @@ pick_next_task(struct rq *rq)
69076 BUG(); /* the idle class will always have a runnable task */
69077 }
69078
69079+#ifdef CONFIG_GRKERNSEC_SETXID
69080+extern void gr_delayed_cred_worker(void);
69081+static inline void gr_cred_schedule(void)
69082+{
69083+ if (unlikely(current->delayed_cred))
69084+ gr_delayed_cred_worker();
69085+}
69086+#else
69087+static inline void gr_cred_schedule(void)
69088+{
69089+}
69090+#endif
69091+
69092 /*
69093 * __schedule() is the main scheduler function.
69094 */
69095@@ -4408,6 +4421,8 @@ need_resched:
69096
69097 schedule_debug(prev);
69098
69099+ gr_cred_schedule();
69100+
69101 if (sched_feat(HRTICK))
69102 hrtick_clear(rq);
69103
69104@@ -5098,6 +5113,8 @@ int can_nice(const struct task_struct *p, const int nice)
69105 /* convert nice value [19,-20] to rlimit style value [1,40] */
69106 int nice_rlim = 20 - nice;
69107
69108+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
69109+
69110 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
69111 capable(CAP_SYS_NICE));
69112 }
69113@@ -5131,7 +5148,8 @@ SYSCALL_DEFINE1(nice, int, increment)
69114 if (nice > 19)
69115 nice = 19;
69116
69117- if (increment < 0 && !can_nice(current, nice))
69118+ if (increment < 0 && (!can_nice(current, nice) ||
69119+ gr_handle_chroot_nice()))
69120 return -EPERM;
69121
69122 retval = security_task_setnice(current, nice);
69123@@ -5288,6 +5306,7 @@ recheck:
69124 unsigned long rlim_rtprio =
69125 task_rlimit(p, RLIMIT_RTPRIO);
69126
69127+ gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
69128 /* can't set/change the rt policy */
69129 if (policy != p->policy && !rlim_rtprio)
69130 return -EPERM;
69131diff --git a/kernel/sched_autogroup.c b/kernel/sched_autogroup.c
69132index 429242f..d7cca82 100644
69133--- a/kernel/sched_autogroup.c
69134+++ b/kernel/sched_autogroup.c
69135@@ -7,7 +7,7 @@
69136
69137 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
69138 static struct autogroup autogroup_default;
69139-static atomic_t autogroup_seq_nr;
69140+static atomic_unchecked_t autogroup_seq_nr;
69141
69142 static void __init autogroup_init(struct task_struct *init_task)
69143 {
69144@@ -78,7 +78,7 @@ static inline struct autogroup *autogroup_create(void)
69145
69146 kref_init(&ag->kref);
69147 init_rwsem(&ag->lock);
69148- ag->id = atomic_inc_return(&autogroup_seq_nr);
69149+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
69150 ag->tg = tg;
69151 #ifdef CONFIG_RT_GROUP_SCHED
69152 /*
69153diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
69154index 8a39fa3..34f3dbc 100644
69155--- a/kernel/sched_fair.c
69156+++ b/kernel/sched_fair.c
69157@@ -4801,7 +4801,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
69158 * run_rebalance_domains is triggered when needed from the scheduler tick.
69159 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
69160 */
69161-static void run_rebalance_domains(struct softirq_action *h)
69162+static void run_rebalance_domains(void)
69163 {
69164 int this_cpu = smp_processor_id();
69165 struct rq *this_rq = cpu_rq(this_cpu);
69166diff --git a/kernel/signal.c b/kernel/signal.c
69167index 2065515..aed2987 100644
69168--- a/kernel/signal.c
69169+++ b/kernel/signal.c
69170@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cachep;
69171
69172 int print_fatal_signals __read_mostly;
69173
69174-static void __user *sig_handler(struct task_struct *t, int sig)
69175+static __sighandler_t sig_handler(struct task_struct *t, int sig)
69176 {
69177 return t->sighand->action[sig - 1].sa.sa_handler;
69178 }
69179
69180-static int sig_handler_ignored(void __user *handler, int sig)
69181+static int sig_handler_ignored(__sighandler_t handler, int sig)
69182 {
69183 /* Is it explicitly or implicitly ignored? */
69184 return handler == SIG_IGN ||
69185@@ -60,7 +60,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
69186 static int sig_task_ignored(struct task_struct *t, int sig,
69187 int from_ancestor_ns)
69188 {
69189- void __user *handler;
69190+ __sighandler_t handler;
69191
69192 handler = sig_handler(t, sig);
69193
69194@@ -364,6 +364,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
69195 atomic_inc(&user->sigpending);
69196 rcu_read_unlock();
69197
69198+ if (!override_rlimit)
69199+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
69200+
69201 if (override_rlimit ||
69202 atomic_read(&user->sigpending) <=
69203 task_rlimit(t, RLIMIT_SIGPENDING)) {
69204@@ -488,7 +491,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
69205
69206 int unhandled_signal(struct task_struct *tsk, int sig)
69207 {
69208- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
69209+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
69210 if (is_global_init(tsk))
69211 return 1;
69212 if (handler != SIG_IGN && handler != SIG_DFL)
69213@@ -815,6 +818,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
69214 }
69215 }
69216
69217+ /* allow glibc communication via tgkill to other threads in our
69218+ thread group */
69219+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
69220+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
69221+ && gr_handle_signal(t, sig))
69222+ return -EPERM;
69223+
69224 return security_task_kill(t, info, sig, 0);
69225 }
69226
69227@@ -1165,7 +1175,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
69228 return send_signal(sig, info, p, 1);
69229 }
69230
69231-static int
69232+int
69233 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69234 {
69235 return send_signal(sig, info, t, 0);
69236@@ -1202,6 +1212,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69237 unsigned long int flags;
69238 int ret, blocked, ignored;
69239 struct k_sigaction *action;
69240+ int is_unhandled = 0;
69241
69242 spin_lock_irqsave(&t->sighand->siglock, flags);
69243 action = &t->sighand->action[sig-1];
69244@@ -1216,9 +1227,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69245 }
69246 if (action->sa.sa_handler == SIG_DFL)
69247 t->signal->flags &= ~SIGNAL_UNKILLABLE;
69248+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
69249+ is_unhandled = 1;
69250 ret = specific_send_sig_info(sig, info, t);
69251 spin_unlock_irqrestore(&t->sighand->siglock, flags);
69252
69253+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
69254+ normal operation */
69255+ if (is_unhandled) {
69256+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
69257+ gr_handle_crash(t, sig);
69258+ }
69259+
69260 return ret;
69261 }
69262
69263@@ -1285,8 +1305,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
69264 ret = check_kill_permission(sig, info, p);
69265 rcu_read_unlock();
69266
69267- if (!ret && sig)
69268+ if (!ret && sig) {
69269 ret = do_send_sig_info(sig, info, p, true);
69270+ if (!ret)
69271+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
69272+ }
69273
69274 return ret;
69275 }
69276@@ -2754,7 +2777,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
69277 int error = -ESRCH;
69278
69279 rcu_read_lock();
69280- p = find_task_by_vpid(pid);
69281+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
69282+ /* allow glibc communication via tgkill to other threads in our
69283+ thread group */
69284+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
69285+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
69286+ p = find_task_by_vpid_unrestricted(pid);
69287+ else
69288+#endif
69289+ p = find_task_by_vpid(pid);
69290 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
69291 error = check_kill_permission(sig, info, p);
69292 /*
69293diff --git a/kernel/smp.c b/kernel/smp.c
69294index db197d6..17aef0b 100644
69295--- a/kernel/smp.c
69296+++ b/kernel/smp.c
69297@@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
69298 }
69299 EXPORT_SYMBOL(smp_call_function);
69300
69301-void ipi_call_lock(void)
69302+void ipi_call_lock(void) __acquires(call_function.lock)
69303 {
69304 raw_spin_lock(&call_function.lock);
69305 }
69306
69307-void ipi_call_unlock(void)
69308+void ipi_call_unlock(void) __releases(call_function.lock)
69309 {
69310 raw_spin_unlock(&call_function.lock);
69311 }
69312
69313-void ipi_call_lock_irq(void)
69314+void ipi_call_lock_irq(void) __acquires(call_function.lock)
69315 {
69316 raw_spin_lock_irq(&call_function.lock);
69317 }
69318
69319-void ipi_call_unlock_irq(void)
69320+void ipi_call_unlock_irq(void) __releases(call_function.lock)
69321 {
69322 raw_spin_unlock_irq(&call_function.lock);
69323 }
69324diff --git a/kernel/softirq.c b/kernel/softirq.c
69325index 2c71d91..1021f81 100644
69326--- a/kernel/softirq.c
69327+++ b/kernel/softirq.c
69328@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
69329
69330 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
69331
69332-char *softirq_to_name[NR_SOFTIRQS] = {
69333+const char * const softirq_to_name[NR_SOFTIRQS] = {
69334 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
69335 "TASKLET", "SCHED", "HRTIMER", "RCU"
69336 };
69337@@ -235,7 +235,7 @@ restart:
69338 kstat_incr_softirqs_this_cpu(vec_nr);
69339
69340 trace_softirq_entry(vec_nr);
69341- h->action(h);
69342+ h->action();
69343 trace_softirq_exit(vec_nr);
69344 if (unlikely(prev_count != preempt_count())) {
69345 printk(KERN_ERR "huh, entered softirq %u %s %p"
69346@@ -385,9 +385,11 @@ void raise_softirq(unsigned int nr)
69347 local_irq_restore(flags);
69348 }
69349
69350-void open_softirq(int nr, void (*action)(struct softirq_action *))
69351+void open_softirq(int nr, void (*action)(void))
69352 {
69353- softirq_vec[nr].action = action;
69354+ pax_open_kernel();
69355+ *(void **)&softirq_vec[nr].action = action;
69356+ pax_close_kernel();
69357 }
69358
69359 /*
69360@@ -441,7 +443,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
69361
69362 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
69363
69364-static void tasklet_action(struct softirq_action *a)
69365+static void tasklet_action(void)
69366 {
69367 struct tasklet_struct *list;
69368
69369@@ -476,7 +478,7 @@ static void tasklet_action(struct softirq_action *a)
69370 }
69371 }
69372
69373-static void tasklet_hi_action(struct softirq_action *a)
69374+static void tasklet_hi_action(void)
69375 {
69376 struct tasklet_struct *list;
69377
69378diff --git a/kernel/sys.c b/kernel/sys.c
69379index 481611f..0754d86 100644
69380--- a/kernel/sys.c
69381+++ b/kernel/sys.c
69382@@ -158,6 +158,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
69383 error = -EACCES;
69384 goto out;
69385 }
69386+
69387+ if (gr_handle_chroot_setpriority(p, niceval)) {
69388+ error = -EACCES;
69389+ goto out;
69390+ }
69391+
69392 no_nice = security_task_setnice(p, niceval);
69393 if (no_nice) {
69394 error = no_nice;
69395@@ -572,6 +578,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
69396 goto error;
69397 }
69398
69399+ if (gr_check_group_change(new->gid, new->egid, -1))
69400+ goto error;
69401+
69402 if (rgid != (gid_t) -1 ||
69403 (egid != (gid_t) -1 && egid != old->gid))
69404 new->sgid = new->egid;
69405@@ -601,6 +610,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
69406 old = current_cred();
69407
69408 retval = -EPERM;
69409+
69410+ if (gr_check_group_change(gid, gid, gid))
69411+ goto error;
69412+
69413 if (nsown_capable(CAP_SETGID))
69414 new->gid = new->egid = new->sgid = new->fsgid = gid;
69415 else if (gid == old->gid || gid == old->sgid)
69416@@ -618,7 +631,7 @@ error:
69417 /*
69418 * change the user struct in a credentials set to match the new UID
69419 */
69420-static int set_user(struct cred *new)
69421+int set_user(struct cred *new)
69422 {
69423 struct user_struct *new_user;
69424
69425@@ -688,6 +701,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
69426 goto error;
69427 }
69428
69429+ if (gr_check_user_change(new->uid, new->euid, -1))
69430+ goto error;
69431+
69432 if (new->uid != old->uid) {
69433 retval = set_user(new);
69434 if (retval < 0)
69435@@ -732,6 +748,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
69436 old = current_cred();
69437
69438 retval = -EPERM;
69439+
69440+ if (gr_check_crash_uid(uid))
69441+ goto error;
69442+ if (gr_check_user_change(uid, uid, uid))
69443+ goto error;
69444+
69445 if (nsown_capable(CAP_SETUID)) {
69446 new->suid = new->uid = uid;
69447 if (uid != old->uid) {
69448@@ -786,6 +808,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
69449 goto error;
69450 }
69451
69452+ if (gr_check_user_change(ruid, euid, -1))
69453+ goto error;
69454+
69455 if (ruid != (uid_t) -1) {
69456 new->uid = ruid;
69457 if (ruid != old->uid) {
69458@@ -850,6 +875,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
69459 goto error;
69460 }
69461
69462+ if (gr_check_group_change(rgid, egid, -1))
69463+ goto error;
69464+
69465 if (rgid != (gid_t) -1)
69466 new->gid = rgid;
69467 if (egid != (gid_t) -1)
69468@@ -896,6 +924,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
69469 old = current_cred();
69470 old_fsuid = old->fsuid;
69471
69472+ if (gr_check_user_change(-1, -1, uid))
69473+ goto error;
69474+
69475 if (uid == old->uid || uid == old->euid ||
69476 uid == old->suid || uid == old->fsuid ||
69477 nsown_capable(CAP_SETUID)) {
69478@@ -906,6 +937,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
69479 }
69480 }
69481
69482+error:
69483 abort_creds(new);
69484 return old_fsuid;
69485
69486@@ -932,12 +964,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
69487 if (gid == old->gid || gid == old->egid ||
69488 gid == old->sgid || gid == old->fsgid ||
69489 nsown_capable(CAP_SETGID)) {
69490+ if (gr_check_group_change(-1, -1, gid))
69491+ goto error;
69492+
69493 if (gid != old_fsgid) {
69494 new->fsgid = gid;
69495 goto change_okay;
69496 }
69497 }
69498
69499+error:
69500 abort_creds(new);
69501 return old_fsgid;
69502
69503@@ -1189,7 +1225,10 @@ static int override_release(char __user *release, int len)
69504 }
69505 v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40;
69506 snprintf(buf, len, "2.6.%u%s", v, rest);
69507- ret = copy_to_user(release, buf, len);
69508+ if (len > sizeof(buf))
69509+ ret = -EFAULT;
69510+ else
69511+ ret = copy_to_user(release, buf, len);
69512 }
69513 return ret;
69514 }
69515@@ -1243,19 +1282,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
69516 return -EFAULT;
69517
69518 down_read(&uts_sem);
69519- error = __copy_to_user(&name->sysname, &utsname()->sysname,
69520+ error = __copy_to_user(name->sysname, &utsname()->sysname,
69521 __OLD_UTS_LEN);
69522 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
69523- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
69524+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
69525 __OLD_UTS_LEN);
69526 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
69527- error |= __copy_to_user(&name->release, &utsname()->release,
69528+ error |= __copy_to_user(name->release, &utsname()->release,
69529 __OLD_UTS_LEN);
69530 error |= __put_user(0, name->release + __OLD_UTS_LEN);
69531- error |= __copy_to_user(&name->version, &utsname()->version,
69532+ error |= __copy_to_user(name->version, &utsname()->version,
69533 __OLD_UTS_LEN);
69534 error |= __put_user(0, name->version + __OLD_UTS_LEN);
69535- error |= __copy_to_user(&name->machine, &utsname()->machine,
69536+ error |= __copy_to_user(name->machine, &utsname()->machine,
69537 __OLD_UTS_LEN);
69538 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
69539 up_read(&uts_sem);
69540@@ -1720,7 +1759,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
69541 error = get_dumpable(me->mm);
69542 break;
69543 case PR_SET_DUMPABLE:
69544- if (arg2 < 0 || arg2 > 1) {
69545+ if (arg2 > 1) {
69546 error = -EINVAL;
69547 break;
69548 }
69549diff --git a/kernel/sysctl.c b/kernel/sysctl.c
69550index ae27196..7506d69 100644
69551--- a/kernel/sysctl.c
69552+++ b/kernel/sysctl.c
69553@@ -86,6 +86,13 @@
69554
69555
69556 #if defined(CONFIG_SYSCTL)
69557+#include <linux/grsecurity.h>
69558+#include <linux/grinternal.h>
69559+
69560+extern __u32 gr_handle_sysctl(const ctl_table *table, const int op);
69561+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
69562+ const int op);
69563+extern int gr_handle_chroot_sysctl(const int op);
69564
69565 /* External variables not in a header file. */
69566 extern int sysctl_overcommit_memory;
69567@@ -191,6 +198,7 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
69568 }
69569
69570 #endif
69571+extern struct ctl_table grsecurity_table[];
69572
69573 static struct ctl_table root_table[];
69574 static struct ctl_table_root sysctl_table_root;
69575@@ -220,6 +228,20 @@ extern struct ctl_table epoll_table[];
69576 int sysctl_legacy_va_layout;
69577 #endif
69578
69579+#ifdef CONFIG_PAX_SOFTMODE
69580+static ctl_table pax_table[] = {
69581+ {
69582+ .procname = "softmode",
69583+ .data = &pax_softmode,
69584+ .maxlen = sizeof(unsigned int),
69585+ .mode = 0600,
69586+ .proc_handler = &proc_dointvec,
69587+ },
69588+
69589+ { }
69590+};
69591+#endif
69592+
69593 /* The default sysctl tables: */
69594
69595 static struct ctl_table root_table[] = {
69596@@ -266,6 +288,22 @@ static int max_extfrag_threshold = 1000;
69597 #endif
69598
69599 static struct ctl_table kern_table[] = {
69600+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
69601+ {
69602+ .procname = "grsecurity",
69603+ .mode = 0500,
69604+ .child = grsecurity_table,
69605+ },
69606+#endif
69607+
69608+#ifdef CONFIG_PAX_SOFTMODE
69609+ {
69610+ .procname = "pax",
69611+ .mode = 0500,
69612+ .child = pax_table,
69613+ },
69614+#endif
69615+
69616 {
69617 .procname = "sched_child_runs_first",
69618 .data = &sysctl_sched_child_runs_first,
69619@@ -550,7 +588,7 @@ static struct ctl_table kern_table[] = {
69620 .data = &modprobe_path,
69621 .maxlen = KMOD_PATH_LEN,
69622 .mode = 0644,
69623- .proc_handler = proc_dostring,
69624+ .proc_handler = proc_dostring_modpriv,
69625 },
69626 {
69627 .procname = "modules_disabled",
69628@@ -717,16 +755,20 @@ static struct ctl_table kern_table[] = {
69629 .extra1 = &zero,
69630 .extra2 = &one,
69631 },
69632+#endif
69633 {
69634 .procname = "kptr_restrict",
69635 .data = &kptr_restrict,
69636 .maxlen = sizeof(int),
69637 .mode = 0644,
69638 .proc_handler = proc_dmesg_restrict,
69639+#ifdef CONFIG_GRKERNSEC_HIDESYM
69640+ .extra1 = &two,
69641+#else
69642 .extra1 = &zero,
69643+#endif
69644 .extra2 = &two,
69645 },
69646-#endif
69647 {
69648 .procname = "ngroups_max",
69649 .data = &ngroups_max,
69650@@ -1216,6 +1258,13 @@ static struct ctl_table vm_table[] = {
69651 .proc_handler = proc_dointvec_minmax,
69652 .extra1 = &zero,
69653 },
69654+ {
69655+ .procname = "heap_stack_gap",
69656+ .data = &sysctl_heap_stack_gap,
69657+ .maxlen = sizeof(sysctl_heap_stack_gap),
69658+ .mode = 0644,
69659+ .proc_handler = proc_doulongvec_minmax,
69660+ },
69661 #else
69662 {
69663 .procname = "nr_trim_pages",
69664@@ -1720,6 +1769,17 @@ static int test_perm(int mode, int op)
69665 int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
69666 {
69667 int mode;
69668+ int error;
69669+
69670+ if (table->parent != NULL && table->parent->procname != NULL &&
69671+ table->procname != NULL &&
69672+ gr_handle_sysctl_mod(table->parent->procname, table->procname, op))
69673+ return -EACCES;
69674+ if (gr_handle_chroot_sysctl(op))
69675+ return -EACCES;
69676+ error = gr_handle_sysctl(table, op);
69677+ if (error)
69678+ return error;
69679
69680 if (root->permissions)
69681 mode = root->permissions(root, current->nsproxy, table);
69682@@ -2124,6 +2184,16 @@ int proc_dostring(struct ctl_table *table, int write,
69683 buffer, lenp, ppos);
69684 }
69685
69686+int proc_dostring_modpriv(struct ctl_table *table, int write,
69687+ void __user *buffer, size_t *lenp, loff_t *ppos)
69688+{
69689+ if (write && !capable(CAP_SYS_MODULE))
69690+ return -EPERM;
69691+
69692+ return _proc_do_string(table->data, table->maxlen, write,
69693+ buffer, lenp, ppos);
69694+}
69695+
69696 static size_t proc_skip_spaces(char **buf)
69697 {
69698 size_t ret;
69699@@ -2229,6 +2299,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
69700 len = strlen(tmp);
69701 if (len > *size)
69702 len = *size;
69703+ if (len > sizeof(tmp))
69704+ len = sizeof(tmp);
69705 if (copy_to_user(*buf, tmp, len))
69706 return -EFAULT;
69707 *size -= len;
69708@@ -2545,8 +2617,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
69709 *i = val;
69710 } else {
69711 val = convdiv * (*i) / convmul;
69712- if (!first)
69713+ if (!first) {
69714 err = proc_put_char(&buffer, &left, '\t');
69715+ if (err)
69716+ break;
69717+ }
69718 err = proc_put_long(&buffer, &left, val, false);
69719 if (err)
69720 break;
69721@@ -2941,6 +3016,12 @@ int proc_dostring(struct ctl_table *table, int write,
69722 return -ENOSYS;
69723 }
69724
69725+int proc_dostring_modpriv(struct ctl_table *table, int write,
69726+ void __user *buffer, size_t *lenp, loff_t *ppos)
69727+{
69728+ return -ENOSYS;
69729+}
69730+
69731 int proc_dointvec(struct ctl_table *table, int write,
69732 void __user *buffer, size_t *lenp, loff_t *ppos)
69733 {
69734@@ -2997,6 +3078,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
69735 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
69736 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
69737 EXPORT_SYMBOL(proc_dostring);
69738+EXPORT_SYMBOL(proc_dostring_modpriv);
69739 EXPORT_SYMBOL(proc_doulongvec_minmax);
69740 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
69741 EXPORT_SYMBOL(register_sysctl_table);
69742diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
69743index a650694..aaeeb20 100644
69744--- a/kernel/sysctl_binary.c
69745+++ b/kernel/sysctl_binary.c
69746@@ -989,7 +989,7 @@ static ssize_t bin_intvec(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@@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(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@@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file *file,
69765 int i;
69766
69767 set_fs(KERNEL_DS);
69768- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
69769+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
69770 set_fs(old_fs);
69771 if (result < 0)
69772 goto out_kfree;
69773@@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file *file,
69774 }
69775
69776 set_fs(KERNEL_DS);
69777- result = vfs_write(file, buffer, str - buffer, &pos);
69778+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
69779 set_fs(old_fs);
69780 if (result < 0)
69781 goto out_kfree;
69782@@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *file,
69783 int i;
69784
69785 set_fs(KERNEL_DS);
69786- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
69787+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
69788 set_fs(old_fs);
69789 if (result < 0)
69790 goto out;
69791@@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struct file *file,
69792 __le16 dnaddr;
69793
69794 set_fs(KERNEL_DS);
69795- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
69796+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
69797 set_fs(old_fs);
69798 if (result < 0)
69799 goto out;
69800@@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struct file *file,
69801 le16_to_cpu(dnaddr) & 0x3ff);
69802
69803 set_fs(KERNEL_DS);
69804- result = vfs_write(file, buf, len, &pos);
69805+ result = vfs_write(file, (const char __force_user *)buf, len, &pos);
69806 set_fs(old_fs);
69807 if (result < 0)
69808 goto out;
69809diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
69810index 362da65..ab8ef8c 100644
69811--- a/kernel/sysctl_check.c
69812+++ b/kernel/sysctl_check.c
69813@@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
69814 set_fail(&fail, table, "Directory with extra2");
69815 } else {
69816 if ((table->proc_handler == proc_dostring) ||
69817+ (table->proc_handler == proc_dostring_modpriv) ||
69818 (table->proc_handler == proc_dointvec) ||
69819 (table->proc_handler == proc_dointvec_minmax) ||
69820 (table->proc_handler == proc_dointvec_jiffies) ||
69821diff --git a/kernel/taskstats.c b/kernel/taskstats.c
69822index e660464..c8b9e67 100644
69823--- a/kernel/taskstats.c
69824+++ b/kernel/taskstats.c
69825@@ -27,9 +27,12 @@
69826 #include <linux/cgroup.h>
69827 #include <linux/fs.h>
69828 #include <linux/file.h>
69829+#include <linux/grsecurity.h>
69830 #include <net/genetlink.h>
69831 #include <linux/atomic.h>
69832
69833+extern int gr_is_taskstats_denied(int pid);
69834+
69835 /*
69836 * Maximum length of a cpumask that can be specified in
69837 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
69838@@ -556,6 +559,9 @@ err:
69839
69840 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
69841 {
69842+ if (gr_is_taskstats_denied(current->pid))
69843+ return -EACCES;
69844+
69845 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
69846 return cmd_attr_register_cpumask(info);
69847 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
69848diff --git a/kernel/time.c b/kernel/time.c
69849index 73e416d..cfc6f69 100644
69850--- a/kernel/time.c
69851+++ b/kernel/time.c
69852@@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
69853 return error;
69854
69855 if (tz) {
69856+ /* we log in do_settimeofday called below, so don't log twice
69857+ */
69858+ if (!tv)
69859+ gr_log_timechange();
69860+
69861 /* SMP safe, global irq locking makes it work. */
69862 sys_tz = *tz;
69863 update_vsyscall_tz();
69864diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
69865index 8a46f5d..bbe6f9c 100644
69866--- a/kernel/time/alarmtimer.c
69867+++ b/kernel/time/alarmtimer.c
69868@@ -773,7 +773,7 @@ static int __init alarmtimer_init(void)
69869 struct platform_device *pdev;
69870 int error = 0;
69871 int i;
69872- struct k_clock alarm_clock = {
69873+ static struct k_clock alarm_clock = {
69874 .clock_getres = alarm_clock_getres,
69875 .clock_get = alarm_clock_get,
69876 .timer_create = alarm_timer_create,
69877diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
69878index fd4a7b1..fae5c2a 100644
69879--- a/kernel/time/tick-broadcast.c
69880+++ b/kernel/time/tick-broadcast.c
69881@@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
69882 * then clear the broadcast bit.
69883 */
69884 if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
69885- int cpu = smp_processor_id();
69886+ cpu = smp_processor_id();
69887
69888 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
69889 tick_broadcast_clear_oneshot(cpu);
69890diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
69891index 2378413..be455fd 100644
69892--- a/kernel/time/timekeeping.c
69893+++ b/kernel/time/timekeeping.c
69894@@ -14,6 +14,7 @@
69895 #include <linux/init.h>
69896 #include <linux/mm.h>
69897 #include <linux/sched.h>
69898+#include <linux/grsecurity.h>
69899 #include <linux/syscore_ops.h>
69900 #include <linux/clocksource.h>
69901 #include <linux/jiffies.h>
69902@@ -365,6 +366,8 @@ int do_settimeofday(const struct timespec *tv)
69903 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
69904 return -EINVAL;
69905
69906+ gr_log_timechange();
69907+
69908 write_seqlock_irqsave(&xtime_lock, flags);
69909
69910 timekeeping_forward_now();
69911diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
69912index 3258455..f35227d 100644
69913--- a/kernel/time/timer_list.c
69914+++ b/kernel/time/timer_list.c
69915@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
69916
69917 static void print_name_offset(struct seq_file *m, void *sym)
69918 {
69919+#ifdef CONFIG_GRKERNSEC_HIDESYM
69920+ SEQ_printf(m, "<%p>", NULL);
69921+#else
69922 char symname[KSYM_NAME_LEN];
69923
69924 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
69925 SEQ_printf(m, "<%pK>", sym);
69926 else
69927 SEQ_printf(m, "%s", symname);
69928+#endif
69929 }
69930
69931 static void
69932@@ -112,7 +116,11 @@ next_one:
69933 static void
69934 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
69935 {
69936+#ifdef CONFIG_GRKERNSEC_HIDESYM
69937+ SEQ_printf(m, " .base: %p\n", NULL);
69938+#else
69939 SEQ_printf(m, " .base: %pK\n", base);
69940+#endif
69941 SEQ_printf(m, " .index: %d\n",
69942 base->index);
69943 SEQ_printf(m, " .resolution: %Lu nsecs\n",
69944@@ -293,7 +301,11 @@ static int __init init_timer_list_procfs(void)
69945 {
69946 struct proc_dir_entry *pe;
69947
69948+#ifdef CONFIG_GRKERNSEC_PROC_ADD
69949+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
69950+#else
69951 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
69952+#endif
69953 if (!pe)
69954 return -ENOMEM;
69955 return 0;
69956diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
69957index 0b537f2..9e71eca 100644
69958--- a/kernel/time/timer_stats.c
69959+++ b/kernel/time/timer_stats.c
69960@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
69961 static unsigned long nr_entries;
69962 static struct entry entries[MAX_ENTRIES];
69963
69964-static atomic_t overflow_count;
69965+static atomic_unchecked_t overflow_count;
69966
69967 /*
69968 * The entries are in a hash-table, for fast lookup:
69969@@ -140,7 +140,7 @@ static void reset_entries(void)
69970 nr_entries = 0;
69971 memset(entries, 0, sizeof(entries));
69972 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
69973- atomic_set(&overflow_count, 0);
69974+ atomic_set_unchecked(&overflow_count, 0);
69975 }
69976
69977 static struct entry *alloc_entry(void)
69978@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
69979 if (likely(entry))
69980 entry->count++;
69981 else
69982- atomic_inc(&overflow_count);
69983+ atomic_inc_unchecked(&overflow_count);
69984
69985 out_unlock:
69986 raw_spin_unlock_irqrestore(lock, flags);
69987@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
69988
69989 static void print_name_offset(struct seq_file *m, unsigned long addr)
69990 {
69991+#ifdef CONFIG_GRKERNSEC_HIDESYM
69992+ seq_printf(m, "<%p>", NULL);
69993+#else
69994 char symname[KSYM_NAME_LEN];
69995
69996 if (lookup_symbol_name(addr, symname) < 0)
69997 seq_printf(m, "<%p>", (void *)addr);
69998 else
69999 seq_printf(m, "%s", symname);
70000+#endif
70001 }
70002
70003 static int tstats_show(struct seq_file *m, void *v)
70004@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
70005
70006 seq_puts(m, "Timer Stats Version: v0.2\n");
70007 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
70008- if (atomic_read(&overflow_count))
70009+ if (atomic_read_unchecked(&overflow_count))
70010 seq_printf(m, "Overflow: %d entries\n",
70011- atomic_read(&overflow_count));
70012+ atomic_read_unchecked(&overflow_count));
70013
70014 for (i = 0; i < nr_entries; i++) {
70015 entry = entries + i;
70016@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
70017 {
70018 struct proc_dir_entry *pe;
70019
70020+#ifdef CONFIG_GRKERNSEC_PROC_ADD
70021+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
70022+#else
70023 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
70024+#endif
70025 if (!pe)
70026 return -ENOMEM;
70027 return 0;
70028diff --git a/kernel/timer.c b/kernel/timer.c
70029index 9c3c62b..441690e 100644
70030--- a/kernel/timer.c
70031+++ b/kernel/timer.c
70032@@ -1304,7 +1304,7 @@ void update_process_times(int user_tick)
70033 /*
70034 * This function runs timers and the timer-tq in bottom half context.
70035 */
70036-static void run_timer_softirq(struct softirq_action *h)
70037+static void run_timer_softirq(void)
70038 {
70039 struct tvec_base *base = __this_cpu_read(tvec_bases);
70040
70041diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
70042index 16fc34a..efd8bb8 100644
70043--- a/kernel/trace/blktrace.c
70044+++ b/kernel/trace/blktrace.c
70045@@ -324,7 +324,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
70046 struct blk_trace *bt = filp->private_data;
70047 char buf[16];
70048
70049- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
70050+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
70051
70052 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
70053 }
70054@@ -389,7 +389,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
70055 return 1;
70056
70057 bt = buf->chan->private_data;
70058- atomic_inc(&bt->dropped);
70059+ atomic_inc_unchecked(&bt->dropped);
70060 return 0;
70061 }
70062
70063@@ -490,7 +490,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
70064
70065 bt->dir = dir;
70066 bt->dev = dev;
70067- atomic_set(&bt->dropped, 0);
70068+ atomic_set_unchecked(&bt->dropped, 0);
70069
70070 ret = -EIO;
70071 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
70072diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
70073index 25b4f4d..6f4772d 100644
70074--- a/kernel/trace/ftrace.c
70075+++ b/kernel/trace/ftrace.c
70076@@ -1587,12 +1587,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
70077 if (unlikely(ftrace_disabled))
70078 return 0;
70079
70080+ ret = ftrace_arch_code_modify_prepare();
70081+ FTRACE_WARN_ON(ret);
70082+ if (ret)
70083+ return 0;
70084+
70085 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
70086+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
70087 if (ret) {
70088 ftrace_bug(ret, ip);
70089- return 0;
70090 }
70091- return 1;
70092+ return ret ? 0 : 1;
70093 }
70094
70095 /*
70096@@ -2608,7 +2613,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp)
70097
70098 int
70099 register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
70100- void *data)
70101+ void *data)
70102 {
70103 struct ftrace_func_probe *entry;
70104 struct ftrace_page *pg;
70105diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
70106index f2bd275..adaf3a2 100644
70107--- a/kernel/trace/trace.c
70108+++ b/kernel/trace/trace.c
70109@@ -4201,10 +4201,9 @@ static const struct file_operations tracing_dyn_info_fops = {
70110 };
70111 #endif
70112
70113-static struct dentry *d_tracer;
70114-
70115 struct dentry *tracing_init_dentry(void)
70116 {
70117+ static struct dentry *d_tracer;
70118 static int once;
70119
70120 if (d_tracer)
70121@@ -4224,10 +4223,9 @@ struct dentry *tracing_init_dentry(void)
70122 return d_tracer;
70123 }
70124
70125-static struct dentry *d_percpu;
70126-
70127 struct dentry *tracing_dentry_percpu(void)
70128 {
70129+ static struct dentry *d_percpu;
70130 static int once;
70131 struct dentry *d_tracer;
70132
70133diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
70134index c212a7f..7b02394 100644
70135--- a/kernel/trace/trace_events.c
70136+++ b/kernel/trace/trace_events.c
70137@@ -1299,10 +1299,6 @@ static LIST_HEAD(ftrace_module_file_list);
70138 struct ftrace_module_file_ops {
70139 struct list_head list;
70140 struct module *mod;
70141- struct file_operations id;
70142- struct file_operations enable;
70143- struct file_operations format;
70144- struct file_operations filter;
70145 };
70146
70147 static struct ftrace_module_file_ops *
70148@@ -1323,17 +1319,12 @@ trace_create_file_ops(struct module *mod)
70149
70150 file_ops->mod = mod;
70151
70152- file_ops->id = ftrace_event_id_fops;
70153- file_ops->id.owner = mod;
70154-
70155- file_ops->enable = ftrace_enable_fops;
70156- file_ops->enable.owner = mod;
70157-
70158- file_ops->filter = ftrace_event_filter_fops;
70159- file_ops->filter.owner = mod;
70160-
70161- file_ops->format = ftrace_event_format_fops;
70162- file_ops->format.owner = mod;
70163+ pax_open_kernel();
70164+ *(void **)&mod->trace_id.owner = mod;
70165+ *(void **)&mod->trace_enable.owner = mod;
70166+ *(void **)&mod->trace_filter.owner = mod;
70167+ *(void **)&mod->trace_format.owner = mod;
70168+ pax_close_kernel();
70169
70170 list_add(&file_ops->list, &ftrace_module_file_list);
70171
70172@@ -1357,8 +1348,8 @@ static void trace_module_add_events(struct module *mod)
70173
70174 for_each_event(call, start, end) {
70175 __trace_add_event_call(*call, mod,
70176- &file_ops->id, &file_ops->enable,
70177- &file_ops->filter, &file_ops->format);
70178+ &mod->trace_id, &mod->trace_enable,
70179+ &mod->trace_filter, &mod->trace_format);
70180 }
70181 }
70182
70183diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
70184index 00d527c..7c5b1a3 100644
70185--- a/kernel/trace/trace_kprobe.c
70186+++ b/kernel/trace/trace_kprobe.c
70187@@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
70188 long ret;
70189 int maxlen = get_rloc_len(*(u32 *)dest);
70190 u8 *dst = get_rloc_data(dest);
70191- u8 *src = addr;
70192+ const u8 __user *src = (const u8 __force_user *)addr;
70193 mm_segment_t old_fs = get_fs();
70194 if (!maxlen)
70195 return;
70196@@ -229,7 +229,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
70197 pagefault_disable();
70198 do
70199 ret = __copy_from_user_inatomic(dst++, src++, 1);
70200- while (dst[-1] && ret == 0 && src - (u8 *)addr < maxlen);
70201+ while (dst[-1] && ret == 0 && src - (const u8 __force_user *)addr < maxlen);
70202 dst[-1] = '\0';
70203 pagefault_enable();
70204 set_fs(old_fs);
70205@@ -238,7 +238,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
70206 ((u8 *)get_rloc_data(dest))[0] = '\0';
70207 *(u32 *)dest = make_data_rloc(0, get_rloc_offs(*(u32 *)dest));
70208 } else
70209- *(u32 *)dest = make_data_rloc(src - (u8 *)addr,
70210+ *(u32 *)dest = make_data_rloc(src - (const u8 __force_user *)addr,
70211 get_rloc_offs(*(u32 *)dest));
70212 }
70213 /* Return the length of string -- including null terminal byte */
70214@@ -252,7 +252,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string_size)(struct pt_regs *regs,
70215 set_fs(KERNEL_DS);
70216 pagefault_disable();
70217 do {
70218- ret = __copy_from_user_inatomic(&c, (u8 *)addr + len, 1);
70219+ ret = __copy_from_user_inatomic(&c, (const u8 __force_user *)addr + len, 1);
70220 len++;
70221 } while (c && ret == 0 && len < MAX_STRING_SIZE);
70222 pagefault_enable();
70223diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
70224index fd3c8aa..5f324a6 100644
70225--- a/kernel/trace/trace_mmiotrace.c
70226+++ b/kernel/trace/trace_mmiotrace.c
70227@@ -24,7 +24,7 @@ struct header_iter {
70228 static struct trace_array *mmio_trace_array;
70229 static bool overrun_detected;
70230 static unsigned long prev_overruns;
70231-static atomic_t dropped_count;
70232+static atomic_unchecked_t dropped_count;
70233
70234 static void mmio_reset_data(struct trace_array *tr)
70235 {
70236@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
70237
70238 static unsigned long count_overruns(struct trace_iterator *iter)
70239 {
70240- unsigned long cnt = atomic_xchg(&dropped_count, 0);
70241+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
70242 unsigned long over = ring_buffer_overruns(iter->tr->buffer);
70243
70244 if (over > prev_overruns)
70245@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
70246 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
70247 sizeof(*entry), 0, pc);
70248 if (!event) {
70249- atomic_inc(&dropped_count);
70250+ atomic_inc_unchecked(&dropped_count);
70251 return;
70252 }
70253 entry = ring_buffer_event_data(event);
70254@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
70255 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
70256 sizeof(*entry), 0, pc);
70257 if (!event) {
70258- atomic_inc(&dropped_count);
70259+ atomic_inc_unchecked(&dropped_count);
70260 return;
70261 }
70262 entry = ring_buffer_event_data(event);
70263diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
70264index 5199930..26c73a0 100644
70265--- a/kernel/trace/trace_output.c
70266+++ b/kernel/trace/trace_output.c
70267@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, struct path *path)
70268
70269 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
70270 if (!IS_ERR(p)) {
70271- p = mangle_path(s->buffer + s->len, p, "\n");
70272+ p = mangle_path(s->buffer + s->len, p, "\n\\");
70273 if (p) {
70274 s->len = p - s->buffer;
70275 return 1;
70276diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
70277index 77575b3..6e623d1 100644
70278--- a/kernel/trace/trace_stack.c
70279+++ b/kernel/trace/trace_stack.c
70280@@ -50,7 +50,7 @@ static inline void check_stack(void)
70281 return;
70282
70283 /* we do not handle interrupt stacks yet */
70284- if (!object_is_on_stack(&this_size))
70285+ if (!object_starts_on_stack(&this_size))
70286 return;
70287
70288 local_irq_save(flags);
70289diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
70290index 209b379..7f76423 100644
70291--- a/kernel/trace/trace_workqueue.c
70292+++ b/kernel/trace/trace_workqueue.c
70293@@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
70294 int cpu;
70295 pid_t pid;
70296 /* Can be inserted from interrupt or user context, need to be atomic */
70297- atomic_t inserted;
70298+ atomic_unchecked_t inserted;
70299 /*
70300 * Don't need to be atomic, works are serialized in a single workqueue thread
70301 * on a single CPU.
70302@@ -60,7 +60,7 @@ probe_workqueue_insertion(void *ignore,
70303 spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags);
70304 list_for_each_entry(node, &workqueue_cpu_stat(cpu)->list, list) {
70305 if (node->pid == wq_thread->pid) {
70306- atomic_inc(&node->inserted);
70307+ atomic_inc_unchecked(&node->inserted);
70308 goto found;
70309 }
70310 }
70311@@ -210,7 +210,7 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
70312 tsk = get_pid_task(pid, PIDTYPE_PID);
70313 if (tsk) {
70314 seq_printf(s, "%3d %6d %6u %s\n", cws->cpu,
70315- atomic_read(&cws->inserted), cws->executed,
70316+ atomic_read_unchecked(&cws->inserted), cws->executed,
70317 tsk->comm);
70318 put_task_struct(tsk);
70319 }
70320diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
70321index 82928f5..92da771 100644
70322--- a/lib/Kconfig.debug
70323+++ b/lib/Kconfig.debug
70324@@ -1103,6 +1103,7 @@ config LATENCYTOP
70325 depends on DEBUG_KERNEL
70326 depends on STACKTRACE_SUPPORT
70327 depends on PROC_FS
70328+ depends on !GRKERNSEC_HIDESYM
70329 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND
70330 select KALLSYMS
70331 select KALLSYMS_ALL
70332diff --git a/lib/bitmap.c b/lib/bitmap.c
70333index 0d4a127..33a06c7 100644
70334--- a/lib/bitmap.c
70335+++ b/lib/bitmap.c
70336@@ -419,7 +419,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
70337 {
70338 int c, old_c, totaldigits, ndigits, nchunks, nbits;
70339 u32 chunk;
70340- const char __user __force *ubuf = (const char __user __force *)buf;
70341+ const char __user *ubuf = (const char __force_user *)buf;
70342
70343 bitmap_zero(maskp, nmaskbits);
70344
70345@@ -504,7 +504,7 @@ int bitmap_parse_user(const char __user *ubuf,
70346 {
70347 if (!access_ok(VERIFY_READ, ubuf, ulen))
70348 return -EFAULT;
70349- return __bitmap_parse((const char __force *)ubuf,
70350+ return __bitmap_parse((const char __force_kernel *)ubuf,
70351 ulen, 1, maskp, nmaskbits);
70352
70353 }
70354@@ -596,7 +596,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
70355 {
70356 unsigned a, b;
70357 int c, old_c, totaldigits;
70358- const char __user __force *ubuf = (const char __user __force *)buf;
70359+ const char __user *ubuf = (const char __force_user *)buf;
70360 int exp_digit, in_range;
70361
70362 totaldigits = c = 0;
70363@@ -696,7 +696,7 @@ int bitmap_parselist_user(const char __user *ubuf,
70364 {
70365 if (!access_ok(VERIFY_READ, ubuf, ulen))
70366 return -EFAULT;
70367- return __bitmap_parselist((const char __force *)ubuf,
70368+ return __bitmap_parselist((const char __force_kernel *)ubuf,
70369 ulen, 1, maskp, nmaskbits);
70370 }
70371 EXPORT_SYMBOL(bitmap_parselist_user);
70372diff --git a/lib/bug.c b/lib/bug.c
70373index 1955209..cbbb2ad 100644
70374--- a/lib/bug.c
70375+++ b/lib/bug.c
70376@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
70377 return BUG_TRAP_TYPE_NONE;
70378
70379 bug = find_bug(bugaddr);
70380+ if (!bug)
70381+ return BUG_TRAP_TYPE_NONE;
70382
70383 file = NULL;
70384 line = 0;
70385diff --git a/lib/debugobjects.c b/lib/debugobjects.c
70386index a78b7c6..2c73084 100644
70387--- a/lib/debugobjects.c
70388+++ b/lib/debugobjects.c
70389@@ -284,7 +284,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
70390 if (limit > 4)
70391 return;
70392
70393- is_on_stack = object_is_on_stack(addr);
70394+ is_on_stack = object_starts_on_stack(addr);
70395 if (is_on_stack == onstack)
70396 return;
70397
70398diff --git a/lib/devres.c b/lib/devres.c
70399index 7c0e953..f642b5c 100644
70400--- a/lib/devres.c
70401+++ b/lib/devres.c
70402@@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
70403 void devm_iounmap(struct device *dev, void __iomem *addr)
70404 {
70405 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
70406- (void *)addr));
70407+ (void __force *)addr));
70408 iounmap(addr);
70409 }
70410 EXPORT_SYMBOL(devm_iounmap);
70411@@ -141,7 +141,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
70412 {
70413 ioport_unmap(addr);
70414 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
70415- devm_ioport_map_match, (void *)addr));
70416+ devm_ioport_map_match, (void __force *)addr));
70417 }
70418 EXPORT_SYMBOL(devm_ioport_unmap);
70419
70420diff --git a/lib/dma-debug.c b/lib/dma-debug.c
70421index fea790a..ebb0e82 100644
70422--- a/lib/dma-debug.c
70423+++ b/lib/dma-debug.c
70424@@ -925,7 +925,7 @@ out:
70425
70426 static void check_for_stack(struct device *dev, void *addr)
70427 {
70428- if (object_is_on_stack(addr))
70429+ if (object_starts_on_stack(addr))
70430 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
70431 "stack [addr=%p]\n", addr);
70432 }
70433diff --git a/lib/extable.c b/lib/extable.c
70434index 4cac81e..63e9b8f 100644
70435--- a/lib/extable.c
70436+++ b/lib/extable.c
70437@@ -13,6 +13,7 @@
70438 #include <linux/init.h>
70439 #include <linux/sort.h>
70440 #include <asm/uaccess.h>
70441+#include <asm/pgtable.h>
70442
70443 #ifndef ARCH_HAS_SORT_EXTABLE
70444 /*
70445@@ -36,8 +37,10 @@ static int cmp_ex(const void *a, const void *b)
70446 void sort_extable(struct exception_table_entry *start,
70447 struct exception_table_entry *finish)
70448 {
70449+ pax_open_kernel();
70450 sort(start, finish - start, sizeof(struct exception_table_entry),
70451 cmp_ex, NULL);
70452+ pax_close_kernel();
70453 }
70454
70455 #ifdef CONFIG_MODULES
70456diff --git a/lib/inflate.c b/lib/inflate.c
70457index 013a761..c28f3fc 100644
70458--- a/lib/inflate.c
70459+++ b/lib/inflate.c
70460@@ -269,7 +269,7 @@ static void free(void *where)
70461 malloc_ptr = free_mem_ptr;
70462 }
70463 #else
70464-#define malloc(a) kmalloc(a, GFP_KERNEL)
70465+#define malloc(a) kmalloc((a), GFP_KERNEL)
70466 #define free(a) kfree(a)
70467 #endif
70468
70469diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
70470index bd2bea9..6b3c95e 100644
70471--- a/lib/is_single_threaded.c
70472+++ b/lib/is_single_threaded.c
70473@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
70474 struct task_struct *p, *t;
70475 bool ret;
70476
70477+ if (!mm)
70478+ return true;
70479+
70480 if (atomic_read(&task->signal->live) != 1)
70481 return false;
70482
70483diff --git a/lib/kref.c b/lib/kref.c
70484index 3efb882..8492f4c 100644
70485--- a/lib/kref.c
70486+++ b/lib/kref.c
70487@@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
70488 */
70489 int kref_put(struct kref *kref, void (*release)(struct kref *kref))
70490 {
70491- WARN_ON(release == NULL);
70492+ BUG_ON(release == NULL);
70493 WARN_ON(release == (void (*)(struct kref *))kfree);
70494
70495 if (atomic_dec_and_test(&kref->refcount)) {
70496diff --git a/lib/radix-tree.c b/lib/radix-tree.c
70497index d9df745..e73c2fe 100644
70498--- a/lib/radix-tree.c
70499+++ b/lib/radix-tree.c
70500@@ -80,7 +80,7 @@ struct radix_tree_preload {
70501 int nr;
70502 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
70503 };
70504-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
70505+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
70506
70507 static inline void *ptr_to_indirect(void *ptr)
70508 {
70509diff --git a/lib/vsprintf.c b/lib/vsprintf.c
70510index 993599e..f1dbc14 100644
70511--- a/lib/vsprintf.c
70512+++ b/lib/vsprintf.c
70513@@ -16,6 +16,9 @@
70514 * - scnprintf and vscnprintf
70515 */
70516
70517+#ifdef CONFIG_GRKERNSEC_HIDESYM
70518+#define __INCLUDED_BY_HIDESYM 1
70519+#endif
70520 #include <stdarg.h>
70521 #include <linux/module.h>
70522 #include <linux/types.h>
70523@@ -413,7 +416,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
70524 char sym[KSYM_SYMBOL_LEN];
70525 if (ext == 'B')
70526 sprint_backtrace(sym, value);
70527- else if (ext != 'f' && ext != 's')
70528+ else if (ext != 'f' && ext != 's' && ext != 'a')
70529 sprint_symbol(sym, value);
70530 else
70531 kallsyms_lookup(value, NULL, NULL, NULL, sym);
70532@@ -777,7 +780,11 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
70533 return string(buf, end, uuid, spec);
70534 }
70535
70536+#ifdef CONFIG_GRKERNSEC_HIDESYM
70537+int kptr_restrict __read_mostly = 2;
70538+#else
70539 int kptr_restrict __read_mostly;
70540+#endif
70541
70542 /*
70543 * Show a '%p' thing. A kernel extension is that the '%p' is followed
70544@@ -791,6 +798,8 @@ int kptr_restrict __read_mostly;
70545 * - 'S' For symbolic direct pointers with offset
70546 * - 's' For symbolic direct pointers without offset
70547 * - 'B' For backtraced symbolic direct pointers with offset
70548+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
70549+ * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
70550 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
70551 * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
70552 * - 'M' For a 6-byte MAC address, it prints the address in the
70553@@ -835,12 +844,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70554 {
70555 if (!ptr && *fmt != 'K') {
70556 /*
70557- * Print (null) with the same width as a pointer so it makes
70558+ * Print (nil) with the same width as a pointer so it makes
70559 * tabular output look nice.
70560 */
70561 if (spec.field_width == -1)
70562 spec.field_width = 2 * sizeof(void *);
70563- return string(buf, end, "(null)", spec);
70564+ return string(buf, end, "(nil)", spec);
70565 }
70566
70567 switch (*fmt) {
70568@@ -850,6 +859,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70569 /* Fallthrough */
70570 case 'S':
70571 case 's':
70572+#ifdef CONFIG_GRKERNSEC_HIDESYM
70573+ break;
70574+#else
70575+ return symbol_string(buf, end, ptr, spec, *fmt);
70576+#endif
70577+ case 'A':
70578+ case 'a':
70579 case 'B':
70580 return symbol_string(buf, end, ptr, spec, *fmt);
70581 case 'R':
70582@@ -878,9 +894,15 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70583 case 'U':
70584 return uuid_string(buf, end, ptr, spec, fmt);
70585 case 'V':
70586- return buf + vsnprintf(buf, end > buf ? end - buf : 0,
70587- ((struct va_format *)ptr)->fmt,
70588- *(((struct va_format *)ptr)->va));
70589+ {
70590+ va_list va;
70591+
70592+ va_copy(va, *((struct va_format *)ptr)->va);
70593+ buf += vsnprintf(buf, end > buf ? end - buf : 0,
70594+ ((struct va_format *)ptr)->fmt, va);
70595+ va_end(va);
70596+ return buf;
70597+ }
70598 case 'K':
70599 /*
70600 * %pK cannot be used in IRQ context because its test
70601@@ -1608,11 +1630,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
70602 typeof(type) value; \
70603 if (sizeof(type) == 8) { \
70604 args = PTR_ALIGN(args, sizeof(u32)); \
70605- *(u32 *)&value = *(u32 *)args; \
70606- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
70607+ *(u32 *)&value = *(const u32 *)args; \
70608+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
70609 } else { \
70610 args = PTR_ALIGN(args, sizeof(type)); \
70611- value = *(typeof(type) *)args; \
70612+ value = *(const typeof(type) *)args; \
70613 } \
70614 args += sizeof(type); \
70615 value; \
70616@@ -1675,7 +1697,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
70617 case FORMAT_TYPE_STR: {
70618 const char *str_arg = args;
70619 args += strlen(str_arg) + 1;
70620- str = string(str, end, (char *)str_arg, spec);
70621+ str = string(str, end, str_arg, spec);
70622 break;
70623 }
70624
70625diff --git a/localversion-grsec b/localversion-grsec
70626new file mode 100644
70627index 0000000..7cd6065
70628--- /dev/null
70629+++ b/localversion-grsec
70630@@ -0,0 +1 @@
70631+-grsec
70632diff --git a/mm/Kconfig b/mm/Kconfig
70633index 011b110..b492af2 100644
70634--- a/mm/Kconfig
70635+++ b/mm/Kconfig
70636@@ -241,10 +241,10 @@ config KSM
70637 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
70638
70639 config DEFAULT_MMAP_MIN_ADDR
70640- int "Low address space to protect from user allocation"
70641+ int "Low address space to protect from user allocation"
70642 depends on MMU
70643- default 4096
70644- help
70645+ default 65536
70646+ help
70647 This is the portion of low virtual memory which should be protected
70648 from userspace allocation. Keeping a user from writing to low pages
70649 can help reduce the impact of kernel NULL pointer bugs.
70650diff --git a/mm/filemap.c b/mm/filemap.c
70651index 03c5b0e..a01e793 100644
70652--- a/mm/filemap.c
70653+++ b/mm/filemap.c
70654@@ -1770,7 +1770,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
70655 struct address_space *mapping = file->f_mapping;
70656
70657 if (!mapping->a_ops->readpage)
70658- return -ENOEXEC;
70659+ return -ENODEV;
70660 file_accessed(file);
70661 vma->vm_ops = &generic_file_vm_ops;
70662 vma->vm_flags |= VM_CAN_NONLINEAR;
70663@@ -2176,6 +2176,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
70664 *pos = i_size_read(inode);
70665
70666 if (limit != RLIM_INFINITY) {
70667+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
70668 if (*pos >= limit) {
70669 send_sig(SIGXFSZ, current, 0);
70670 return -EFBIG;
70671diff --git a/mm/fremap.c b/mm/fremap.c
70672index 9ed4fd4..c42648d 100644
70673--- a/mm/fremap.c
70674+++ b/mm/fremap.c
70675@@ -155,6 +155,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
70676 retry:
70677 vma = find_vma(mm, start);
70678
70679+#ifdef CONFIG_PAX_SEGMEXEC
70680+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
70681+ goto out;
70682+#endif
70683+
70684 /*
70685 * Make sure the vma is shared, that it supports prefaulting,
70686 * and that the remapped range is valid and fully within
70687diff --git a/mm/highmem.c b/mm/highmem.c
70688index 57d82c6..e9e0552 100644
70689--- a/mm/highmem.c
70690+++ b/mm/highmem.c
70691@@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
70692 * So no dangers, even with speculative execution.
70693 */
70694 page = pte_page(pkmap_page_table[i]);
70695+ pax_open_kernel();
70696 pte_clear(&init_mm, (unsigned long)page_address(page),
70697 &pkmap_page_table[i]);
70698-
70699+ pax_close_kernel();
70700 set_page_address(page, NULL);
70701 need_flush = 1;
70702 }
70703@@ -186,9 +187,11 @@ start:
70704 }
70705 }
70706 vaddr = PKMAP_ADDR(last_pkmap_nr);
70707+
70708+ pax_open_kernel();
70709 set_pte_at(&init_mm, vaddr,
70710 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
70711-
70712+ pax_close_kernel();
70713 pkmap_count[last_pkmap_nr] = 1;
70714 set_page_address(page, (void *)vaddr);
70715
70716diff --git a/mm/huge_memory.c b/mm/huge_memory.c
70717index 8f005e9..1cb1036 100644
70718--- a/mm/huge_memory.c
70719+++ b/mm/huge_memory.c
70720@@ -704,7 +704,7 @@ out:
70721 * run pte_offset_map on the pmd, if an huge pmd could
70722 * materialize from under us from a different thread.
70723 */
70724- if (unlikely(__pte_alloc(mm, vma, pmd, address)))
70725+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
70726 return VM_FAULT_OOM;
70727 /* if an huge pmd materialized from under us just retry later */
70728 if (unlikely(pmd_trans_huge(*pmd)))
70729diff --git a/mm/hugetlb.c b/mm/hugetlb.c
70730index 2316840..b418671 100644
70731--- a/mm/hugetlb.c
70732+++ b/mm/hugetlb.c
70733@@ -2347,6 +2347,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
70734 return 1;
70735 }
70736
70737+#ifdef CONFIG_PAX_SEGMEXEC
70738+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
70739+{
70740+ struct mm_struct *mm = vma->vm_mm;
70741+ struct vm_area_struct *vma_m;
70742+ unsigned long address_m;
70743+ pte_t *ptep_m;
70744+
70745+ vma_m = pax_find_mirror_vma(vma);
70746+ if (!vma_m)
70747+ return;
70748+
70749+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
70750+ address_m = address + SEGMEXEC_TASK_SIZE;
70751+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
70752+ get_page(page_m);
70753+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
70754+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
70755+}
70756+#endif
70757+
70758 /*
70759 * Hugetlb_cow() should be called with page lock of the original hugepage held.
70760 */
70761@@ -2450,6 +2471,11 @@ retry_avoidcopy:
70762 make_huge_pte(vma, new_page, 1));
70763 page_remove_rmap(old_page);
70764 hugepage_add_new_anon_rmap(new_page, vma, address);
70765+
70766+#ifdef CONFIG_PAX_SEGMEXEC
70767+ pax_mirror_huge_pte(vma, address, new_page);
70768+#endif
70769+
70770 /* Make the old page be freed below */
70771 new_page = old_page;
70772 mmu_notifier_invalidate_range_end(mm,
70773@@ -2601,6 +2627,10 @@ retry:
70774 && (vma->vm_flags & VM_SHARED)));
70775 set_huge_pte_at(mm, address, ptep, new_pte);
70776
70777+#ifdef CONFIG_PAX_SEGMEXEC
70778+ pax_mirror_huge_pte(vma, address, page);
70779+#endif
70780+
70781 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
70782 /* Optimization, do the COW without a second fault */
70783 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
70784@@ -2630,6 +2660,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
70785 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
70786 struct hstate *h = hstate_vma(vma);
70787
70788+#ifdef CONFIG_PAX_SEGMEXEC
70789+ struct vm_area_struct *vma_m;
70790+#endif
70791+
70792 ptep = huge_pte_offset(mm, address);
70793 if (ptep) {
70794 entry = huge_ptep_get(ptep);
70795@@ -2641,6 +2675,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
70796 VM_FAULT_SET_HINDEX(h - hstates);
70797 }
70798
70799+#ifdef CONFIG_PAX_SEGMEXEC
70800+ vma_m = pax_find_mirror_vma(vma);
70801+ if (vma_m) {
70802+ unsigned long address_m;
70803+
70804+ if (vma->vm_start > vma_m->vm_start) {
70805+ address_m = address;
70806+ address -= SEGMEXEC_TASK_SIZE;
70807+ vma = vma_m;
70808+ h = hstate_vma(vma);
70809+ } else
70810+ address_m = address + SEGMEXEC_TASK_SIZE;
70811+
70812+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
70813+ return VM_FAULT_OOM;
70814+ address_m &= HPAGE_MASK;
70815+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
70816+ }
70817+#endif
70818+
70819 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
70820 if (!ptep)
70821 return VM_FAULT_OOM;
70822diff --git a/mm/internal.h b/mm/internal.h
70823index 2189af4..f2ca332 100644
70824--- a/mm/internal.h
70825+++ b/mm/internal.h
70826@@ -95,6 +95,7 @@ extern void putback_lru_page(struct page *page);
70827 * in mm/page_alloc.c
70828 */
70829 extern void __free_pages_bootmem(struct page *page, unsigned int order);
70830+extern void free_compound_page(struct page *page);
70831 extern void prep_compound_page(struct page *page, unsigned long order);
70832 #ifdef CONFIG_MEMORY_FAILURE
70833 extern bool is_free_buddy_page(struct page *page);
70834diff --git a/mm/kmemleak.c b/mm/kmemleak.c
70835index f3b2a00..61da94d 100644
70836--- a/mm/kmemleak.c
70837+++ b/mm/kmemleak.c
70838@@ -357,7 +357,7 @@ static void print_unreferenced(struct seq_file *seq,
70839
70840 for (i = 0; i < object->trace_len; i++) {
70841 void *ptr = (void *)object->trace[i];
70842- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
70843+ seq_printf(seq, " [<%p>] %pA\n", ptr, ptr);
70844 }
70845 }
70846
70847diff --git a/mm/maccess.c b/mm/maccess.c
70848index d53adf9..03a24bf 100644
70849--- a/mm/maccess.c
70850+++ b/mm/maccess.c
70851@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
70852 set_fs(KERNEL_DS);
70853 pagefault_disable();
70854 ret = __copy_from_user_inatomic(dst,
70855- (__force const void __user *)src, size);
70856+ (const void __force_user *)src, size);
70857 pagefault_enable();
70858 set_fs(old_fs);
70859
70860@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
70861
70862 set_fs(KERNEL_DS);
70863 pagefault_disable();
70864- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
70865+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
70866 pagefault_enable();
70867 set_fs(old_fs);
70868
70869diff --git a/mm/madvise.c b/mm/madvise.c
70870index 74bf193..feb6fd3 100644
70871--- a/mm/madvise.c
70872+++ b/mm/madvise.c
70873@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
70874 pgoff_t pgoff;
70875 unsigned long new_flags = vma->vm_flags;
70876
70877+#ifdef CONFIG_PAX_SEGMEXEC
70878+ struct vm_area_struct *vma_m;
70879+#endif
70880+
70881 switch (behavior) {
70882 case MADV_NORMAL:
70883 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
70884@@ -110,6 +114,13 @@ success:
70885 /*
70886 * vm_flags is protected by the mmap_sem held in write mode.
70887 */
70888+
70889+#ifdef CONFIG_PAX_SEGMEXEC
70890+ vma_m = pax_find_mirror_vma(vma);
70891+ if (vma_m)
70892+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
70893+#endif
70894+
70895 vma->vm_flags = new_flags;
70896
70897 out:
70898@@ -168,6 +179,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
70899 struct vm_area_struct ** prev,
70900 unsigned long start, unsigned long end)
70901 {
70902+
70903+#ifdef CONFIG_PAX_SEGMEXEC
70904+ struct vm_area_struct *vma_m;
70905+#endif
70906+
70907 *prev = vma;
70908 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
70909 return -EINVAL;
70910@@ -180,6 +196,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
70911 zap_page_range(vma, start, end - start, &details);
70912 } else
70913 zap_page_range(vma, start, end - start, NULL);
70914+
70915+#ifdef CONFIG_PAX_SEGMEXEC
70916+ vma_m = pax_find_mirror_vma(vma);
70917+ if (vma_m) {
70918+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
70919+ struct zap_details details = {
70920+ .nonlinear_vma = vma_m,
70921+ .last_index = ULONG_MAX,
70922+ };
70923+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
70924+ } else
70925+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
70926+ }
70927+#endif
70928+
70929 return 0;
70930 }
70931
70932@@ -376,6 +407,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
70933 if (end < start)
70934 goto out;
70935
70936+#ifdef CONFIG_PAX_SEGMEXEC
70937+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
70938+ if (end > SEGMEXEC_TASK_SIZE)
70939+ goto out;
70940+ } else
70941+#endif
70942+
70943+ if (end > TASK_SIZE)
70944+ goto out;
70945+
70946 error = 0;
70947 if (end == start)
70948 goto out;
70949diff --git a/mm/memory-failure.c b/mm/memory-failure.c
70950index 06d3479..0778eef 100644
70951--- a/mm/memory-failure.c
70952+++ b/mm/memory-failure.c
70953@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
70954
70955 int sysctl_memory_failure_recovery __read_mostly = 1;
70956
70957-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
70958+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
70959
70960 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
70961
70962@@ -202,7 +202,7 @@ static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno,
70963 si.si_signo = SIGBUS;
70964 si.si_errno = 0;
70965 si.si_code = BUS_MCEERR_AO;
70966- si.si_addr = (void *)addr;
70967+ si.si_addr = (void __user *)addr;
70968 #ifdef __ARCH_SI_TRAPNO
70969 si.si_trapno = trapno;
70970 #endif
70971@@ -1010,7 +1010,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70972 }
70973
70974 nr_pages = 1 << compound_trans_order(hpage);
70975- atomic_long_add(nr_pages, &mce_bad_pages);
70976+ atomic_long_add_unchecked(nr_pages, &mce_bad_pages);
70977
70978 /*
70979 * We need/can do nothing about count=0 pages.
70980@@ -1040,7 +1040,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70981 if (!PageHWPoison(hpage)
70982 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
70983 || (p != hpage && TestSetPageHWPoison(hpage))) {
70984- atomic_long_sub(nr_pages, &mce_bad_pages);
70985+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70986 return 0;
70987 }
70988 set_page_hwpoison_huge_page(hpage);
70989@@ -1098,7 +1098,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70990 }
70991 if (hwpoison_filter(p)) {
70992 if (TestClearPageHWPoison(p))
70993- atomic_long_sub(nr_pages, &mce_bad_pages);
70994+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70995 unlock_page(hpage);
70996 put_page(hpage);
70997 return 0;
70998@@ -1315,7 +1315,7 @@ int unpoison_memory(unsigned long pfn)
70999 return 0;
71000 }
71001 if (TestClearPageHWPoison(p))
71002- atomic_long_sub(nr_pages, &mce_bad_pages);
71003+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
71004 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
71005 return 0;
71006 }
71007@@ -1329,7 +1329,7 @@ int unpoison_memory(unsigned long pfn)
71008 */
71009 if (TestClearPageHWPoison(page)) {
71010 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
71011- atomic_long_sub(nr_pages, &mce_bad_pages);
71012+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
71013 freeit = 1;
71014 if (PageHuge(page))
71015 clear_page_hwpoison_huge_page(page);
71016@@ -1442,7 +1442,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
71017 }
71018 done:
71019 if (!PageHWPoison(hpage))
71020- atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
71021+ atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages);
71022 set_page_hwpoison_huge_page(hpage);
71023 dequeue_hwpoisoned_huge_page(hpage);
71024 /* keep elevated page count for bad page */
71025@@ -1573,7 +1573,7 @@ int soft_offline_page(struct page *page, int flags)
71026 return ret;
71027
71028 done:
71029- atomic_long_add(1, &mce_bad_pages);
71030+ atomic_long_add_unchecked(1, &mce_bad_pages);
71031 SetPageHWPoison(page);
71032 /* keep elevated page count for bad page */
71033 return ret;
71034diff --git a/mm/memory.c b/mm/memory.c
71035index 829d437..3d3926a 100644
71036--- a/mm/memory.c
71037+++ b/mm/memory.c
71038@@ -457,8 +457,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
71039 return;
71040
71041 pmd = pmd_offset(pud, start);
71042+
71043+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
71044 pud_clear(pud);
71045 pmd_free_tlb(tlb, pmd, start);
71046+#endif
71047+
71048 }
71049
71050 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
71051@@ -489,9 +493,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
71052 if (end - 1 > ceiling - 1)
71053 return;
71054
71055+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
71056 pud = pud_offset(pgd, start);
71057 pgd_clear(pgd);
71058 pud_free_tlb(tlb, pud, start);
71059+#endif
71060+
71061 }
71062
71063 /*
71064@@ -1566,12 +1573,6 @@ no_page_table:
71065 return page;
71066 }
71067
71068-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
71069-{
71070- return stack_guard_page_start(vma, addr) ||
71071- stack_guard_page_end(vma, addr+PAGE_SIZE);
71072-}
71073-
71074 /**
71075 * __get_user_pages() - pin user pages in memory
71076 * @tsk: task_struct of target task
71077@@ -1644,10 +1645,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
71078 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
71079 i = 0;
71080
71081- do {
71082+ while (nr_pages) {
71083 struct vm_area_struct *vma;
71084
71085- vma = find_extend_vma(mm, start);
71086+ vma = find_vma(mm, start);
71087 if (!vma && in_gate_area(mm, start)) {
71088 unsigned long pg = start & PAGE_MASK;
71089 pgd_t *pgd;
71090@@ -1695,7 +1696,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
71091 goto next_page;
71092 }
71093
71094- if (!vma ||
71095+ if (!vma || start < vma->vm_start ||
71096 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
71097 !(vm_flags & vma->vm_flags))
71098 return i ? : -EFAULT;
71099@@ -1722,11 +1723,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
71100 int ret;
71101 unsigned int fault_flags = 0;
71102
71103- /* For mlock, just skip the stack guard page. */
71104- if (foll_flags & FOLL_MLOCK) {
71105- if (stack_guard_page(vma, start))
71106- goto next_page;
71107- }
71108 if (foll_flags & FOLL_WRITE)
71109 fault_flags |= FAULT_FLAG_WRITE;
71110 if (nonblocking)
71111@@ -1800,7 +1796,7 @@ next_page:
71112 start += PAGE_SIZE;
71113 nr_pages--;
71114 } while (nr_pages && start < vma->vm_end);
71115- } while (nr_pages);
71116+ }
71117 return i;
71118 }
71119 EXPORT_SYMBOL(__get_user_pages);
71120@@ -2007,6 +2003,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
71121 page_add_file_rmap(page);
71122 set_pte_at(mm, addr, pte, mk_pte(page, prot));
71123
71124+#ifdef CONFIG_PAX_SEGMEXEC
71125+ pax_mirror_file_pte(vma, addr, page, ptl);
71126+#endif
71127+
71128 retval = 0;
71129 pte_unmap_unlock(pte, ptl);
71130 return retval;
71131@@ -2041,10 +2041,22 @@ out:
71132 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
71133 struct page *page)
71134 {
71135+
71136+#ifdef CONFIG_PAX_SEGMEXEC
71137+ struct vm_area_struct *vma_m;
71138+#endif
71139+
71140 if (addr < vma->vm_start || addr >= vma->vm_end)
71141 return -EFAULT;
71142 if (!page_count(page))
71143 return -EINVAL;
71144+
71145+#ifdef CONFIG_PAX_SEGMEXEC
71146+ vma_m = pax_find_mirror_vma(vma);
71147+ if (vma_m)
71148+ vma_m->vm_flags |= VM_INSERTPAGE;
71149+#endif
71150+
71151 vma->vm_flags |= VM_INSERTPAGE;
71152 return insert_page(vma, addr, page, vma->vm_page_prot);
71153 }
71154@@ -2130,6 +2142,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
71155 unsigned long pfn)
71156 {
71157 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
71158+ BUG_ON(vma->vm_mirror);
71159
71160 if (addr < vma->vm_start || addr >= vma->vm_end)
71161 return -EFAULT;
71162@@ -2445,6 +2458,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
71163 copy_user_highpage(dst, src, va, vma);
71164 }
71165
71166+#ifdef CONFIG_PAX_SEGMEXEC
71167+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
71168+{
71169+ struct mm_struct *mm = vma->vm_mm;
71170+ spinlock_t *ptl;
71171+ pte_t *pte, entry;
71172+
71173+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
71174+ entry = *pte;
71175+ if (!pte_present(entry)) {
71176+ if (!pte_none(entry)) {
71177+ BUG_ON(pte_file(entry));
71178+ free_swap_and_cache(pte_to_swp_entry(entry));
71179+ pte_clear_not_present_full(mm, address, pte, 0);
71180+ }
71181+ } else {
71182+ struct page *page;
71183+
71184+ flush_cache_page(vma, address, pte_pfn(entry));
71185+ entry = ptep_clear_flush(vma, address, pte);
71186+ BUG_ON(pte_dirty(entry));
71187+ page = vm_normal_page(vma, address, entry);
71188+ if (page) {
71189+ update_hiwater_rss(mm);
71190+ if (PageAnon(page))
71191+ dec_mm_counter_fast(mm, MM_ANONPAGES);
71192+ else
71193+ dec_mm_counter_fast(mm, MM_FILEPAGES);
71194+ page_remove_rmap(page);
71195+ page_cache_release(page);
71196+ }
71197+ }
71198+ pte_unmap_unlock(pte, ptl);
71199+}
71200+
71201+/* PaX: if vma is mirrored, synchronize the mirror's PTE
71202+ *
71203+ * the ptl of the lower mapped page is held on entry and is not released on exit
71204+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
71205+ */
71206+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
71207+{
71208+ struct mm_struct *mm = vma->vm_mm;
71209+ unsigned long address_m;
71210+ spinlock_t *ptl_m;
71211+ struct vm_area_struct *vma_m;
71212+ pmd_t *pmd_m;
71213+ pte_t *pte_m, entry_m;
71214+
71215+ BUG_ON(!page_m || !PageAnon(page_m));
71216+
71217+ vma_m = pax_find_mirror_vma(vma);
71218+ if (!vma_m)
71219+ return;
71220+
71221+ BUG_ON(!PageLocked(page_m));
71222+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71223+ address_m = address + SEGMEXEC_TASK_SIZE;
71224+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71225+ pte_m = pte_offset_map(pmd_m, address_m);
71226+ ptl_m = pte_lockptr(mm, pmd_m);
71227+ if (ptl != ptl_m) {
71228+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71229+ if (!pte_none(*pte_m))
71230+ goto out;
71231+ }
71232+
71233+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
71234+ page_cache_get(page_m);
71235+ page_add_anon_rmap(page_m, vma_m, address_m);
71236+ inc_mm_counter_fast(mm, MM_ANONPAGES);
71237+ set_pte_at(mm, address_m, pte_m, entry_m);
71238+ update_mmu_cache(vma_m, address_m, entry_m);
71239+out:
71240+ if (ptl != ptl_m)
71241+ spin_unlock(ptl_m);
71242+ pte_unmap(pte_m);
71243+ unlock_page(page_m);
71244+}
71245+
71246+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
71247+{
71248+ struct mm_struct *mm = vma->vm_mm;
71249+ unsigned long address_m;
71250+ spinlock_t *ptl_m;
71251+ struct vm_area_struct *vma_m;
71252+ pmd_t *pmd_m;
71253+ pte_t *pte_m, entry_m;
71254+
71255+ BUG_ON(!page_m || PageAnon(page_m));
71256+
71257+ vma_m = pax_find_mirror_vma(vma);
71258+ if (!vma_m)
71259+ return;
71260+
71261+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71262+ address_m = address + SEGMEXEC_TASK_SIZE;
71263+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71264+ pte_m = pte_offset_map(pmd_m, address_m);
71265+ ptl_m = pte_lockptr(mm, pmd_m);
71266+ if (ptl != ptl_m) {
71267+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71268+ if (!pte_none(*pte_m))
71269+ goto out;
71270+ }
71271+
71272+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
71273+ page_cache_get(page_m);
71274+ page_add_file_rmap(page_m);
71275+ inc_mm_counter_fast(mm, MM_FILEPAGES);
71276+ set_pte_at(mm, address_m, pte_m, entry_m);
71277+ update_mmu_cache(vma_m, address_m, entry_m);
71278+out:
71279+ if (ptl != ptl_m)
71280+ spin_unlock(ptl_m);
71281+ pte_unmap(pte_m);
71282+}
71283+
71284+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
71285+{
71286+ struct mm_struct *mm = vma->vm_mm;
71287+ unsigned long address_m;
71288+ spinlock_t *ptl_m;
71289+ struct vm_area_struct *vma_m;
71290+ pmd_t *pmd_m;
71291+ pte_t *pte_m, entry_m;
71292+
71293+ vma_m = pax_find_mirror_vma(vma);
71294+ if (!vma_m)
71295+ return;
71296+
71297+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71298+ address_m = address + SEGMEXEC_TASK_SIZE;
71299+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71300+ pte_m = pte_offset_map(pmd_m, address_m);
71301+ ptl_m = pte_lockptr(mm, pmd_m);
71302+ if (ptl != ptl_m) {
71303+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71304+ if (!pte_none(*pte_m))
71305+ goto out;
71306+ }
71307+
71308+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
71309+ set_pte_at(mm, address_m, pte_m, entry_m);
71310+out:
71311+ if (ptl != ptl_m)
71312+ spin_unlock(ptl_m);
71313+ pte_unmap(pte_m);
71314+}
71315+
71316+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
71317+{
71318+ struct page *page_m;
71319+ pte_t entry;
71320+
71321+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
71322+ goto out;
71323+
71324+ entry = *pte;
71325+ page_m = vm_normal_page(vma, address, entry);
71326+ if (!page_m)
71327+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
71328+ else if (PageAnon(page_m)) {
71329+ if (pax_find_mirror_vma(vma)) {
71330+ pte_unmap_unlock(pte, ptl);
71331+ lock_page(page_m);
71332+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
71333+ if (pte_same(entry, *pte))
71334+ pax_mirror_anon_pte(vma, address, page_m, ptl);
71335+ else
71336+ unlock_page(page_m);
71337+ }
71338+ } else
71339+ pax_mirror_file_pte(vma, address, page_m, ptl);
71340+
71341+out:
71342+ pte_unmap_unlock(pte, ptl);
71343+}
71344+#endif
71345+
71346 /*
71347 * This routine handles present pages, when users try to write
71348 * to a shared page. It is done by copying the page to a new address
71349@@ -2656,6 +2849,12 @@ gotten:
71350 */
71351 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
71352 if (likely(pte_same(*page_table, orig_pte))) {
71353+
71354+#ifdef CONFIG_PAX_SEGMEXEC
71355+ if (pax_find_mirror_vma(vma))
71356+ BUG_ON(!trylock_page(new_page));
71357+#endif
71358+
71359 if (old_page) {
71360 if (!PageAnon(old_page)) {
71361 dec_mm_counter_fast(mm, MM_FILEPAGES);
71362@@ -2707,6 +2906,10 @@ gotten:
71363 page_remove_rmap(old_page);
71364 }
71365
71366+#ifdef CONFIG_PAX_SEGMEXEC
71367+ pax_mirror_anon_pte(vma, address, new_page, ptl);
71368+#endif
71369+
71370 /* Free the old page.. */
71371 new_page = old_page;
71372 ret |= VM_FAULT_WRITE;
71373@@ -2986,6 +3189,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
71374 swap_free(entry);
71375 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
71376 try_to_free_swap(page);
71377+
71378+#ifdef CONFIG_PAX_SEGMEXEC
71379+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
71380+#endif
71381+
71382 unlock_page(page);
71383 if (swapcache) {
71384 /*
71385@@ -3009,6 +3217,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
71386
71387 /* No need to invalidate - it was non-present before */
71388 update_mmu_cache(vma, address, page_table);
71389+
71390+#ifdef CONFIG_PAX_SEGMEXEC
71391+ pax_mirror_anon_pte(vma, address, page, ptl);
71392+#endif
71393+
71394 unlock:
71395 pte_unmap_unlock(page_table, ptl);
71396 out:
71397@@ -3028,40 +3241,6 @@ out_release:
71398 }
71399
71400 /*
71401- * This is like a special single-page "expand_{down|up}wards()",
71402- * except we must first make sure that 'address{-|+}PAGE_SIZE'
71403- * doesn't hit another vma.
71404- */
71405-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
71406-{
71407- address &= PAGE_MASK;
71408- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
71409- struct vm_area_struct *prev = vma->vm_prev;
71410-
71411- /*
71412- * Is there a mapping abutting this one below?
71413- *
71414- * That's only ok if it's the same stack mapping
71415- * that has gotten split..
71416- */
71417- if (prev && prev->vm_end == address)
71418- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
71419-
71420- expand_downwards(vma, address - PAGE_SIZE);
71421- }
71422- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
71423- struct vm_area_struct *next = vma->vm_next;
71424-
71425- /* As VM_GROWSDOWN but s/below/above/ */
71426- if (next && next->vm_start == address + PAGE_SIZE)
71427- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
71428-
71429- expand_upwards(vma, address + PAGE_SIZE);
71430- }
71431- return 0;
71432-}
71433-
71434-/*
71435 * We enter with non-exclusive mmap_sem (to exclude vma changes,
71436 * but allow concurrent faults), and pte mapped but not yet locked.
71437 * We return with mmap_sem still held, but pte unmapped and unlocked.
71438@@ -3070,27 +3249,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
71439 unsigned long address, pte_t *page_table, pmd_t *pmd,
71440 unsigned int flags)
71441 {
71442- struct page *page;
71443+ struct page *page = NULL;
71444 spinlock_t *ptl;
71445 pte_t entry;
71446
71447- pte_unmap(page_table);
71448-
71449- /* Check if we need to add a guard page to the stack */
71450- if (check_stack_guard_page(vma, address) < 0)
71451- return VM_FAULT_SIGBUS;
71452-
71453- /* Use the zero-page for reads */
71454 if (!(flags & FAULT_FLAG_WRITE)) {
71455 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
71456 vma->vm_page_prot));
71457- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
71458+ ptl = pte_lockptr(mm, pmd);
71459+ spin_lock(ptl);
71460 if (!pte_none(*page_table))
71461 goto unlock;
71462 goto setpte;
71463 }
71464
71465 /* Allocate our own private page. */
71466+ pte_unmap(page_table);
71467+
71468 if (unlikely(anon_vma_prepare(vma)))
71469 goto oom;
71470 page = alloc_zeroed_user_highpage_movable(vma, address);
71471@@ -3109,6 +3284,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
71472 if (!pte_none(*page_table))
71473 goto release;
71474
71475+#ifdef CONFIG_PAX_SEGMEXEC
71476+ if (pax_find_mirror_vma(vma))
71477+ BUG_ON(!trylock_page(page));
71478+#endif
71479+
71480 inc_mm_counter_fast(mm, MM_ANONPAGES);
71481 page_add_new_anon_rmap(page, vma, address);
71482 setpte:
71483@@ -3116,6 +3296,12 @@ setpte:
71484
71485 /* No need to invalidate - it was non-present before */
71486 update_mmu_cache(vma, address, page_table);
71487+
71488+#ifdef CONFIG_PAX_SEGMEXEC
71489+ if (page)
71490+ pax_mirror_anon_pte(vma, address, page, ptl);
71491+#endif
71492+
71493 unlock:
71494 pte_unmap_unlock(page_table, ptl);
71495 return 0;
71496@@ -3259,6 +3445,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71497 */
71498 /* Only go through if we didn't race with anybody else... */
71499 if (likely(pte_same(*page_table, orig_pte))) {
71500+
71501+#ifdef CONFIG_PAX_SEGMEXEC
71502+ if (anon && pax_find_mirror_vma(vma))
71503+ BUG_ON(!trylock_page(page));
71504+#endif
71505+
71506 flush_icache_page(vma, page);
71507 entry = mk_pte(page, vma->vm_page_prot);
71508 if (flags & FAULT_FLAG_WRITE)
71509@@ -3278,6 +3470,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71510
71511 /* no need to invalidate: a not-present page won't be cached */
71512 update_mmu_cache(vma, address, page_table);
71513+
71514+#ifdef CONFIG_PAX_SEGMEXEC
71515+ if (anon)
71516+ pax_mirror_anon_pte(vma, address, page, ptl);
71517+ else
71518+ pax_mirror_file_pte(vma, address, page, ptl);
71519+#endif
71520+
71521 } else {
71522 if (cow_page)
71523 mem_cgroup_uncharge_page(cow_page);
71524@@ -3431,6 +3631,12 @@ int handle_pte_fault(struct mm_struct *mm,
71525 if (flags & FAULT_FLAG_WRITE)
71526 flush_tlb_fix_spurious_fault(vma, address);
71527 }
71528+
71529+#ifdef CONFIG_PAX_SEGMEXEC
71530+ pax_mirror_pte(vma, address, pte, pmd, ptl);
71531+ return 0;
71532+#endif
71533+
71534 unlock:
71535 pte_unmap_unlock(pte, ptl);
71536 return 0;
71537@@ -3447,6 +3653,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71538 pmd_t *pmd;
71539 pte_t *pte;
71540
71541+#ifdef CONFIG_PAX_SEGMEXEC
71542+ struct vm_area_struct *vma_m;
71543+#endif
71544+
71545 __set_current_state(TASK_RUNNING);
71546
71547 count_vm_event(PGFAULT);
71548@@ -3458,6 +3668,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71549 if (unlikely(is_vm_hugetlb_page(vma)))
71550 return hugetlb_fault(mm, vma, address, flags);
71551
71552+#ifdef CONFIG_PAX_SEGMEXEC
71553+ vma_m = pax_find_mirror_vma(vma);
71554+ if (vma_m) {
71555+ unsigned long address_m;
71556+ pgd_t *pgd_m;
71557+ pud_t *pud_m;
71558+ pmd_t *pmd_m;
71559+
71560+ if (vma->vm_start > vma_m->vm_start) {
71561+ address_m = address;
71562+ address -= SEGMEXEC_TASK_SIZE;
71563+ vma = vma_m;
71564+ } else
71565+ address_m = address + SEGMEXEC_TASK_SIZE;
71566+
71567+ pgd_m = pgd_offset(mm, address_m);
71568+ pud_m = pud_alloc(mm, pgd_m, address_m);
71569+ if (!pud_m)
71570+ return VM_FAULT_OOM;
71571+ pmd_m = pmd_alloc(mm, pud_m, address_m);
71572+ if (!pmd_m)
71573+ return VM_FAULT_OOM;
71574+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
71575+ return VM_FAULT_OOM;
71576+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
71577+ }
71578+#endif
71579+
71580 pgd = pgd_offset(mm, address);
71581 pud = pud_alloc(mm, pgd, address);
71582 if (!pud)
71583@@ -3487,7 +3725,7 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71584 * run pte_offset_map on the pmd, if an huge pmd could
71585 * materialize from under us from a different thread.
71586 */
71587- if (unlikely(pmd_none(*pmd)) && __pte_alloc(mm, vma, pmd, address))
71588+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
71589 return VM_FAULT_OOM;
71590 /* if an huge pmd materialized from under us just retry later */
71591 if (unlikely(pmd_trans_huge(*pmd)))
71592@@ -3591,7 +3829,7 @@ static int __init gate_vma_init(void)
71593 gate_vma.vm_start = FIXADDR_USER_START;
71594 gate_vma.vm_end = FIXADDR_USER_END;
71595 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
71596- gate_vma.vm_page_prot = __P101;
71597+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
71598 /*
71599 * Make sure the vDSO gets into every core dump.
71600 * Dumping its contents makes post-mortem fully interpretable later
71601diff --git a/mm/mempolicy.c b/mm/mempolicy.c
71602index c3fdbcb..2e8ef90 100644
71603--- a/mm/mempolicy.c
71604+++ b/mm/mempolicy.c
71605@@ -640,6 +640,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
71606 unsigned long vmstart;
71607 unsigned long vmend;
71608
71609+#ifdef CONFIG_PAX_SEGMEXEC
71610+ struct vm_area_struct *vma_m;
71611+#endif
71612+
71613 vma = find_vma_prev(mm, start, &prev);
71614 if (!vma || vma->vm_start > start)
71615 return -EFAULT;
71616@@ -678,6 +682,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
71617 err = policy_vma(vma, new_pol);
71618 if (err)
71619 goto out;
71620+
71621+#ifdef CONFIG_PAX_SEGMEXEC
71622+ vma_m = pax_find_mirror_vma(vma);
71623+ if (vma_m) {
71624+ err = policy_vma(vma_m, new_pol);
71625+ if (err)
71626+ goto out;
71627+ }
71628+#endif
71629+
71630 }
71631
71632 out:
71633@@ -1111,6 +1125,17 @@ static long do_mbind(unsigned long start, unsigned long len,
71634
71635 if (end < start)
71636 return -EINVAL;
71637+
71638+#ifdef CONFIG_PAX_SEGMEXEC
71639+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
71640+ if (end > SEGMEXEC_TASK_SIZE)
71641+ return -EINVAL;
71642+ } else
71643+#endif
71644+
71645+ if (end > TASK_SIZE)
71646+ return -EINVAL;
71647+
71648 if (end == start)
71649 return 0;
71650
71651@@ -1329,6 +1354,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
71652 if (!mm)
71653 goto out;
71654
71655+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
71656+ if (mm != current->mm &&
71657+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
71658+ err = -EPERM;
71659+ goto out;
71660+ }
71661+#endif
71662+
71663 /*
71664 * Check if this process has the right to modify the specified
71665 * process. The right exists if the process has administrative
71666@@ -1338,8 +1371,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
71667 rcu_read_lock();
71668 tcred = __task_cred(task);
71669 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
71670- cred->uid != tcred->suid && cred->uid != tcred->uid &&
71671- !capable(CAP_SYS_NICE)) {
71672+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
71673 rcu_read_unlock();
71674 err = -EPERM;
71675 goto out;
71676diff --git a/mm/migrate.c b/mm/migrate.c
71677index 177aca4..ab3a744 100644
71678--- a/mm/migrate.c
71679+++ b/mm/migrate.c
71680@@ -1313,6 +1313,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
71681 if (!mm)
71682 return -EINVAL;
71683
71684+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
71685+ if (mm != current->mm &&
71686+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
71687+ err = -EPERM;
71688+ goto out;
71689+ }
71690+#endif
71691+
71692 /*
71693 * Check if this process has the right to modify the specified
71694 * process. The right exists if the process has administrative
71695@@ -1322,8 +1330,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
71696 rcu_read_lock();
71697 tcred = __task_cred(task);
71698 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
71699- cred->uid != tcred->suid && cred->uid != tcred->uid &&
71700- !capable(CAP_SYS_NICE)) {
71701+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
71702 rcu_read_unlock();
71703 err = -EPERM;
71704 goto out;
71705diff --git a/mm/mlock.c b/mm/mlock.c
71706index 4f4f53b..9511904 100644
71707--- a/mm/mlock.c
71708+++ b/mm/mlock.c
71709@@ -13,6 +13,7 @@
71710 #include <linux/pagemap.h>
71711 #include <linux/mempolicy.h>
71712 #include <linux/syscalls.h>
71713+#include <linux/security.h>
71714 #include <linux/sched.h>
71715 #include <linux/export.h>
71716 #include <linux/rmap.h>
71717@@ -385,6 +386,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
71718 return -EINVAL;
71719 if (end == start)
71720 return 0;
71721+ if (end > TASK_SIZE)
71722+ return -EINVAL;
71723+
71724 vma = find_vma_prev(current->mm, start, &prev);
71725 if (!vma || vma->vm_start > start)
71726 return -ENOMEM;
71727@@ -395,6 +399,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
71728 for (nstart = start ; ; ) {
71729 vm_flags_t newflags;
71730
71731+#ifdef CONFIG_PAX_SEGMEXEC
71732+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
71733+ break;
71734+#endif
71735+
71736 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
71737
71738 newflags = vma->vm_flags | VM_LOCKED;
71739@@ -500,6 +509,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
71740 lock_limit >>= PAGE_SHIFT;
71741
71742 /* check against resource limits */
71743+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
71744 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
71745 error = do_mlock(start, len, 1);
71746 up_write(&current->mm->mmap_sem);
71747@@ -523,17 +533,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
71748 static int do_mlockall(int flags)
71749 {
71750 struct vm_area_struct * vma, * prev = NULL;
71751- unsigned int def_flags = 0;
71752
71753 if (flags & MCL_FUTURE)
71754- def_flags = VM_LOCKED;
71755- current->mm->def_flags = def_flags;
71756+ current->mm->def_flags |= VM_LOCKED;
71757+ else
71758+ current->mm->def_flags &= ~VM_LOCKED;
71759 if (flags == MCL_FUTURE)
71760 goto out;
71761
71762 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
71763 vm_flags_t newflags;
71764
71765+#ifdef CONFIG_PAX_SEGMEXEC
71766+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
71767+ break;
71768+#endif
71769+
71770+ BUG_ON(vma->vm_end > TASK_SIZE);
71771 newflags = vma->vm_flags | VM_LOCKED;
71772 if (!(flags & MCL_CURRENT))
71773 newflags &= ~VM_LOCKED;
71774@@ -566,6 +582,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
71775 lock_limit >>= PAGE_SHIFT;
71776
71777 ret = -ENOMEM;
71778+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
71779 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
71780 capable(CAP_IPC_LOCK))
71781 ret = do_mlockall(flags);
71782diff --git a/mm/mmap.c b/mm/mmap.c
71783index eae90af..c930262 100644
71784--- a/mm/mmap.c
71785+++ b/mm/mmap.c
71786@@ -46,6 +46,16 @@
71787 #define arch_rebalance_pgtables(addr, len) (addr)
71788 #endif
71789
71790+static inline void verify_mm_writelocked(struct mm_struct *mm)
71791+{
71792+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
71793+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
71794+ up_read(&mm->mmap_sem);
71795+ BUG();
71796+ }
71797+#endif
71798+}
71799+
71800 static void unmap_region(struct mm_struct *mm,
71801 struct vm_area_struct *vma, struct vm_area_struct *prev,
71802 unsigned long start, unsigned long end);
71803@@ -71,22 +81,32 @@ static void unmap_region(struct mm_struct *mm,
71804 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
71805 *
71806 */
71807-pgprot_t protection_map[16] = {
71808+pgprot_t protection_map[16] __read_only = {
71809 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
71810 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
71811 };
71812
71813-pgprot_t vm_get_page_prot(unsigned long vm_flags)
71814+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
71815 {
71816- return __pgprot(pgprot_val(protection_map[vm_flags &
71817+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
71818 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
71819 pgprot_val(arch_vm_get_page_prot(vm_flags)));
71820+
71821+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
71822+ if (!(__supported_pte_mask & _PAGE_NX) &&
71823+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
71824+ (vm_flags & (VM_READ | VM_WRITE)))
71825+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
71826+#endif
71827+
71828+ return prot;
71829 }
71830 EXPORT_SYMBOL(vm_get_page_prot);
71831
71832 int sysctl_overcommit_memory __read_mostly = OVERCOMMIT_GUESS; /* heuristic overcommit */
71833 int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
71834 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
71835+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
71836 /*
71837 * Make sure vm_committed_as in one cacheline and not cacheline shared with
71838 * other variables. It can be updated by several CPUs frequently.
71839@@ -228,6 +248,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
71840 struct vm_area_struct *next = vma->vm_next;
71841
71842 might_sleep();
71843+ BUG_ON(vma->vm_mirror);
71844 if (vma->vm_ops && vma->vm_ops->close)
71845 vma->vm_ops->close(vma);
71846 if (vma->vm_file) {
71847@@ -272,6 +293,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
71848 * not page aligned -Ram Gupta
71849 */
71850 rlim = rlimit(RLIMIT_DATA);
71851+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
71852 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
71853 (mm->end_data - mm->start_data) > rlim)
71854 goto out;
71855@@ -689,6 +711,12 @@ static int
71856 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
71857 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
71858 {
71859+
71860+#ifdef CONFIG_PAX_SEGMEXEC
71861+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
71862+ return 0;
71863+#endif
71864+
71865 if (is_mergeable_vma(vma, file, vm_flags) &&
71866 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
71867 if (vma->vm_pgoff == vm_pgoff)
71868@@ -708,6 +736,12 @@ static int
71869 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
71870 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
71871 {
71872+
71873+#ifdef CONFIG_PAX_SEGMEXEC
71874+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
71875+ return 0;
71876+#endif
71877+
71878 if (is_mergeable_vma(vma, file, vm_flags) &&
71879 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
71880 pgoff_t vm_pglen;
71881@@ -750,13 +784,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
71882 struct vm_area_struct *vma_merge(struct mm_struct *mm,
71883 struct vm_area_struct *prev, unsigned long addr,
71884 unsigned long end, unsigned long vm_flags,
71885- struct anon_vma *anon_vma, struct file *file,
71886+ struct anon_vma *anon_vma, struct file *file,
71887 pgoff_t pgoff, struct mempolicy *policy)
71888 {
71889 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
71890 struct vm_area_struct *area, *next;
71891 int err;
71892
71893+#ifdef CONFIG_PAX_SEGMEXEC
71894+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
71895+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
71896+
71897+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
71898+#endif
71899+
71900 /*
71901 * We later require that vma->vm_flags == vm_flags,
71902 * so this tests vma->vm_flags & VM_SPECIAL, too.
71903@@ -772,6 +813,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71904 if (next && next->vm_end == end) /* cases 6, 7, 8 */
71905 next = next->vm_next;
71906
71907+#ifdef CONFIG_PAX_SEGMEXEC
71908+ if (prev)
71909+ prev_m = pax_find_mirror_vma(prev);
71910+ if (area)
71911+ area_m = pax_find_mirror_vma(area);
71912+ if (next)
71913+ next_m = pax_find_mirror_vma(next);
71914+#endif
71915+
71916 /*
71917 * Can it merge with the predecessor?
71918 */
71919@@ -791,9 +841,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71920 /* cases 1, 6 */
71921 err = vma_adjust(prev, prev->vm_start,
71922 next->vm_end, prev->vm_pgoff, NULL);
71923- } else /* cases 2, 5, 7 */
71924+
71925+#ifdef CONFIG_PAX_SEGMEXEC
71926+ if (!err && prev_m)
71927+ err = vma_adjust(prev_m, prev_m->vm_start,
71928+ next_m->vm_end, prev_m->vm_pgoff, NULL);
71929+#endif
71930+
71931+ } else { /* cases 2, 5, 7 */
71932 err = vma_adjust(prev, prev->vm_start,
71933 end, prev->vm_pgoff, NULL);
71934+
71935+#ifdef CONFIG_PAX_SEGMEXEC
71936+ if (!err && prev_m)
71937+ err = vma_adjust(prev_m, prev_m->vm_start,
71938+ end_m, prev_m->vm_pgoff, NULL);
71939+#endif
71940+
71941+ }
71942 if (err)
71943 return NULL;
71944 khugepaged_enter_vma_merge(prev);
71945@@ -807,12 +872,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71946 mpol_equal(policy, vma_policy(next)) &&
71947 can_vma_merge_before(next, vm_flags,
71948 anon_vma, file, pgoff+pglen)) {
71949- if (prev && addr < prev->vm_end) /* case 4 */
71950+ if (prev && addr < prev->vm_end) { /* case 4 */
71951 err = vma_adjust(prev, prev->vm_start,
71952 addr, prev->vm_pgoff, NULL);
71953- else /* cases 3, 8 */
71954+
71955+#ifdef CONFIG_PAX_SEGMEXEC
71956+ if (!err && prev_m)
71957+ err = vma_adjust(prev_m, prev_m->vm_start,
71958+ addr_m, prev_m->vm_pgoff, NULL);
71959+#endif
71960+
71961+ } else { /* cases 3, 8 */
71962 err = vma_adjust(area, addr, next->vm_end,
71963 next->vm_pgoff - pglen, NULL);
71964+
71965+#ifdef CONFIG_PAX_SEGMEXEC
71966+ if (!err && area_m)
71967+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
71968+ next_m->vm_pgoff - pglen, NULL);
71969+#endif
71970+
71971+ }
71972 if (err)
71973 return NULL;
71974 khugepaged_enter_vma_merge(area);
71975@@ -921,14 +1001,11 @@ none:
71976 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
71977 struct file *file, long pages)
71978 {
71979- const unsigned long stack_flags
71980- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
71981-
71982 if (file) {
71983 mm->shared_vm += pages;
71984 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
71985 mm->exec_vm += pages;
71986- } else if (flags & stack_flags)
71987+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
71988 mm->stack_vm += pages;
71989 if (flags & (VM_RESERVED|VM_IO))
71990 mm->reserved_vm += pages;
71991@@ -955,7 +1032,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71992 * (the exception is when the underlying filesystem is noexec
71993 * mounted, in which case we dont add PROT_EXEC.)
71994 */
71995- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
71996+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
71997 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
71998 prot |= PROT_EXEC;
71999
72000@@ -981,7 +1058,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
72001 /* Obtain the address to map to. we verify (or select) it and ensure
72002 * that it represents a valid section of the address space.
72003 */
72004- addr = get_unmapped_area(file, addr, len, pgoff, flags);
72005+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
72006 if (addr & ~PAGE_MASK)
72007 return addr;
72008
72009@@ -992,6 +1069,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
72010 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
72011 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
72012
72013+#ifdef CONFIG_PAX_MPROTECT
72014+ if (mm->pax_flags & MF_PAX_MPROTECT) {
72015+#ifndef CONFIG_PAX_MPROTECT_COMPAT
72016+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
72017+ gr_log_rwxmmap(file);
72018+
72019+#ifdef CONFIG_PAX_EMUPLT
72020+ vm_flags &= ~VM_EXEC;
72021+#else
72022+ return -EPERM;
72023+#endif
72024+
72025+ }
72026+
72027+ if (!(vm_flags & VM_EXEC))
72028+ vm_flags &= ~VM_MAYEXEC;
72029+#else
72030+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
72031+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
72032+#endif
72033+ else
72034+ vm_flags &= ~VM_MAYWRITE;
72035+ }
72036+#endif
72037+
72038+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
72039+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
72040+ vm_flags &= ~VM_PAGEEXEC;
72041+#endif
72042+
72043 if (flags & MAP_LOCKED)
72044 if (!can_do_mlock())
72045 return -EPERM;
72046@@ -1003,6 +1110,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
72047 locked += mm->locked_vm;
72048 lock_limit = rlimit(RLIMIT_MEMLOCK);
72049 lock_limit >>= PAGE_SHIFT;
72050+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
72051 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
72052 return -EAGAIN;
72053 }
72054@@ -1073,6 +1181,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
72055 if (error)
72056 return error;
72057
72058+ if (!gr_acl_handle_mmap(file, prot))
72059+ return -EACCES;
72060+
72061 return mmap_region(file, addr, len, flags, vm_flags, pgoff);
72062 }
72063 EXPORT_SYMBOL(do_mmap_pgoff);
72064@@ -1153,7 +1264,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
72065 vm_flags_t vm_flags = vma->vm_flags;
72066
72067 /* If it was private or non-writable, the write bit is already clear */
72068- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
72069+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
72070 return 0;
72071
72072 /* The backer wishes to know when pages are first written to? */
72073@@ -1202,14 +1313,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
72074 unsigned long charged = 0;
72075 struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
72076
72077+#ifdef CONFIG_PAX_SEGMEXEC
72078+ struct vm_area_struct *vma_m = NULL;
72079+#endif
72080+
72081+ /*
72082+ * mm->mmap_sem is required to protect against another thread
72083+ * changing the mappings in case we sleep.
72084+ */
72085+ verify_mm_writelocked(mm);
72086+
72087 /* Clear old maps */
72088 error = -ENOMEM;
72089-munmap_back:
72090 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72091 if (vma && vma->vm_start < addr + len) {
72092 if (do_munmap(mm, addr, len))
72093 return -ENOMEM;
72094- goto munmap_back;
72095+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72096+ BUG_ON(vma && vma->vm_start < addr + len);
72097 }
72098
72099 /* Check against address space limit. */
72100@@ -1258,6 +1379,16 @@ munmap_back:
72101 goto unacct_error;
72102 }
72103
72104+#ifdef CONFIG_PAX_SEGMEXEC
72105+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
72106+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72107+ if (!vma_m) {
72108+ error = -ENOMEM;
72109+ goto free_vma;
72110+ }
72111+ }
72112+#endif
72113+
72114 vma->vm_mm = mm;
72115 vma->vm_start = addr;
72116 vma->vm_end = addr + len;
72117@@ -1266,8 +1397,9 @@ munmap_back:
72118 vma->vm_pgoff = pgoff;
72119 INIT_LIST_HEAD(&vma->anon_vma_chain);
72120
72121+ error = -EINVAL; /* when rejecting VM_GROWSDOWN|VM_GROWSUP */
72122+
72123 if (file) {
72124- error = -EINVAL;
72125 if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
72126 goto free_vma;
72127 if (vm_flags & VM_DENYWRITE) {
72128@@ -1281,6 +1413,19 @@ munmap_back:
72129 error = file->f_op->mmap(file, vma);
72130 if (error)
72131 goto unmap_and_free_vma;
72132+
72133+#ifdef CONFIG_PAX_SEGMEXEC
72134+ if (vma_m && (vm_flags & VM_EXECUTABLE))
72135+ added_exe_file_vma(mm);
72136+#endif
72137+
72138+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
72139+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
72140+ vma->vm_flags |= VM_PAGEEXEC;
72141+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
72142+ }
72143+#endif
72144+
72145 if (vm_flags & VM_EXECUTABLE)
72146 added_exe_file_vma(mm);
72147
72148@@ -1293,6 +1438,8 @@ munmap_back:
72149 pgoff = vma->vm_pgoff;
72150 vm_flags = vma->vm_flags;
72151 } else if (vm_flags & VM_SHARED) {
72152+ if (unlikely(vm_flags & (VM_GROWSDOWN|VM_GROWSUP)))
72153+ goto free_vma;
72154 error = shmem_zero_setup(vma);
72155 if (error)
72156 goto free_vma;
72157@@ -1316,6 +1463,11 @@ munmap_back:
72158 vma_link(mm, vma, prev, rb_link, rb_parent);
72159 file = vma->vm_file;
72160
72161+#ifdef CONFIG_PAX_SEGMEXEC
72162+ if (vma_m)
72163+ BUG_ON(pax_mirror_vma(vma_m, vma));
72164+#endif
72165+
72166 /* Once vma denies write, undo our temporary denial count */
72167 if (correct_wcount)
72168 atomic_inc(&inode->i_writecount);
72169@@ -1324,6 +1476,7 @@ out:
72170
72171 mm->total_vm += len >> PAGE_SHIFT;
72172 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
72173+ track_exec_limit(mm, addr, addr + len, vm_flags);
72174 if (vm_flags & VM_LOCKED) {
72175 if (!mlock_vma_pages_range(vma, addr, addr + len))
72176 mm->locked_vm += (len >> PAGE_SHIFT);
72177@@ -1341,6 +1494,12 @@ unmap_and_free_vma:
72178 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
72179 charged = 0;
72180 free_vma:
72181+
72182+#ifdef CONFIG_PAX_SEGMEXEC
72183+ if (vma_m)
72184+ kmem_cache_free(vm_area_cachep, vma_m);
72185+#endif
72186+
72187 kmem_cache_free(vm_area_cachep, vma);
72188 unacct_error:
72189 if (charged)
72190@@ -1348,6 +1507,44 @@ unacct_error:
72191 return error;
72192 }
72193
72194+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
72195+{
72196+ if (!vma) {
72197+#ifdef CONFIG_STACK_GROWSUP
72198+ if (addr > sysctl_heap_stack_gap)
72199+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
72200+ else
72201+ vma = find_vma(current->mm, 0);
72202+ if (vma && (vma->vm_flags & VM_GROWSUP))
72203+ return false;
72204+#endif
72205+ return true;
72206+ }
72207+
72208+ if (addr + len > vma->vm_start)
72209+ return false;
72210+
72211+ if (vma->vm_flags & VM_GROWSDOWN)
72212+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
72213+#ifdef CONFIG_STACK_GROWSUP
72214+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
72215+ return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
72216+#endif
72217+
72218+ return true;
72219+}
72220+
72221+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
72222+{
72223+ if (vma->vm_start < len)
72224+ return -ENOMEM;
72225+ if (!(vma->vm_flags & VM_GROWSDOWN))
72226+ return vma->vm_start - len;
72227+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
72228+ return vma->vm_start - len - sysctl_heap_stack_gap;
72229+ return -ENOMEM;
72230+}
72231+
72232 /* Get an address range which is currently unmapped.
72233 * For shmat() with addr=0.
72234 *
72235@@ -1374,18 +1571,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
72236 if (flags & MAP_FIXED)
72237 return addr;
72238
72239+#ifdef CONFIG_PAX_RANDMMAP
72240+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
72241+#endif
72242+
72243 if (addr) {
72244 addr = PAGE_ALIGN(addr);
72245- vma = find_vma(mm, addr);
72246- if (TASK_SIZE - len >= addr &&
72247- (!vma || addr + len <= vma->vm_start))
72248- return addr;
72249+ if (TASK_SIZE - len >= addr) {
72250+ vma = find_vma(mm, addr);
72251+ if (check_heap_stack_gap(vma, addr, len))
72252+ return addr;
72253+ }
72254 }
72255 if (len > mm->cached_hole_size) {
72256- start_addr = addr = mm->free_area_cache;
72257+ start_addr = addr = mm->free_area_cache;
72258 } else {
72259- start_addr = addr = TASK_UNMAPPED_BASE;
72260- mm->cached_hole_size = 0;
72261+ start_addr = addr = mm->mmap_base;
72262+ mm->cached_hole_size = 0;
72263 }
72264
72265 full_search:
72266@@ -1396,34 +1598,40 @@ full_search:
72267 * Start a new search - just in case we missed
72268 * some holes.
72269 */
72270- if (start_addr != TASK_UNMAPPED_BASE) {
72271- addr = TASK_UNMAPPED_BASE;
72272- start_addr = addr;
72273+ if (start_addr != mm->mmap_base) {
72274+ start_addr = addr = mm->mmap_base;
72275 mm->cached_hole_size = 0;
72276 goto full_search;
72277 }
72278 return -ENOMEM;
72279 }
72280- if (!vma || addr + len <= vma->vm_start) {
72281- /*
72282- * Remember the place where we stopped the search:
72283- */
72284- mm->free_area_cache = addr + len;
72285- return addr;
72286- }
72287+ if (check_heap_stack_gap(vma, addr, len))
72288+ break;
72289 if (addr + mm->cached_hole_size < vma->vm_start)
72290 mm->cached_hole_size = vma->vm_start - addr;
72291 addr = vma->vm_end;
72292 }
72293+
72294+ /*
72295+ * Remember the place where we stopped the search:
72296+ */
72297+ mm->free_area_cache = addr + len;
72298+ return addr;
72299 }
72300 #endif
72301
72302 void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
72303 {
72304+
72305+#ifdef CONFIG_PAX_SEGMEXEC
72306+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
72307+ return;
72308+#endif
72309+
72310 /*
72311 * Is this a new hole at the lowest possible address?
72312 */
72313- if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache) {
72314+ if (addr >= mm->mmap_base && addr < mm->free_area_cache) {
72315 mm->free_area_cache = addr;
72316 mm->cached_hole_size = ~0UL;
72317 }
72318@@ -1441,7 +1649,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72319 {
72320 struct vm_area_struct *vma;
72321 struct mm_struct *mm = current->mm;
72322- unsigned long addr = addr0;
72323+ unsigned long base = mm->mmap_base, addr = addr0;
72324
72325 /* requested length too big for entire address space */
72326 if (len > TASK_SIZE)
72327@@ -1450,13 +1658,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72328 if (flags & MAP_FIXED)
72329 return addr;
72330
72331+#ifdef CONFIG_PAX_RANDMMAP
72332+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
72333+#endif
72334+
72335 /* requesting a specific address */
72336 if (addr) {
72337 addr = PAGE_ALIGN(addr);
72338- vma = find_vma(mm, addr);
72339- if (TASK_SIZE - len >= addr &&
72340- (!vma || addr + len <= vma->vm_start))
72341- return addr;
72342+ if (TASK_SIZE - len >= addr) {
72343+ vma = find_vma(mm, addr);
72344+ if (check_heap_stack_gap(vma, addr, len))
72345+ return addr;
72346+ }
72347 }
72348
72349 /* check if free_area_cache is useful for us */
72350@@ -1471,7 +1684,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72351 /* make sure it can fit in the remaining address space */
72352 if (addr > len) {
72353 vma = find_vma(mm, addr-len);
72354- if (!vma || addr <= vma->vm_start)
72355+ if (check_heap_stack_gap(vma, addr - len, len))
72356 /* remember the address as a hint for next time */
72357 return (mm->free_area_cache = addr-len);
72358 }
72359@@ -1488,7 +1701,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72360 * return with success:
72361 */
72362 vma = find_vma(mm, addr);
72363- if (!vma || addr+len <= vma->vm_start)
72364+ if (check_heap_stack_gap(vma, addr, len))
72365 /* remember the address as a hint for next time */
72366 return (mm->free_area_cache = addr);
72367
72368@@ -1497,8 +1710,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72369 mm->cached_hole_size = vma->vm_start - addr;
72370
72371 /* try just below the current vma->vm_start */
72372- addr = vma->vm_start-len;
72373- } while (len < vma->vm_start);
72374+ addr = skip_heap_stack_gap(vma, len);
72375+ } while (!IS_ERR_VALUE(addr));
72376
72377 bottomup:
72378 /*
72379@@ -1507,13 +1720,21 @@ bottomup:
72380 * can happen with large stack limits and large mmap()
72381 * allocations.
72382 */
72383+ mm->mmap_base = TASK_UNMAPPED_BASE;
72384+
72385+#ifdef CONFIG_PAX_RANDMMAP
72386+ if (mm->pax_flags & MF_PAX_RANDMMAP)
72387+ mm->mmap_base += mm->delta_mmap;
72388+#endif
72389+
72390+ mm->free_area_cache = mm->mmap_base;
72391 mm->cached_hole_size = ~0UL;
72392- mm->free_area_cache = TASK_UNMAPPED_BASE;
72393 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
72394 /*
72395 * Restore the topdown base:
72396 */
72397- mm->free_area_cache = mm->mmap_base;
72398+ mm->mmap_base = base;
72399+ mm->free_area_cache = base;
72400 mm->cached_hole_size = ~0UL;
72401
72402 return addr;
72403@@ -1522,6 +1743,12 @@ bottomup:
72404
72405 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
72406 {
72407+
72408+#ifdef CONFIG_PAX_SEGMEXEC
72409+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
72410+ return;
72411+#endif
72412+
72413 /*
72414 * Is this a new hole at the highest possible address?
72415 */
72416@@ -1529,8 +1756,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
72417 mm->free_area_cache = addr;
72418
72419 /* dont allow allocations above current base */
72420- if (mm->free_area_cache > mm->mmap_base)
72421+ if (mm->free_area_cache > mm->mmap_base) {
72422 mm->free_area_cache = mm->mmap_base;
72423+ mm->cached_hole_size = ~0UL;
72424+ }
72425 }
72426
72427 unsigned long
72428@@ -1603,40 +1832,50 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
72429
72430 EXPORT_SYMBOL(find_vma);
72431
72432-/* Same as find_vma, but also return a pointer to the previous VMA in *pprev. */
72433+/*
72434+ * Same as find_vma, but also return a pointer to the previous VMA in *pprev.
72435+ */
72436 struct vm_area_struct *
72437 find_vma_prev(struct mm_struct *mm, unsigned long addr,
72438 struct vm_area_struct **pprev)
72439 {
72440- struct vm_area_struct *vma = NULL, *prev = NULL;
72441- struct rb_node *rb_node;
72442- if (!mm)
72443- goto out;
72444-
72445- /* Guard against addr being lower than the first VMA */
72446- vma = mm->mmap;
72447-
72448- /* Go through the RB tree quickly. */
72449- rb_node = mm->mm_rb.rb_node;
72450-
72451- while (rb_node) {
72452- struct vm_area_struct *vma_tmp;
72453- vma_tmp = rb_entry(rb_node, struct vm_area_struct, vm_rb);
72454-
72455- if (addr < vma_tmp->vm_end) {
72456- rb_node = rb_node->rb_left;
72457- } else {
72458- prev = vma_tmp;
72459- if (!prev->vm_next || (addr < prev->vm_next->vm_end))
72460- break;
72461+ struct vm_area_struct *vma;
72462+
72463+ vma = find_vma(mm, addr);
72464+ if (vma) {
72465+ *pprev = vma->vm_prev;
72466+ } else {
72467+ struct rb_node *rb_node = mm->mm_rb.rb_node;
72468+ *pprev = NULL;
72469+ while (rb_node) {
72470+ *pprev = rb_entry(rb_node, struct vm_area_struct, vm_rb);
72471 rb_node = rb_node->rb_right;
72472 }
72473 }
72474+ return vma;
72475+}
72476+
72477+#ifdef CONFIG_PAX_SEGMEXEC
72478+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
72479+{
72480+ struct vm_area_struct *vma_m;
72481
72482-out:
72483- *pprev = prev;
72484- return prev ? prev->vm_next : vma;
72485+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
72486+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
72487+ BUG_ON(vma->vm_mirror);
72488+ return NULL;
72489+ }
72490+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
72491+ vma_m = vma->vm_mirror;
72492+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
72493+ BUG_ON(vma->vm_file != vma_m->vm_file);
72494+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
72495+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
72496+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
72497+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
72498+ return vma_m;
72499 }
72500+#endif
72501
72502 /*
72503 * Verify that the stack growth is acceptable and
72504@@ -1654,6 +1893,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72505 return -ENOMEM;
72506
72507 /* Stack limit test */
72508+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
72509 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
72510 return -ENOMEM;
72511
72512@@ -1664,6 +1904,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72513 locked = mm->locked_vm + grow;
72514 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
72515 limit >>= PAGE_SHIFT;
72516+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
72517 if (locked > limit && !capable(CAP_IPC_LOCK))
72518 return -ENOMEM;
72519 }
72520@@ -1694,37 +1935,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72521 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
72522 * vma is the last one with address > vma->vm_end. Have to extend vma.
72523 */
72524+#ifndef CONFIG_IA64
72525+static
72526+#endif
72527 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
72528 {
72529 int error;
72530+ bool locknext;
72531
72532 if (!(vma->vm_flags & VM_GROWSUP))
72533 return -EFAULT;
72534
72535+ /* Also guard against wrapping around to address 0. */
72536+ if (address < PAGE_ALIGN(address+1))
72537+ address = PAGE_ALIGN(address+1);
72538+ else
72539+ return -ENOMEM;
72540+
72541 /*
72542 * We must make sure the anon_vma is allocated
72543 * so that the anon_vma locking is not a noop.
72544 */
72545 if (unlikely(anon_vma_prepare(vma)))
72546 return -ENOMEM;
72547+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
72548+ if (locknext && anon_vma_prepare(vma->vm_next))
72549+ return -ENOMEM;
72550 vma_lock_anon_vma(vma);
72551+ if (locknext)
72552+ vma_lock_anon_vma(vma->vm_next);
72553
72554 /*
72555 * vma->vm_start/vm_end cannot change under us because the caller
72556 * is required to hold the mmap_sem in read mode. We need the
72557- * anon_vma lock to serialize against concurrent expand_stacks.
72558- * Also guard against wrapping around to address 0.
72559+ * anon_vma locks to serialize against concurrent expand_stacks
72560+ * and expand_upwards.
72561 */
72562- if (address < PAGE_ALIGN(address+4))
72563- address = PAGE_ALIGN(address+4);
72564- else {
72565- vma_unlock_anon_vma(vma);
72566- return -ENOMEM;
72567- }
72568 error = 0;
72569
72570 /* Somebody else might have raced and expanded it already */
72571- if (address > vma->vm_end) {
72572+ 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)
72573+ error = -ENOMEM;
72574+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
72575 unsigned long size, grow;
72576
72577 size = address - vma->vm_start;
72578@@ -1739,6 +1991,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
72579 }
72580 }
72581 }
72582+ if (locknext)
72583+ vma_unlock_anon_vma(vma->vm_next);
72584 vma_unlock_anon_vma(vma);
72585 khugepaged_enter_vma_merge(vma);
72586 return error;
72587@@ -1752,6 +2006,8 @@ int expand_downwards(struct vm_area_struct *vma,
72588 unsigned long address)
72589 {
72590 int error;
72591+ bool lockprev = false;
72592+ struct vm_area_struct *prev;
72593
72594 /*
72595 * We must make sure the anon_vma is allocated
72596@@ -1765,6 +2021,15 @@ int expand_downwards(struct vm_area_struct *vma,
72597 if (error)
72598 return error;
72599
72600+ prev = vma->vm_prev;
72601+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
72602+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
72603+#endif
72604+ if (lockprev && anon_vma_prepare(prev))
72605+ return -ENOMEM;
72606+ if (lockprev)
72607+ vma_lock_anon_vma(prev);
72608+
72609 vma_lock_anon_vma(vma);
72610
72611 /*
72612@@ -1774,9 +2039,17 @@ int expand_downwards(struct vm_area_struct *vma,
72613 */
72614
72615 /* Somebody else might have raced and expanded it already */
72616- if (address < vma->vm_start) {
72617+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
72618+ error = -ENOMEM;
72619+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
72620 unsigned long size, grow;
72621
72622+#ifdef CONFIG_PAX_SEGMEXEC
72623+ struct vm_area_struct *vma_m;
72624+
72625+ vma_m = pax_find_mirror_vma(vma);
72626+#endif
72627+
72628 size = vma->vm_end - address;
72629 grow = (vma->vm_start - address) >> PAGE_SHIFT;
72630
72631@@ -1786,11 +2059,22 @@ int expand_downwards(struct vm_area_struct *vma,
72632 if (!error) {
72633 vma->vm_start = address;
72634 vma->vm_pgoff -= grow;
72635+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
72636+
72637+#ifdef CONFIG_PAX_SEGMEXEC
72638+ if (vma_m) {
72639+ vma_m->vm_start -= grow << PAGE_SHIFT;
72640+ vma_m->vm_pgoff -= grow;
72641+ }
72642+#endif
72643+
72644 perf_event_mmap(vma);
72645 }
72646 }
72647 }
72648 vma_unlock_anon_vma(vma);
72649+ if (lockprev)
72650+ vma_unlock_anon_vma(prev);
72651 khugepaged_enter_vma_merge(vma);
72652 return error;
72653 }
72654@@ -1860,6 +2144,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
72655 do {
72656 long nrpages = vma_pages(vma);
72657
72658+#ifdef CONFIG_PAX_SEGMEXEC
72659+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
72660+ vma = remove_vma(vma);
72661+ continue;
72662+ }
72663+#endif
72664+
72665 mm->total_vm -= nrpages;
72666 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
72667 vma = remove_vma(vma);
72668@@ -1905,6 +2196,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
72669 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
72670 vma->vm_prev = NULL;
72671 do {
72672+
72673+#ifdef CONFIG_PAX_SEGMEXEC
72674+ if (vma->vm_mirror) {
72675+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
72676+ vma->vm_mirror->vm_mirror = NULL;
72677+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
72678+ vma->vm_mirror = NULL;
72679+ }
72680+#endif
72681+
72682 rb_erase(&vma->vm_rb, &mm->mm_rb);
72683 mm->map_count--;
72684 tail_vma = vma;
72685@@ -1933,14 +2234,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72686 struct vm_area_struct *new;
72687 int err = -ENOMEM;
72688
72689+#ifdef CONFIG_PAX_SEGMEXEC
72690+ struct vm_area_struct *vma_m, *new_m = NULL;
72691+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
72692+#endif
72693+
72694 if (is_vm_hugetlb_page(vma) && (addr &
72695 ~(huge_page_mask(hstate_vma(vma)))))
72696 return -EINVAL;
72697
72698+#ifdef CONFIG_PAX_SEGMEXEC
72699+ vma_m = pax_find_mirror_vma(vma);
72700+#endif
72701+
72702 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
72703 if (!new)
72704 goto out_err;
72705
72706+#ifdef CONFIG_PAX_SEGMEXEC
72707+ if (vma_m) {
72708+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
72709+ if (!new_m) {
72710+ kmem_cache_free(vm_area_cachep, new);
72711+ goto out_err;
72712+ }
72713+ }
72714+#endif
72715+
72716 /* most fields are the same, copy all, and then fixup */
72717 *new = *vma;
72718
72719@@ -1953,6 +2273,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72720 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
72721 }
72722
72723+#ifdef CONFIG_PAX_SEGMEXEC
72724+ if (vma_m) {
72725+ *new_m = *vma_m;
72726+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
72727+ new_m->vm_mirror = new;
72728+ new->vm_mirror = new_m;
72729+
72730+ if (new_below)
72731+ new_m->vm_end = addr_m;
72732+ else {
72733+ new_m->vm_start = addr_m;
72734+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
72735+ }
72736+ }
72737+#endif
72738+
72739 pol = mpol_dup(vma_policy(vma));
72740 if (IS_ERR(pol)) {
72741 err = PTR_ERR(pol);
72742@@ -1978,6 +2314,42 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72743 else
72744 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
72745
72746+#ifdef CONFIG_PAX_SEGMEXEC
72747+ if (!err && vma_m) {
72748+ if (anon_vma_clone(new_m, vma_m))
72749+ goto out_free_mpol;
72750+
72751+ mpol_get(pol);
72752+ vma_set_policy(new_m, pol);
72753+
72754+ if (new_m->vm_file) {
72755+ get_file(new_m->vm_file);
72756+ if (vma_m->vm_flags & VM_EXECUTABLE)
72757+ added_exe_file_vma(mm);
72758+ }
72759+
72760+ if (new_m->vm_ops && new_m->vm_ops->open)
72761+ new_m->vm_ops->open(new_m);
72762+
72763+ if (new_below)
72764+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
72765+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
72766+ else
72767+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
72768+
72769+ if (err) {
72770+ if (new_m->vm_ops && new_m->vm_ops->close)
72771+ new_m->vm_ops->close(new_m);
72772+ if (new_m->vm_file) {
72773+ if (vma_m->vm_flags & VM_EXECUTABLE)
72774+ removed_exe_file_vma(mm);
72775+ fput(new_m->vm_file);
72776+ }
72777+ mpol_put(pol);
72778+ }
72779+ }
72780+#endif
72781+
72782 /* Success. */
72783 if (!err)
72784 return 0;
72785@@ -1990,10 +2362,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72786 removed_exe_file_vma(mm);
72787 fput(new->vm_file);
72788 }
72789- unlink_anon_vmas(new);
72790 out_free_mpol:
72791 mpol_put(pol);
72792 out_free_vma:
72793+
72794+#ifdef CONFIG_PAX_SEGMEXEC
72795+ if (new_m) {
72796+ unlink_anon_vmas(new_m);
72797+ kmem_cache_free(vm_area_cachep, new_m);
72798+ }
72799+#endif
72800+
72801+ unlink_anon_vmas(new);
72802 kmem_cache_free(vm_area_cachep, new);
72803 out_err:
72804 return err;
72805@@ -2006,6 +2386,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72806 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
72807 unsigned long addr, int new_below)
72808 {
72809+
72810+#ifdef CONFIG_PAX_SEGMEXEC
72811+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
72812+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
72813+ if (mm->map_count >= sysctl_max_map_count-1)
72814+ return -ENOMEM;
72815+ } else
72816+#endif
72817+
72818 if (mm->map_count >= sysctl_max_map_count)
72819 return -ENOMEM;
72820
72821@@ -2017,11 +2406,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
72822 * work. This now handles partial unmappings.
72823 * Jeremy Fitzhardinge <jeremy@goop.org>
72824 */
72825+#ifdef CONFIG_PAX_SEGMEXEC
72826 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72827 {
72828+ int ret = __do_munmap(mm, start, len);
72829+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
72830+ return ret;
72831+
72832+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
72833+}
72834+
72835+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72836+#else
72837+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72838+#endif
72839+{
72840 unsigned long end;
72841 struct vm_area_struct *vma, *prev, *last;
72842
72843+ /*
72844+ * mm->mmap_sem is required to protect against another thread
72845+ * changing the mappings in case we sleep.
72846+ */
72847+ verify_mm_writelocked(mm);
72848+
72849 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
72850 return -EINVAL;
72851
72852@@ -2096,6 +2504,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72853 /* Fix up all other VM information */
72854 remove_vma_list(mm, vma);
72855
72856+ track_exec_limit(mm, start, end, 0UL);
72857+
72858 return 0;
72859 }
72860
72861@@ -2108,22 +2518,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
72862
72863 profile_munmap(addr);
72864
72865+#ifdef CONFIG_PAX_SEGMEXEC
72866+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
72867+ (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len))
72868+ return -EINVAL;
72869+#endif
72870+
72871 down_write(&mm->mmap_sem);
72872 ret = do_munmap(mm, addr, len);
72873 up_write(&mm->mmap_sem);
72874 return ret;
72875 }
72876
72877-static inline void verify_mm_writelocked(struct mm_struct *mm)
72878-{
72879-#ifdef CONFIG_DEBUG_VM
72880- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
72881- WARN_ON(1);
72882- up_read(&mm->mmap_sem);
72883- }
72884-#endif
72885-}
72886-
72887 /*
72888 * this is really a simplified "do_mmap". it only handles
72889 * anonymous maps. eventually we may be able to do some
72890@@ -2137,6 +2543,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72891 struct rb_node ** rb_link, * rb_parent;
72892 pgoff_t pgoff = addr >> PAGE_SHIFT;
72893 int error;
72894+ unsigned long charged;
72895
72896 len = PAGE_ALIGN(len);
72897 if (!len)
72898@@ -2148,16 +2555,30 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72899
72900 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
72901
72902+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
72903+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72904+ flags &= ~VM_EXEC;
72905+
72906+#ifdef CONFIG_PAX_MPROTECT
72907+ if (mm->pax_flags & MF_PAX_MPROTECT)
72908+ flags &= ~VM_MAYEXEC;
72909+#endif
72910+
72911+ }
72912+#endif
72913+
72914 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
72915 if (error & ~PAGE_MASK)
72916 return error;
72917
72918+ charged = len >> PAGE_SHIFT;
72919+
72920 /*
72921 * mlock MCL_FUTURE?
72922 */
72923 if (mm->def_flags & VM_LOCKED) {
72924 unsigned long locked, lock_limit;
72925- locked = len >> PAGE_SHIFT;
72926+ locked = charged;
72927 locked += mm->locked_vm;
72928 lock_limit = rlimit(RLIMIT_MEMLOCK);
72929 lock_limit >>= PAGE_SHIFT;
72930@@ -2174,22 +2595,22 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72931 /*
72932 * Clear old maps. this also does some error checking for us
72933 */
72934- munmap_back:
72935 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72936 if (vma && vma->vm_start < addr + len) {
72937 if (do_munmap(mm, addr, len))
72938 return -ENOMEM;
72939- goto munmap_back;
72940+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72941+ BUG_ON(vma && vma->vm_start < addr + len);
72942 }
72943
72944 /* Check against address space limits *after* clearing old maps... */
72945- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
72946+ if (!may_expand_vm(mm, charged))
72947 return -ENOMEM;
72948
72949 if (mm->map_count > sysctl_max_map_count)
72950 return -ENOMEM;
72951
72952- if (security_vm_enough_memory(len >> PAGE_SHIFT))
72953+ if (security_vm_enough_memory(charged))
72954 return -ENOMEM;
72955
72956 /* Can we just expand an old private anonymous mapping? */
72957@@ -2203,7 +2624,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72958 */
72959 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72960 if (!vma) {
72961- vm_unacct_memory(len >> PAGE_SHIFT);
72962+ vm_unacct_memory(charged);
72963 return -ENOMEM;
72964 }
72965
72966@@ -2217,11 +2638,12 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72967 vma_link(mm, vma, prev, rb_link, rb_parent);
72968 out:
72969 perf_event_mmap(vma);
72970- mm->total_vm += len >> PAGE_SHIFT;
72971+ mm->total_vm += charged;
72972 if (flags & VM_LOCKED) {
72973 if (!mlock_vma_pages_range(vma, addr, addr + len))
72974- mm->locked_vm += (len >> PAGE_SHIFT);
72975+ mm->locked_vm += charged;
72976 }
72977+ track_exec_limit(mm, addr, addr + len, flags);
72978 return addr;
72979 }
72980
72981@@ -2268,8 +2690,10 @@ void exit_mmap(struct mm_struct *mm)
72982 * Walk the list again, actually closing and freeing it,
72983 * with preemption enabled, without holding any MM locks.
72984 */
72985- while (vma)
72986+ while (vma) {
72987+ vma->vm_mirror = NULL;
72988 vma = remove_vma(vma);
72989+ }
72990
72991 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
72992 }
72993@@ -2283,6 +2707,13 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
72994 struct vm_area_struct * __vma, * prev;
72995 struct rb_node ** rb_link, * rb_parent;
72996
72997+#ifdef CONFIG_PAX_SEGMEXEC
72998+ struct vm_area_struct *vma_m = NULL;
72999+#endif
73000+
73001+ if (security_file_mmap(NULL, 0, 0, 0, vma->vm_start, 1))
73002+ return -EPERM;
73003+
73004 /*
73005 * The vm_pgoff of a purely anonymous vma should be irrelevant
73006 * until its first write fault, when page's anon_vma and index
73007@@ -2305,7 +2736,22 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
73008 if ((vma->vm_flags & VM_ACCOUNT) &&
73009 security_vm_enough_memory_mm(mm, vma_pages(vma)))
73010 return -ENOMEM;
73011+
73012+#ifdef CONFIG_PAX_SEGMEXEC
73013+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
73014+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
73015+ if (!vma_m)
73016+ return -ENOMEM;
73017+ }
73018+#endif
73019+
73020 vma_link(mm, vma, prev, rb_link, rb_parent);
73021+
73022+#ifdef CONFIG_PAX_SEGMEXEC
73023+ if (vma_m)
73024+ BUG_ON(pax_mirror_vma(vma_m, vma));
73025+#endif
73026+
73027 return 0;
73028 }
73029
73030@@ -2323,6 +2769,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
73031 struct rb_node **rb_link, *rb_parent;
73032 struct mempolicy *pol;
73033
73034+ BUG_ON(vma->vm_mirror);
73035+
73036 /*
73037 * If anonymous vma has not yet been faulted, update new pgoff
73038 * to match new location, to increase its chance of merging.
73039@@ -2373,6 +2821,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
73040 return NULL;
73041 }
73042
73043+#ifdef CONFIG_PAX_SEGMEXEC
73044+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
73045+{
73046+ struct vm_area_struct *prev_m;
73047+ struct rb_node **rb_link_m, *rb_parent_m;
73048+ struct mempolicy *pol_m;
73049+
73050+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
73051+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
73052+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
73053+ *vma_m = *vma;
73054+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
73055+ if (anon_vma_clone(vma_m, vma))
73056+ return -ENOMEM;
73057+ pol_m = vma_policy(vma_m);
73058+ mpol_get(pol_m);
73059+ vma_set_policy(vma_m, pol_m);
73060+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
73061+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
73062+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
73063+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
73064+ if (vma_m->vm_file)
73065+ get_file(vma_m->vm_file);
73066+ if (vma_m->vm_ops && vma_m->vm_ops->open)
73067+ vma_m->vm_ops->open(vma_m);
73068+ find_vma_prepare(vma->vm_mm, vma_m->vm_start, &prev_m, &rb_link_m, &rb_parent_m);
73069+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
73070+ vma_m->vm_mirror = vma;
73071+ vma->vm_mirror = vma_m;
73072+ return 0;
73073+}
73074+#endif
73075+
73076 /*
73077 * Return true if the calling process may expand its vm space by the passed
73078 * number of pages
73079@@ -2383,7 +2864,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
73080 unsigned long lim;
73081
73082 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
73083-
73084+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
73085 if (cur + npages > lim)
73086 return 0;
73087 return 1;
73088@@ -2454,6 +2935,22 @@ int install_special_mapping(struct mm_struct *mm,
73089 vma->vm_start = addr;
73090 vma->vm_end = addr + len;
73091
73092+#ifdef CONFIG_PAX_MPROTECT
73093+ if (mm->pax_flags & MF_PAX_MPROTECT) {
73094+#ifndef CONFIG_PAX_MPROTECT_COMPAT
73095+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
73096+ return -EPERM;
73097+ if (!(vm_flags & VM_EXEC))
73098+ vm_flags &= ~VM_MAYEXEC;
73099+#else
73100+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
73101+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
73102+#endif
73103+ else
73104+ vm_flags &= ~VM_MAYWRITE;
73105+ }
73106+#endif
73107+
73108 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
73109 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
73110
73111diff --git a/mm/mprotect.c b/mm/mprotect.c
73112index 5a688a2..27e031c 100644
73113--- a/mm/mprotect.c
73114+++ b/mm/mprotect.c
73115@@ -23,10 +23,16 @@
73116 #include <linux/mmu_notifier.h>
73117 #include <linux/migrate.h>
73118 #include <linux/perf_event.h>
73119+
73120+#ifdef CONFIG_PAX_MPROTECT
73121+#include <linux/elf.h>
73122+#endif
73123+
73124 #include <asm/uaccess.h>
73125 #include <asm/pgtable.h>
73126 #include <asm/cacheflush.h>
73127 #include <asm/tlbflush.h>
73128+#include <asm/mmu_context.h>
73129
73130 #ifndef pgprot_modify
73131 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
73132@@ -141,6 +147,48 @@ static void change_protection(struct vm_area_struct *vma,
73133 flush_tlb_range(vma, start, end);
73134 }
73135
73136+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
73137+/* called while holding the mmap semaphor for writing except stack expansion */
73138+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
73139+{
73140+ unsigned long oldlimit, newlimit = 0UL;
73141+
73142+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
73143+ return;
73144+
73145+ spin_lock(&mm->page_table_lock);
73146+ oldlimit = mm->context.user_cs_limit;
73147+ if ((prot & VM_EXEC) && oldlimit < end)
73148+ /* USER_CS limit moved up */
73149+ newlimit = end;
73150+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
73151+ /* USER_CS limit moved down */
73152+ newlimit = start;
73153+
73154+ if (newlimit) {
73155+ mm->context.user_cs_limit = newlimit;
73156+
73157+#ifdef CONFIG_SMP
73158+ wmb();
73159+ cpus_clear(mm->context.cpu_user_cs_mask);
73160+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
73161+#endif
73162+
73163+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
73164+ }
73165+ spin_unlock(&mm->page_table_lock);
73166+ if (newlimit == end) {
73167+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
73168+
73169+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
73170+ if (is_vm_hugetlb_page(vma))
73171+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
73172+ else
73173+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma));
73174+ }
73175+}
73176+#endif
73177+
73178 int
73179 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
73180 unsigned long start, unsigned long end, unsigned long newflags)
73181@@ -153,11 +201,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
73182 int error;
73183 int dirty_accountable = 0;
73184
73185+#ifdef CONFIG_PAX_SEGMEXEC
73186+ struct vm_area_struct *vma_m = NULL;
73187+ unsigned long start_m, end_m;
73188+
73189+ start_m = start + SEGMEXEC_TASK_SIZE;
73190+ end_m = end + SEGMEXEC_TASK_SIZE;
73191+#endif
73192+
73193 if (newflags == oldflags) {
73194 *pprev = vma;
73195 return 0;
73196 }
73197
73198+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
73199+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
73200+
73201+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
73202+ return -ENOMEM;
73203+
73204+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
73205+ return -ENOMEM;
73206+ }
73207+
73208 /*
73209 * If we make a private mapping writable we increase our commit;
73210 * but (without finer accounting) cannot reduce our commit if we
73211@@ -174,6 +240,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
73212 }
73213 }
73214
73215+#ifdef CONFIG_PAX_SEGMEXEC
73216+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
73217+ if (start != vma->vm_start) {
73218+ error = split_vma(mm, vma, start, 1);
73219+ if (error)
73220+ goto fail;
73221+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
73222+ *pprev = (*pprev)->vm_next;
73223+ }
73224+
73225+ if (end != vma->vm_end) {
73226+ error = split_vma(mm, vma, end, 0);
73227+ if (error)
73228+ goto fail;
73229+ }
73230+
73231+ if (pax_find_mirror_vma(vma)) {
73232+ error = __do_munmap(mm, start_m, end_m - start_m);
73233+ if (error)
73234+ goto fail;
73235+ } else {
73236+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
73237+ if (!vma_m) {
73238+ error = -ENOMEM;
73239+ goto fail;
73240+ }
73241+ vma->vm_flags = newflags;
73242+ error = pax_mirror_vma(vma_m, vma);
73243+ if (error) {
73244+ vma->vm_flags = oldflags;
73245+ goto fail;
73246+ }
73247+ }
73248+ }
73249+#endif
73250+
73251 /*
73252 * First try to merge with previous and/or next vma.
73253 */
73254@@ -204,9 +306,21 @@ success:
73255 * vm_flags and vm_page_prot are protected by the mmap_sem
73256 * held in write mode.
73257 */
73258+
73259+#ifdef CONFIG_PAX_SEGMEXEC
73260+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
73261+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
73262+#endif
73263+
73264 vma->vm_flags = newflags;
73265+
73266+#ifdef CONFIG_PAX_MPROTECT
73267+ if (mm->binfmt && mm->binfmt->handle_mprotect)
73268+ mm->binfmt->handle_mprotect(vma, newflags);
73269+#endif
73270+
73271 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
73272- vm_get_page_prot(newflags));
73273+ vm_get_page_prot(vma->vm_flags));
73274
73275 if (vma_wants_writenotify(vma)) {
73276 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
73277@@ -248,6 +362,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73278 end = start + len;
73279 if (end <= start)
73280 return -ENOMEM;
73281+
73282+#ifdef CONFIG_PAX_SEGMEXEC
73283+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
73284+ if (end > SEGMEXEC_TASK_SIZE)
73285+ return -EINVAL;
73286+ } else
73287+#endif
73288+
73289+ if (end > TASK_SIZE)
73290+ return -EINVAL;
73291+
73292 if (!arch_validate_prot(prot))
73293 return -EINVAL;
73294
73295@@ -255,7 +380,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73296 /*
73297 * Does the application expect PROT_READ to imply PROT_EXEC:
73298 */
73299- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
73300+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
73301 prot |= PROT_EXEC;
73302
73303 vm_flags = calc_vm_prot_bits(prot);
73304@@ -287,6 +412,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73305 if (start > vma->vm_start)
73306 prev = vma;
73307
73308+#ifdef CONFIG_PAX_MPROTECT
73309+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
73310+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
73311+#endif
73312+
73313 for (nstart = start ; ; ) {
73314 unsigned long newflags;
73315
73316@@ -296,6 +426,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73317
73318 /* newflags >> 4 shift VM_MAY% in place of VM_% */
73319 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
73320+ if (prot & (PROT_WRITE | PROT_EXEC))
73321+ gr_log_rwxmprotect(vma->vm_file);
73322+
73323+ error = -EACCES;
73324+ goto out;
73325+ }
73326+
73327+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
73328 error = -EACCES;
73329 goto out;
73330 }
73331@@ -310,6 +448,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73332 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
73333 if (error)
73334 goto out;
73335+
73336+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
73337+
73338 nstart = tmp;
73339
73340 if (nstart < prev->vm_end)
73341diff --git a/mm/mremap.c b/mm/mremap.c
73342index d6959cb..18a402a 100644
73343--- a/mm/mremap.c
73344+++ b/mm/mremap.c
73345@@ -106,6 +106,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
73346 continue;
73347 pte = ptep_get_and_clear(mm, old_addr, old_pte);
73348 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
73349+
73350+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
73351+ if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
73352+ pte = pte_exprotect(pte);
73353+#endif
73354+
73355 set_pte_at(mm, new_addr, new_pte, pte);
73356 }
73357
73358@@ -290,6 +296,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
73359 if (is_vm_hugetlb_page(vma))
73360 goto Einval;
73361
73362+#ifdef CONFIG_PAX_SEGMEXEC
73363+ if (pax_find_mirror_vma(vma))
73364+ goto Einval;
73365+#endif
73366+
73367 /* We can't remap across vm area boundaries */
73368 if (old_len > vma->vm_end - addr)
73369 goto Efault;
73370@@ -346,20 +357,25 @@ static unsigned long mremap_to(unsigned long addr,
73371 unsigned long ret = -EINVAL;
73372 unsigned long charged = 0;
73373 unsigned long map_flags;
73374+ unsigned long pax_task_size = TASK_SIZE;
73375
73376 if (new_addr & ~PAGE_MASK)
73377 goto out;
73378
73379- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
73380+#ifdef CONFIG_PAX_SEGMEXEC
73381+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
73382+ pax_task_size = SEGMEXEC_TASK_SIZE;
73383+#endif
73384+
73385+ pax_task_size -= PAGE_SIZE;
73386+
73387+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
73388 goto out;
73389
73390 /* Check if the location we're moving into overlaps the
73391 * old location at all, and fail if it does.
73392 */
73393- if ((new_addr <= addr) && (new_addr+new_len) > addr)
73394- goto out;
73395-
73396- if ((addr <= new_addr) && (addr+old_len) > new_addr)
73397+ if (addr + old_len > new_addr && new_addr + new_len > addr)
73398 goto out;
73399
73400 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
73401@@ -431,6 +447,7 @@ unsigned long do_mremap(unsigned long addr,
73402 struct vm_area_struct *vma;
73403 unsigned long ret = -EINVAL;
73404 unsigned long charged = 0;
73405+ unsigned long pax_task_size = TASK_SIZE;
73406
73407 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
73408 goto out;
73409@@ -449,6 +466,17 @@ unsigned long do_mremap(unsigned long addr,
73410 if (!new_len)
73411 goto out;
73412
73413+#ifdef CONFIG_PAX_SEGMEXEC
73414+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
73415+ pax_task_size = SEGMEXEC_TASK_SIZE;
73416+#endif
73417+
73418+ pax_task_size -= PAGE_SIZE;
73419+
73420+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
73421+ old_len > pax_task_size || addr > pax_task_size-old_len)
73422+ goto out;
73423+
73424 if (flags & MREMAP_FIXED) {
73425 if (flags & MREMAP_MAYMOVE)
73426 ret = mremap_to(addr, old_len, new_addr, new_len);
73427@@ -498,6 +526,7 @@ unsigned long do_mremap(unsigned long addr,
73428 addr + new_len);
73429 }
73430 ret = addr;
73431+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
73432 goto out;
73433 }
73434 }
73435@@ -524,7 +553,13 @@ unsigned long do_mremap(unsigned long addr,
73436 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
73437 if (ret)
73438 goto out;
73439+
73440+ map_flags = vma->vm_flags;
73441 ret = move_vma(vma, addr, old_len, new_len, new_addr);
73442+ if (!(ret & ~PAGE_MASK)) {
73443+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
73444+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
73445+ }
73446 }
73447 out:
73448 if (ret & ~PAGE_MASK)
73449diff --git a/mm/nobootmem.c b/mm/nobootmem.c
73450index 7fa41b4..6087460 100644
73451--- a/mm/nobootmem.c
73452+++ b/mm/nobootmem.c
73453@@ -110,19 +110,30 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)
73454 unsigned long __init free_all_memory_core_early(int nodeid)
73455 {
73456 int i;
73457- u64 start, end;
73458+ u64 start, end, startrange, endrange;
73459 unsigned long count = 0;
73460- struct range *range = NULL;
73461+ struct range *range = NULL, rangerange = { 0, 0 };
73462 int nr_range;
73463
73464 nr_range = get_free_all_memory_range(&range, nodeid);
73465+ startrange = __pa(range) >> PAGE_SHIFT;
73466+ endrange = (__pa(range + nr_range) - 1) >> PAGE_SHIFT;
73467
73468 for (i = 0; i < nr_range; i++) {
73469 start = range[i].start;
73470 end = range[i].end;
73471+ if (start <= endrange && startrange < end) {
73472+ BUG_ON(rangerange.start | rangerange.end);
73473+ rangerange = range[i];
73474+ continue;
73475+ }
73476 count += end - start;
73477 __free_pages_memory(start, end);
73478 }
73479+ start = rangerange.start;
73480+ end = rangerange.end;
73481+ count += end - start;
73482+ __free_pages_memory(start, end);
73483
73484 return count;
73485 }
73486diff --git a/mm/nommu.c b/mm/nommu.c
73487index f59e170..34e2a2b 100644
73488--- a/mm/nommu.c
73489+++ b/mm/nommu.c
73490@@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
73491 int sysctl_overcommit_ratio = 50; /* default is 50% */
73492 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
73493 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
73494-int heap_stack_gap = 0;
73495
73496 atomic_long_t mmap_pages_allocated;
73497
73498@@ -827,15 +826,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
73499 EXPORT_SYMBOL(find_vma);
73500
73501 /*
73502- * find a VMA
73503- * - we don't extend stack VMAs under NOMMU conditions
73504- */
73505-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
73506-{
73507- return find_vma(mm, addr);
73508-}
73509-
73510-/*
73511 * expand a stack to a given address
73512 * - not supported under NOMMU conditions
73513 */
73514@@ -1555,6 +1545,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
73515
73516 /* most fields are the same, copy all, and then fixup */
73517 *new = *vma;
73518+ INIT_LIST_HEAD(&new->anon_vma_chain);
73519 *region = *vma->vm_region;
73520 new->vm_region = region;
73521
73522diff --git a/mm/page_alloc.c b/mm/page_alloc.c
73523index 485be89..c059ad3 100644
73524--- a/mm/page_alloc.c
73525+++ b/mm/page_alloc.c
73526@@ -341,7 +341,7 @@ out:
73527 * This usage means that zero-order pages may not be compound.
73528 */
73529
73530-static void free_compound_page(struct page *page)
73531+void free_compound_page(struct page *page)
73532 {
73533 __free_pages_ok(page, compound_order(page));
73534 }
73535@@ -654,6 +654,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
73536 int i;
73537 int bad = 0;
73538
73539+#ifdef CONFIG_PAX_MEMORY_SANITIZE
73540+ unsigned long index = 1UL << order;
73541+#endif
73542+
73543 trace_mm_page_free_direct(page, order);
73544 kmemcheck_free_shadow(page, order);
73545
73546@@ -669,6 +673,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
73547 debug_check_no_obj_freed(page_address(page),
73548 PAGE_SIZE << order);
73549 }
73550+
73551+#ifdef CONFIG_PAX_MEMORY_SANITIZE
73552+ for (; index; --index)
73553+ sanitize_highpage(page + index - 1);
73554+#endif
73555+
73556 arch_free_page(page, order);
73557 kernel_map_pages(page, 1 << order, 0);
73558
73559@@ -784,8 +794,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
73560 arch_alloc_page(page, order);
73561 kernel_map_pages(page, 1 << order, 1);
73562
73563+#ifndef CONFIG_PAX_MEMORY_SANITIZE
73564 if (gfp_flags & __GFP_ZERO)
73565 prep_zero_page(page, order, gfp_flags);
73566+#endif
73567
73568 if (order && (gfp_flags & __GFP_COMP))
73569 prep_compound_page(page, order);
73570@@ -3357,7 +3369,13 @@ static int pageblock_is_reserved(unsigned long start_pfn, unsigned long end_pfn)
73571 unsigned long pfn;
73572
73573 for (pfn = start_pfn; pfn < end_pfn; pfn++) {
73574+#ifdef CONFIG_X86_32
73575+ /* boot failures in VMware 8 on 32bit vanilla since
73576+ this change */
73577+ if (!pfn_valid(pfn) || PageReserved(pfn_to_page(pfn)))
73578+#else
73579 if (!pfn_valid_within(pfn) || PageReserved(pfn_to_page(pfn)))
73580+#endif
73581 return 1;
73582 }
73583 return 0;
73584diff --git a/mm/percpu.c b/mm/percpu.c
73585index 716eb4a..8d10419 100644
73586--- a/mm/percpu.c
73587+++ b/mm/percpu.c
73588@@ -121,7 +121,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
73589 static unsigned int pcpu_high_unit_cpu __read_mostly;
73590
73591 /* the address of the first chunk which starts with the kernel static area */
73592-void *pcpu_base_addr __read_mostly;
73593+void *pcpu_base_addr __read_only;
73594 EXPORT_SYMBOL_GPL(pcpu_base_addr);
73595
73596 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
73597diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
73598index e920aa3..137702a 100644
73599--- a/mm/process_vm_access.c
73600+++ b/mm/process_vm_access.c
73601@@ -13,6 +13,7 @@
73602 #include <linux/uio.h>
73603 #include <linux/sched.h>
73604 #include <linux/highmem.h>
73605+#include <linux/security.h>
73606 #include <linux/ptrace.h>
73607 #include <linux/slab.h>
73608 #include <linux/syscalls.h>
73609@@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
73610 size_t iov_l_curr_offset = 0;
73611 ssize_t iov_len;
73612
73613+ return -ENOSYS; // PaX: until properly audited
73614+
73615 /*
73616 * Work out how many pages of struct pages we're going to need
73617 * when eventually calling get_user_pages
73618 */
73619 for (i = 0; i < riovcnt; i++) {
73620 iov_len = rvec[i].iov_len;
73621- if (iov_len > 0) {
73622- nr_pages_iov = ((unsigned long)rvec[i].iov_base
73623- + iov_len)
73624- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
73625- / PAGE_SIZE + 1;
73626- nr_pages = max(nr_pages, nr_pages_iov);
73627- }
73628+ if (iov_len <= 0)
73629+ continue;
73630+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
73631+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
73632+ nr_pages = max(nr_pages, nr_pages_iov);
73633 }
73634
73635 if (nr_pages == 0)
73636@@ -298,23 +299,23 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
73637 goto free_proc_pages;
73638 }
73639
73640- task_lock(task);
73641- if (__ptrace_may_access(task, PTRACE_MODE_ATTACH)) {
73642- task_unlock(task);
73643+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
73644 rc = -EPERM;
73645 goto put_task_struct;
73646 }
73647- mm = task->mm;
73648
73649- if (!mm || (task->flags & PF_KTHREAD)) {
73650- task_unlock(task);
73651- rc = -EINVAL;
73652+ mm = mm_access(task, PTRACE_MODE_ATTACH);
73653+ if (!mm || IS_ERR(mm)) {
73654+ rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
73655+ /*
73656+ * Explicitly map EACCES to EPERM as EPERM is a more a
73657+ * appropriate error code for process_vw_readv/writev
73658+ */
73659+ if (rc == -EACCES)
73660+ rc = -EPERM;
73661 goto put_task_struct;
73662 }
73663
73664- atomic_inc(&mm->mm_users);
73665- task_unlock(task);
73666-
73667 for (i = 0; i < riovcnt && iov_l_curr_idx < liovcnt; i++) {
73668 rc = process_vm_rw_single_vec(
73669 (unsigned long)rvec[i].iov_base, rvec[i].iov_len,
73670diff --git a/mm/rmap.c b/mm/rmap.c
73671index a4fd368..e0ffec7 100644
73672--- a/mm/rmap.c
73673+++ b/mm/rmap.c
73674@@ -152,6 +152,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73675 struct anon_vma *anon_vma = vma->anon_vma;
73676 struct anon_vma_chain *avc;
73677
73678+#ifdef CONFIG_PAX_SEGMEXEC
73679+ struct anon_vma_chain *avc_m = NULL;
73680+#endif
73681+
73682 might_sleep();
73683 if (unlikely(!anon_vma)) {
73684 struct mm_struct *mm = vma->vm_mm;
73685@@ -161,6 +165,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73686 if (!avc)
73687 goto out_enomem;
73688
73689+#ifdef CONFIG_PAX_SEGMEXEC
73690+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
73691+ if (!avc_m)
73692+ goto out_enomem_free_avc;
73693+#endif
73694+
73695 anon_vma = find_mergeable_anon_vma(vma);
73696 allocated = NULL;
73697 if (!anon_vma) {
73698@@ -174,6 +184,21 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73699 /* page_table_lock to protect against threads */
73700 spin_lock(&mm->page_table_lock);
73701 if (likely(!vma->anon_vma)) {
73702+
73703+#ifdef CONFIG_PAX_SEGMEXEC
73704+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
73705+
73706+ if (vma_m) {
73707+ BUG_ON(vma_m->anon_vma);
73708+ vma_m->anon_vma = anon_vma;
73709+ avc_m->anon_vma = anon_vma;
73710+ avc_m->vma = vma;
73711+ list_add(&avc_m->same_vma, &vma_m->anon_vma_chain);
73712+ list_add(&avc_m->same_anon_vma, &anon_vma->head);
73713+ avc_m = NULL;
73714+ }
73715+#endif
73716+
73717 vma->anon_vma = anon_vma;
73718 avc->anon_vma = anon_vma;
73719 avc->vma = vma;
73720@@ -187,12 +212,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73721
73722 if (unlikely(allocated))
73723 put_anon_vma(allocated);
73724+
73725+#ifdef CONFIG_PAX_SEGMEXEC
73726+ if (unlikely(avc_m))
73727+ anon_vma_chain_free(avc_m);
73728+#endif
73729+
73730 if (unlikely(avc))
73731 anon_vma_chain_free(avc);
73732 }
73733 return 0;
73734
73735 out_enomem_free_avc:
73736+
73737+#ifdef CONFIG_PAX_SEGMEXEC
73738+ if (avc_m)
73739+ anon_vma_chain_free(avc_m);
73740+#endif
73741+
73742 anon_vma_chain_free(avc);
73743 out_enomem:
73744 return -ENOMEM;
73745@@ -243,7 +280,7 @@ static void anon_vma_chain_link(struct vm_area_struct *vma,
73746 * Attach the anon_vmas from src to dst.
73747 * Returns 0 on success, -ENOMEM on failure.
73748 */
73749-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
73750+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
73751 {
73752 struct anon_vma_chain *avc, *pavc;
73753 struct anon_vma *root = NULL;
73754@@ -276,7 +313,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
73755 * the corresponding VMA in the parent process is attached to.
73756 * Returns 0 on success, non-zero on failure.
73757 */
73758-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
73759+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
73760 {
73761 struct anon_vma_chain *avc;
73762 struct anon_vma *anon_vma;
73763diff --git a/mm/shmem.c b/mm/shmem.c
73764index 6c253f7..367e20a 100644
73765--- a/mm/shmem.c
73766+++ b/mm/shmem.c
73767@@ -31,7 +31,7 @@
73768 #include <linux/export.h>
73769 #include <linux/swap.h>
73770
73771-static struct vfsmount *shm_mnt;
73772+struct vfsmount *shm_mnt;
73773
73774 #ifdef CONFIG_SHMEM
73775 /*
73776@@ -74,7 +74,7 @@ static struct vfsmount *shm_mnt;
73777 #define BOGO_DIRENT_SIZE 20
73778
73779 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
73780-#define SHORT_SYMLINK_LEN 128
73781+#define SHORT_SYMLINK_LEN 64
73782
73783 struct shmem_xattr {
73784 struct list_head list; /* anchored by shmem_inode_info->xattr_list */
73785@@ -2180,8 +2180,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
73786 int err = -ENOMEM;
73787
73788 /* Round up to L1_CACHE_BYTES to resist false sharing */
73789- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
73790- L1_CACHE_BYTES), GFP_KERNEL);
73791+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
73792 if (!sbinfo)
73793 return -ENOMEM;
73794
73795diff --git a/mm/slab.c b/mm/slab.c
73796index 83311c9a..fcf8f86 100644
73797--- a/mm/slab.c
73798+++ b/mm/slab.c
73799@@ -151,7 +151,7 @@
73800
73801 /* Legal flag mask for kmem_cache_create(). */
73802 #if DEBUG
73803-# define CREATE_MASK (SLAB_RED_ZONE | \
73804+# define CREATE_MASK (SLAB_USERCOPY | SLAB_RED_ZONE | \
73805 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
73806 SLAB_CACHE_DMA | \
73807 SLAB_STORE_USER | \
73808@@ -159,7 +159,7 @@
73809 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
73810 SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
73811 #else
73812-# define CREATE_MASK (SLAB_HWCACHE_ALIGN | \
73813+# define CREATE_MASK (SLAB_USERCOPY | SLAB_HWCACHE_ALIGN | \
73814 SLAB_CACHE_DMA | \
73815 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
73816 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
73817@@ -288,7 +288,7 @@ struct kmem_list3 {
73818 * Need this for bootstrapping a per node allocator.
73819 */
73820 #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
73821-static struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
73822+static struct kmem_list3 initkmem_list3[NUM_INIT_LISTS];
73823 #define CACHE_CACHE 0
73824 #define SIZE_AC MAX_NUMNODES
73825 #define SIZE_L3 (2 * MAX_NUMNODES)
73826@@ -389,10 +389,10 @@ static void kmem_list3_init(struct kmem_list3 *parent)
73827 if ((x)->max_freeable < i) \
73828 (x)->max_freeable = i; \
73829 } while (0)
73830-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
73831-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
73832-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
73833-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
73834+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
73835+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
73836+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
73837+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
73838 #else
73839 #define STATS_INC_ACTIVE(x) do { } while (0)
73840 #define STATS_DEC_ACTIVE(x) do { } while (0)
73841@@ -538,7 +538,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
73842 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
73843 */
73844 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
73845- const struct slab *slab, void *obj)
73846+ const struct slab *slab, const void *obj)
73847 {
73848 u32 offset = (obj - slab->s_mem);
73849 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
73850@@ -564,7 +564,7 @@ struct cache_names {
73851 static struct cache_names __initdata cache_names[] = {
73852 #define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
73853 #include <linux/kmalloc_sizes.h>
73854- {NULL,}
73855+ {NULL}
73856 #undef CACHE
73857 };
73858
73859@@ -1572,7 +1572,7 @@ void __init kmem_cache_init(void)
73860 sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
73861 sizes[INDEX_AC].cs_size,
73862 ARCH_KMALLOC_MINALIGN,
73863- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73864+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73865 NULL);
73866
73867 if (INDEX_AC != INDEX_L3) {
73868@@ -1580,7 +1580,7 @@ void __init kmem_cache_init(void)
73869 kmem_cache_create(names[INDEX_L3].name,
73870 sizes[INDEX_L3].cs_size,
73871 ARCH_KMALLOC_MINALIGN,
73872- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73873+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73874 NULL);
73875 }
73876
73877@@ -1598,7 +1598,7 @@ void __init kmem_cache_init(void)
73878 sizes->cs_cachep = kmem_cache_create(names->name,
73879 sizes->cs_size,
73880 ARCH_KMALLOC_MINALIGN,
73881- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73882+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73883 NULL);
73884 }
73885 #ifdef CONFIG_ZONE_DMA
73886@@ -4322,10 +4322,10 @@ static int s_show(struct seq_file *m, void *p)
73887 }
73888 /* cpu stats */
73889 {
73890- unsigned long allochit = atomic_read(&cachep->allochit);
73891- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
73892- unsigned long freehit = atomic_read(&cachep->freehit);
73893- unsigned long freemiss = atomic_read(&cachep->freemiss);
73894+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
73895+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
73896+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
73897+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
73898
73899 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
73900 allochit, allocmiss, freehit, freemiss);
73901@@ -4584,13 +4584,62 @@ static int __init slab_proc_init(void)
73902 {
73903 proc_create("slabinfo",S_IWUSR|S_IRUSR,NULL,&proc_slabinfo_operations);
73904 #ifdef CONFIG_DEBUG_SLAB_LEAK
73905- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
73906+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
73907 #endif
73908 return 0;
73909 }
73910 module_init(slab_proc_init);
73911 #endif
73912
73913+void check_object_size(const void *ptr, unsigned long n, bool to)
73914+{
73915+
73916+#ifdef CONFIG_PAX_USERCOPY
73917+ struct page *page;
73918+ struct kmem_cache *cachep = NULL;
73919+ struct slab *slabp;
73920+ unsigned int objnr;
73921+ unsigned long offset;
73922+ const char *type;
73923+
73924+ if (!n)
73925+ return;
73926+
73927+ type = "<null>";
73928+ if (ZERO_OR_NULL_PTR(ptr))
73929+ goto report;
73930+
73931+ if (!virt_addr_valid(ptr))
73932+ return;
73933+
73934+ page = virt_to_head_page(ptr);
73935+
73936+ type = "<process stack>";
73937+ if (!PageSlab(page)) {
73938+ if (object_is_on_stack(ptr, n) == -1)
73939+ goto report;
73940+ return;
73941+ }
73942+
73943+ cachep = page_get_cache(page);
73944+ type = cachep->name;
73945+ if (!(cachep->flags & SLAB_USERCOPY))
73946+ goto report;
73947+
73948+ slabp = page_get_slab(page);
73949+ objnr = obj_to_index(cachep, slabp, ptr);
73950+ BUG_ON(objnr >= cachep->num);
73951+ offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
73952+ if (offset <= obj_size(cachep) && n <= obj_size(cachep) - offset)
73953+ return;
73954+
73955+report:
73956+ pax_report_usercopy(ptr, n, to, type);
73957+#endif
73958+
73959+}
73960+EXPORT_SYMBOL(check_object_size);
73961+
73962 /**
73963 * ksize - get the actual amount of memory allocated for a given object
73964 * @objp: Pointer to the object
73965diff --git a/mm/slob.c b/mm/slob.c
73966index 8105be4..e045f96 100644
73967--- a/mm/slob.c
73968+++ b/mm/slob.c
73969@@ -29,7 +29,7 @@
73970 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
73971 * alloc_pages() directly, allocating compound pages so the page order
73972 * does not have to be separately tracked, and also stores the exact
73973- * allocation size in page->private so that it can be used to accurately
73974+ * allocation size in slob_page->size so that it can be used to accurately
73975 * provide ksize(). These objects are detected in kfree() because slob_page()
73976 * is false for them.
73977 *
73978@@ -58,6 +58,7 @@
73979 */
73980
73981 #include <linux/kernel.h>
73982+#include <linux/sched.h>
73983 #include <linux/slab.h>
73984 #include <linux/mm.h>
73985 #include <linux/swap.h> /* struct reclaim_state */
73986@@ -102,7 +103,8 @@ struct slob_page {
73987 unsigned long flags; /* mandatory */
73988 atomic_t _count; /* mandatory */
73989 slobidx_t units; /* free units left in page */
73990- unsigned long pad[2];
73991+ unsigned long pad[1];
73992+ unsigned long size; /* size when >=PAGE_SIZE */
73993 slob_t *free; /* first free slob_t in page */
73994 struct list_head list; /* linked list of free pages */
73995 };
73996@@ -135,7 +137,7 @@ static LIST_HEAD(free_slob_large);
73997 */
73998 static inline int is_slob_page(struct slob_page *sp)
73999 {
74000- return PageSlab((struct page *)sp);
74001+ return PageSlab((struct page *)sp) && !sp->size;
74002 }
74003
74004 static inline void set_slob_page(struct slob_page *sp)
74005@@ -150,7 +152,7 @@ static inline void clear_slob_page(struct slob_page *sp)
74006
74007 static inline struct slob_page *slob_page(const void *addr)
74008 {
74009- return (struct slob_page *)virt_to_page(addr);
74010+ return (struct slob_page *)virt_to_head_page(addr);
74011 }
74012
74013 /*
74014@@ -210,7 +212,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
74015 /*
74016 * Return the size of a slob block.
74017 */
74018-static slobidx_t slob_units(slob_t *s)
74019+static slobidx_t slob_units(const slob_t *s)
74020 {
74021 if (s->units > 0)
74022 return s->units;
74023@@ -220,7 +222,7 @@ static slobidx_t slob_units(slob_t *s)
74024 /*
74025 * Return the next free slob block pointer after this one.
74026 */
74027-static slob_t *slob_next(slob_t *s)
74028+static slob_t *slob_next(const slob_t *s)
74029 {
74030 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
74031 slobidx_t next;
74032@@ -235,7 +237,7 @@ static slob_t *slob_next(slob_t *s)
74033 /*
74034 * Returns true if s is the last free block in its page.
74035 */
74036-static int slob_last(slob_t *s)
74037+static int slob_last(const slob_t *s)
74038 {
74039 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
74040 }
74041@@ -254,6 +256,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
74042 if (!page)
74043 return NULL;
74044
74045+ set_slob_page(page);
74046 return page_address(page);
74047 }
74048
74049@@ -370,11 +373,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
74050 if (!b)
74051 return NULL;
74052 sp = slob_page(b);
74053- set_slob_page(sp);
74054
74055 spin_lock_irqsave(&slob_lock, flags);
74056 sp->units = SLOB_UNITS(PAGE_SIZE);
74057 sp->free = b;
74058+ sp->size = 0;
74059 INIT_LIST_HEAD(&sp->list);
74060 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
74061 set_slob_page_free(sp, slob_list);
74062@@ -476,10 +479,9 @@ out:
74063 * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
74064 */
74065
74066-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
74067+static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
74068 {
74069- unsigned int *m;
74070- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74071+ slob_t *m;
74072 void *ret;
74073
74074 gfp &= gfp_allowed_mask;
74075@@ -494,7 +496,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
74076
74077 if (!m)
74078 return NULL;
74079- *m = size;
74080+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
74081+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
74082+ m[0].units = size;
74083+ m[1].units = align;
74084 ret = (void *)m + align;
74085
74086 trace_kmalloc_node(_RET_IP_, ret,
74087@@ -506,16 +511,25 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
74088 gfp |= __GFP_COMP;
74089 ret = slob_new_pages(gfp, order, node);
74090 if (ret) {
74091- struct page *page;
74092- page = virt_to_page(ret);
74093- page->private = size;
74094+ struct slob_page *sp;
74095+ sp = slob_page(ret);
74096+ sp->size = size;
74097 }
74098
74099 trace_kmalloc_node(_RET_IP_, ret,
74100 size, PAGE_SIZE << order, gfp, node);
74101 }
74102
74103- kmemleak_alloc(ret, size, 1, gfp);
74104+ return ret;
74105+}
74106+
74107+void *__kmalloc_node(size_t size, gfp_t gfp, int node)
74108+{
74109+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74110+ void *ret = __kmalloc_node_align(size, gfp, node, align);
74111+
74112+ if (!ZERO_OR_NULL_PTR(ret))
74113+ kmemleak_alloc(ret, size, 1, gfp);
74114 return ret;
74115 }
74116 EXPORT_SYMBOL(__kmalloc_node);
74117@@ -533,13 +547,92 @@ void kfree(const void *block)
74118 sp = slob_page(block);
74119 if (is_slob_page(sp)) {
74120 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74121- unsigned int *m = (unsigned int *)(block - align);
74122- slob_free(m, *m + align);
74123- } else
74124+ slob_t *m = (slob_t *)(block - align);
74125+ slob_free(m, m[0].units + align);
74126+ } else {
74127+ clear_slob_page(sp);
74128+ free_slob_page(sp);
74129+ sp->size = 0;
74130 put_page(&sp->page);
74131+ }
74132 }
74133 EXPORT_SYMBOL(kfree);
74134
74135+void check_object_size(const void *ptr, unsigned long n, bool to)
74136+{
74137+
74138+#ifdef CONFIG_PAX_USERCOPY
74139+ struct slob_page *sp;
74140+ const slob_t *free;
74141+ const void *base;
74142+ unsigned long flags;
74143+ const char *type;
74144+
74145+ if (!n)
74146+ return;
74147+
74148+ type = "<null>";
74149+ if (ZERO_OR_NULL_PTR(ptr))
74150+ goto report;
74151+
74152+ if (!virt_addr_valid(ptr))
74153+ return;
74154+
74155+ type = "<process stack>";
74156+ sp = slob_page(ptr);
74157+ if (!PageSlab((struct page *)sp)) {
74158+ if (object_is_on_stack(ptr, n) == -1)
74159+ goto report;
74160+ return;
74161+ }
74162+
74163+ type = "<slob>";
74164+ if (sp->size) {
74165+ base = page_address(&sp->page);
74166+ if (base <= ptr && n <= sp->size - (ptr - base))
74167+ return;
74168+ goto report;
74169+ }
74170+
74171+ /* some tricky double walking to find the chunk */
74172+ spin_lock_irqsave(&slob_lock, flags);
74173+ base = (void *)((unsigned long)ptr & PAGE_MASK);
74174+ free = sp->free;
74175+
74176+ while (!slob_last(free) && (void *)free <= ptr) {
74177+ base = free + slob_units(free);
74178+ free = slob_next(free);
74179+ }
74180+
74181+ while (base < (void *)free) {
74182+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
74183+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
74184+ int offset;
74185+
74186+ if (ptr < base + align)
74187+ break;
74188+
74189+ offset = ptr - base - align;
74190+ if (offset >= m) {
74191+ base += size;
74192+ continue;
74193+ }
74194+
74195+ if (n > m - offset)
74196+ break;
74197+
74198+ spin_unlock_irqrestore(&slob_lock, flags);
74199+ return;
74200+ }
74201+
74202+ spin_unlock_irqrestore(&slob_lock, flags);
74203+report:
74204+ pax_report_usercopy(ptr, n, to, type);
74205+#endif
74206+
74207+}
74208+EXPORT_SYMBOL(check_object_size);
74209+
74210 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
74211 size_t ksize(const void *block)
74212 {
74213@@ -552,10 +645,10 @@ size_t ksize(const void *block)
74214 sp = slob_page(block);
74215 if (is_slob_page(sp)) {
74216 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74217- unsigned int *m = (unsigned int *)(block - align);
74218- return SLOB_UNITS(*m) * SLOB_UNIT;
74219+ slob_t *m = (slob_t *)(block - align);
74220+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
74221 } else
74222- return sp->page.private;
74223+ return sp->size;
74224 }
74225 EXPORT_SYMBOL(ksize);
74226
74227@@ -571,8 +664,13 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74228 {
74229 struct kmem_cache *c;
74230
74231+#ifdef CONFIG_PAX_USERCOPY
74232+ c = __kmalloc_node_align(sizeof(struct kmem_cache),
74233+ GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
74234+#else
74235 c = slob_alloc(sizeof(struct kmem_cache),
74236 GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
74237+#endif
74238
74239 if (c) {
74240 c->name = name;
74241@@ -614,17 +712,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
74242
74243 lockdep_trace_alloc(flags);
74244
74245+#ifdef CONFIG_PAX_USERCOPY
74246+ b = __kmalloc_node_align(c->size, flags, node, c->align);
74247+#else
74248 if (c->size < PAGE_SIZE) {
74249 b = slob_alloc(c->size, flags, c->align, node);
74250 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
74251 SLOB_UNITS(c->size) * SLOB_UNIT,
74252 flags, node);
74253 } else {
74254+ struct slob_page *sp;
74255+
74256 b = slob_new_pages(flags, get_order(c->size), node);
74257+ sp = slob_page(b);
74258+ sp->size = c->size;
74259 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
74260 PAGE_SIZE << get_order(c->size),
74261 flags, node);
74262 }
74263+#endif
74264
74265 if (c->ctor)
74266 c->ctor(b);
74267@@ -636,10 +742,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
74268
74269 static void __kmem_cache_free(void *b, int size)
74270 {
74271- if (size < PAGE_SIZE)
74272+ struct slob_page *sp = slob_page(b);
74273+
74274+ if (is_slob_page(sp))
74275 slob_free(b, size);
74276- else
74277+ else {
74278+ clear_slob_page(sp);
74279+ free_slob_page(sp);
74280+ sp->size = 0;
74281 slob_free_pages(b, get_order(size));
74282+ }
74283 }
74284
74285 static void kmem_rcu_free(struct rcu_head *head)
74286@@ -652,17 +764,31 @@ static void kmem_rcu_free(struct rcu_head *head)
74287
74288 void kmem_cache_free(struct kmem_cache *c, void *b)
74289 {
74290+ int size = c->size;
74291+
74292+#ifdef CONFIG_PAX_USERCOPY
74293+ if (size + c->align < PAGE_SIZE) {
74294+ size += c->align;
74295+ b -= c->align;
74296+ }
74297+#endif
74298+
74299 kmemleak_free_recursive(b, c->flags);
74300 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
74301 struct slob_rcu *slob_rcu;
74302- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
74303- slob_rcu->size = c->size;
74304+ slob_rcu = b + (size - sizeof(struct slob_rcu));
74305+ slob_rcu->size = size;
74306 call_rcu(&slob_rcu->head, kmem_rcu_free);
74307 } else {
74308- __kmem_cache_free(b, c->size);
74309+ __kmem_cache_free(b, size);
74310 }
74311
74312+#ifdef CONFIG_PAX_USERCOPY
74313+ trace_kfree(_RET_IP_, b);
74314+#else
74315 trace_kmem_cache_free(_RET_IP_, b);
74316+#endif
74317+
74318 }
74319 EXPORT_SYMBOL(kmem_cache_free);
74320
74321diff --git a/mm/slub.c b/mm/slub.c
74322index 1a919f0..1739c9b 100644
74323--- a/mm/slub.c
74324+++ b/mm/slub.c
74325@@ -208,7 +208,7 @@ struct track {
74326
74327 enum track_item { TRACK_ALLOC, TRACK_FREE };
74328
74329-#ifdef CONFIG_SYSFS
74330+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74331 static int sysfs_slab_add(struct kmem_cache *);
74332 static int sysfs_slab_alias(struct kmem_cache *, const char *);
74333 static void sysfs_slab_remove(struct kmem_cache *);
74334@@ -530,7 +530,7 @@ static void print_track(const char *s, struct track *t)
74335 if (!t->addr)
74336 return;
74337
74338- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
74339+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
74340 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
74341 #ifdef CONFIG_STACKTRACE
74342 {
74343@@ -2559,6 +2559,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
74344
74345 page = virt_to_head_page(x);
74346
74347+ BUG_ON(!PageSlab(page));
74348+
74349 slab_free(s, page, x, _RET_IP_);
74350
74351 trace_kmem_cache_free(_RET_IP_, x);
74352@@ -2592,7 +2594,7 @@ static int slub_min_objects;
74353 * Merge control. If this is set then no merging of slab caches will occur.
74354 * (Could be removed. This was introduced to pacify the merge skeptics.)
74355 */
74356-static int slub_nomerge;
74357+static int slub_nomerge = 1;
74358
74359 /*
74360 * Calculate the order of allocation given an slab object size.
74361@@ -3042,7 +3044,7 @@ static int kmem_cache_open(struct kmem_cache *s,
74362 else
74363 s->cpu_partial = 30;
74364
74365- s->refcount = 1;
74366+ atomic_set(&s->refcount, 1);
74367 #ifdef CONFIG_NUMA
74368 s->remote_node_defrag_ratio = 1000;
74369 #endif
74370@@ -3146,8 +3148,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
74371 void kmem_cache_destroy(struct kmem_cache *s)
74372 {
74373 down_write(&slub_lock);
74374- s->refcount--;
74375- if (!s->refcount) {
74376+ if (atomic_dec_and_test(&s->refcount)) {
74377 list_del(&s->list);
74378 up_write(&slub_lock);
74379 if (kmem_cache_close(s)) {
74380@@ -3358,6 +3359,50 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
74381 EXPORT_SYMBOL(__kmalloc_node);
74382 #endif
74383
74384+void check_object_size(const void *ptr, unsigned long n, bool to)
74385+{
74386+
74387+#ifdef CONFIG_PAX_USERCOPY
74388+ struct page *page;
74389+ struct kmem_cache *s = NULL;
74390+ unsigned long offset;
74391+ const char *type;
74392+
74393+ if (!n)
74394+ return;
74395+
74396+ type = "<null>";
74397+ if (ZERO_OR_NULL_PTR(ptr))
74398+ goto report;
74399+
74400+ if (!virt_addr_valid(ptr))
74401+ return;
74402+
74403+ page = virt_to_head_page(ptr);
74404+
74405+ type = "<process stack>";
74406+ if (!PageSlab(page)) {
74407+ if (object_is_on_stack(ptr, n) == -1)
74408+ goto report;
74409+ return;
74410+ }
74411+
74412+ s = page->slab;
74413+ type = s->name;
74414+ if (!(s->flags & SLAB_USERCOPY))
74415+ goto report;
74416+
74417+ offset = (ptr - page_address(page)) % s->size;
74418+ if (offset <= s->objsize && n <= s->objsize - offset)
74419+ return;
74420+
74421+report:
74422+ pax_report_usercopy(ptr, n, to, type);
74423+#endif
74424+
74425+}
74426+EXPORT_SYMBOL(check_object_size);
74427+
74428 size_t ksize(const void *object)
74429 {
74430 struct page *page;
74431@@ -3632,7 +3677,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
74432 int node;
74433
74434 list_add(&s->list, &slab_caches);
74435- s->refcount = -1;
74436+ atomic_set(&s->refcount, -1);
74437
74438 for_each_node_state(node, N_NORMAL_MEMORY) {
74439 struct kmem_cache_node *n = get_node(s, node);
74440@@ -3749,17 +3794,17 @@ void __init kmem_cache_init(void)
74441
74442 /* Caches that are not of the two-to-the-power-of size */
74443 if (KMALLOC_MIN_SIZE <= 32) {
74444- kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, 0);
74445+ kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, SLAB_USERCOPY);
74446 caches++;
74447 }
74448
74449 if (KMALLOC_MIN_SIZE <= 64) {
74450- kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, 0);
74451+ kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, SLAB_USERCOPY);
74452 caches++;
74453 }
74454
74455 for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
74456- kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, 0);
74457+ kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, SLAB_USERCOPY);
74458 caches++;
74459 }
74460
74461@@ -3827,7 +3872,7 @@ static int slab_unmergeable(struct kmem_cache *s)
74462 /*
74463 * We may have set a slab to be unmergeable during bootstrap.
74464 */
74465- if (s->refcount < 0)
74466+ if (atomic_read(&s->refcount) < 0)
74467 return 1;
74468
74469 return 0;
74470@@ -3886,7 +3931,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74471 down_write(&slub_lock);
74472 s = find_mergeable(size, align, flags, name, ctor);
74473 if (s) {
74474- s->refcount++;
74475+ atomic_inc(&s->refcount);
74476 /*
74477 * Adjust the object sizes so that we clear
74478 * the complete object on kzalloc.
74479@@ -3895,7 +3940,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74480 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
74481
74482 if (sysfs_slab_alias(s, name)) {
74483- s->refcount--;
74484+ atomic_dec(&s->refcount);
74485 goto err;
74486 }
74487 up_write(&slub_lock);
74488@@ -4023,7 +4068,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
74489 }
74490 #endif
74491
74492-#ifdef CONFIG_SYSFS
74493+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74494 static int count_inuse(struct page *page)
74495 {
74496 return page->inuse;
74497@@ -4410,12 +4455,12 @@ static void resiliency_test(void)
74498 validate_slab_cache(kmalloc_caches[9]);
74499 }
74500 #else
74501-#ifdef CONFIG_SYSFS
74502+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74503 static void resiliency_test(void) {};
74504 #endif
74505 #endif
74506
74507-#ifdef CONFIG_SYSFS
74508+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74509 enum slab_stat_type {
74510 SL_ALL, /* All slabs */
74511 SL_PARTIAL, /* Only partially allocated slabs */
74512@@ -4656,7 +4701,7 @@ SLAB_ATTR_RO(ctor);
74513
74514 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
74515 {
74516- return sprintf(buf, "%d\n", s->refcount - 1);
74517+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
74518 }
74519 SLAB_ATTR_RO(aliases);
74520
74521@@ -5223,6 +5268,7 @@ static char *create_unique_id(struct kmem_cache *s)
74522 return name;
74523 }
74524
74525+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74526 static int sysfs_slab_add(struct kmem_cache *s)
74527 {
74528 int err;
74529@@ -5285,6 +5331,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
74530 kobject_del(&s->kobj);
74531 kobject_put(&s->kobj);
74532 }
74533+#endif
74534
74535 /*
74536 * Need to buffer aliases during bootup until sysfs becomes
74537@@ -5298,6 +5345,7 @@ struct saved_alias {
74538
74539 static struct saved_alias *alias_list;
74540
74541+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74542 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
74543 {
74544 struct saved_alias *al;
74545@@ -5320,6 +5368,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
74546 alias_list = al;
74547 return 0;
74548 }
74549+#endif
74550
74551 static int __init slab_sysfs_init(void)
74552 {
74553diff --git a/mm/swap.c b/mm/swap.c
74554index 55b266d..a532537 100644
74555--- a/mm/swap.c
74556+++ b/mm/swap.c
74557@@ -31,6 +31,7 @@
74558 #include <linux/backing-dev.h>
74559 #include <linux/memcontrol.h>
74560 #include <linux/gfp.h>
74561+#include <linux/hugetlb.h>
74562
74563 #include "internal.h"
74564
74565@@ -71,6 +72,8 @@ static void __put_compound_page(struct page *page)
74566
74567 __page_cache_release(page);
74568 dtor = get_compound_page_dtor(page);
74569+ if (!PageHuge(page))
74570+ BUG_ON(dtor != free_compound_page);
74571 (*dtor)(page);
74572 }
74573
74574diff --git a/mm/swapfile.c b/mm/swapfile.c
74575index b1cd120..aaae885 100644
74576--- a/mm/swapfile.c
74577+++ b/mm/swapfile.c
74578@@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex);
74579
74580 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
74581 /* Activity counter to indicate that a swapon or swapoff has occurred */
74582-static atomic_t proc_poll_event = ATOMIC_INIT(0);
74583+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
74584
74585 static inline unsigned char swap_count(unsigned char ent)
74586 {
74587@@ -1670,7 +1670,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
74588 }
74589 filp_close(swap_file, NULL);
74590 err = 0;
74591- atomic_inc(&proc_poll_event);
74592+ atomic_inc_unchecked(&proc_poll_event);
74593 wake_up_interruptible(&proc_poll_wait);
74594
74595 out_dput:
74596@@ -1686,8 +1686,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
74597
74598 poll_wait(file, &proc_poll_wait, wait);
74599
74600- if (seq->poll_event != atomic_read(&proc_poll_event)) {
74601- seq->poll_event = atomic_read(&proc_poll_event);
74602+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
74603+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
74604 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
74605 }
74606
74607@@ -1785,7 +1785,7 @@ static int swaps_open(struct inode *inode, struct file *file)
74608 return ret;
74609
74610 seq = file->private_data;
74611- seq->poll_event = atomic_read(&proc_poll_event);
74612+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
74613 return 0;
74614 }
74615
74616@@ -2123,7 +2123,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
74617 (p->flags & SWP_DISCARDABLE) ? "D" : "");
74618
74619 mutex_unlock(&swapon_mutex);
74620- atomic_inc(&proc_poll_event);
74621+ atomic_inc_unchecked(&proc_poll_event);
74622 wake_up_interruptible(&proc_poll_wait);
74623
74624 if (S_ISREG(inode->i_mode))
74625diff --git a/mm/util.c b/mm/util.c
74626index 136ac4f..f917fa9 100644
74627--- a/mm/util.c
74628+++ b/mm/util.c
74629@@ -243,6 +243,12 @@ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
74630 void arch_pick_mmap_layout(struct mm_struct *mm)
74631 {
74632 mm->mmap_base = TASK_UNMAPPED_BASE;
74633+
74634+#ifdef CONFIG_PAX_RANDMMAP
74635+ if (mm->pax_flags & MF_PAX_RANDMMAP)
74636+ mm->mmap_base += mm->delta_mmap;
74637+#endif
74638+
74639 mm->get_unmapped_area = arch_get_unmapped_area;
74640 mm->unmap_area = arch_unmap_area;
74641 }
74642diff --git a/mm/vmalloc.c b/mm/vmalloc.c
74643index 27be2f0..633e5cc 100644
74644--- a/mm/vmalloc.c
74645+++ b/mm/vmalloc.c
74646@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
74647
74648 pte = pte_offset_kernel(pmd, addr);
74649 do {
74650- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74651- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74652+
74653+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74654+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
74655+ BUG_ON(!pte_exec(*pte));
74656+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
74657+ continue;
74658+ }
74659+#endif
74660+
74661+ {
74662+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74663+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74664+ }
74665 } while (pte++, addr += PAGE_SIZE, addr != end);
74666 }
74667
74668@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
74669 unsigned long end, pgprot_t prot, struct page **pages, int *nr)
74670 {
74671 pte_t *pte;
74672+ int ret = -ENOMEM;
74673
74674 /*
74675 * nr is a running index into the array which helps higher level
74676@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
74677 pte = pte_alloc_kernel(pmd, addr);
74678 if (!pte)
74679 return -ENOMEM;
74680+
74681+ pax_open_kernel();
74682 do {
74683 struct page *page = pages[*nr];
74684
74685- if (WARN_ON(!pte_none(*pte)))
74686- return -EBUSY;
74687- if (WARN_ON(!page))
74688- return -ENOMEM;
74689+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74690+ if (pgprot_val(prot) & _PAGE_NX)
74691+#endif
74692+
74693+ if (WARN_ON(!pte_none(*pte))) {
74694+ ret = -EBUSY;
74695+ goto out;
74696+ }
74697+ if (WARN_ON(!page)) {
74698+ ret = -ENOMEM;
74699+ goto out;
74700+ }
74701 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
74702 (*nr)++;
74703 } while (pte++, addr += PAGE_SIZE, addr != end);
74704- return 0;
74705+ ret = 0;
74706+out:
74707+ pax_close_kernel();
74708+ return ret;
74709 }
74710
74711 static int vmap_pmd_range(pud_t *pud, unsigned long addr,
74712@@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void *x)
74713 * and fall back on vmalloc() if that fails. Others
74714 * just put it in the vmalloc space.
74715 */
74716-#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
74717+#ifdef CONFIG_MODULES
74718+#ifdef MODULES_VADDR
74719 unsigned long addr = (unsigned long)x;
74720 if (addr >= MODULES_VADDR && addr < MODULES_END)
74721 return 1;
74722 #endif
74723+
74724+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74725+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
74726+ return 1;
74727+#endif
74728+
74729+#endif
74730+
74731 return is_vmalloc_addr(x);
74732 }
74733
74734@@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
74735
74736 if (!pgd_none(*pgd)) {
74737 pud_t *pud = pud_offset(pgd, addr);
74738+#ifdef CONFIG_X86
74739+ if (!pud_large(*pud))
74740+#endif
74741 if (!pud_none(*pud)) {
74742 pmd_t *pmd = pmd_offset(pud, addr);
74743+#ifdef CONFIG_X86
74744+ if (!pmd_large(*pmd))
74745+#endif
74746 if (!pmd_none(*pmd)) {
74747 pte_t *ptep, pte;
74748
74749@@ -1294,6 +1334,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
74750 struct vm_struct *area;
74751
74752 BUG_ON(in_interrupt());
74753+
74754+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74755+ if (flags & VM_KERNEXEC) {
74756+ if (start != VMALLOC_START || end != VMALLOC_END)
74757+ return NULL;
74758+ start = (unsigned long)MODULES_EXEC_VADDR;
74759+ end = (unsigned long)MODULES_EXEC_END;
74760+ }
74761+#endif
74762+
74763 if (flags & VM_IOREMAP) {
74764 int bit = fls(size);
74765
74766@@ -1526,6 +1576,11 @@ void *vmap(struct page **pages, unsigned int count,
74767 if (count > totalram_pages)
74768 return NULL;
74769
74770+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74771+ if (!(pgprot_val(prot) & _PAGE_NX))
74772+ flags |= VM_KERNEXEC;
74773+#endif
74774+
74775 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
74776 __builtin_return_address(0));
74777 if (!area)
74778@@ -1627,6 +1682,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
74779 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
74780 goto fail;
74781
74782+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74783+ if (!(pgprot_val(prot) & _PAGE_NX))
74784+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
74785+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
74786+ else
74787+#endif
74788+
74789 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
74790 start, end, node, gfp_mask, caller);
74791 if (!area)
74792@@ -1800,10 +1862,9 @@ EXPORT_SYMBOL(vzalloc_node);
74793 * For tight control over page level allocator and protection flags
74794 * use __vmalloc() instead.
74795 */
74796-
74797 void *vmalloc_exec(unsigned long size)
74798 {
74799- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
74800+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
74801 -1, __builtin_return_address(0));
74802 }
74803
74804@@ -2098,6 +2159,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
74805 unsigned long uaddr = vma->vm_start;
74806 unsigned long usize = vma->vm_end - vma->vm_start;
74807
74808+ BUG_ON(vma->vm_mirror);
74809+
74810 if ((PAGE_SIZE-1) & (unsigned long)addr)
74811 return -EINVAL;
74812
74813diff --git a/mm/vmstat.c b/mm/vmstat.c
74814index 8fd603b..cf0d930 100644
74815--- a/mm/vmstat.c
74816+++ b/mm/vmstat.c
74817@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
74818 *
74819 * vm_stat contains the global counters
74820 */
74821-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
74822+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
74823 EXPORT_SYMBOL(vm_stat);
74824
74825 #ifdef CONFIG_SMP
74826@@ -454,7 +454,7 @@ void refresh_cpu_vm_stats(int cpu)
74827 v = p->vm_stat_diff[i];
74828 p->vm_stat_diff[i] = 0;
74829 local_irq_restore(flags);
74830- atomic_long_add(v, &zone->vm_stat[i]);
74831+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
74832 global_diff[i] += v;
74833 #ifdef CONFIG_NUMA
74834 /* 3 seconds idle till flush */
74835@@ -492,7 +492,7 @@ void refresh_cpu_vm_stats(int cpu)
74836
74837 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
74838 if (global_diff[i])
74839- atomic_long_add(global_diff[i], &vm_stat[i]);
74840+ atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
74841 }
74842
74843 #endif
74844@@ -1208,10 +1208,20 @@ static int __init setup_vmstat(void)
74845 start_cpu_timer(cpu);
74846 #endif
74847 #ifdef CONFIG_PROC_FS
74848- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
74849- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
74850- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
74851- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
74852+ {
74853+ mode_t gr_mode = S_IRUGO;
74854+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74855+ gr_mode = S_IRUSR;
74856+#endif
74857+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
74858+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
74859+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74860+ proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
74861+#else
74862+ proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
74863+#endif
74864+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
74865+ }
74866 #endif
74867 return 0;
74868 }
74869diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
74870index 5471628..cef8398 100644
74871--- a/net/8021q/vlan.c
74872+++ b/net/8021q/vlan.c
74873@@ -588,8 +588,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
74874 err = -EPERM;
74875 if (!capable(CAP_NET_ADMIN))
74876 break;
74877- if ((args.u.name_type >= 0) &&
74878- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
74879+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
74880 struct vlan_net *vn;
74881
74882 vn = net_generic(net, vlan_net_id);
74883diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
74884index fdfdb57..38d368c 100644
74885--- a/net/9p/trans_fd.c
74886+++ b/net/9p/trans_fd.c
74887@@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
74888 oldfs = get_fs();
74889 set_fs(get_ds());
74890 /* The cast to a user pointer is valid due to the set_fs() */
74891- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
74892+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
74893 set_fs(oldfs);
74894
74895 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
74896diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
74897index f41f026..fe76ea8 100644
74898--- a/net/atm/atm_misc.c
74899+++ b/net/atm/atm_misc.c
74900@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
74901 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
74902 return 1;
74903 atm_return(vcc, truesize);
74904- atomic_inc(&vcc->stats->rx_drop);
74905+ atomic_inc_unchecked(&vcc->stats->rx_drop);
74906 return 0;
74907 }
74908 EXPORT_SYMBOL(atm_charge);
74909@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
74910 }
74911 }
74912 atm_return(vcc, guess);
74913- atomic_inc(&vcc->stats->rx_drop);
74914+ atomic_inc_unchecked(&vcc->stats->rx_drop);
74915 return NULL;
74916 }
74917 EXPORT_SYMBOL(atm_alloc_charge);
74918@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
74919
74920 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
74921 {
74922-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
74923+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
74924 __SONET_ITEMS
74925 #undef __HANDLE_ITEM
74926 }
74927@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
74928
74929 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
74930 {
74931-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
74932+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
74933 __SONET_ITEMS
74934 #undef __HANDLE_ITEM
74935 }
74936diff --git a/net/atm/lec.h b/net/atm/lec.h
74937index dfc0719..47c5322 100644
74938--- a/net/atm/lec.h
74939+++ b/net/atm/lec.h
74940@@ -48,7 +48,7 @@ struct lane2_ops {
74941 const u8 *tlvs, u32 sizeoftlvs);
74942 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
74943 const u8 *tlvs, u32 sizeoftlvs);
74944-};
74945+} __no_const;
74946
74947 /*
74948 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
74949diff --git a/net/atm/mpc.h b/net/atm/mpc.h
74950index 0919a88..a23d54e 100644
74951--- a/net/atm/mpc.h
74952+++ b/net/atm/mpc.h
74953@@ -33,7 +33,7 @@ struct mpoa_client {
74954 struct mpc_parameters parameters; /* parameters for this client */
74955
74956 const struct net_device_ops *old_ops;
74957- struct net_device_ops new_ops;
74958+ net_device_ops_no_const new_ops;
74959 };
74960
74961
74962diff --git a/net/atm/proc.c b/net/atm/proc.c
74963index 0d020de..011c7bb 100644
74964--- a/net/atm/proc.c
74965+++ b/net/atm/proc.c
74966@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
74967 const struct k_atm_aal_stats *stats)
74968 {
74969 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
74970- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
74971- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
74972- atomic_read(&stats->rx_drop));
74973+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
74974+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
74975+ atomic_read_unchecked(&stats->rx_drop));
74976 }
74977
74978 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
74979diff --git a/net/atm/resources.c b/net/atm/resources.c
74980index 23f45ce..c748f1a 100644
74981--- a/net/atm/resources.c
74982+++ b/net/atm/resources.c
74983@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
74984 static void copy_aal_stats(struct k_atm_aal_stats *from,
74985 struct atm_aal_stats *to)
74986 {
74987-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
74988+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
74989 __AAL_STAT_ITEMS
74990 #undef __HANDLE_ITEM
74991 }
74992@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
74993 static void subtract_aal_stats(struct k_atm_aal_stats *from,
74994 struct atm_aal_stats *to)
74995 {
74996-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
74997+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
74998 __AAL_STAT_ITEMS
74999 #undef __HANDLE_ITEM
75000 }
75001diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
75002index 3512e25..2b33401 100644
75003--- a/net/batman-adv/bat_iv_ogm.c
75004+++ b/net/batman-adv/bat_iv_ogm.c
75005@@ -541,7 +541,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
75006
75007 /* change sequence number to network order */
75008 batman_ogm_packet->seqno =
75009- htonl((uint32_t)atomic_read(&hard_iface->seqno));
75010+ htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
75011
75012 batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
75013 batman_ogm_packet->tt_crc = htons((uint16_t)
75014@@ -561,7 +561,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
75015 else
75016 batman_ogm_packet->gw_flags = NO_FLAGS;
75017
75018- atomic_inc(&hard_iface->seqno);
75019+ atomic_inc_unchecked(&hard_iface->seqno);
75020
75021 slide_own_bcast_window(hard_iface);
75022 bat_ogm_queue_add(bat_priv, hard_iface->packet_buff,
75023@@ -922,7 +922,7 @@ static void bat_ogm_process(const struct ethhdr *ethhdr,
75024 return;
75025
75026 /* could be changed by schedule_own_packet() */
75027- if_incoming_seqno = atomic_read(&if_incoming->seqno);
75028+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->seqno);
75029
75030 has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);
75031
75032diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
75033index 7704df4..beb4e16 100644
75034--- a/net/batman-adv/hard-interface.c
75035+++ b/net/batman-adv/hard-interface.c
75036@@ -326,8 +326,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
75037 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
75038 dev_add_pack(&hard_iface->batman_adv_ptype);
75039
75040- atomic_set(&hard_iface->seqno, 1);
75041- atomic_set(&hard_iface->frag_seqno, 1);
75042+ atomic_set_unchecked(&hard_iface->seqno, 1);
75043+ atomic_set_unchecked(&hard_iface->frag_seqno, 1);
75044 bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
75045 hard_iface->net_dev->name);
75046
75047diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
75048index f9cc957..efd9dae 100644
75049--- a/net/batman-adv/soft-interface.c
75050+++ b/net/batman-adv/soft-interface.c
75051@@ -634,7 +634,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
75052
75053 /* set broadcast sequence number */
75054 bcast_packet->seqno =
75055- htonl(atomic_inc_return(&bat_priv->bcast_seqno));
75056+ htonl(atomic_inc_return_unchecked(&bat_priv->bcast_seqno));
75057
75058 add_bcast_packet_to_list(bat_priv, skb, 1);
75059
75060@@ -828,7 +828,7 @@ struct net_device *softif_create(const char *name)
75061 atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
75062
75063 atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
75064- atomic_set(&bat_priv->bcast_seqno, 1);
75065+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
75066 atomic_set(&bat_priv->ttvn, 0);
75067 atomic_set(&bat_priv->tt_local_changes, 0);
75068 atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
75069diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
75070index ab8d0fe..ceba3fd 100644
75071--- a/net/batman-adv/types.h
75072+++ b/net/batman-adv/types.h
75073@@ -38,8 +38,8 @@ struct hard_iface {
75074 int16_t if_num;
75075 char if_status;
75076 struct net_device *net_dev;
75077- atomic_t seqno;
75078- atomic_t frag_seqno;
75079+ atomic_unchecked_t seqno;
75080+ atomic_unchecked_t frag_seqno;
75081 unsigned char *packet_buff;
75082 int packet_len;
75083 struct kobject *hardif_obj;
75084@@ -154,7 +154,7 @@ struct bat_priv {
75085 atomic_t orig_interval; /* uint */
75086 atomic_t hop_penalty; /* uint */
75087 atomic_t log_level; /* uint */
75088- atomic_t bcast_seqno;
75089+ atomic_unchecked_t bcast_seqno;
75090 atomic_t bcast_queue_left;
75091 atomic_t batman_queue_left;
75092 atomic_t ttvn; /* translation table version number */
75093diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
75094index 07d1c1d..7e9bea9 100644
75095--- a/net/batman-adv/unicast.c
75096+++ b/net/batman-adv/unicast.c
75097@@ -264,7 +264,7 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
75098 frag1->flags = UNI_FRAG_HEAD | large_tail;
75099 frag2->flags = large_tail;
75100
75101- seqno = atomic_add_return(2, &hard_iface->frag_seqno);
75102+ seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
75103 frag1->seqno = htons(seqno - 1);
75104 frag2->seqno = htons(seqno);
75105
75106diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
75107index c1c597e..05ebb40 100644
75108--- a/net/bluetooth/hci_conn.c
75109+++ b/net/bluetooth/hci_conn.c
75110@@ -234,7 +234,7 @@ void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16])
75111 memset(&cp, 0, sizeof(cp));
75112
75113 cp.handle = cpu_to_le16(conn->handle);
75114- memcpy(cp.ltk, ltk, sizeof(ltk));
75115+ memcpy(cp.ltk, ltk, sizeof(cp.ltk));
75116
75117 hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
75118 }
75119diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
75120index 17b5b1c..826d872 100644
75121--- a/net/bluetooth/l2cap_core.c
75122+++ b/net/bluetooth/l2cap_core.c
75123@@ -2176,8 +2176,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
75124 break;
75125
75126 case L2CAP_CONF_RFC:
75127- if (olen == sizeof(rfc))
75128- memcpy(&rfc, (void *)val, olen);
75129+ if (olen != sizeof(rfc))
75130+ break;
75131+
75132+ memcpy(&rfc, (void *)val, olen);
75133
75134 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
75135 rfc.mode != chan->mode)
75136@@ -2265,8 +2267,10 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len)
75137
75138 switch (type) {
75139 case L2CAP_CONF_RFC:
75140- if (olen == sizeof(rfc))
75141- memcpy(&rfc, (void *)val, olen);
75142+ if (olen != sizeof(rfc))
75143+ break;
75144+
75145+ memcpy(&rfc, (void *)val, olen);
75146 goto done;
75147 }
75148 }
75149diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
75150index a5f4e57..910ee6d 100644
75151--- a/net/bridge/br_multicast.c
75152+++ b/net/bridge/br_multicast.c
75153@@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
75154 nexthdr = ip6h->nexthdr;
75155 offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
75156
75157- if (offset < 0 || nexthdr != IPPROTO_ICMPV6)
75158+ if (nexthdr != IPPROTO_ICMPV6)
75159 return 0;
75160
75161 /* Okay, we found ICMPv6 header */
75162diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
75163index 5864cc4..121f3a30 100644
75164--- a/net/bridge/netfilter/ebtables.c
75165+++ b/net/bridge/netfilter/ebtables.c
75166@@ -1513,7 +1513,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
75167 tmp.valid_hooks = t->table->valid_hooks;
75168 }
75169 mutex_unlock(&ebt_mutex);
75170- if (copy_to_user(user, &tmp, *len) != 0){
75171+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
75172 BUGPRINT("c2u Didn't work\n");
75173 ret = -EFAULT;
75174 break;
75175diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
75176index a986280..13444a1 100644
75177--- a/net/caif/caif_socket.c
75178+++ b/net/caif/caif_socket.c
75179@@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
75180 #ifdef CONFIG_DEBUG_FS
75181 struct debug_fs_counter {
75182 atomic_t caif_nr_socks;
75183- atomic_t caif_sock_create;
75184- atomic_t num_connect_req;
75185- atomic_t num_connect_resp;
75186- atomic_t num_connect_fail_resp;
75187- atomic_t num_disconnect;
75188- atomic_t num_remote_shutdown_ind;
75189- atomic_t num_tx_flow_off_ind;
75190- atomic_t num_tx_flow_on_ind;
75191- atomic_t num_rx_flow_off;
75192- atomic_t num_rx_flow_on;
75193+ atomic_unchecked_t caif_sock_create;
75194+ atomic_unchecked_t num_connect_req;
75195+ atomic_unchecked_t num_connect_resp;
75196+ atomic_unchecked_t num_connect_fail_resp;
75197+ atomic_unchecked_t num_disconnect;
75198+ atomic_unchecked_t num_remote_shutdown_ind;
75199+ atomic_unchecked_t num_tx_flow_off_ind;
75200+ atomic_unchecked_t num_tx_flow_on_ind;
75201+ atomic_unchecked_t num_rx_flow_off;
75202+ atomic_unchecked_t num_rx_flow_on;
75203 };
75204 static struct debug_fs_counter cnt;
75205 #define dbfs_atomic_inc(v) atomic_inc_return(v)
75206+#define dbfs_atomic_inc_unchecked(v) atomic_inc_return_unchecked(v)
75207 #define dbfs_atomic_dec(v) atomic_dec_return(v)
75208 #else
75209 #define dbfs_atomic_inc(v) 0
75210@@ -161,7 +162,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75211 atomic_read(&cf_sk->sk.sk_rmem_alloc),
75212 sk_rcvbuf_lowwater(cf_sk));
75213 set_rx_flow_off(cf_sk);
75214- dbfs_atomic_inc(&cnt.num_rx_flow_off);
75215+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
75216 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
75217 }
75218
75219@@ -172,7 +173,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75220 set_rx_flow_off(cf_sk);
75221 if (net_ratelimit())
75222 pr_debug("sending flow OFF due to rmem_schedule\n");
75223- dbfs_atomic_inc(&cnt.num_rx_flow_off);
75224+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
75225 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
75226 }
75227 skb->dev = NULL;
75228@@ -233,14 +234,14 @@ static void caif_ctrl_cb(struct cflayer *layr,
75229 switch (flow) {
75230 case CAIF_CTRLCMD_FLOW_ON_IND:
75231 /* OK from modem to start sending again */
75232- dbfs_atomic_inc(&cnt.num_tx_flow_on_ind);
75233+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_on_ind);
75234 set_tx_flow_on(cf_sk);
75235 cf_sk->sk.sk_state_change(&cf_sk->sk);
75236 break;
75237
75238 case CAIF_CTRLCMD_FLOW_OFF_IND:
75239 /* Modem asks us to shut up */
75240- dbfs_atomic_inc(&cnt.num_tx_flow_off_ind);
75241+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_off_ind);
75242 set_tx_flow_off(cf_sk);
75243 cf_sk->sk.sk_state_change(&cf_sk->sk);
75244 break;
75245@@ -249,7 +250,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
75246 /* We're now connected */
75247 caif_client_register_refcnt(&cf_sk->layer,
75248 cfsk_hold, cfsk_put);
75249- dbfs_atomic_inc(&cnt.num_connect_resp);
75250+ dbfs_atomic_inc_unchecked(&cnt.num_connect_resp);
75251 cf_sk->sk.sk_state = CAIF_CONNECTED;
75252 set_tx_flow_on(cf_sk);
75253 cf_sk->sk.sk_state_change(&cf_sk->sk);
75254@@ -263,7 +264,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
75255
75256 case CAIF_CTRLCMD_INIT_FAIL_RSP:
75257 /* Connect request failed */
75258- dbfs_atomic_inc(&cnt.num_connect_fail_resp);
75259+ dbfs_atomic_inc_unchecked(&cnt.num_connect_fail_resp);
75260 cf_sk->sk.sk_err = ECONNREFUSED;
75261 cf_sk->sk.sk_state = CAIF_DISCONNECTED;
75262 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
75263@@ -277,7 +278,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
75264
75265 case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:
75266 /* Modem has closed this connection, or device is down. */
75267- dbfs_atomic_inc(&cnt.num_remote_shutdown_ind);
75268+ dbfs_atomic_inc_unchecked(&cnt.num_remote_shutdown_ind);
75269 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
75270 cf_sk->sk.sk_err = ECONNRESET;
75271 set_rx_flow_on(cf_sk);
75272@@ -297,7 +298,7 @@ static void caif_check_flow_release(struct sock *sk)
75273 return;
75274
75275 if (atomic_read(&sk->sk_rmem_alloc) <= sk_rcvbuf_lowwater(cf_sk)) {
75276- dbfs_atomic_inc(&cnt.num_rx_flow_on);
75277+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_on);
75278 set_rx_flow_on(cf_sk);
75279 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_ON_REQ);
75280 }
75281@@ -854,7 +855,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr,
75282 /*ifindex = id of the interface.*/
75283 cf_sk->conn_req.ifindex = cf_sk->sk.sk_bound_dev_if;
75284
75285- dbfs_atomic_inc(&cnt.num_connect_req);
75286+ dbfs_atomic_inc_unchecked(&cnt.num_connect_req);
75287 cf_sk->layer.receive = caif_sktrecv_cb;
75288
75289 err = caif_connect_client(sock_net(sk), &cf_sk->conn_req,
75290@@ -943,7 +944,7 @@ static int caif_release(struct socket *sock)
75291 spin_unlock_bh(&sk->sk_receive_queue.lock);
75292 sock->sk = NULL;
75293
75294- dbfs_atomic_inc(&cnt.num_disconnect);
75295+ dbfs_atomic_inc_unchecked(&cnt.num_disconnect);
75296
75297 WARN_ON(IS_ERR(cf_sk->debugfs_socket_dir));
75298 if (cf_sk->debugfs_socket_dir != NULL)
75299@@ -1122,7 +1123,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol,
75300 cf_sk->conn_req.protocol = protocol;
75301 /* Increase the number of sockets created. */
75302 dbfs_atomic_inc(&cnt.caif_nr_socks);
75303- num = dbfs_atomic_inc(&cnt.caif_sock_create);
75304+ num = dbfs_atomic_inc_unchecked(&cnt.caif_sock_create);
75305 #ifdef CONFIG_DEBUG_FS
75306 if (!IS_ERR(debugfsdir)) {
75307
75308diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
75309index 5cf5222..6f704ad 100644
75310--- a/net/caif/cfctrl.c
75311+++ b/net/caif/cfctrl.c
75312@@ -9,6 +9,7 @@
75313 #include <linux/stddef.h>
75314 #include <linux/spinlock.h>
75315 #include <linux/slab.h>
75316+#include <linux/sched.h>
75317 #include <net/caif/caif_layer.h>
75318 #include <net/caif/cfpkt.h>
75319 #include <net/caif/cfctrl.h>
75320@@ -42,8 +43,8 @@ struct cflayer *cfctrl_create(void)
75321 memset(&dev_info, 0, sizeof(dev_info));
75322 dev_info.id = 0xff;
75323 cfsrvl_init(&this->serv, 0, &dev_info, false);
75324- atomic_set(&this->req_seq_no, 1);
75325- atomic_set(&this->rsp_seq_no, 1);
75326+ atomic_set_unchecked(&this->req_seq_no, 1);
75327+ atomic_set_unchecked(&this->rsp_seq_no, 1);
75328 this->serv.layer.receive = cfctrl_recv;
75329 sprintf(this->serv.layer.name, "ctrl");
75330 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
75331@@ -129,8 +130,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
75332 struct cfctrl_request_info *req)
75333 {
75334 spin_lock_bh(&ctrl->info_list_lock);
75335- atomic_inc(&ctrl->req_seq_no);
75336- req->sequence_no = atomic_read(&ctrl->req_seq_no);
75337+ atomic_inc_unchecked(&ctrl->req_seq_no);
75338+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
75339 list_add_tail(&req->list, &ctrl->list);
75340 spin_unlock_bh(&ctrl->info_list_lock);
75341 }
75342@@ -148,7 +149,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
75343 if (p != first)
75344 pr_warn("Requests are not received in order\n");
75345
75346- atomic_set(&ctrl->rsp_seq_no,
75347+ atomic_set_unchecked(&ctrl->rsp_seq_no,
75348 p->sequence_no);
75349 list_del(&p->list);
75350 goto out;
75351diff --git a/net/can/gw.c b/net/can/gw.c
75352index 3d79b12..8de85fa 100644
75353--- a/net/can/gw.c
75354+++ b/net/can/gw.c
75355@@ -96,7 +96,7 @@ struct cf_mod {
75356 struct {
75357 void (*xor)(struct can_frame *cf, struct cgw_csum_xor *xor);
75358 void (*crc8)(struct can_frame *cf, struct cgw_csum_crc8 *crc8);
75359- } csumfunc;
75360+ } __no_const csumfunc;
75361 };
75362
75363
75364diff --git a/net/compat.c b/net/compat.c
75365index 6def90e..c6992fa 100644
75366--- a/net/compat.c
75367+++ b/net/compat.c
75368@@ -71,9 +71,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
75369 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
75370 __get_user(kmsg->msg_flags, &umsg->msg_flags))
75371 return -EFAULT;
75372- kmsg->msg_name = compat_ptr(tmp1);
75373- kmsg->msg_iov = compat_ptr(tmp2);
75374- kmsg->msg_control = compat_ptr(tmp3);
75375+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
75376+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
75377+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
75378 return 0;
75379 }
75380
75381@@ -85,7 +85,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75382
75383 if (kern_msg->msg_namelen) {
75384 if (mode == VERIFY_READ) {
75385- int err = move_addr_to_kernel(kern_msg->msg_name,
75386+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
75387 kern_msg->msg_namelen,
75388 kern_address);
75389 if (err < 0)
75390@@ -96,7 +96,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75391 kern_msg->msg_name = NULL;
75392
75393 tot_len = iov_from_user_compat_to_kern(kern_iov,
75394- (struct compat_iovec __user *)kern_msg->msg_iov,
75395+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
75396 kern_msg->msg_iovlen);
75397 if (tot_len >= 0)
75398 kern_msg->msg_iov = kern_iov;
75399@@ -116,20 +116,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75400
75401 #define CMSG_COMPAT_FIRSTHDR(msg) \
75402 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
75403- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
75404+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
75405 (struct compat_cmsghdr __user *)NULL)
75406
75407 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
75408 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
75409 (ucmlen) <= (unsigned long) \
75410 ((mhdr)->msg_controllen - \
75411- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
75412+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
75413
75414 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
75415 struct compat_cmsghdr __user *cmsg, int cmsg_len)
75416 {
75417 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
75418- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
75419+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
75420 msg->msg_controllen)
75421 return NULL;
75422 return (struct compat_cmsghdr __user *)ptr;
75423@@ -221,7 +221,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
75424 {
75425 struct compat_timeval ctv;
75426 struct compat_timespec cts[3];
75427- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
75428+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
75429 struct compat_cmsghdr cmhdr;
75430 int cmlen;
75431
75432@@ -273,7 +273,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
75433
75434 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
75435 {
75436- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
75437+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
75438 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
75439 int fdnum = scm->fp->count;
75440 struct file **fp = scm->fp->fp;
75441@@ -370,7 +370,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
75442 return -EFAULT;
75443 old_fs = get_fs();
75444 set_fs(KERNEL_DS);
75445- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
75446+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
75447 set_fs(old_fs);
75448
75449 return err;
75450@@ -431,7 +431,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
75451 len = sizeof(ktime);
75452 old_fs = get_fs();
75453 set_fs(KERNEL_DS);
75454- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
75455+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
75456 set_fs(old_fs);
75457
75458 if (!err) {
75459@@ -566,7 +566,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75460 case MCAST_JOIN_GROUP:
75461 case MCAST_LEAVE_GROUP:
75462 {
75463- struct compat_group_req __user *gr32 = (void *)optval;
75464+ struct compat_group_req __user *gr32 = (void __user *)optval;
75465 struct group_req __user *kgr =
75466 compat_alloc_user_space(sizeof(struct group_req));
75467 u32 interface;
75468@@ -587,7 +587,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75469 case MCAST_BLOCK_SOURCE:
75470 case MCAST_UNBLOCK_SOURCE:
75471 {
75472- struct compat_group_source_req __user *gsr32 = (void *)optval;
75473+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
75474 struct group_source_req __user *kgsr = compat_alloc_user_space(
75475 sizeof(struct group_source_req));
75476 u32 interface;
75477@@ -608,7 +608,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75478 }
75479 case MCAST_MSFILTER:
75480 {
75481- struct compat_group_filter __user *gf32 = (void *)optval;
75482+ struct compat_group_filter __user *gf32 = (void __user *)optval;
75483 struct group_filter __user *kgf;
75484 u32 interface, fmode, numsrc;
75485
75486@@ -646,7 +646,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
75487 char __user *optval, int __user *optlen,
75488 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
75489 {
75490- struct compat_group_filter __user *gf32 = (void *)optval;
75491+ struct compat_group_filter __user *gf32 = (void __user *)optval;
75492 struct group_filter __user *kgf;
75493 int __user *koptlen;
75494 u32 interface, fmode, numsrc;
75495diff --git a/net/core/datagram.c b/net/core/datagram.c
75496index 68bbf9f..5ef0d12 100644
75497--- a/net/core/datagram.c
75498+++ b/net/core/datagram.c
75499@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
75500 }
75501
75502 kfree_skb(skb);
75503- atomic_inc(&sk->sk_drops);
75504+ atomic_inc_unchecked(&sk->sk_drops);
75505 sk_mem_reclaim_partial(sk);
75506
75507 return err;
75508diff --git a/net/core/dev.c b/net/core/dev.c
75509index c56cacf..b28e35f 100644
75510--- a/net/core/dev.c
75511+++ b/net/core/dev.c
75512@@ -1139,10 +1139,14 @@ void dev_load(struct net *net, const char *name)
75513 if (no_module && capable(CAP_NET_ADMIN))
75514 no_module = request_module("netdev-%s", name);
75515 if (no_module && capable(CAP_SYS_MODULE)) {
75516+#ifdef CONFIG_GRKERNSEC_MODHARDEN
75517+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
75518+#else
75519 if (!request_module("%s", name))
75520 pr_err("Loading kernel module for a network device "
75521 "with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s "
75522 "instead\n", name);
75523+#endif
75524 }
75525 }
75526 EXPORT_SYMBOL(dev_load);
75527@@ -1573,7 +1577,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
75528 {
75529 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
75530 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
75531- atomic_long_inc(&dev->rx_dropped);
75532+ atomic_long_inc_unchecked(&dev->rx_dropped);
75533 kfree_skb(skb);
75534 return NET_RX_DROP;
75535 }
75536@@ -1583,7 +1587,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
75537 nf_reset(skb);
75538
75539 if (unlikely(!is_skb_forwardable(dev, skb))) {
75540- atomic_long_inc(&dev->rx_dropped);
75541+ atomic_long_inc_unchecked(&dev->rx_dropped);
75542 kfree_skb(skb);
75543 return NET_RX_DROP;
75544 }
75545@@ -2036,7 +2040,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
75546
75547 struct dev_gso_cb {
75548 void (*destructor)(struct sk_buff *skb);
75549-};
75550+} __no_const;
75551
75552 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
75553
75554@@ -2970,7 +2974,7 @@ enqueue:
75555
75556 local_irq_restore(flags);
75557
75558- atomic_long_inc(&skb->dev->rx_dropped);
75559+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
75560 kfree_skb(skb);
75561 return NET_RX_DROP;
75562 }
75563@@ -3044,7 +3048,7 @@ int netif_rx_ni(struct sk_buff *skb)
75564 }
75565 EXPORT_SYMBOL(netif_rx_ni);
75566
75567-static void net_tx_action(struct softirq_action *h)
75568+static void net_tx_action(void)
75569 {
75570 struct softnet_data *sd = &__get_cpu_var(softnet_data);
75571
75572@@ -3333,7 +3337,7 @@ ncls:
75573 if (pt_prev) {
75574 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
75575 } else {
75576- atomic_long_inc(&skb->dev->rx_dropped);
75577+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
75578 kfree_skb(skb);
75579 /* Jamal, now you will not able to escape explaining
75580 * me how you were going to use this. :-)
75581@@ -3897,7 +3901,7 @@ void netif_napi_del(struct napi_struct *napi)
75582 }
75583 EXPORT_SYMBOL(netif_napi_del);
75584
75585-static void net_rx_action(struct softirq_action *h)
75586+static void net_rx_action(void)
75587 {
75588 struct softnet_data *sd = &__get_cpu_var(softnet_data);
75589 unsigned long time_limit = jiffies + 2;
75590@@ -5955,7 +5959,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
75591 } else {
75592 netdev_stats_to_stats64(storage, &dev->stats);
75593 }
75594- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
75595+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
75596 return storage;
75597 }
75598 EXPORT_SYMBOL(dev_get_stats);
75599diff --git a/net/core/flow.c b/net/core/flow.c
75600index e318c7e..168b1d0 100644
75601--- a/net/core/flow.c
75602+++ b/net/core/flow.c
75603@@ -61,7 +61,7 @@ struct flow_cache {
75604 struct timer_list rnd_timer;
75605 };
75606
75607-atomic_t flow_cache_genid = ATOMIC_INIT(0);
75608+atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
75609 EXPORT_SYMBOL(flow_cache_genid);
75610 static struct flow_cache flow_cache_global;
75611 static struct kmem_cache *flow_cachep __read_mostly;
75612@@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
75613
75614 static int flow_entry_valid(struct flow_cache_entry *fle)
75615 {
75616- if (atomic_read(&flow_cache_genid) != fle->genid)
75617+ if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
75618 return 0;
75619 if (fle->object && !fle->object->ops->check(fle->object))
75620 return 0;
75621@@ -259,7 +259,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
75622 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
75623 fcp->hash_count++;
75624 }
75625- } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
75626+ } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
75627 flo = fle->object;
75628 if (!flo)
75629 goto ret_object;
75630@@ -280,7 +280,7 @@ nocache:
75631 }
75632 flo = resolver(net, key, family, dir, flo, ctx);
75633 if (fle) {
75634- fle->genid = atomic_read(&flow_cache_genid);
75635+ fle->genid = atomic_read_unchecked(&flow_cache_genid);
75636 if (!IS_ERR(flo))
75637 fle->object = flo;
75638 else
75639diff --git a/net/core/iovec.c b/net/core/iovec.c
75640index c40f27e..7f49254 100644
75641--- a/net/core/iovec.c
75642+++ b/net/core/iovec.c
75643@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
75644 if (m->msg_namelen) {
75645 if (mode == VERIFY_READ) {
75646 void __user *namep;
75647- namep = (void __user __force *) m->msg_name;
75648+ namep = (void __force_user *) m->msg_name;
75649 err = move_addr_to_kernel(namep, m->msg_namelen,
75650 address);
75651 if (err < 0)
75652@@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
75653 }
75654
75655 size = m->msg_iovlen * sizeof(struct iovec);
75656- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
75657+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
75658 return -EFAULT;
75659
75660 m->msg_iov = iov;
75661diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
75662index 9083e82..1673203 100644
75663--- a/net/core/rtnetlink.c
75664+++ b/net/core/rtnetlink.c
75665@@ -57,7 +57,7 @@ struct rtnl_link {
75666 rtnl_doit_func doit;
75667 rtnl_dumpit_func dumpit;
75668 rtnl_calcit_func calcit;
75669-};
75670+} __no_const;
75671
75672 static DEFINE_MUTEX(rtnl_mutex);
75673 static u16 min_ifinfo_dump_size;
75674diff --git a/net/core/scm.c b/net/core/scm.c
75675index ff52ad0..aff1c0f 100644
75676--- a/net/core/scm.c
75677+++ b/net/core/scm.c
75678@@ -220,7 +220,7 @@ EXPORT_SYMBOL(__scm_send);
75679 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
75680 {
75681 struct cmsghdr __user *cm
75682- = (__force struct cmsghdr __user *)msg->msg_control;
75683+ = (struct cmsghdr __force_user *)msg->msg_control;
75684 struct cmsghdr cmhdr;
75685 int cmlen = CMSG_LEN(len);
75686 int err;
75687@@ -243,7 +243,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
75688 err = -EFAULT;
75689 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
75690 goto out;
75691- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
75692+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
75693 goto out;
75694 cmlen = CMSG_SPACE(len);
75695 if (msg->msg_controllen < cmlen)
75696@@ -259,7 +259,7 @@ EXPORT_SYMBOL(put_cmsg);
75697 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
75698 {
75699 struct cmsghdr __user *cm
75700- = (__force struct cmsghdr __user*)msg->msg_control;
75701+ = (struct cmsghdr __force_user *)msg->msg_control;
75702
75703 int fdmax = 0;
75704 int fdnum = scm->fp->count;
75705@@ -279,7 +279,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
75706 if (fdnum < fdmax)
75707 fdmax = fdnum;
75708
75709- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
75710+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
75711 i++, cmfptr++)
75712 {
75713 int new_fd;
75714diff --git a/net/core/sock.c b/net/core/sock.c
75715index b23f174..b9a0d26 100644
75716--- a/net/core/sock.c
75717+++ b/net/core/sock.c
75718@@ -289,7 +289,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75719 struct sk_buff_head *list = &sk->sk_receive_queue;
75720
75721 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
75722- atomic_inc(&sk->sk_drops);
75723+ atomic_inc_unchecked(&sk->sk_drops);
75724 trace_sock_rcvqueue_full(sk, skb);
75725 return -ENOMEM;
75726 }
75727@@ -299,7 +299,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75728 return err;
75729
75730 if (!sk_rmem_schedule(sk, skb->truesize)) {
75731- atomic_inc(&sk->sk_drops);
75732+ atomic_inc_unchecked(&sk->sk_drops);
75733 return -ENOBUFS;
75734 }
75735
75736@@ -319,7 +319,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75737 skb_dst_force(skb);
75738
75739 spin_lock_irqsave(&list->lock, flags);
75740- skb->dropcount = atomic_read(&sk->sk_drops);
75741+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
75742 __skb_queue_tail(list, skb);
75743 spin_unlock_irqrestore(&list->lock, flags);
75744
75745@@ -339,7 +339,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
75746 skb->dev = NULL;
75747
75748 if (sk_rcvqueues_full(sk, skb)) {
75749- atomic_inc(&sk->sk_drops);
75750+ atomic_inc_unchecked(&sk->sk_drops);
75751 goto discard_and_relse;
75752 }
75753 if (nested)
75754@@ -357,7 +357,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
75755 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
75756 } else if (sk_add_backlog(sk, skb)) {
75757 bh_unlock_sock(sk);
75758- atomic_inc(&sk->sk_drops);
75759+ atomic_inc_unchecked(&sk->sk_drops);
75760 goto discard_and_relse;
75761 }
75762
75763@@ -917,7 +917,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75764 if (len > sizeof(peercred))
75765 len = sizeof(peercred);
75766 cred_to_ucred(sk->sk_peer_pid, sk->sk_peer_cred, &peercred);
75767- if (copy_to_user(optval, &peercred, len))
75768+ if (len > sizeof(peercred) || copy_to_user(optval, &peercred, len))
75769 return -EFAULT;
75770 goto lenout;
75771 }
75772@@ -930,7 +930,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75773 return -ENOTCONN;
75774 if (lv < len)
75775 return -EINVAL;
75776- if (copy_to_user(optval, address, len))
75777+ if (len > sizeof(address) || copy_to_user(optval, address, len))
75778 return -EFAULT;
75779 goto lenout;
75780 }
75781@@ -963,7 +963,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75782
75783 if (len > lv)
75784 len = lv;
75785- if (copy_to_user(optval, &v, len))
75786+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
75787 return -EFAULT;
75788 lenout:
75789 if (put_user(len, optlen))
75790@@ -2020,7 +2020,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
75791 */
75792 smp_wmb();
75793 atomic_set(&sk->sk_refcnt, 1);
75794- atomic_set(&sk->sk_drops, 0);
75795+ atomic_set_unchecked(&sk->sk_drops, 0);
75796 }
75797 EXPORT_SYMBOL(sock_init_data);
75798
75799diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
75800index 02e75d1..9a57a7c 100644
75801--- a/net/decnet/sysctl_net_decnet.c
75802+++ b/net/decnet/sysctl_net_decnet.c
75803@@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
75804
75805 if (len > *lenp) len = *lenp;
75806
75807- if (copy_to_user(buffer, addr, len))
75808+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
75809 return -EFAULT;
75810
75811 *lenp = len;
75812@@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
75813
75814 if (len > *lenp) len = *lenp;
75815
75816- if (copy_to_user(buffer, devname, len))
75817+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
75818 return -EFAULT;
75819
75820 *lenp = len;
75821diff --git a/net/econet/Kconfig b/net/econet/Kconfig
75822index 39a2d29..f39c0fe 100644
75823--- a/net/econet/Kconfig
75824+++ b/net/econet/Kconfig
75825@@ -4,7 +4,7 @@
75826
75827 config ECONET
75828 tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
75829- depends on EXPERIMENTAL && INET
75830+ depends on EXPERIMENTAL && INET && BROKEN
75831 ---help---
75832 Econet is a fairly old and slow networking protocol mainly used by
75833 Acorn computers to access file and print servers. It uses native
75834diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
75835index 36d1440..44ff28b 100644
75836--- a/net/ipv4/ah4.c
75837+++ b/net/ipv4/ah4.c
75838@@ -19,6 +19,8 @@ struct ah_skb_cb {
75839 #define AH_SKB_CB(__skb) ((struct ah_skb_cb *)&((__skb)->cb[0]))
75840
75841 static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
75842+ unsigned int size) __size_overflow(3);
75843+static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
75844 unsigned int size)
75845 {
75846 unsigned int len;
75847diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
75848index 92fc5f6..b790d91 100644
75849--- a/net/ipv4/fib_frontend.c
75850+++ b/net/ipv4/fib_frontend.c
75851@@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
75852 #ifdef CONFIG_IP_ROUTE_MULTIPATH
75853 fib_sync_up(dev);
75854 #endif
75855- atomic_inc(&net->ipv4.dev_addr_genid);
75856+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75857 rt_cache_flush(dev_net(dev), -1);
75858 break;
75859 case NETDEV_DOWN:
75860 fib_del_ifaddr(ifa, NULL);
75861- atomic_inc(&net->ipv4.dev_addr_genid);
75862+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75863 if (ifa->ifa_dev->ifa_list == NULL) {
75864 /* Last address was deleted from this interface.
75865 * Disable IP.
75866@@ -1011,7 +1011,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
75867 #ifdef CONFIG_IP_ROUTE_MULTIPATH
75868 fib_sync_up(dev);
75869 #endif
75870- atomic_inc(&net->ipv4.dev_addr_genid);
75871+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75872 rt_cache_flush(dev_net(dev), -1);
75873 break;
75874 case NETDEV_DOWN:
75875diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
75876index 80106d8..232e898 100644
75877--- a/net/ipv4/fib_semantics.c
75878+++ b/net/ipv4/fib_semantics.c
75879@@ -699,7 +699,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
75880 nh->nh_saddr = inet_select_addr(nh->nh_dev,
75881 nh->nh_gw,
75882 nh->nh_parent->fib_scope);
75883- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
75884+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
75885
75886 return nh->nh_saddr;
75887 }
75888diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
75889index ccee270..db23c3c 100644
75890--- a/net/ipv4/inet_diag.c
75891+++ b/net/ipv4/inet_diag.c
75892@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct sock *sk,
75893 r->idiag_retrans = 0;
75894
75895 r->id.idiag_if = sk->sk_bound_dev_if;
75896+
75897+#ifdef CONFIG_GRKERNSEC_HIDESYM
75898+ r->id.idiag_cookie[0] = 0;
75899+ r->id.idiag_cookie[1] = 0;
75900+#else
75901 r->id.idiag_cookie[0] = (u32)(unsigned long)sk;
75902 r->id.idiag_cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
75903+#endif
75904
75905 r->id.idiag_sport = inet->inet_sport;
75906 r->id.idiag_dport = inet->inet_dport;
75907@@ -210,8 +216,15 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
75908 r->idiag_family = tw->tw_family;
75909 r->idiag_retrans = 0;
75910 r->id.idiag_if = tw->tw_bound_dev_if;
75911+
75912+#ifdef CONFIG_GRKERNSEC_HIDESYM
75913+ r->id.idiag_cookie[0] = 0;
75914+ r->id.idiag_cookie[1] = 0;
75915+#else
75916 r->id.idiag_cookie[0] = (u32)(unsigned long)tw;
75917 r->id.idiag_cookie[1] = (u32)(((unsigned long)tw >> 31) >> 1);
75918+#endif
75919+
75920 r->id.idiag_sport = tw->tw_sport;
75921 r->id.idiag_dport = tw->tw_dport;
75922 r->id.idiag_src[0] = tw->tw_rcv_saddr;
75923@@ -294,12 +307,14 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
75924 if (sk == NULL)
75925 goto unlock;
75926
75927+#ifndef CONFIG_GRKERNSEC_HIDESYM
75928 err = -ESTALE;
75929 if ((req->id.idiag_cookie[0] != INET_DIAG_NOCOOKIE ||
75930 req->id.idiag_cookie[1] != INET_DIAG_NOCOOKIE) &&
75931 ((u32)(unsigned long)sk != req->id.idiag_cookie[0] ||
75932 (u32)((((unsigned long)sk) >> 31) >> 1) != req->id.idiag_cookie[1]))
75933 goto out;
75934+#endif
75935
75936 err = -ENOMEM;
75937 rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) +
75938@@ -589,8 +604,14 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
75939 r->idiag_retrans = req->retrans;
75940
75941 r->id.idiag_if = sk->sk_bound_dev_if;
75942+
75943+#ifdef CONFIG_GRKERNSEC_HIDESYM
75944+ r->id.idiag_cookie[0] = 0;
75945+ r->id.idiag_cookie[1] = 0;
75946+#else
75947 r->id.idiag_cookie[0] = (u32)(unsigned long)req;
75948 r->id.idiag_cookie[1] = (u32)(((unsigned long)req >> 31) >> 1);
75949+#endif
75950
75951 tmo = req->expires - jiffies;
75952 if (tmo < 0)
75953diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
75954index 984ec65..97ac518 100644
75955--- a/net/ipv4/inet_hashtables.c
75956+++ b/net/ipv4/inet_hashtables.c
75957@@ -18,12 +18,15 @@
75958 #include <linux/sched.h>
75959 #include <linux/slab.h>
75960 #include <linux/wait.h>
75961+#include <linux/security.h>
75962
75963 #include <net/inet_connection_sock.h>
75964 #include <net/inet_hashtables.h>
75965 #include <net/secure_seq.h>
75966 #include <net/ip.h>
75967
75968+extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
75969+
75970 /*
75971 * Allocate and initialize a new local port bind bucket.
75972 * The bindhash mutex for snum's hash chain must be held here.
75973@@ -530,6 +533,8 @@ ok:
75974 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
75975 spin_unlock(&head->lock);
75976
75977+ gr_update_task_in_ip_table(current, inet_sk(sk));
75978+
75979 if (tw) {
75980 inet_twsk_deschedule(tw, death_row);
75981 while (twrefcnt) {
75982diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
75983index 86f13c67..59a35b5 100644
75984--- a/net/ipv4/inetpeer.c
75985+++ b/net/ipv4/inetpeer.c
75986@@ -436,8 +436,8 @@ relookup:
75987 if (p) {
75988 p->daddr = *daddr;
75989 atomic_set(&p->refcnt, 1);
75990- atomic_set(&p->rid, 0);
75991- atomic_set(&p->ip_id_count,
75992+ atomic_set_unchecked(&p->rid, 0);
75993+ atomic_set_unchecked(&p->ip_id_count,
75994 (daddr->family == AF_INET) ?
75995 secure_ip_id(daddr->addr.a4) :
75996 secure_ipv6_id(daddr->addr.a6));
75997diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
75998index fdaabf2..0ec3205 100644
75999--- a/net/ipv4/ip_fragment.c
76000+++ b/net/ipv4/ip_fragment.c
76001@@ -316,7 +316,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
76002 return 0;
76003
76004 start = qp->rid;
76005- end = atomic_inc_return(&peer->rid);
76006+ end = atomic_inc_return_unchecked(&peer->rid);
76007 qp->rid = end;
76008
76009 rc = qp->q.fragments && (end - start) > max;
76010diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
76011index 09ff51b..d3968eb 100644
76012--- a/net/ipv4/ip_sockglue.c
76013+++ b/net/ipv4/ip_sockglue.c
76014@@ -1111,7 +1111,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
76015 len = min_t(unsigned int, len, opt->optlen);
76016 if (put_user(len, optlen))
76017 return -EFAULT;
76018- if (copy_to_user(optval, opt->__data, len))
76019+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
76020+ copy_to_user(optval, opt->__data, len))
76021 return -EFAULT;
76022 return 0;
76023 }
76024@@ -1239,7 +1240,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
76025 if (sk->sk_type != SOCK_STREAM)
76026 return -ENOPROTOOPT;
76027
76028- msg.msg_control = optval;
76029+ msg.msg_control = (void __force_kernel *)optval;
76030 msg.msg_controllen = len;
76031 msg.msg_flags = flags;
76032
76033diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
76034index 99ec116..c5628fe 100644
76035--- a/net/ipv4/ipconfig.c
76036+++ b/net/ipv4/ipconfig.c
76037@@ -318,7 +318,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
76038
76039 mm_segment_t oldfs = get_fs();
76040 set_fs(get_ds());
76041- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
76042+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
76043 set_fs(oldfs);
76044 return res;
76045 }
76046@@ -329,7 +329,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
76047
76048 mm_segment_t oldfs = get_fs();
76049 set_fs(get_ds());
76050- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
76051+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
76052 set_fs(oldfs);
76053 return res;
76054 }
76055@@ -340,7 +340,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
76056
76057 mm_segment_t oldfs = get_fs();
76058 set_fs(get_ds());
76059- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
76060+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
76061 set_fs(oldfs);
76062 return res;
76063 }
76064diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
76065index fd7a3f6..e5be655 100644
76066--- a/net/ipv4/netfilter/arp_tables.c
76067+++ b/net/ipv4/netfilter/arp_tables.c
76068@@ -984,6 +984,11 @@ static int __do_replace(struct net *net, const char *name,
76069 unsigned int valid_hooks,
76070 struct xt_table_info *newinfo,
76071 unsigned int num_counters,
76072+ void __user *counters_ptr) __size_overflow(5);
76073+static int __do_replace(struct net *net, const char *name,
76074+ unsigned int valid_hooks,
76075+ struct xt_table_info *newinfo,
76076+ unsigned int num_counters,
76077 void __user *counters_ptr)
76078 {
76079 int ret;
76080@@ -1104,6 +1109,8 @@ static int do_replace(struct net *net, const void __user *user,
76081 }
76082
76083 static int do_add_counters(struct net *net, const void __user *user,
76084+ unsigned int len, int compat) __size_overflow(3);
76085+static int do_add_counters(struct net *net, const void __user *user,
76086 unsigned int len, int compat)
76087 {
76088 unsigned int i, curcpu;
76089diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
76090index 24e556e..a8daf7a 100644
76091--- a/net/ipv4/netfilter/ip_tables.c
76092+++ b/net/ipv4/netfilter/ip_tables.c
76093@@ -1172,6 +1172,10 @@ get_entries(struct net *net, struct ipt_get_entries __user *uptr,
76094 static int
76095 __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76096 struct xt_table_info *newinfo, unsigned int num_counters,
76097+ void __user *counters_ptr) __size_overflow(5);
76098+static int
76099+__do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76100+ struct xt_table_info *newinfo, unsigned int num_counters,
76101 void __user *counters_ptr)
76102 {
76103 int ret;
76104@@ -1293,6 +1297,9 @@ do_replace(struct net *net, const void __user *user, unsigned int len)
76105
76106 static int
76107 do_add_counters(struct net *net, const void __user *user,
76108+ unsigned int len, int compat) __size_overflow(3);
76109+static int
76110+do_add_counters(struct net *net, const void __user *user,
76111 unsigned int len, int compat)
76112 {
76113 unsigned int i, curcpu;
76114diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
76115index 2133c30..0e8047e 100644
76116--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
76117+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
76118@@ -435,6 +435,10 @@ static unsigned char asn1_subid_decode(struct asn1_ctx *ctx,
76119 static unsigned char asn1_oid_decode(struct asn1_ctx *ctx,
76120 unsigned char *eoc,
76121 unsigned long **oid,
76122+ unsigned int *len) __size_overflow(2);
76123+static unsigned char asn1_oid_decode(struct asn1_ctx *ctx,
76124+ unsigned char *eoc,
76125+ unsigned long **oid,
76126 unsigned int *len)
76127 {
76128 unsigned long subid;
76129diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
76130index 43d4c3b..1914409 100644
76131--- a/net/ipv4/ping.c
76132+++ b/net/ipv4/ping.c
76133@@ -836,7 +836,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
76134 sk_rmem_alloc_get(sp),
76135 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76136 atomic_read(&sp->sk_refcnt), sp,
76137- atomic_read(&sp->sk_drops), len);
76138+ atomic_read_unchecked(&sp->sk_drops), len);
76139 }
76140
76141 static int ping_seq_show(struct seq_file *seq, void *v)
76142diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
76143index 007e2eb..85a18a0 100644
76144--- a/net/ipv4/raw.c
76145+++ b/net/ipv4/raw.c
76146@@ -303,7 +303,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
76147 int raw_rcv(struct sock *sk, struct sk_buff *skb)
76148 {
76149 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
76150- atomic_inc(&sk->sk_drops);
76151+ atomic_inc_unchecked(&sk->sk_drops);
76152 kfree_skb(skb);
76153 return NET_RX_DROP;
76154 }
76155@@ -738,16 +738,20 @@ static int raw_init(struct sock *sk)
76156
76157 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
76158 {
76159+ struct icmp_filter filter;
76160+
76161 if (optlen > sizeof(struct icmp_filter))
76162 optlen = sizeof(struct icmp_filter);
76163- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
76164+ if (copy_from_user(&filter, optval, optlen))
76165 return -EFAULT;
76166+ raw_sk(sk)->filter = filter;
76167 return 0;
76168 }
76169
76170 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
76171 {
76172 int len, ret = -EFAULT;
76173+ struct icmp_filter filter;
76174
76175 if (get_user(len, optlen))
76176 goto out;
76177@@ -757,8 +761,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
76178 if (len > sizeof(struct icmp_filter))
76179 len = sizeof(struct icmp_filter);
76180 ret = -EFAULT;
76181- if (put_user(len, optlen) ||
76182- copy_to_user(optval, &raw_sk(sk)->filter, len))
76183+ filter = raw_sk(sk)->filter;
76184+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
76185 goto out;
76186 ret = 0;
76187 out: return ret;
76188@@ -986,7 +990,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
76189 sk_wmem_alloc_get(sp),
76190 sk_rmem_alloc_get(sp),
76191 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76192- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
76193+ atomic_read(&sp->sk_refcnt),
76194+#ifdef CONFIG_GRKERNSEC_HIDESYM
76195+ NULL,
76196+#else
76197+ sp,
76198+#endif
76199+ atomic_read_unchecked(&sp->sk_drops));
76200 }
76201
76202 static int raw_seq_show(struct seq_file *seq, void *v)
76203diff --git a/net/ipv4/route.c b/net/ipv4/route.c
76204index 94cdbc5..0cb0063 100644
76205--- a/net/ipv4/route.c
76206+++ b/net/ipv4/route.c
76207@@ -313,7 +313,7 @@ static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx,
76208
76209 static inline int rt_genid(struct net *net)
76210 {
76211- return atomic_read(&net->ipv4.rt_genid);
76212+ return atomic_read_unchecked(&net->ipv4.rt_genid);
76213 }
76214
76215 #ifdef CONFIG_PROC_FS
76216@@ -937,7 +937,7 @@ static void rt_cache_invalidate(struct net *net)
76217 unsigned char shuffle;
76218
76219 get_random_bytes(&shuffle, sizeof(shuffle));
76220- atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
76221+ atomic_add_unchecked(shuffle + 1U, &net->ipv4.rt_genid);
76222 redirect_genid++;
76223 }
76224
76225@@ -3022,7 +3022,7 @@ static int rt_fill_info(struct net *net,
76226 error = rt->dst.error;
76227 if (peer) {
76228 inet_peer_refcheck(rt->peer);
76229- id = atomic_read(&peer->ip_id_count) & 0xffff;
76230+ id = atomic_read_unchecked(&peer->ip_id_count) & 0xffff;
76231 if (peer->tcp_ts_stamp) {
76232 ts = peer->tcp_ts;
76233 tsage = get_seconds() - peer->tcp_ts_stamp;
76234diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
76235index 90f6544..769c0e9 100644
76236--- a/net/ipv4/syncookies.c
76237+++ b/net/ipv4/syncookies.c
76238@@ -278,6 +278,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
76239 struct rtable *rt;
76240 __u8 rcv_wscale;
76241 bool ecn_ok = false;
76242+ struct flowi4 fl4;
76243
76244 if (!sysctl_tcp_syncookies || !th->ack || th->rst)
76245 goto out;
76246@@ -346,20 +347,16 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
76247 * hasn't changed since we received the original syn, but I see
76248 * no easy way to do this.
76249 */
76250- {
76251- struct flowi4 fl4;
76252-
76253- flowi4_init_output(&fl4, 0, sk->sk_mark, RT_CONN_FLAGS(sk),
76254- RT_SCOPE_UNIVERSE, IPPROTO_TCP,
76255- inet_sk_flowi_flags(sk),
76256- (opt && opt->srr) ? opt->faddr : ireq->rmt_addr,
76257- ireq->loc_addr, th->source, th->dest);
76258- security_req_classify_flow(req, flowi4_to_flowi(&fl4));
76259- rt = ip_route_output_key(sock_net(sk), &fl4);
76260- if (IS_ERR(rt)) {
76261- reqsk_free(req);
76262- goto out;
76263- }
76264+ flowi4_init_output(&fl4, 0, sk->sk_mark, RT_CONN_FLAGS(sk),
76265+ RT_SCOPE_UNIVERSE, IPPROTO_TCP,
76266+ inet_sk_flowi_flags(sk),
76267+ (opt && opt->srr) ? opt->faddr : ireq->rmt_addr,
76268+ ireq->loc_addr, th->source, th->dest);
76269+ security_req_classify_flow(req, flowi4_to_flowi(&fl4));
76270+ rt = ip_route_output_key(sock_net(sk), &fl4);
76271+ if (IS_ERR(rt)) {
76272+ reqsk_free(req);
76273+ goto out;
76274 }
76275
76276 /* Try to redo what tcp_v4_send_synack did. */
76277@@ -373,5 +370,10 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
76278 ireq->rcv_wscale = rcv_wscale;
76279
76280 ret = get_cookie_sock(sk, skb, req, &rt->dst);
76281+ /* ip_queue_xmit() depends on our flow being setup
76282+ * Normal sockets get it right from inet_csk_route_child_sock()
76283+ */
76284+ if (ret)
76285+ inet_sk(ret)->cork.fl.u.ip4 = fl4;
76286 out: return ret;
76287 }
76288diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
76289index eb90aa8..74908e1 100644
76290--- a/net/ipv4/tcp_ipv4.c
76291+++ b/net/ipv4/tcp_ipv4.c
76292@@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
76293 int sysctl_tcp_low_latency __read_mostly;
76294 EXPORT_SYMBOL(sysctl_tcp_low_latency);
76295
76296+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76297+extern int grsec_enable_blackhole;
76298+#endif
76299
76300 #ifdef CONFIG_TCP_MD5SIG
76301 static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
76302@@ -1465,9 +1468,13 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
76303 inet_csk(newsk)->icsk_ext_hdr_len = inet_opt->opt.optlen;
76304 newinet->inet_id = newtp->write_seq ^ jiffies;
76305
76306- if (!dst && (dst = inet_csk_route_child_sock(sk, newsk, req)) == NULL)
76307- goto put_and_exit;
76308-
76309+ if (!dst) {
76310+ dst = inet_csk_route_child_sock(sk, newsk, req);
76311+ if (!dst)
76312+ goto put_and_exit;
76313+ } else {
76314+ /* syncookie case : see end of cookie_v4_check() */
76315+ }
76316 sk_setup_caps(newsk, dst);
76317
76318 tcp_mtup_init(newsk);
76319@@ -1632,6 +1639,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
76320 return 0;
76321
76322 reset:
76323+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76324+ if (!grsec_enable_blackhole)
76325+#endif
76326 tcp_v4_send_reset(rsk, skb);
76327 discard:
76328 kfree_skb(skb);
76329@@ -1694,12 +1704,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
76330 TCP_SKB_CB(skb)->sacked = 0;
76331
76332 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
76333- if (!sk)
76334+ if (!sk) {
76335+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76336+ ret = 1;
76337+#endif
76338 goto no_tcp_socket;
76339-
76340+ }
76341 process:
76342- if (sk->sk_state == TCP_TIME_WAIT)
76343+ if (sk->sk_state == TCP_TIME_WAIT) {
76344+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76345+ ret = 2;
76346+#endif
76347 goto do_time_wait;
76348+ }
76349
76350 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
76351 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
76352@@ -1749,6 +1766,10 @@ no_tcp_socket:
76353 bad_packet:
76354 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
76355 } else {
76356+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76357+ if (!grsec_enable_blackhole || (ret == 1 &&
76358+ (skb->dev->flags & IFF_LOOPBACK)))
76359+#endif
76360 tcp_v4_send_reset(NULL, skb);
76361 }
76362
76363@@ -2409,7 +2430,11 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req,
76364 0, /* non standard timer */
76365 0, /* open_requests have no inode */
76366 atomic_read(&sk->sk_refcnt),
76367+#ifdef CONFIG_GRKERNSEC_HIDESYM
76368+ NULL,
76369+#else
76370 req,
76371+#endif
76372 len);
76373 }
76374
76375@@ -2459,7 +2484,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
76376 sock_i_uid(sk),
76377 icsk->icsk_probes_out,
76378 sock_i_ino(sk),
76379- atomic_read(&sk->sk_refcnt), sk,
76380+ atomic_read(&sk->sk_refcnt),
76381+#ifdef CONFIG_GRKERNSEC_HIDESYM
76382+ NULL,
76383+#else
76384+ sk,
76385+#endif
76386 jiffies_to_clock_t(icsk->icsk_rto),
76387 jiffies_to_clock_t(icsk->icsk_ack.ato),
76388 (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
76389@@ -2487,7 +2517,13 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,
76390 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
76391 i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
76392 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
76393- atomic_read(&tw->tw_refcnt), tw, len);
76394+ atomic_read(&tw->tw_refcnt),
76395+#ifdef CONFIG_GRKERNSEC_HIDESYM
76396+ NULL,
76397+#else
76398+ tw,
76399+#endif
76400+ len);
76401 }
76402
76403 #define TMPSZ 150
76404diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
76405index 66363b6..b0654a3 100644
76406--- a/net/ipv4/tcp_minisocks.c
76407+++ b/net/ipv4/tcp_minisocks.c
76408@@ -27,6 +27,10 @@
76409 #include <net/inet_common.h>
76410 #include <net/xfrm.h>
76411
76412+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76413+extern int grsec_enable_blackhole;
76414+#endif
76415+
76416 int sysctl_tcp_syncookies __read_mostly = 1;
76417 EXPORT_SYMBOL(sysctl_tcp_syncookies);
76418
76419@@ -751,6 +755,10 @@ listen_overflow:
76420
76421 embryonic_reset:
76422 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
76423+
76424+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76425+ if (!grsec_enable_blackhole)
76426+#endif
76427 if (!(flg & TCP_FLAG_RST))
76428 req->rsk_ops->send_reset(sk, skb);
76429
76430diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
76431index 85ee7eb..53277ab 100644
76432--- a/net/ipv4/tcp_probe.c
76433+++ b/net/ipv4/tcp_probe.c
76434@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
76435 if (cnt + width >= len)
76436 break;
76437
76438- if (copy_to_user(buf + cnt, tbuf, width))
76439+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
76440 return -EFAULT;
76441 cnt += width;
76442 }
76443diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
76444index 2e0f0af..e2948bf 100644
76445--- a/net/ipv4/tcp_timer.c
76446+++ b/net/ipv4/tcp_timer.c
76447@@ -22,6 +22,10 @@
76448 #include <linux/gfp.h>
76449 #include <net/tcp.h>
76450
76451+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76452+extern int grsec_lastack_retries;
76453+#endif
76454+
76455 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
76456 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
76457 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
76458@@ -199,6 +203,13 @@ static int tcp_write_timeout(struct sock *sk)
76459 }
76460 }
76461
76462+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76463+ if ((sk->sk_state == TCP_LAST_ACK) &&
76464+ (grsec_lastack_retries > 0) &&
76465+ (grsec_lastack_retries < retry_until))
76466+ retry_until = grsec_lastack_retries;
76467+#endif
76468+
76469 if (retransmits_timed_out(sk, retry_until,
76470 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
76471 /* Has it gone just too far? */
76472diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
76473index 5a65eea..bd913a1 100644
76474--- a/net/ipv4/udp.c
76475+++ b/net/ipv4/udp.c
76476@@ -86,6 +86,7 @@
76477 #include <linux/types.h>
76478 #include <linux/fcntl.h>
76479 #include <linux/module.h>
76480+#include <linux/security.h>
76481 #include <linux/socket.h>
76482 #include <linux/sockios.h>
76483 #include <linux/igmp.h>
76484@@ -108,6 +109,10 @@
76485 #include <trace/events/udp.h>
76486 #include "udp_impl.h"
76487
76488+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76489+extern int grsec_enable_blackhole;
76490+#endif
76491+
76492 struct udp_table udp_table __read_mostly;
76493 EXPORT_SYMBOL(udp_table);
76494
76495@@ -565,6 +570,9 @@ found:
76496 return s;
76497 }
76498
76499+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
76500+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
76501+
76502 /*
76503 * This routine is called by the ICMP module when it gets some
76504 * sort of error condition. If err < 0 then the socket should
76505@@ -856,9 +864,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
76506 dport = usin->sin_port;
76507 if (dport == 0)
76508 return -EINVAL;
76509+
76510+ err = gr_search_udp_sendmsg(sk, usin);
76511+ if (err)
76512+ return err;
76513 } else {
76514 if (sk->sk_state != TCP_ESTABLISHED)
76515 return -EDESTADDRREQ;
76516+
76517+ err = gr_search_udp_sendmsg(sk, NULL);
76518+ if (err)
76519+ return err;
76520+
76521 daddr = inet->inet_daddr;
76522 dport = inet->inet_dport;
76523 /* Open fast path for connected socket.
76524@@ -1099,7 +1116,7 @@ static unsigned int first_packet_length(struct sock *sk)
76525 udp_lib_checksum_complete(skb)) {
76526 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
76527 IS_UDPLITE(sk));
76528- atomic_inc(&sk->sk_drops);
76529+ atomic_inc_unchecked(&sk->sk_drops);
76530 __skb_unlink(skb, rcvq);
76531 __skb_queue_tail(&list_kill, skb);
76532 }
76533@@ -1185,6 +1202,10 @@ try_again:
76534 if (!skb)
76535 goto out;
76536
76537+ err = gr_search_udp_recvmsg(sk, skb);
76538+ if (err)
76539+ goto out_free;
76540+
76541 ulen = skb->len - sizeof(struct udphdr);
76542 copied = len;
76543 if (copied > ulen)
76544@@ -1487,7 +1508,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
76545
76546 drop:
76547 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
76548- atomic_inc(&sk->sk_drops);
76549+ atomic_inc_unchecked(&sk->sk_drops);
76550 kfree_skb(skb);
76551 return -1;
76552 }
76553@@ -1506,7 +1527,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
76554 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
76555
76556 if (!skb1) {
76557- atomic_inc(&sk->sk_drops);
76558+ atomic_inc_unchecked(&sk->sk_drops);
76559 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
76560 IS_UDPLITE(sk));
76561 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
76562@@ -1675,6 +1696,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76563 goto csum_error;
76564
76565 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
76566+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76567+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
76568+#endif
76569 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
76570
76571 /*
76572@@ -2098,8 +2122,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
76573 sk_wmem_alloc_get(sp),
76574 sk_rmem_alloc_get(sp),
76575 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76576- atomic_read(&sp->sk_refcnt), sp,
76577- atomic_read(&sp->sk_drops), len);
76578+ atomic_read(&sp->sk_refcnt),
76579+#ifdef CONFIG_GRKERNSEC_HIDESYM
76580+ NULL,
76581+#else
76582+ sp,
76583+#endif
76584+ atomic_read_unchecked(&sp->sk_drops), len);
76585 }
76586
76587 int udp4_seq_show(struct seq_file *seq, void *v)
76588diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
76589index 836c4ea..cbb74dc 100644
76590--- a/net/ipv6/addrconf.c
76591+++ b/net/ipv6/addrconf.c
76592@@ -2149,7 +2149,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
76593 p.iph.ihl = 5;
76594 p.iph.protocol = IPPROTO_IPV6;
76595 p.iph.ttl = 64;
76596- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
76597+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
76598
76599 if (ops->ndo_do_ioctl) {
76600 mm_segment_t oldfs = get_fs();
76601diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
76602index 4c0f894..fca5d15 100644
76603--- a/net/ipv6/ah6.c
76604+++ b/net/ipv6/ah6.c
76605@@ -56,6 +56,8 @@ struct ah_skb_cb {
76606 #define AH_SKB_CB(__skb) ((struct ah_skb_cb *)&((__skb)->cb[0]))
76607
76608 static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
76609+ unsigned int size) __size_overflow(3);
76610+static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
76611 unsigned int size)
76612 {
76613 unsigned int len;
76614diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
76615index 1567fb1..29af910 100644
76616--- a/net/ipv6/inet6_connection_sock.c
76617+++ b/net/ipv6/inet6_connection_sock.c
76618@@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
76619 #ifdef CONFIG_XFRM
76620 {
76621 struct rt6_info *rt = (struct rt6_info *)dst;
76622- rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
76623+ rt->rt6i_flow_cache_genid = atomic_read_unchecked(&flow_cache_genid);
76624 }
76625 #endif
76626 }
76627@@ -193,7 +193,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
76628 #ifdef CONFIG_XFRM
76629 if (dst) {
76630 struct rt6_info *rt = (struct rt6_info *)dst;
76631- if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
76632+ if (rt->rt6i_flow_cache_genid != atomic_read_unchecked(&flow_cache_genid)) {
76633 __sk_dst_reset(sk);
76634 dst = NULL;
76635 }
76636diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
76637index 26cb08c..8af9877 100644
76638--- a/net/ipv6/ipv6_sockglue.c
76639+++ b/net/ipv6/ipv6_sockglue.c
76640@@ -960,7 +960,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
76641 if (sk->sk_type != SOCK_STREAM)
76642 return -ENOPROTOOPT;
76643
76644- msg.msg_control = optval;
76645+ msg.msg_control = (void __force_kernel *)optval;
76646 msg.msg_controllen = len;
76647 msg.msg_flags = flags;
76648
76649diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
76650index 94874b0..dc413fa 100644
76651--- a/net/ipv6/netfilter/ip6_tables.c
76652+++ b/net/ipv6/netfilter/ip6_tables.c
76653@@ -1194,6 +1194,10 @@ get_entries(struct net *net, struct ip6t_get_entries __user *uptr,
76654 static int
76655 __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76656 struct xt_table_info *newinfo, unsigned int num_counters,
76657+ void __user *counters_ptr) __size_overflow(5);
76658+static int
76659+__do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76660+ struct xt_table_info *newinfo, unsigned int num_counters,
76661 void __user *counters_ptr)
76662 {
76663 int ret;
76664@@ -1315,6 +1319,9 @@ do_replace(struct net *net, const void __user *user, unsigned int len)
76665
76666 static int
76667 do_add_counters(struct net *net, const void __user *user, unsigned int len,
76668+ int compat) __size_overflow(3);
76669+static int
76670+do_add_counters(struct net *net, const void __user *user, unsigned int len,
76671 int compat)
76672 {
76673 unsigned int i, curcpu;
76674diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
76675index 361ebf3..d5628fb 100644
76676--- a/net/ipv6/raw.c
76677+++ b/net/ipv6/raw.c
76678@@ -377,7 +377,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
76679 {
76680 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
76681 skb_checksum_complete(skb)) {
76682- atomic_inc(&sk->sk_drops);
76683+ atomic_inc_unchecked(&sk->sk_drops);
76684 kfree_skb(skb);
76685 return NET_RX_DROP;
76686 }
76687@@ -404,7 +404,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
76688 struct raw6_sock *rp = raw6_sk(sk);
76689
76690 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
76691- atomic_inc(&sk->sk_drops);
76692+ atomic_inc_unchecked(&sk->sk_drops);
76693 kfree_skb(skb);
76694 return NET_RX_DROP;
76695 }
76696@@ -428,7 +428,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
76697
76698 if (inet->hdrincl) {
76699 if (skb_checksum_complete(skb)) {
76700- atomic_inc(&sk->sk_drops);
76701+ atomic_inc_unchecked(&sk->sk_drops);
76702 kfree_skb(skb);
76703 return NET_RX_DROP;
76704 }
76705@@ -601,7 +601,7 @@ out:
76706 return err;
76707 }
76708
76709-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
76710+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
76711 struct flowi6 *fl6, struct dst_entry **dstp,
76712 unsigned int flags)
76713 {
76714@@ -909,12 +909,15 @@ do_confirm:
76715 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
76716 char __user *optval, int optlen)
76717 {
76718+ struct icmp6_filter filter;
76719+
76720 switch (optname) {
76721 case ICMPV6_FILTER:
76722 if (optlen > sizeof(struct icmp6_filter))
76723 optlen = sizeof(struct icmp6_filter);
76724- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
76725+ if (copy_from_user(&filter, optval, optlen))
76726 return -EFAULT;
76727+ raw6_sk(sk)->filter = filter;
76728 return 0;
76729 default:
76730 return -ENOPROTOOPT;
76731@@ -927,6 +930,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
76732 char __user *optval, int __user *optlen)
76733 {
76734 int len;
76735+ struct icmp6_filter filter;
76736
76737 switch (optname) {
76738 case ICMPV6_FILTER:
76739@@ -938,7 +942,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
76740 len = sizeof(struct icmp6_filter);
76741 if (put_user(len, optlen))
76742 return -EFAULT;
76743- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
76744+ filter = raw6_sk(sk)->filter;
76745+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
76746 return -EFAULT;
76747 return 0;
76748 default:
76749@@ -1245,7 +1250,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
76750 0, 0L, 0,
76751 sock_i_uid(sp), 0,
76752 sock_i_ino(sp),
76753- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
76754+ atomic_read(&sp->sk_refcnt),
76755+#ifdef CONFIG_GRKERNSEC_HIDESYM
76756+ NULL,
76757+#else
76758+ sp,
76759+#endif
76760+ atomic_read_unchecked(&sp->sk_drops));
76761 }
76762
76763 static int raw6_seq_show(struct seq_file *seq, void *v)
76764diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
76765index b859e4a..f9d1589 100644
76766--- a/net/ipv6/tcp_ipv6.c
76767+++ b/net/ipv6/tcp_ipv6.c
76768@@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
76769 }
76770 #endif
76771
76772+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76773+extern int grsec_enable_blackhole;
76774+#endif
76775+
76776 static void tcp_v6_hash(struct sock *sk)
76777 {
76778 if (sk->sk_state != TCP_CLOSE) {
76779@@ -1651,6 +1655,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
76780 return 0;
76781
76782 reset:
76783+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76784+ if (!grsec_enable_blackhole)
76785+#endif
76786 tcp_v6_send_reset(sk, skb);
76787 discard:
76788 if (opt_skb)
76789@@ -1730,12 +1737,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
76790 TCP_SKB_CB(skb)->sacked = 0;
76791
76792 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
76793- if (!sk)
76794+ if (!sk) {
76795+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76796+ ret = 1;
76797+#endif
76798 goto no_tcp_socket;
76799+ }
76800
76801 process:
76802- if (sk->sk_state == TCP_TIME_WAIT)
76803+ if (sk->sk_state == TCP_TIME_WAIT) {
76804+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76805+ ret = 2;
76806+#endif
76807 goto do_time_wait;
76808+ }
76809
76810 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
76811 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
76812@@ -1783,6 +1798,10 @@ no_tcp_socket:
76813 bad_packet:
76814 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
76815 } else {
76816+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76817+ if (!grsec_enable_blackhole || (ret == 1 &&
76818+ (skb->dev->flags & IFF_LOOPBACK)))
76819+#endif
76820 tcp_v6_send_reset(NULL, skb);
76821 }
76822
76823@@ -2043,7 +2062,13 @@ static void get_openreq6(struct seq_file *seq,
76824 uid,
76825 0, /* non standard timer */
76826 0, /* open_requests have no inode */
76827- 0, req);
76828+ 0,
76829+#ifdef CONFIG_GRKERNSEC_HIDESYM
76830+ NULL
76831+#else
76832+ req
76833+#endif
76834+ );
76835 }
76836
76837 static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
76838@@ -2093,7 +2118,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
76839 sock_i_uid(sp),
76840 icsk->icsk_probes_out,
76841 sock_i_ino(sp),
76842- atomic_read(&sp->sk_refcnt), sp,
76843+ atomic_read(&sp->sk_refcnt),
76844+#ifdef CONFIG_GRKERNSEC_HIDESYM
76845+ NULL,
76846+#else
76847+ sp,
76848+#endif
76849 jiffies_to_clock_t(icsk->icsk_rto),
76850 jiffies_to_clock_t(icsk->icsk_ack.ato),
76851 (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
76852@@ -2128,7 +2158,13 @@ static void get_timewait6_sock(struct seq_file *seq,
76853 dest->s6_addr32[2], dest->s6_addr32[3], destp,
76854 tw->tw_substate, 0, 0,
76855 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
76856- atomic_read(&tw->tw_refcnt), tw);
76857+ atomic_read(&tw->tw_refcnt),
76858+#ifdef CONFIG_GRKERNSEC_HIDESYM
76859+ NULL
76860+#else
76861+ tw
76862+#endif
76863+ );
76864 }
76865
76866 static int tcp6_seq_show(struct seq_file *seq, void *v)
76867diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
76868index 8c25419..47a51ae 100644
76869--- a/net/ipv6/udp.c
76870+++ b/net/ipv6/udp.c
76871@@ -50,6 +50,10 @@
76872 #include <linux/seq_file.h>
76873 #include "udp_impl.h"
76874
76875+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76876+extern int grsec_enable_blackhole;
76877+#endif
76878+
76879 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
76880 {
76881 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
76882@@ -549,7 +553,7 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
76883
76884 return 0;
76885 drop:
76886- atomic_inc(&sk->sk_drops);
76887+ atomic_inc_unchecked(&sk->sk_drops);
76888 drop_no_sk_drops_inc:
76889 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
76890 kfree_skb(skb);
76891@@ -625,7 +629,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
76892 continue;
76893 }
76894 drop:
76895- atomic_inc(&sk->sk_drops);
76896+ atomic_inc_unchecked(&sk->sk_drops);
76897 UDP6_INC_STATS_BH(sock_net(sk),
76898 UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk));
76899 UDP6_INC_STATS_BH(sock_net(sk),
76900@@ -780,6 +784,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76901 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
76902 proto == IPPROTO_UDPLITE);
76903
76904+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76905+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
76906+#endif
76907 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
76908
76909 kfree_skb(skb);
76910@@ -796,7 +803,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76911 if (!sock_owned_by_user(sk))
76912 udpv6_queue_rcv_skb(sk, skb);
76913 else if (sk_add_backlog(sk, skb)) {
76914- atomic_inc(&sk->sk_drops);
76915+ atomic_inc_unchecked(&sk->sk_drops);
76916 bh_unlock_sock(sk);
76917 sock_put(sk);
76918 goto discard;
76919@@ -1407,8 +1414,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
76920 0, 0L, 0,
76921 sock_i_uid(sp), 0,
76922 sock_i_ino(sp),
76923- atomic_read(&sp->sk_refcnt), sp,
76924- atomic_read(&sp->sk_drops));
76925+ atomic_read(&sp->sk_refcnt),
76926+#ifdef CONFIG_GRKERNSEC_HIDESYM
76927+ NULL,
76928+#else
76929+ sp,
76930+#endif
76931+ atomic_read_unchecked(&sp->sk_drops));
76932 }
76933
76934 int udp6_seq_show(struct seq_file *seq, void *v)
76935diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
76936index 253695d..9481ce8 100644
76937--- a/net/irda/ircomm/ircomm_tty.c
76938+++ b/net/irda/ircomm/ircomm_tty.c
76939@@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76940 add_wait_queue(&self->open_wait, &wait);
76941
76942 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
76943- __FILE__,__LINE__, tty->driver->name, self->open_count );
76944+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
76945
76946 /* As far as I can see, we protect open_count - Jean II */
76947 spin_lock_irqsave(&self->spinlock, flags);
76948 if (!tty_hung_up_p(filp)) {
76949 extra_count = 1;
76950- self->open_count--;
76951+ local_dec(&self->open_count);
76952 }
76953 spin_unlock_irqrestore(&self->spinlock, flags);
76954- self->blocked_open++;
76955+ local_inc(&self->blocked_open);
76956
76957 while (1) {
76958 if (tty->termios->c_cflag & CBAUD) {
76959@@ -331,7 +331,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76960 }
76961
76962 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
76963- __FILE__,__LINE__, tty->driver->name, self->open_count );
76964+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
76965
76966 schedule();
76967 }
76968@@ -342,13 +342,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76969 if (extra_count) {
76970 /* ++ is not atomic, so this should be protected - Jean II */
76971 spin_lock_irqsave(&self->spinlock, flags);
76972- self->open_count++;
76973+ local_inc(&self->open_count);
76974 spin_unlock_irqrestore(&self->spinlock, flags);
76975 }
76976- self->blocked_open--;
76977+ local_dec(&self->blocked_open);
76978
76979 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
76980- __FILE__,__LINE__, tty->driver->name, self->open_count);
76981+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
76982
76983 if (!retval)
76984 self->flags |= ASYNC_NORMAL_ACTIVE;
76985@@ -417,14 +417,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
76986 }
76987 /* ++ is not atomic, so this should be protected - Jean II */
76988 spin_lock_irqsave(&self->spinlock, flags);
76989- self->open_count++;
76990+ local_inc(&self->open_count);
76991
76992 tty->driver_data = self;
76993 self->tty = tty;
76994 spin_unlock_irqrestore(&self->spinlock, flags);
76995
76996 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
76997- self->line, self->open_count);
76998+ self->line, local_read(&self->open_count));
76999
77000 /* Not really used by us, but lets do it anyway */
77001 self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
77002@@ -510,7 +510,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
77003 return;
77004 }
77005
77006- if ((tty->count == 1) && (self->open_count != 1)) {
77007+ if ((tty->count == 1) && (local_read(&self->open_count) != 1)) {
77008 /*
77009 * Uh, oh. tty->count is 1, which means that the tty
77010 * structure will be freed. state->count should always
77011@@ -520,16 +520,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
77012 */
77013 IRDA_DEBUG(0, "%s(), bad serial port count; "
77014 "tty->count is 1, state->count is %d\n", __func__ ,
77015- self->open_count);
77016- self->open_count = 1;
77017+ local_read(&self->open_count));
77018+ local_set(&self->open_count, 1);
77019 }
77020
77021- if (--self->open_count < 0) {
77022+ if (local_dec_return(&self->open_count) < 0) {
77023 IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
77024- __func__, self->line, self->open_count);
77025- self->open_count = 0;
77026+ __func__, self->line, local_read(&self->open_count));
77027+ local_set(&self->open_count, 0);
77028 }
77029- if (self->open_count) {
77030+ if (local_read(&self->open_count)) {
77031 spin_unlock_irqrestore(&self->spinlock, flags);
77032
77033 IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
77034@@ -561,7 +561,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
77035 tty->closing = 0;
77036 self->tty = NULL;
77037
77038- if (self->blocked_open) {
77039+ if (local_read(&self->blocked_open)) {
77040 if (self->close_delay)
77041 schedule_timeout_interruptible(self->close_delay);
77042 wake_up_interruptible(&self->open_wait);
77043@@ -1013,7 +1013,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
77044 spin_lock_irqsave(&self->spinlock, flags);
77045 self->flags &= ~ASYNC_NORMAL_ACTIVE;
77046 self->tty = NULL;
77047- self->open_count = 0;
77048+ local_set(&self->open_count, 0);
77049 spin_unlock_irqrestore(&self->spinlock, flags);
77050
77051 wake_up_interruptible(&self->open_wait);
77052@@ -1360,7 +1360,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
77053 seq_putc(m, '\n');
77054
77055 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
77056- seq_printf(m, "Open count: %d\n", self->open_count);
77057+ seq_printf(m, "Open count: %d\n", local_read(&self->open_count));
77058 seq_printf(m, "Max data size: %d\n", self->max_data_size);
77059 seq_printf(m, "Max header size: %d\n", self->max_header_size);
77060
77061diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
77062index 274d150..656a144 100644
77063--- a/net/iucv/af_iucv.c
77064+++ b/net/iucv/af_iucv.c
77065@@ -787,10 +787,10 @@ static int iucv_sock_autobind(struct sock *sk)
77066
77067 write_lock_bh(&iucv_sk_list.lock);
77068
77069- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
77070+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
77071 while (__iucv_get_sock_by_name(name)) {
77072 sprintf(name, "%08x",
77073- atomic_inc_return(&iucv_sk_list.autobind_name));
77074+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
77075 }
77076
77077 write_unlock_bh(&iucv_sk_list.lock);
77078diff --git a/net/key/af_key.c b/net/key/af_key.c
77079index 1e733e9..3d73c9f 100644
77080--- a/net/key/af_key.c
77081+++ b/net/key/af_key.c
77082@@ -3016,10 +3016,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
77083 static u32 get_acqseq(void)
77084 {
77085 u32 res;
77086- static atomic_t acqseq;
77087+ static atomic_unchecked_t acqseq;
77088
77089 do {
77090- res = atomic_inc_return(&acqseq);
77091+ res = atomic_inc_return_unchecked(&acqseq);
77092 } while (!res);
77093 return res;
77094 }
77095diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
77096index 73495f1..ad51356 100644
77097--- a/net/mac80211/ieee80211_i.h
77098+++ b/net/mac80211/ieee80211_i.h
77099@@ -27,6 +27,7 @@
77100 #include <net/ieee80211_radiotap.h>
77101 #include <net/cfg80211.h>
77102 #include <net/mac80211.h>
77103+#include <asm/local.h>
77104 #include "key.h"
77105 #include "sta_info.h"
77106
77107@@ -764,7 +765,7 @@ struct ieee80211_local {
77108 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
77109 spinlock_t queue_stop_reason_lock;
77110
77111- int open_count;
77112+ local_t open_count;
77113 int monitors, cooked_mntrs;
77114 /* number of interfaces with corresponding FIF_ flags */
77115 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
77116diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
77117index 30d7355..e260095 100644
77118--- a/net/mac80211/iface.c
77119+++ b/net/mac80211/iface.c
77120@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
77121 break;
77122 }
77123
77124- if (local->open_count == 0) {
77125+ if (local_read(&local->open_count) == 0) {
77126 res = drv_start(local);
77127 if (res)
77128 goto err_del_bss;
77129@@ -235,7 +235,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
77130 memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
77131
77132 if (!is_valid_ether_addr(dev->dev_addr)) {
77133- if (!local->open_count)
77134+ if (!local_read(&local->open_count))
77135 drv_stop(local);
77136 return -EADDRNOTAVAIL;
77137 }
77138@@ -327,7 +327,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
77139 mutex_unlock(&local->mtx);
77140
77141 if (coming_up)
77142- local->open_count++;
77143+ local_inc(&local->open_count);
77144
77145 if (hw_reconf_flags) {
77146 ieee80211_hw_config(local, hw_reconf_flags);
77147@@ -347,7 +347,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
77148 err_del_interface:
77149 drv_remove_interface(local, &sdata->vif);
77150 err_stop:
77151- if (!local->open_count)
77152+ if (!local_read(&local->open_count))
77153 drv_stop(local);
77154 err_del_bss:
77155 sdata->bss = NULL;
77156@@ -472,7 +472,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
77157 }
77158
77159 if (going_down)
77160- local->open_count--;
77161+ local_dec(&local->open_count);
77162
77163 switch (sdata->vif.type) {
77164 case NL80211_IFTYPE_AP_VLAN:
77165@@ -531,7 +531,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
77166
77167 ieee80211_recalc_ps(local, -1);
77168
77169- if (local->open_count == 0) {
77170+ if (local_read(&local->open_count) == 0) {
77171 if (local->ops->napi_poll)
77172 napi_disable(&local->napi);
77173 ieee80211_clear_tx_pending(local);
77174diff --git a/net/mac80211/main.c b/net/mac80211/main.c
77175index 7d9b21d..0687004 100644
77176--- a/net/mac80211/main.c
77177+++ b/net/mac80211/main.c
77178@@ -163,7 +163,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
77179 local->hw.conf.power_level = power;
77180 }
77181
77182- if (changed && local->open_count) {
77183+ if (changed && local_read(&local->open_count)) {
77184 ret = drv_config(local, changed);
77185 /*
77186 * Goal:
77187diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
77188index 9ee7164..56c5061 100644
77189--- a/net/mac80211/pm.c
77190+++ b/net/mac80211/pm.c
77191@@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
77192 struct ieee80211_sub_if_data *sdata;
77193 struct sta_info *sta;
77194
77195- if (!local->open_count)
77196+ if (!local_read(&local->open_count))
77197 goto suspend;
77198
77199 ieee80211_scan_cancel(local);
77200@@ -72,7 +72,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
77201 cancel_work_sync(&local->dynamic_ps_enable_work);
77202 del_timer_sync(&local->dynamic_ps_timer);
77203
77204- local->wowlan = wowlan && local->open_count;
77205+ local->wowlan = wowlan && local_read(&local->open_count);
77206 if (local->wowlan) {
77207 int err = drv_suspend(local, wowlan);
77208 if (err < 0) {
77209@@ -129,7 +129,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
77210 }
77211
77212 /* stop hardware - this must stop RX */
77213- if (local->open_count)
77214+ if (local_read(&local->open_count))
77215 ieee80211_stop_device(local);
77216
77217 suspend:
77218diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
77219index 7d84b87..6a69cd9 100644
77220--- a/net/mac80211/rate.c
77221+++ b/net/mac80211/rate.c
77222@@ -401,7 +401,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
77223
77224 ASSERT_RTNL();
77225
77226- if (local->open_count)
77227+ if (local_read(&local->open_count))
77228 return -EBUSY;
77229
77230 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
77231diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
77232index c97a065..ff61928 100644
77233--- a/net/mac80211/rc80211_pid_debugfs.c
77234+++ b/net/mac80211/rc80211_pid_debugfs.c
77235@@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
77236
77237 spin_unlock_irqrestore(&events->lock, status);
77238
77239- if (copy_to_user(buf, pb, p))
77240+ if (p > sizeof(pb) || copy_to_user(buf, pb, p))
77241 return -EFAULT;
77242
77243 return p;
77244diff --git a/net/mac80211/util.c b/net/mac80211/util.c
77245index d5230ec..c604b21 100644
77246--- a/net/mac80211/util.c
77247+++ b/net/mac80211/util.c
77248@@ -1000,7 +1000,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
77249 drv_set_coverage_class(local, hw->wiphy->coverage_class);
77250
77251 /* everything else happens only if HW was up & running */
77252- if (!local->open_count)
77253+ if (!local_read(&local->open_count))
77254 goto wake_up;
77255
77256 /*
77257diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
77258index d5597b7..ab6d39c 100644
77259--- a/net/netfilter/Kconfig
77260+++ b/net/netfilter/Kconfig
77261@@ -779,6 +779,16 @@ config NETFILTER_XT_MATCH_ESP
77262
77263 To compile it as a module, choose M here. If unsure, say N.
77264
77265+config NETFILTER_XT_MATCH_GRADM
77266+ tristate '"gradm" match support'
77267+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
77268+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
77269+ ---help---
77270+ The gradm match allows to match on grsecurity RBAC being enabled.
77271+ It is useful when iptables rules are applied early on bootup to
77272+ prevent connections to the machine (except from a trusted host)
77273+ while the RBAC system is disabled.
77274+
77275 config NETFILTER_XT_MATCH_HASHLIMIT
77276 tristate '"hashlimit" match support'
77277 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
77278diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
77279index 1a02853..5d8c22e 100644
77280--- a/net/netfilter/Makefile
77281+++ b/net/netfilter/Makefile
77282@@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
77283 obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
77284 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
77285 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
77286+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
77287 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
77288 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
77289 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
77290diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
77291index 29fa5ba..8debc79 100644
77292--- a/net/netfilter/ipvs/ip_vs_conn.c
77293+++ b/net/netfilter/ipvs/ip_vs_conn.c
77294@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
77295 /* Increase the refcnt counter of the dest */
77296 atomic_inc(&dest->refcnt);
77297
77298- conn_flags = atomic_read(&dest->conn_flags);
77299+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
77300 if (cp->protocol != IPPROTO_UDP)
77301 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
77302 /* Bind with the destination and its corresponding transmitter */
77303@@ -869,7 +869,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
77304 atomic_set(&cp->refcnt, 1);
77305
77306 atomic_set(&cp->n_control, 0);
77307- atomic_set(&cp->in_pkts, 0);
77308+ atomic_set_unchecked(&cp->in_pkts, 0);
77309
77310 atomic_inc(&ipvs->conn_count);
77311 if (flags & IP_VS_CONN_F_NO_CPORT)
77312@@ -1149,7 +1149,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
77313
77314 /* Don't drop the entry if its number of incoming packets is not
77315 located in [0, 8] */
77316- i = atomic_read(&cp->in_pkts);
77317+ i = atomic_read_unchecked(&cp->in_pkts);
77318 if (i > 8 || i < 0) return 0;
77319
77320 if (!todrop_rate[i]) return 0;
77321diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
77322index 6dc7d7d..e45913a 100644
77323--- a/net/netfilter/ipvs/ip_vs_core.c
77324+++ b/net/netfilter/ipvs/ip_vs_core.c
77325@@ -562,7 +562,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
77326 ret = cp->packet_xmit(skb, cp, pd->pp);
77327 /* do not touch skb anymore */
77328
77329- atomic_inc(&cp->in_pkts);
77330+ atomic_inc_unchecked(&cp->in_pkts);
77331 ip_vs_conn_put(cp);
77332 return ret;
77333 }
77334@@ -1611,7 +1611,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
77335 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
77336 pkts = sysctl_sync_threshold(ipvs);
77337 else
77338- pkts = atomic_add_return(1, &cp->in_pkts);
77339+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
77340
77341 if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
77342 cp->protocol == IPPROTO_SCTP) {
77343diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
77344index e1a66cf..0910076 100644
77345--- a/net/netfilter/ipvs/ip_vs_ctl.c
77346+++ b/net/netfilter/ipvs/ip_vs_ctl.c
77347@@ -788,7 +788,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
77348 ip_vs_rs_hash(ipvs, dest);
77349 write_unlock_bh(&ipvs->rs_lock);
77350 }
77351- atomic_set(&dest->conn_flags, conn_flags);
77352+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
77353
77354 /* bind the service */
77355 if (!dest->svc) {
77356@@ -2028,7 +2028,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
77357 " %-7s %-6d %-10d %-10d\n",
77358 &dest->addr.in6,
77359 ntohs(dest->port),
77360- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
77361+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
77362 atomic_read(&dest->weight),
77363 atomic_read(&dest->activeconns),
77364 atomic_read(&dest->inactconns));
77365@@ -2039,7 +2039,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
77366 "%-7s %-6d %-10d %-10d\n",
77367 ntohl(dest->addr.ip),
77368 ntohs(dest->port),
77369- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
77370+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
77371 atomic_read(&dest->weight),
77372 atomic_read(&dest->activeconns),
77373 atomic_read(&dest->inactconns));
77374@@ -2509,7 +2509,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
77375
77376 entry.addr = dest->addr.ip;
77377 entry.port = dest->port;
77378- entry.conn_flags = atomic_read(&dest->conn_flags);
77379+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
77380 entry.weight = atomic_read(&dest->weight);
77381 entry.u_threshold = dest->u_threshold;
77382 entry.l_threshold = dest->l_threshold;
77383@@ -3042,7 +3042,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
77384 NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
77385
77386 NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
77387- atomic_read(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
77388+ atomic_read_unchecked(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
77389 NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
77390 NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
77391 NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
77392diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
77393index 2b6678c0..aaa41fc 100644
77394--- a/net/netfilter/ipvs/ip_vs_sync.c
77395+++ b/net/netfilter/ipvs/ip_vs_sync.c
77396@@ -649,7 +649,7 @@ control:
77397 * i.e only increment in_pkts for Templates.
77398 */
77399 if (cp->flags & IP_VS_CONN_F_TEMPLATE) {
77400- int pkts = atomic_add_return(1, &cp->in_pkts);
77401+ int pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
77402
77403 if (pkts % sysctl_sync_period(ipvs) != 1)
77404 return;
77405@@ -795,7 +795,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
77406
77407 if (opt)
77408 memcpy(&cp->in_seq, opt, sizeof(*opt));
77409- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
77410+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
77411 cp->state = state;
77412 cp->old_state = cp->state;
77413 /*
77414diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
77415index aa2d720..d8aa111 100644
77416--- a/net/netfilter/ipvs/ip_vs_xmit.c
77417+++ b/net/netfilter/ipvs/ip_vs_xmit.c
77418@@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
77419 else
77420 rc = NF_ACCEPT;
77421 /* do not touch skb anymore */
77422- atomic_inc(&cp->in_pkts);
77423+ atomic_inc_unchecked(&cp->in_pkts);
77424 goto out;
77425 }
77426
77427@@ -1272,7 +1272,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
77428 else
77429 rc = NF_ACCEPT;
77430 /* do not touch skb anymore */
77431- atomic_inc(&cp->in_pkts);
77432+ atomic_inc_unchecked(&cp->in_pkts);
77433 goto out;
77434 }
77435
77436diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
77437index 66b2c54..c7884e3 100644
77438--- a/net/netfilter/nfnetlink_log.c
77439+++ b/net/netfilter/nfnetlink_log.c
77440@@ -70,7 +70,7 @@ struct nfulnl_instance {
77441 };
77442
77443 static DEFINE_SPINLOCK(instances_lock);
77444-static atomic_t global_seq;
77445+static atomic_unchecked_t global_seq;
77446
77447 #define INSTANCE_BUCKETS 16
77448 static struct hlist_head instance_table[INSTANCE_BUCKETS];
77449@@ -502,7 +502,7 @@ __build_packet_message(struct nfulnl_instance *inst,
77450 /* global sequence number */
77451 if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
77452 NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
77453- htonl(atomic_inc_return(&global_seq)));
77454+ htonl(atomic_inc_return_unchecked(&global_seq)));
77455
77456 if (data_len) {
77457 struct nlattr *nla;
77458diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
77459new file mode 100644
77460index 0000000..6905327
77461--- /dev/null
77462+++ b/net/netfilter/xt_gradm.c
77463@@ -0,0 +1,51 @@
77464+/*
77465+ * gradm match for netfilter
77466